diff --git a/flake.lock b/flake.lock index 08ead55..5a8a1b0 100644 --- a/flake.lock +++ b/flake.lock @@ -2,12 +2,8 @@ "nodes": { "agenix": { "inputs": { - "darwin": [ - "nix-darwin" - ], - "home-manager": [ - "home-manager" - ], + "darwin": "darwin", + "home-manager": "home-manager", "nixpkgs": [ "nixpkgs" ], @@ -27,6 +23,28 @@ "type": "github" } }, + "darwin": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1744478979, + "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "43975d782b418ebf4969e9ccba82466728c2851b", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -49,6 +67,27 @@ } }, "home-manager": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1745494811, + "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -202,7 +241,7 @@ "root": { "inputs": { "agenix": "agenix", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs", diff --git a/flake.nix b/flake.nix index 3ae5187..14948bb 100644 --- a/flake.nix +++ b/flake.nix @@ -6,43 +6,31 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-25.05-darwin"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - - # Inputs for both darwin and linux systems - agenix = { - url = "github:ryantm/agenix"; - inputs = { - nixpkgs.follows = "nixpkgs"; - darwin.follows = "nix-darwin"; - home-manager.follows = "home-manager"; - }; - }; home-manager = { url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; + agenix = { + url = "github:ryantm/agenix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nix-darwin = { + url = "github:LnL7/nix-darwin/nix-darwin-25.05"; + inputs.nixpkgs.follows = "nixpkgs-darwin"; + }; + rycee-nurpkgs = { + url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nur = { url = "github:nix-community/NUR"; inputs.nixpkgs.follows = "nixpkgs"; }; - rycee-nurpkgs = { - url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - # Linux-specific inputs + nix-flatpak.url = "github:gmodena/nix-flatpak?ref=v0.6.0"; plasma-manager = { url = "github:nix-community/plasma-manager"; - inputs = { - nixpkgs.follows = "nixpkgs"; - home-manager.follows = "home-manager"; - }; - }; - nix-flatpak.url = "github:gmodena/nix-flatpak?ref=v0.6.0"; - - # Darwin-specific inputs - nix-darwin = { - url = "github:LnL7/nix-darwin/nix-darwin-25.05"; - inputs.nixpkgs.follows = "nixpkgs-darwin"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.home-manager.follows = "home-manager"; }; }; diff --git a/systems/darwin/corianne.nix b/systems/darwin/corianne.nix index 54bc569..0c679d0 100644 --- a/systems/darwin/corianne.nix +++ b/systems/darwin/corianne.nix @@ -81,6 +81,7 @@ "alt-tab" "anki" "anythingllm" + "eloston-chromium" "firefox" "freetube" "inkscape" @@ -96,12 +97,10 @@ "qownnotes" "rstudio" "signal" - "slack" "stats" "steam" "textmate" "thunderbird@esr" - "ungoogled-chromium" "veracrypt" "vlc" "vorta"