From 68e689d9aaf38214a07601936b3d50c54fb105ad Mon Sep 17 00:00:00 2001 From: Don Harper Date: Sun, 26 May 2024 22:31:34 -0500 Subject: [PATCH] updates from makefile --- flake.lock | 30 ++++++++++---------- flake.nix | 62 +++++++++++++++++++++++++++++++++-------- hosts/smaug/default.nix | 1 + 3 files changed, 66 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index a9a1bbd..e05c544 100644 --- a/flake.lock +++ b/flake.lock @@ -240,11 +240,11 @@ ] }, "locked": { - "lastModified": 1715930644, - "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", + "lastModified": 1716736760, + "narHash": "sha256-h3RmnNknKYtVA+EvUSra6QAwfZjC2q1G8YA7W0gat8Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", + "rev": "5d151429e1e79107acf6d06dcc5ace4e642ec239", "type": "github" }, "original": { @@ -301,11 +301,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1715985683, - "narHash": "sha256-FX9TaUzIaq6v2XhjjNv/OjTSbqtBF2Lzy2cH38aePL8=", + "lastModified": 1716735518, + "narHash": "sha256-LtsyUsVpr9sM0n1L7MeTw8/6wGtGeXFvKAbPR5lqN8Q=", "owner": "NixOS", "repo": "nix", - "rev": "d25e54d56aa40b4d09521b966c77f44d684d7e8e", + "rev": "7de033d63fbcf97aad164e131ae3a85e5dcebce7", "type": "github" }, "original": { @@ -315,11 +315,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1715881912, - "narHash": "sha256-e4LJk5uV1wvrRkffGFZekPWvFUx29NnnOahBlLaq8Ek=", + "lastModified": 1716715385, + "narHash": "sha256-fe6Z33pbfqu4TI5ijmcaNc5vRBs633tyxJ12HTghy3w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ff1be1e3cdf884df0935ab28745ab13c3c26d828", + "rev": "2e7d6c568063c83355fe066b8a8917ee758de1b8", "type": "github" }, "original": { @@ -381,11 +381,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1715787315, - "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", "type": "github" }, "original": { @@ -484,11 +484,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1716037261, - "narHash": "sha256-eF0A36GdegKkEiwFArjCysGU/XEYvzj7x5jfkFMtmqM=", + "lastModified": 1716744577, + "narHash": "sha256-YvYYKLuf+SNj129k6SS/bhVybaLYgUlnznTa7rKv904=", "owner": "danth", "repo": "stylix", - "rev": "76e7daf5a16d442ac98e844582f7dc1354610886", + "rev": "00a11ba2f0b52f761c0bc77daebb00cb4d44ba09", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index bc2852d..6e0fef2 100644 --- a/flake.nix +++ b/flake.nix @@ -47,16 +47,23 @@ nixosConfigurations = { # clients ace = lib.nixosSystem { - modules = [ ./hosts/ace ]; + modules = [ + inputs.stylix.nixosModules.stylix + ./hosts/ace + ]; specialArgs = { inherit inputs outputs; }; }; dragon = lib.nixosSystem { - modules = [ ./hosts/dragon ]; + modules = [ + inputs.stylix.nixosModules.stylix + ./hosts/dragon + ]; specialArgs = { inherit inputs outputs; }; }; eve = lib.nixosSystem { modules = [ nixos-hardware.nixosModules.google-pixelbook + inputs.stylix.nixosModules.stylix ./hosts/eve ]; specialArgs = { inherit inputs outputs; }; @@ -71,54 +78,85 @@ }; pocket2 = lib.nixosSystem { - modules = [ ./hosts/pocket2 ]; + modules = [ + inputs.stylix.nixosModules.stylix + ./hosts/pocket2 + ]; specialArgs = { inherit inputs outputs; }; }; smaug = lib.nixosSystem { modules = [ nixos-hardware.nixosModules.lenovo-thinkpad-x260 + inputs.stylix.nixosModules.stylix ./hosts/smaug ]; specialArgs = { inherit inputs outputs; }; }; # t2 = lib.nixosSystem { - # modules = [ ./hosts/t2 ]; + # modules = [ + # inputs.stylix.nixosModules.stylix + # ./hosts/t2 + # ]; # specialArgs = { inherit inputs outputs; }; # }; # servers display = lib.nixosSystem { - modules = [ ./hosts/display ]; + modules = [ + inputs.stylix.nixosModules.stylix + ./hosts/display + ]; specialArgs = { inherit inputs outputs; }; }; fred = lib.nixosSystem { - modules = [ ./hosts/fred ]; + modules = [ + inputs.stylix.nixosModules.stylix + ./hosts/fred + ]; specialArgs = { inherit inputs outputs; }; }; harper2 = lib.nixosSystem { - modules = [ ./hosts/harper2 ]; + modules = [ + inputs.stylix.nixosModules.stylix + ./hosts/harper2 + ]; specialArgs = { inherit inputs outputs; }; }; harper = lib.nixosSystem { - modules = [ ./hosts/harper ]; + modules = [ + inputs.stylix.nixosModules.stylix + ./hosts/harper + ]; specialArgs = { inherit inputs outputs; }; }; nuwww = lib.nixosSystem { - modules = [ ./hosts/nuwww ]; + modules = [ + inputs.stylix.nixosModules.stylix + ./hosts/nuwww + ]; specialArgs = { inherit inputs outputs; }; }; pihole = lib.nixosSystem { - modules = [ ./hosts/pihole ]; + modules = [ + inputs.stylix.nixosModules.stylix + ./hosts/pihole + ]; specialArgs = { inherit inputs outputs; }; }; www2 = lib.nixosSystem { - modules = [ ./hosts/www2 ]; + modules = [ + inputs.stylix.nixosModules.stylix + ./hosts/www2 + ]; specialArgs = { inherit inputs outputs; }; }; # test system nixos = lib.nixosSystem { - modules = [ ./hosts/nixos ]; + modules = [ + inputs.stylix.nixosModules.stylix + ./hosts/nixos + ]; specialArgs = { inherit inputs outputs; }; }; }; diff --git a/hosts/smaug/default.nix b/hosts/smaug/default.nix index 82146bf..7803b41 100644 --- a/hosts/smaug/default.nix +++ b/hosts/smaug/default.nix @@ -6,6 +6,7 @@ ./hardware-configuration.nix ../workstation ../wm + ../themes.nix ]; networking.hostName = "smaug"; }