diff --git a/nixos/modules/cosmic.nix b/nixos/modules/cosmic.nix deleted file mode 100755 index 2c4be49..0000000 --- a/nixos/modules/cosmic.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - nix.settings = { - substituters = [ - "https://cosmic.cachix.org/" - ]; - trusted-public-keys = [ - "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" - ]; - }; - - environment.sessionVariables.COSMIC_DATA_CONTROL_ENABLED = 1; - services = { - desktopManager.cosmic.enable = true; - displayManager.cosmic-greeter.enable = true; - }; -} diff --git a/nixos/modules/doas.nix b/nixos/modules/doas.nix index 3afded9..26bc1ac 100755 --- a/nixos/modules/doas.nix +++ b/nixos/modules/doas.nix @@ -9,6 +9,7 @@ let ; hostname = config.networking.hostName; desktop = devices.desktop.name; + server = devices.server.name; fallaryn = devices.fallaryn.name; in { @@ -23,6 +24,8 @@ in ( if hostname == desktop then user0 + else if hostname == server then + user0 else if hostname == fallaryn then user2 else diff --git a/nixos/modules/sops.nix b/nixos/modules/sops.nix index 7e3aba2..6c1bc24 100755 --- a/nixos/modules/sops.nix +++ b/nixos/modules/sops.nix @@ -9,11 +9,14 @@ let ; hostname = config.networking.hostName; desktop = devices.desktop.name; + server = devices.server.name; fallaryn = devices.fallaryn.name; userLogic = if hostname == desktop then user0 + else if hostname == server then + user0 else if hostname == fallaryn then user2 else diff --git a/nixos/modules/ssh.nix b/nixos/modules/ssh.nix index 34932f0..09bcb74 100755 --- a/nixos/modules/ssh.nix +++ b/nixos/modules/ssh.nix @@ -16,11 +16,14 @@ let ; hostname = config.networking.hostName; desktop = devices.desktop.name; + server = devices.server.name; fallaryn = devices.fallaryn.name; userLogic = if hostname == desktop then user0 + else if hostname == server then + user0 else if hostname == fallaryn then user2 else