From ce94f5df61e525bc49229a77d8b165f144842a5e Mon Sep 17 00:00:00 2001 From: "Mohamed C." Date: Sun, 6 Oct 2024 15:46:59 +0200 Subject: [PATCH] change to gnome, remove stuff --- flake.nix | 8 +++----- modules/system/ai/default.nix | 11 ----------- modules/system/jovian-konsole/default.nix | 2 +- modules/system/jovian-workstation/default.nix | 11 ++++++++++- modules/system/retrodeck/default.nix | 6 ------ 5 files changed, 14 insertions(+), 24 deletions(-) delete mode 100644 modules/system/ai/default.nix delete mode 100644 modules/system/retrodeck/default.nix diff --git a/flake.nix b/flake.nix index 19e7209..545babf 100644 --- a/flake.nix +++ b/flake.nix @@ -46,21 +46,19 @@ ./modules/system/users ]; desktopSystemModules = hostName:[ - #./modules/system/ai ./modules/system/apps-misc ./modules/system/browser ./modules/system/flatpak - ./modules/system/plasma + ./modules/system/gnome ./modules/system/syncthing-${hostName} ]; displaySystemModules = [ - ./modules/system/sddm + ./modules/system/gdm ]; gamingSystemModules = hostName:[ ./modules/system/controller ./modules/system/jovian-${hostName} ./modules/system/lact - ./modules/system/retrodeck ./modules/system/steam ./modules/system/sunshine-${hostName} ]; @@ -75,7 +73,7 @@ ./modules/user/shell ]; desktopUserModules = [ - ./modules/user/plasma + ./modules/user/gnome ]; gamingUserModules = [ ./modules/user/steam diff --git a/modules/system/ai/default.nix b/modules/system/ai/default.nix deleted file mode 100644 index f2ac94a..0000000 --- a/modules/system/ai/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ ... }: -{ -services.ollama = { - enable = true; - acceleration = "rocm"; - environmentVariables = { - HCC_AMDGPU_TARGET = "gfx1100"; - HSA_OVERRIDE_GFX_VERSION="11.0.0"; - }; -}; -} diff --git a/modules/system/jovian-konsole/default.nix b/modules/system/jovian-konsole/default.nix index 77e177a..83e86ba 100644 --- a/modules/system/jovian-konsole/default.nix +++ b/modules/system/jovian-konsole/default.nix @@ -4,7 +4,7 @@ enable = true; autoStart = true; user = user; - desktopSession = "plasma"; + desktopSession = "gnome"; }; jovian.decky-loader.enable = true; jovian.decky-loader.user = user; diff --git a/modules/system/jovian-workstation/default.nix b/modules/system/jovian-workstation/default.nix index 8b6f5f3..905fe7d 100644 --- a/modules/system/jovian-workstation/default.nix +++ b/modules/system/jovian-workstation/default.nix @@ -1,4 +1,13 @@ -{ ... }: +{ user, ... }: { + jovian.steam = { + enable = true; + autoStart = false; + user = user; + desktopSession = "gnome"; + }; + jovian.decky-loader.enable = true; + jovian.decky-loader.user = user; + jovian.steamos.enableBluetoothConfig = true; hardware.enableRedistributableFirmware = true; } diff --git a/modules/system/retrodeck/default.nix b/modules/system/retrodeck/default.nix deleted file mode 100644 index e30f802..0000000 --- a/modules/system/retrodeck/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: -{ - services.flatpak.packages = [ - { appId = "net.retrodeck.retrodeck"; origin = "flathub"; } - ]; -}