diff options
| -rw-r--r-- | nix-conf/config.nix | 18 | ||||
| -rw-r--r-- | nix-conf/flake.lock | 12 | ||||
| -rw-r--r-- | nix-conf/flake.nix | 43 | ||||
| -rw-r--r-- | nix-conf/home/includes/common.nix | 2 | ||||
| -rw-r--r-- | nix-conf/machines/egalmoth/configuration.nix | 12 |
5 files changed, 36 insertions, 51 deletions
diff --git a/nix-conf/config.nix b/nix-conf/config.nix new file mode 100644 index 0000000..09d248e --- /dev/null +++ b/nix-conf/config.nix @@ -0,0 +1,18 @@ +{ pkgs, lib, nixpkgs, ... }: +{ + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "aspell-dict-en-science" ]; + nix = { + package = pkgs.nix; + settings = { + experimental-features = "nix-command flakes"; + substituters = [ + "https://nix-community.cachix.org" + "https://cache.nixos.org/" + ]; + trusted-public-keys = [ + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + ]; + }; + }; +} + diff --git a/nix-conf/flake.lock b/nix-conf/flake.lock index 2e9c1e2..a745d87 100644 --- a/nix-conf/flake.lock +++ b/nix-conf/flake.lock @@ -93,11 +93,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1754028485, - "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", + "lastModified": 1754292888, + "narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "59e69648d345d6e8fef86158c555730fa12af9de", + "rev": "ce01daebf8489ba97bd1609d185ea276efdeb121", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1752544651, - "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=", + "lastModified": 1754328224, + "narHash": "sha256-glPK8DF329/dXtosV7YSzRlF4n35WDjaVwdOMEoEXHA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2c8def626f54708a9c38a5861866660395bb3461", + "rev": "49021900e69812ba7ddb9e40f9170218a7eca9f4", "type": "github" }, "original": { diff --git a/nix-conf/flake.nix b/nix-conf/flake.nix index a90931d..ad2dee9 100644 --- a/nix-conf/flake.nix +++ b/nix-conf/flake.nix @@ -53,9 +53,6 @@ linux-arm-overlay-unstable = final: prev: { unstable = nixpkgs.legacyPackages.${linux-arm-system}; }; - nixpkgs-config = { - allowUnfreePredicate = pkg: builtins.elem (nixpkgs.lib.getName pkg) [ "aspell-dict-en-science" ]; - }; in { nixosConfigurations."egalmoth" = nixpkgs-stable.lib.nixosSystem { @@ -65,9 +62,9 @@ { config, pkgs, ... }: { nixpkgs.overlays = [ linux-overlay-unstable ]; - nix.settings.experimental-features = "nix-command flakes"; } ) + ./config.nix ./machines/egalmoth/configuration.nix ]; }; @@ -78,9 +75,9 @@ { config, pkgs, ... }: { nixpkgs.overlays = [ linux-overlay-unstable ]; - nix.settings.experimental-features = "nix-command flakes"; } ) + ./config.nix ./machines/edrahil/configuration.nix sops-nix.nixosModules.sops ]; @@ -92,9 +89,9 @@ { config, pkgs, ... }: { nixpkgs.overlays = [ linux-overlay-unstable ]; - nix.settings.experimental-features = "nix-command flakes"; } ) + ./config.nix ./machines/djmuk1/configuration.nix ]; }; @@ -105,9 +102,9 @@ { config, pkgs, ... }: { nixpkgs.overlays = [ linux-arm-overlay-unstable ]; - nix.settings.experimental-features = "nix-command flakes"; } ) + ./config.nix ./machines/djmuk2/configuration.nix ]; }; @@ -118,7 +115,6 @@ ( { pkgs, ... }: { - nix.settings.experimental-features = "nix-command flakes"; nix.settings.trusted-users = [ "dmorgan" "@staff" @@ -160,21 +156,7 @@ ]; } ) - # TODO remove or re-enable? - #home-manager.darwinModules.home-manager - #{ - # nixpkgs.overlays = [ darwin-overlay-unstable ]; - # nixpkgs.config = nixpkgs-config; - # home-manager = { - # useGlobalPkgs = true; - # useUserPackages = true; - # extraSpecialArgs = { - # inherit inputs; - # system = darwin-system; - # }; - # users.dmorgan = ./home/otm.nix; - # }; - #} + ./config.nix ]; }; homeConfigurations."dmorgan@LDN-DMORGAN" = home-manager.lib.homeManagerConfiguration { @@ -188,10 +170,9 @@ { config, pkgs, ... }: { nixpkgs.overlays = [ darwin-overlay-unstable ]; - nixpkgs.config = nixpkgs-config; - nix.package = pkgs.nix; } ) + ./config.nix ./home/otm.nix ]; }; @@ -205,11 +186,10 @@ ( { config, pkgs, ... }: { - nix.package = pkgs.nix; nixpkgs.overlays = [ linux-overlay-unstable ]; - nixpkgs.config = nixpkgs-config; } ) + ./config.nix ./home/egalmoth.nix ]; }; @@ -223,11 +203,10 @@ ( { config, pkgs, ... }: { - nix.package = pkgs.nix; nixpkgs.overlays = [ linux-overlay-unstable ]; - nixpkgs.config = nixpkgs-config; } ) + ./config.nix ./home/edrahil.nix ]; }; @@ -241,11 +220,10 @@ ( { config, pkgs, ... }: { - nix.package = pkgs.nix; nixpkgs.overlays = [ linux-overlay-unstable ]; - nixpkgs.config = nixpkgs-config; } ) + ./config.nix ./home/djmuk1.nix ]; }; @@ -259,11 +237,10 @@ ( { config, pkgs, ... }: { - nix.package = pkgs.nix; nixpkgs.overlays = [ linux-arm-overlay-unstable ]; - nixpkgs.config = nixpkgs-config; } ) + ./config.nix ./home/djmuk2.nix ]; }; diff --git a/nix-conf/home/includes/common.nix b/nix-conf/home/includes/common.nix index af1e484..281cf2c 100644 --- a/nix-conf/home/includes/common.nix +++ b/nix-conf/home/includes/common.nix @@ -32,6 +32,7 @@ home.sessionVariables = { LSP_USE_PLISTS = "true"; + NH_FLAKE = config.home.homeDirectory; }; home.packages = with pkgs; [ @@ -369,6 +370,7 @@ }; }; + # TODO: programs.nh.flake bring in so many dependencies? programs.nh.enable = true; } diff --git a/nix-conf/machines/egalmoth/configuration.nix b/nix-conf/machines/egalmoth/configuration.nix index 0da134b..d1fdd56 100644 --- a/nix-conf/machines/egalmoth/configuration.nix +++ b/nix-conf/machines/egalmoth/configuration.nix @@ -159,18 +159,6 @@ services.locate.enable = true; - nix = { - settings = { - substituters = [ - "https://nix-community.cachix.org" - "https://cache.nixos.org/" - ]; - trusted-public-keys = [ - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - ]; - }; - }; - environment.systemPackages = with pkgs; [ acpi acpitool |