diff --git a/flake.nix b/flake.nix index 33ba709..6151903 100644 --- a/flake.nix +++ b/flake.nix @@ -35,7 +35,8 @@ modules = [ { nixpkgs.overlays = overlays; } sops-nix.nixosModules.sops - ./xps13-hardware-configuration.nix.nix + ./configuration.nix + ./xps13-hardware-configuration.nix home-manager.nixosModules.home-manager { # home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; diff --git a/modules/configuration-common.nix b/modules/configuration-common.nix index a2067ba..66574b9 100644 --- a/modules/configuration-common.nix +++ b/modules/configuration-common.nix @@ -4,7 +4,7 @@ imports = [ ./shares.nix - ./sops.nix; + ./sops.nix ]; nix.settings.experimental-features = [ "nix-command" "flakes" ]; @@ -35,7 +35,7 @@ "10.0.0.76" = [ "nas nas.lan" ]; "10.0.0.125" = [ "git" "git.lan" ]; "10.0.0.153" = [ "samphone" "samphone.lan" ]; - "10.0.0.223" = [ "pve", "pve.lan" ]; + "10.0.0.223" = [ "pve" "pve.lan" ]; "10.0.0.39" = [ "chronos" "chronos.lan" ]; "10.0.0.78" = [ "pyshelf" "pyshelf.lan" ]; "10.0.0.121" = [ "titan" "titan.lan" ]; diff --git a/modules/home-manager-common.nix b/modules/home-manager-common.nix index 1bdf2b4..c1c8b55 100644 --- a/modules/home-manager-common.nix +++ b/modules/home-manager-common.nix @@ -192,7 +192,7 @@ bind F3 send-keys 'igrep .' C-m port = 8022; identityFile = "~/.ssh/id_ed25519"; }; - git.local = { + git = { host = "10.0.0.125"; user = "git"; identityFile = "~/.ssh/id_ed25519";