diff --git a/modules/system/programs/desktops/default.nix b/modules/system/programs/desktops/default.nix index 0b9839d..6908fab 100644 --- a/modules/system/programs/desktops/default.nix +++ b/modules/system/programs/desktops/default.nix @@ -14,5 +14,19 @@ services.dbus.enable = true; security.pam.services.swaylock = {}; + + services.displayManager.ly.settings.waylandsessions = "/etc/greetd/environments"; + environment.etc = { + "greetd/environments/sway.desktop".text = '' + [Desktop Entry] + Name=Sway + Exec=sway --unsupported-gpu + ''; + "greetd/environments/niri.desktop".text = '' + [Desktop Entry] + Name=Niri + Exec=niri-session + ''; + }; }; } diff --git a/modules/system/services/general/default.nix b/modules/system/services/general/default.nix index 682795a..73f051d 100644 --- a/modules/system/services/general/default.nix +++ b/modules/system/services/general/default.nix @@ -9,6 +9,7 @@ ./libvirtd ./mpd ./portals + ./snowflake ./ssh ./sunshine ./tlp diff --git a/modules/system/services/general/displaymanager/default.nix b/modules/system/services/general/displaymanager/default.nix index 3b14992..7581b46 100644 --- a/modules/system/services/general/displaymanager/default.nix +++ b/modules/system/services/general/displaymanager/default.nix @@ -1,25 +1,7 @@ -{ config, pkgs, lib, ... }: +{ config, ... }: { - config = lib.mkIf config.system.desktop.enable { - services.displayManager.ly = { - enable = true; - settings = { - vi_mode = true; - waylandsessions = "/etc/greetd/environments"; - }; - }; - - environment.etc = { - "greetd/environments/sway.desktop".text = '' - [Desktop Entry] - Name=Sway - Exec=sway --unsupported-gpu - ''; - "greetd/environments/niri.desktop".text = '' - [Desktop Entry] - Name=Niri - Exec=niri-session - ''; - }; + services.displayManager.ly = { + enable = config.system.desktop.enable; + settings.vi_mode = true; }; } diff --git a/modules/system/services/server/snowflake/default.nix b/modules/system/services/general/snowflake/default.nix similarity index 100% rename from modules/system/services/server/snowflake/default.nix rename to modules/system/services/general/snowflake/default.nix diff --git a/modules/system/services/server/default.nix b/modules/system/services/server/default.nix index 49dfb1d..7481d00 100644 --- a/modules/system/services/server/default.nix +++ b/modules/system/services/server/default.nix @@ -10,7 +10,6 @@ ./minecraft ./mysql ./nginx - ./snowflake ./social ./transmission ./vaultwarden diff --git a/modules/system/services/server/fileserver/default.nix b/modules/system/services/server/fileserver/default.nix index 5db3fb2..a791db3 100644 --- a/modules/system/services/server/fileserver/default.nix +++ b/modules/system/services/server/fileserver/default.nix @@ -1,7 +1,8 @@ { ... }: { imports = [ - ./local - ./public + ./nextcloud + ./nfs + ./samba ]; } diff --git a/modules/system/services/server/fileserver/local/default.nix b/modules/system/services/server/fileserver/local/default.nix deleted file mode 100644 index c10f4f6..0000000 --- a/modules/system/services/server/fileserver/local/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: -{ - imports = [ - ./nfs - ./samba - ]; -} diff --git a/modules/system/services/server/fileserver/public/nextcloud/default.nix b/modules/system/services/server/fileserver/nextcloud/default.nix similarity index 100% rename from modules/system/services/server/fileserver/public/nextcloud/default.nix rename to modules/system/services/server/fileserver/nextcloud/default.nix diff --git a/modules/system/services/server/fileserver/public/nextcloud/nginx/default.nix b/modules/system/services/server/fileserver/nextcloud/nginx/default.nix similarity index 100% rename from modules/system/services/server/fileserver/public/nextcloud/nginx/default.nix rename to modules/system/services/server/fileserver/nextcloud/nginx/default.nix diff --git a/modules/system/services/server/fileserver/local/nfs/default.nix b/modules/system/services/server/fileserver/nfs/default.nix similarity index 100% rename from modules/system/services/server/fileserver/local/nfs/default.nix rename to modules/system/services/server/fileserver/nfs/default.nix diff --git a/modules/system/services/server/fileserver/public/default.nix b/modules/system/services/server/fileserver/public/default.nix deleted file mode 100644 index c3610c0..0000000 --- a/modules/system/services/server/fileserver/public/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ ... }: -{ - imports = [ ./nextcloud ]; -} diff --git a/modules/system/services/server/fileserver/local/samba/default.nix b/modules/system/services/server/fileserver/samba/default.nix similarity index 100% rename from modules/system/services/server/fileserver/local/samba/default.nix rename to modules/system/services/server/fileserver/samba/default.nix