diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..1217659 --- /dev/null +++ b/flake.lock @@ -0,0 +1,66 @@ +{ + "nodes": { + "catppuccin-bat": { + "flake": false, + "locked": { + "lastModified": 1734996624, + "narHash": "sha256-6fWoCH90IGumAMc4buLRWL0N61op+AuMNN9CAR9/OdI=", + "owner": "catppuccin", + "repo": "bat", + "rev": "699f60fc8ec434574ca7451b444b880430319941", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "bat", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.05", + "repo": "home-manager", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1735563628, + "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "catppuccin-bat": "catppuccin-bat", + "home-manager": "home-manager", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix index 52ea7c0..57682b3 100644 --- a/flake.nix +++ b/flake.nix @@ -38,7 +38,7 @@ ... }: { nixosConfigurations = { - nixos-test = let + m920q = let username = "phil"; specialArgs = {inherit username;}; in @@ -47,30 +47,7 @@ system = "x86_64-linux"; modules = [ - ./hosts/nixos-test - ./users/${username}/nixos.nix - - home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - - home-manager.extraSpecialArgs = inputs // specialArgs; - home-manager.users.${username} = import ./users/${username}/home.nix; - } - ]; - }; - - msi-rtx4090 = let - username = "suzi"; # another username for this machine - specialArgs = {inherit username;}; - in - nixpkgs.lib.nixosSystem { - inherit specialArgs; - system = "x86_64-linux"; - - modules = [ - ./hosts/msi-rtx4090 + ./hosts/m920q ./users/${username}/nixos.nix home-manager.nixosModules.home-manager