diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index cf1ab35..605b11b 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -34,30 +34,10 @@ in ./boot.nix ./filesystems.nix # ../../cachix/cachix.nix - ../default.nix + ../default.nix ]; specialisation = { - plasma.configuration = { - apps.discover-wrapped.enable = false; - - services = { - # Enable Desktop Environment. - displayManager = { - sddm.enable = true; - sddm.wayland.enable = true; - sddm.theme = "breeze"; - defaultSession = "plasma"; - }; - - desktopManager.plasma6.enable = true; - - # Enable Flatpak - flatpak.enable = false; - }; - - # xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ]; - }; gnome.configuration = { services = { @@ -68,12 +48,17 @@ in displayManager = { gdm.enable = true; gdm.wayland = true; - defaultSession = "gnome"; }; }; + displayManager.defaultSession = "gnome"; + # Enable Flatpak flatpak.enable = false; + + # disable plasma + displayManager.sddm.enable = false; + desktopManager.plasma6.enable = false; }; environment = { @@ -93,10 +78,33 @@ in services = { desktopManager.cosmic.enable = true; displayManager.cosmic-greeter.enable = true; + + # disable plasma + displayManager.sddm.enable = false; + desktopManager.plasma6.enable = false; }; }; }; + apps.discover-wrapped.enable = false; + + services = { + # Enable Desktop Environment. + displayManager = { + sddm.enable = lib.mkDefault true; + sddm.wayland.enable = lib.mkDefault true; + sddm.theme = lib.mkDefault "breeze"; + defaultSession = lib.mkDefault "plasma"; + }; + + desktopManager.plasma6.enable = lib.mkDefault true; + + # Enable Flatpak + flatpak.enable = lib.mkDefault false; + }; + + # xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ]; + share.hardware.amd = { enable = true; lact.enable = true; diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index 696361e..d73b05a 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -91,33 +91,36 @@ vscode ]; - dconf = { - enable = true; - settings = { - "org/gnome/desktop/interface".clock-format = "12h"; - "org/gnome/desktop/interface".color-scheme = "prefer-dark"; - "org/gnome/desktop/interface".enable-hot-corners = false; - "org/gnome/desktop/interface".font-antialiasing = "grayscale"; - "org/gnome/desktop/interface".font-hinting = "slight"; - "org/gnome/desktop/interface".icon-theme = "Papirus-Dark"; - "org/gnome/desktop/peripherals/mouse".accel-profile = "flat"; - "org/gnome/desktop/peripherals/touchpad".two-finger-scrolling-enabled = true; - "org/gnome/desktop/peripherals/touchpad".tap-to-click = true; - "org/gnome/mutter".experimental-features = [ - "scale-monitor-framebuffer" - "variable-refresh-rate" - ]; - "org/gnome/tweaks".show-extensions-notice = false; - "org/gnome/shell".enabled-extensions = [ - "appindicatorsupport@rgcjonas.gmail.com" - "arcmenu@arcmenu.com" - "user-theme@gnome-shell-extensions.gcampax.github.com" - "dash-to-panel@jderose9.github.com" - "tiling-assistant@leleat-on-github" - ]; - "org/gnome/shell/extensions/dash-to-panel".primary-monitor = 1; - "org/gnome/shell/extensions/dash-to-panel".multi-monitors = false; - "org/gtk/settings/file-chooser".clock-format = "12h"; + specialisation.gnome.configuration = { + dconf = { + enable = true; + settings = { + "org/gnome/desktop/interface".clock-format = "12h"; + "org/gnome/desktop/interface".color-scheme = "prefer-dark"; + "org/gnome/desktop/interface".enable-hot-corners = false; + "org/gnome/desktop/interface".font-antialiasing = "grayscale"; + "org/gnome/desktop/interface".font-hinting = "slight"; + "org/gnome/desktop/interface".icon-theme = "Papirus-Dark"; + "org/gnome/desktop/peripherals/mouse".accel-profile = "flat"; + "org/gnome/desktop/peripherals/touchpad".two-finger-scrolling-enabled = true; + "org/gnome/desktop/peripherals/touchpad".tap-to-click = true; + "org/gnome/mutter".experimental-features = [ + "scale-monitor-framebuffer" + "variable-refresh-rate" + ]; + "org/gnome/tweaks".show-extensions-notice = false; + "org/gnome/shell".enabled-extensions = [ + "appindicatorsupport@rgcjonas.gmail.com" + "arcmenu@arcmenu.com" + "user-theme@gnome-shell-extensions.gcampax.github.com" + "dash-to-panel@jderose9.github.com" + "tiling-assistant@leleat-on-github" + ]; + "org/gnome/shell/extensions/dash-to-panel".primary-monitor = 1; + "org/gnome/shell/extensions/dash-to-panel".multi-monitors = false; + "org/gtk/settings/file-chooser".clock-format = "12h"; + }; }; }; + }