diff --git a/hosts/yodaGaming/configuration.nix b/hosts/yodaGaming/configuration.nix index d609608..690d10d 100644 --- a/hosts/yodaGaming/configuration.nix +++ b/hosts/yodaGaming/configuration.nix @@ -15,16 +15,17 @@ ../../modules/nitrokey-gpg-smartcard.nix ../../modules/ssh-client.nix ../../modules/ssh-server.nix + #../../modules/gpu-amd.nix ../../modules/btrfs-scrub.nix ../../modules/btrfs-mount-options.nix - #../../modules/gpu-amd.nix ../../modules/gnome-base.nix ../../modules/gnome-config.nix ../../modules/gnome-extensions.nix ../../modules/fwupd-gnome.nix ../../modules/gnome-wallpaper.nix + ../../modules/programs-gnome.nix #../../modules/gnome-terminal.nix ../../modules/blackbox.nix diff --git a/hosts/yodaTab/configuration.nix b/hosts/yodaTab/configuration.nix index 3ae9e37..67e969d 100644 --- a/hosts/yodaTab/configuration.nix +++ b/hosts/yodaTab/configuration.nix @@ -30,6 +30,7 @@ #../../modules/gnome-fractional-scaling.nix ../../modules/fwupd-gnome.nix ../../modules/gnome-wallpaper.nix + ../../modules/programs-gnome.nix #../../modules/gnome-terminal.nix ../../modules/blackbox.nix diff --git a/hosts/yodaTux/configuration.nix b/hosts/yodaTux/configuration.nix index 4ab3af9..b295f45 100644 --- a/hosts/yodaTux/configuration.nix +++ b/hosts/yodaTux/configuration.nix @@ -24,26 +24,27 @@ ../../modules/ssh-client.nix ../../modules/ssh-server.nix ../../modules/lid-switch-handling.nix + ../../modules/gpu-amd.nix ../../modules/btrfs-scrub.nix ../../modules/btrfs-mount-options.nix - ../../modules/gpu-amd.nix - #../../modules/kde.nix - ../../modules/gnome-base.nix - ../../modules/gnome-config.nix - ../../modules/gnome-extensions.nix - ../../modules/gnome-fractional-scaling.nix - ../../modules/fwupd-gnome.nix - ../../modules/gnome-wallpaper.nix + ../../modules/kde.nix +# ../../modules/gnome-base.nix +# ../../modules/gnome-config.nix +# ../../modules/gnome-extensions.nix +# ../../modules/gnome-fractional-scaling.nix +# #../../modules/fwupd-gnome.nix # TODO: Constantly keeps installing the same fw update again +# ../../modules/gnome-wallpaper.nix +# ../../modules/programs-gnome.nix #../../modules/gnome-terminal.nix - ../../modules/blackbox.nix + #../../modules/blackbox.nix ../../modules/programs-base.nix - ../../modules/programs.nix + #../../modules/programs.nix ../../modules/flatpak.nix - ../../modules/file-roller.nix + #../../modules/file-roller.nix ../../modules/rnote.nix ../../modules/ausweisapp.nix ../../modules/nextcloud-client.nix @@ -59,23 +60,24 @@ ../../modules/digikam-rawtherapee-hugin-gimp.nix ../../modules/freetube.nix ../../modules/ghostwriter.nix - ../../modules/print-and-scan.nix + #../../modules/print-and-scan.nix #../../modules/waydroid.nix - ../../modules/uni-vpn.nix + #../../modules/uni-vpn.nix ../../modules/games.nix - ../../modules/dosbox-x.nix + #../../modules/dosbox-x.nix ../../modules/steam.nix - ../../modules/autostart.nix + #../../modules/autostart.nix ../../modules/jetbrains-ide.nix #../../modules/vscodium.nix ../../modules/android.nix - ../../modules/pmbootstrap.nix + #../../modules/pmbootstrap.nix - ../../modules/boxes.nix + #../../modules/boxes.nix #../../modules/virtualbox.nix + #../../modules/virt-manager.nix ../../modules/docker.nix ../../modules/docker-pushrm.nix ]; @@ -91,4 +93,13 @@ # Most users should never change this value after the initial install, for any reason, even if you've upgraded your system to a new NixOS release. system.stateVersion = "23.05"; + +# users.users.foo = { +# initialPassword = "asdf"; +# isNormalUser = true; +# description = "Just for testing"; +# extraGroups = [ "wheel" "networkmanager" ]; +# }; + + # TODO: refactor new file "favorite-apps.nix" -> only if on gnome, use dconf.settings } diff --git a/modules/kde.nix b/modules/kde.nix index 608257e..6ba70b6 100644 --- a/modules/kde.nix +++ b/modules/kde.nix @@ -1,46 +1,56 @@ +# KDE desktop environment. + +# TODO: Declarative KDE setting adjustments. +# - Plasma > Breeze Dark +# - Global theme > Breeze Dark +# - Touchpad > Invert scroll direction (natural scrolling) +# - Touchpad > Tap to click > unchecked +# - File search > Also index file content +# - On AC power > Button events handling > When laptop lid is closed > Do nothing +# - On AC power > Suspend session -> unchecked + { config, pkgs, ... }: { - # KDE desktop environment. - # See also: gnome-base.nix - # https://nixos.wiki/wiki/KDE - - # TODO: if including modules that enable dconf, KDE does not start. Maybe some conflicting configs in ~/ from GNOME? Create new (blank) user and try to log in with it. - - # TODO: Declarative KDE setting adjustments. - # - Plasma > Breeze Dark - # - Global theme > Breeze Dark - # - Touchpad > Invert scroll direction (natural scrolling) - # - Touchpad > Tap to click > unchecked - # - File search > Also index file content - # - On AC power > Button events handling > When laptop lid is closed > Do nothing - # - On AC power > Suspend session -> unchecked - imports = [ ./audio.nix ]; + # https://wiki.nixos.org/wiki/KDE + + # Optional. # Enable the X11 windowing system. - services.xserver.enable = true; + #services.xserver.enable = true; + # Exclude xterm. + #services.xserver.excludePackages = [ pkgs.xterm ]; # Enable the KDE desktop environment - #services.xserver.displayManager.sddm.enable = true; - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; + services.displayManager.sddm = { + enable = true; + #theme = "sddm-chili-theme"; + wayland.enable = true; + }; + + #services.xserver.displayManager.gdm.enable = true; + services.desktopManager.plasma6.enable = true; # Don't install all programs of the KDE desktop. -# environment.plasma5.excludePackages = with pkgs.libsForQt5; [ -# plasma-browser-integration + # https://wiki.nixos.org/wiki/KDE#Plasma_6_2 + # + # Optional packages: https://github.com/NixOS/nixpkgs/blob/88195a94f390381c6afcdaa933c2f6ff93959cb4/nixos/modules/services/desktop-managers/plasma6.nix#L157-L180 + # +# environment.plasma6.excludePackages = with pkgs.kdePackages; [ # konsole -# oxygen # ]; # GNOME desktop integration. + # https://wiki.nixos.org/wiki/KDE#GNOME_desktop_integration + # # Using the following example configuration, QT applications will have a look similar to the GNOME desktop, using a dark theme - qt = { - enable = true; - platformTheme = "gnome"; - style = "adwaita-dark"; - }; +# qt = { +# enable = true; +# platformTheme = "gnome"; +# style = "adwaita-dark"; +# }; # Configure keymap in X11. services.xserver.xkb = { @@ -50,5 +60,5 @@ # Enable Bluetooth support # https://nixos.wiki/wiki/Bluetooth - hardware.bluetooth.enable = true; + #hardware.bluetooth.enable = true; } diff --git a/modules/programs-base.nix b/modules/programs-base.nix index a186bc9..ce6ebb3 100644 --- a/modules/programs-base.nix +++ b/modules/programs-base.nix @@ -5,13 +5,8 @@ zenith # Terminal resource monitor / task manager btop # Terminal resource monitor / task manager htop # Terminal resource monitor / task manager - colmena + colmena # NixOS config deployment - gnome-tweaks - dconf-editor - resources # Resource monitor / task manager - - #gnome-secrets # Password manager (Native Wayland client), but very slow. keepassxc # Password manager. TODO Wayland: Maybe QT_QPA_PLATFORM defined in ghostwriter.nix fixed blurry fonts? warp # Fast and secure file transfer ]; diff --git a/modules/programs-gnome.nix b/modules/programs-gnome.nix new file mode 100644 index 0000000..a74b811 --- /dev/null +++ b/modules/programs-gnome.nix @@ -0,0 +1,10 @@ +{ config, pkgs, ... }: +{ + users.users.yoda = { + packages = with pkgs; [ + gnome-tweaks + dconf-editor + resources # Resource monitor / task manager + ]; + }; +}