From f89c75aad292c637b90289916981675fed7cdcf7 Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Mon, 15 Sep 2025 17:52:33 +0200 Subject: [PATCH] move more stuff into modules --- home/vinzenz/gnome.nix | 13 ++- modules/desktop-environment.nix | 31 ------- modules/gnome.nix | 46 ---------- nixosConfigurations/ronja-pc/default.nix | 6 +- nixosConfigurations/vinzenz-lpt2/default.nix | 6 +- nixosConfigurations/vinzenz-pc2/default.nix | 7 +- nixosModules/en-de.nix | 7 ++ nixosModules/gnome.nix | 88 +++++++++++++------ {modules => nixosModules}/latex.nix | 0 {modules => nixosModules}/niri.nix | 0 nixosModules/vinzenz-desktop-settings.nix | 28 ++++++ .../wine-gaming.nix | 0 12 files changed, 116 insertions(+), 116 deletions(-) delete mode 100644 modules/desktop-environment.nix delete mode 100644 modules/gnome.nix rename {modules => nixosModules}/latex.nix (100%) rename {modules => nixosModules}/niri.nix (100%) create mode 100644 nixosModules/vinzenz-desktop-settings.nix rename modules/gaming.nix => nixosModules/wine-gaming.nix (100%) diff --git a/home/vinzenz/gnome.nix b/home/vinzenz/gnome.nix index ac8875e..7424363 100644 --- a/home/vinzenz/gnome.nix +++ b/home/vinzenz/gnome.nix @@ -1,8 +1,17 @@ { pkgs, ... }: { config = { - home.packages = with pkgs.gnomeExtensions; [ - solaar-extension + home.packages = with pkgs; [ + gitg + meld + simple-scan + pinta + dconf-editor + impression # usb image writer + papers # pdf viewer + gnome-software # for flatpak apps + gnomeExtensions.solaar-extension + snapshot ]; dconf.settings = { diff --git a/modules/desktop-environment.nix b/modules/desktop-environment.nix deleted file mode 100644 index e839353..0000000 --- a/modules/desktop-environment.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ pkgs, ... }: -{ - config = { - programs.firefox.enable = true; - - environment.systemPackages = with pkgs; [ - lm_sensors - - # office - #libreoffice-qt - #hunspell - #hunspellDicts.de-de - #hunspellDicts.en-us-large - ]; - - fonts = { - enableDefaultPackages = true; - fontconfig.defaultFonts.monospace = [ "FiraCode Nerd Font" ]; - packages = with pkgs; [ - nerd-fonts.fira-code - roboto-mono - recursive - ]; - }; - - hardware.logitech.wireless = { - enable = true; - enableGraphical = true; - }; - }; -} diff --git a/modules/gnome.nix b/modules/gnome.nix deleted file mode 100644 index c347e72..0000000 --- a/modules/gnome.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ pkgs, ... }: -{ - # remove some gnome default apps - environment.gnome.excludePackages = with pkgs; [ - cheese # photo booth - epiphany # web browser - evince # document viewer - geary # email client - gnome-maps - gnome-weather - gnome-tour - sysprof - orca # screen reader - gnome-weather - gnome-backgrounds - gnome-user-docs - yelp # help app - # gnome-music - # totem # video player - # snapshot # camera - # baobab # disk usage - ]; - - # RDP connections - services.gnome.gnome-remote-desktop.enable = true; - networking.firewall.allowedTCPPorts = [ 3389 ]; - - home-manager.sharedModules = [ - { - home.packages = with pkgs; [ - gitg - meld - simple-scan - pinta - dconf-editor - gpaste - ghex - impression - papers - - # graphical installer for flatpak apps - gnome-software - ]; - } - ]; -} diff --git a/nixosConfigurations/ronja-pc/default.nix b/nixosConfigurations/ronja-pc/default.nix index 6b7fa0b..225fe6f 100644 --- a/nixosConfigurations/ronja-pc/default.nix +++ b/nixosConfigurations/ronja-pc/default.nix @@ -4,10 +4,10 @@ ./configuration.nix ./hardware.nix - ../../modules/gnome.nix - ../../modules/gaming.nix + vinzenzNixosModules.gnome vinzenzNixosModules.steam - ../../modules/desktop-environment.nix + vinzenzNixosModules.wine-gaming + vinzenzNixosModules.vinzenz-desktop-settings ../../home/ronja ]; diff --git a/nixosConfigurations/vinzenz-lpt2/default.nix b/nixosConfigurations/vinzenz-lpt2/default.nix index 02f6d82..fef8d34 100644 --- a/nixosConfigurations/vinzenz-lpt2/default.nix +++ b/nixosConfigurations/vinzenz-lpt2/default.nix @@ -4,12 +4,12 @@ ./configuration.nix ./hardware.nix - ../../modules/gnome.nix - ../../modules/gaming.nix + vinzenzNixosModules.gnome + vinzenzNixosModules.wine-gaming vinzenzNixosModules.steam vinzenzNixosModules.printing vinzenzNixosModules.podman - ../../modules/desktop-environment.nix + vinzenzNixosModules.vinzenz-desktop-settings ../../home/vinzenz ../../home/ronja diff --git a/nixosConfigurations/vinzenz-pc2/default.nix b/nixosConfigurations/vinzenz-pc2/default.nix index 0b5073d..3400235 100644 --- a/nixosConfigurations/vinzenz-pc2/default.nix +++ b/nixosConfigurations/vinzenz-pc2/default.nix @@ -6,13 +6,12 @@ ./vscode-server.nix ./hass.nix - ../../modules/gnome.nix - ../../modules/gaming.nix + vinzenzNixosModules.gnome + vinzenzNixosModules.wine-gaming vinzenzNixosModules.steam vinzenzNixosModules.printing vinzenzNixosModules.podman - #../../modules/niri.nix - ../../modules/desktop-environment.nix + vinzenzNixosModules.vinzenz-desktop-settings ../../home/vinzenz ../../home/ronja diff --git a/nixosModules/en-de.nix b/nixosModules/en-de.nix index 0ed4faf..a91780e 100644 --- a/nixosModules/en-de.nix +++ b/nixosModules/en-de.nix @@ -1,3 +1,4 @@ +{ pkgs, ... }: { i18n = { defaultLocale = "en_US.UTF-8"; @@ -21,4 +22,10 @@ "en-US" "de" ]; + + environment.systemPackages = [ + pkgs.hunspell + pkgs.hunspellDicts.de-de + pkgs.hunspellDicts.en-us + ]; } diff --git a/nixosModules/gnome.nix b/nixosModules/gnome.nix index 3afe9ce..7a6f920 100644 --- a/nixosModules/gnome.nix +++ b/nixosModules/gnome.nix @@ -1,31 +1,65 @@ -{ pkgs, ... }: { - services = { - xserver = { - # Enable the GNOME Desktop Environment. - desktopManager.gnome = { - enable = true; - extraGSettingsOverridePackages = [ pkgs.mutter ]; - extraGSettingsOverrides = '' - [org.gnome.mutter] - experimental-features=['scale-monitor-framebuffer'] - ''; + pkgs, + lib, + config, + ... +}: +{ + options.vinzenz = { + keep-gnome-default-apps = lib.mkEnableOption "keep gnome default apps"; + }; + + config = lib.mkMerge [ + { + services = { + xserver = { + # Enable the GNOME Desktop Environment. + desktopManager.gnome = { + enable = true; + extraGSettingsOverridePackages = [ pkgs.mutter ]; + extraGSettingsOverrides = '' + [org.gnome.mutter] + experimental-features=['scale-monitor-framebuffer'] + ''; + }; + displayManager.gdm.enable = true; + excludePackages = [ pkgs.xterm ]; + }; + + displayManager.defaultSession = "gnome"; + + gnome = { + tinysparql.enable = false; + localsearch.enable = false; + sushi.enable = true; + }; }; - displayManager.gdm.enable = true; - excludePackages = [ pkgs.xterm ]; - }; - displayManager.defaultSession = "gnome"; - - gnome = { - tinysparql.enable = false; - localsearch.enable = false; - sushi.enable = true; - }; - }; - - programs = { - dconf.enable = true; - gpaste.enable = true; - }; + programs = { + dconf.enable = true; + gpaste.enable = true; + }; + } + (lib.mkIf (!config.vinzenz.keep-gnome-default-apps) { + environment.gnome.excludePackages = with pkgs; [ + cheese # photo booth + epiphany # web browser + evince # document viewer + geary # email client + gnome-maps + gnome-weather + gnome-tour + sysprof + orca # screen reader + gnome-weather + gnome-backgrounds + gnome-user-docs + yelp # help app + gnome-music + totem # video player + snapshot # camera + baobab # disk usage + ]; + }) + ]; } diff --git a/modules/latex.nix b/nixosModules/latex.nix similarity index 100% rename from modules/latex.nix rename to nixosModules/latex.nix diff --git a/modules/niri.nix b/nixosModules/niri.nix similarity index 100% rename from modules/niri.nix rename to nixosModules/niri.nix diff --git a/nixosModules/vinzenz-desktop-settings.nix b/nixosModules/vinzenz-desktop-settings.nix new file mode 100644 index 0000000..24b4b4f --- /dev/null +++ b/nixosModules/vinzenz-desktop-settings.nix @@ -0,0 +1,28 @@ +{ pkgs, ... }: +{ + programs.firefox.enable = true; + + environment.systemPackages = with pkgs; [ + lm_sensors + libreoffice-qt6 + ]; + + fonts = { + enableDefaultPackages = true; + fontconfig.defaultFonts.monospace = [ "FiraCode Nerd Font" ]; + packages = with pkgs; [ + nerd-fonts.fira-code + roboto-mono + recursive + ]; + }; + + hardware.logitech.wireless = { + enable = true; + enableGraphical = true; + }; + + # RDP connections + services.gnome.gnome-remote-desktop.enable = true; + networking.firewall.allowedTCPPorts = [ 3389 ]; +} diff --git a/modules/gaming.nix b/nixosModules/wine-gaming.nix similarity index 100% rename from modules/gaming.nix rename to nixosModules/wine-gaming.nix