diff --git a/hosts/snowbelle/configuration.nix b/hosts/snowbelle/configuration.nix index d83c405..ca4c17f 100644 --- a/hosts/snowbelle/configuration.nix +++ b/hosts/snowbelle/configuration.nix @@ -10,13 +10,13 @@ ]; modules = { - system = { - ssh.enable = true; - docker.enable = true; +# system = { +# ssh.enable = true; +# docker.enable = true; # syncthing.enable = true; - tailscale.enable = true; - nvidia.enable = false; - }; +# tailscale.enable = true; +# nvidia.enable = false; +# }; homelab = { zfs.enable = true; smb.enable = true; diff --git a/modules/system/ssh.nix b/modules/system/ssh.nix index 9d45034..fbb6c8c 100644 --- a/modules/system/ssh.nix +++ b/modules/system/ssh.nix @@ -5,10 +5,6 @@ modules.system.ssh.enable = lib.mkEnableOption "enables ssh"; }; - config = { - modules.system.ssh.enable = lib.mkDefault true; - }; - config = lib.mkIf config.modules.system.ssh.enable { # enable and configure openssh services.openssh = { diff --git a/modules/system/syncthing.nix b/modules/system/syncthing.nix index f1cd95d..dc1fdc9 100644 --- a/modules/system/syncthing.nix +++ b/modules/system/syncthing.nix @@ -5,10 +5,6 @@ modules.system.syncthing.enable = lib.mkEnableOption "enables syncthing"; }; - config = { - modules.system.syncthing.enable = lib.mkDefault true; - }; - config = lib.mkIf config.modules.system.syncthing.enable { services.syncthing = { enable = true; diff --git a/modules/system/system.nix b/modules/system/system.nix index c4a1b1d..eee3112 100644 --- a/modules/system/system.nix +++ b/modules/system/system.nix @@ -9,10 +9,10 @@ ./nvidia.nix ]; -# modules.system.ssh.enable = lib.mkDefault true; + modules.system.ssh.enable = lib.mkDefault true; modules.system.docker.enable = lib.mkDefault true; modules.system.tailscale.enable = lib.mkDefault true; -# modules.system.syncthing.enable = lib.mkDefault true; + modules.system.syncthing.enable = lib.mkDefault true; modules.system.nvidia.enable = lib.mkDefault false; } diff --git a/rebuild.sh b/rebuild.sh index 0f009dc..00d1700 100755 --- a/rebuild.sh +++ b/rebuild.sh @@ -15,7 +15,7 @@ fi echo "nixos rebuilding..." sudo nixos-rebuild switch --flake ~/.nix#snowbelle &>.nixos-switch-log || ( - cat nixos-switch.log | grep --color error && false) + cat .nixos-switch-log | grep --color error && false) gen=$(nixos-rebuild list-generations | grep current) git commit -am "$gen" popd