move more stuff into modules

home/vinzenz/gnome.nix

@@ -1,8 +1,17 @@
 { pkgs, ... }:
 {
   config = {
-    home.packages = with pkgs.gnomeExtensions; [
+    home.packages = with pkgs; [
-      solaar-extension
+      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 = {

modules/desktop-environment.nix

@@ -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;
-    };
-  };
-}

modules/gnome.nix

@@ -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
-      ];
-    }
-  ];
-}

nixosConfigurations/ronja-pc/default.nix

@@ -4,10 +4,10 @@
     ./configuration.nix
     ./hardware.nix
 
-    ../../modules/gnome.nix
+    vinzenzNixosModules.gnome
-    ../../modules/gaming.nix
     vinzenzNixosModules.steam
-    ../../modules/desktop-environment.nix
+    vinzenzNixosModules.wine-gaming
+    vinzenzNixosModules.vinzenz-desktop-settings
 
     ../../home/ronja
   ];

nixosConfigurations/vinzenz-lpt2/default.nix

@@ -4,12 +4,12 @@
     ./configuration.nix
     ./hardware.nix
 
-    ../../modules/gnome.nix
+    vinzenzNixosModules.gnome
-    ../../modules/gaming.nix
+    vinzenzNixosModules.wine-gaming
     vinzenzNixosModules.steam
     vinzenzNixosModules.printing
     vinzenzNixosModules.podman
-    ../../modules/desktop-environment.nix
+    vinzenzNixosModules.vinzenz-desktop-settings
 
     ../../home/vinzenz
     ../../home/ronja

nixosConfigurations/vinzenz-pc2/default.nix

@@ -6,13 +6,12 @@
     ./vscode-server.nix
     ./hass.nix
 
-    ../../modules/gnome.nix
+    vinzenzNixosModules.gnome
-    ../../modules/gaming.nix
+    vinzenzNixosModules.wine-gaming
     vinzenzNixosModules.steam
     vinzenzNixosModules.printing
     vinzenzNixosModules.podman
-    #../../modules/niri.nix
+    vinzenzNixosModules.vinzenz-desktop-settings
-    ../../modules/desktop-environment.nix
 
     ../../home/vinzenz
     ../../home/ronja

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
+  ];
 }

nixosModules/gnome.nix

@@ -1,31 +1,65 @@
-{ pkgs, ... }:
 {
-  services = {
+  pkgs,
-    xserver = {
+  lib,
-      # Enable the GNOME Desktop Environment.
+  config,
-      desktopManager.gnome = {
+  ...
-        enable = true;
+}:
-        extraGSettingsOverridePackages = [ pkgs.mutter ];
+{
-        extraGSettingsOverrides = ''
+  options.vinzenz = {
-          [org.gnome.mutter]
+    keep-gnome-default-apps = lib.mkEnableOption "keep gnome default apps";
-          experimental-features=['scale-monitor-framebuffer']
+  };
-        '';
+
+  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";
+      programs = {
-
+        dconf.enable = true;
-    gnome = {
+        gpaste.enable = true;
-      tinysparql.enable = false;
+      };
-      localsearch.enable = false;
+    }
-      sushi.enable = true;
+    (lib.mkIf (!config.vinzenz.keep-gnome-default-apps) {
-    };
+      environment.gnome.excludePackages = with pkgs; [
-  };
+        cheese # photo booth
-
+        epiphany # web browser
-  programs = {
+        evince # document viewer
-    dconf.enable = true;
+        geary # email client
-    gpaste.enable = true;
+        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
+      ];
+    })
+  ];
 }

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 ];
+}