From a8accc6b71c2dd5263f13417327b05d83f972a60 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Fri, 2 Feb 2024 00:00:54 -0600 Subject: [PATCH] Tinkering with KDE --- modules/home-manager/wallpaper-manager.nix | 6 ++- modules/nixos/default.nix | 1 + modules/nixos/gnome.nix | 13 +++-- modules/nixos/kde-plasma.nix | 59 ++++++++++++++++++++++ nixos/foxtrot.nix | 11 +++- 5 files changed, 84 insertions(+), 6 deletions(-) create mode 100644 modules/nixos/kde-plasma.nix diff --git a/modules/home-manager/wallpaper-manager.nix b/modules/home-manager/wallpaper-manager.nix index 470abdd..f63f6bf 100644 --- a/modules/home-manager/wallpaper-manager.nix +++ b/modules/home-manager/wallpaper-manager.nix @@ -11,7 +11,11 @@ Install.WantedBy = ["graphical-session.target"]; Service = { Environment = [ - "PATH=${lib.makeBinPath (with pkgs; [variety])}" + "PATH=${lib.makeBinPath (with pkgs; [ + variety + (lib.getBin pkgs.plasma5Packages.qttools) + libsForQt5.kdialog + ])}" ]; ExecStart = '' ${pkgs.variety}/bin/variety diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 159bbce..f6fbbe2 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -20,6 +20,7 @@ with builtins; "wifi" "gnome" "kde-connect" + "kde-plasma" "printing" "avahi" diff --git a/modules/nixos/gnome.nix b/modules/nixos/gnome.nix index 4e45ac8..204735d 100644 --- a/modules/nixos/gnome.nix +++ b/modules/nixos/gnome.nix @@ -1,15 +1,19 @@ -{pkgs, ...}: { +{ + pkgs, + lib, + ... +}: { imports = [./pipewire.nix]; - services.xserver.enable = true; + services.xserver.enable = lib.mkDefault true; services.xserver.displayManager.gdm = { - enable = true; + enable = lib.mkDefault true; }; hardware.pulseaudio.enable = false; services.xserver.desktopManager.gnome = { - enable = true; + enable = lib.mkDefault true; extraGSettingsOverridePackages = [pkgs.gnome.mutter]; extraGSettingsOverrides = '' @@ -43,6 +47,7 @@ }; systemPackages = with pkgs; [ + gnome.gnome-power-manager brightnessctl feh # gimp diff --git a/modules/nixos/kde-plasma.nix b/modules/nixos/kde-plasma.nix new file mode 100644 index 0000000..63aaf01 --- /dev/null +++ b/modules/nixos/kde-plasma.nix @@ -0,0 +1,59 @@ +{ + pkgs, + lib, + ... +}: { + imports = [./pipewire.nix]; + + # qt.platformTheme = "gnome"; + + services.xserver.displayManager.defaultSession = "plasmawayland"; + services.xserver.enable = lib.mkDefault true; + services.xserver.displayManager.sddm = { + enable = lib.mkDefault true; + }; + + hardware.pulseaudio.enable = false; + services.xserver.desktopManager.plasma5 = { + enable = lib.mkDefault true; + }; + + qt = { + enable = true; + # platformTheme = "gnome"; + # style = "adwaita-dark"; + }; + + programs.dconf.enable = true; + + environment = { + variables = { + GTK_THEME = "Catppuccin-Mocha-Compact-Sapphire-Dark"; + VISUAL = "hx"; + PAGER = "less"; + MANPAGER = "less"; + }; + + systemPackages = with pkgs; [ + inkscape + krita + noto-fonts + vlc + wl-clipboard + libsForQt5.kate + libsForQt5.kdenlive + libsForQt5.merkuro + libsForQt5.kmail + libsForQt5.kcalc + libsForQt5.neochat + libsForQt5.filelight + libsForQt5.krdc + libsForQt5.krfb + libsForQt5.kclock + libsForQt5.kweather + libsForQt5.ktorrent + libsForQt5.kdevelop + libsForQt5.kdialog + ]; + }; +} diff --git a/nixos/foxtrot.nix b/nixos/foxtrot.nix index 6e6fe48..244acf6 100644 --- a/nixos/foxtrot.nix +++ b/nixos/foxtrot.nix @@ -2,6 +2,7 @@ flake, inputs, outputs, + # lib, # config, pkgs, ... @@ -14,7 +15,8 @@ in { flake.diskoConfigurations.standard inputs.hardware.nixosModules.framework-13-7040-amd desktop-usage - gnome + # gnome + kde-plasma podman lutris # postgres @@ -22,6 +24,10 @@ in { # hyprland ]; + services.xserver.enable = true; + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + programs.steam.enable = true; programs.steam.remotePlay.openFirewall = true; @@ -33,6 +39,7 @@ in { variety # wallpaper switcher that I use with GNOME radeontop sops + obs-studio ]; }; @@ -79,6 +86,8 @@ in { }; }; + services.upower.enable = true; + # use updated ppd for framework 13: # source: https://community.frame.work/t/tracking-ppd-v-tlp-for-amd-ryzen-7040/39423/137?u=lytedev nixpkgs.overlays = [