Add gimp to gandalf system

Reviewed-on: #14

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773681845,
-        "narHash": "sha256-o8hrZrigP0JYcwnglCp8Zi8jQafWsxbDtRRPzuVwFxY=",
+        "lastModified": 1774875830,
+        "narHash": "sha256-WPYlTmZvVa9dWlAziFkVjBdv1Z6giNIq40O1DxsBmiI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0759e0e137305bc9d0c52c204c6d8dffe6f601a6",
+        "rev": "7afd8cebb99e25a64a745765920e663478eb8830",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1773814637,
-        "narHash": "sha256-GNU+ooRmrHLfjlMsKdn0prEKVa0faVanm0jrgu1J/gY=",
+        "lastModified": 1774799055,
+        "narHash": "sha256-Tsq9BCz0q47ej1uFF39m4tuhcwru/ls6vCCJzutEpaw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fea3b367d61c1a6592bc47c72f40a9f3e6a53e96",
+        "rev": "107cba9eb4a8d8c9f8e9e61266d78d340867913a",
         "type": "github"
       },
       "original": {

systems/gandalf/default.nix

@@ -18,6 +18,10 @@
       ../modules/matrix.nix
       ../modules/kdenlive.nix
       ../modules/audacity.nix
+      ../modules/ollama.nix
+      ../modules/wireguard.nix
+      ../modules/qbittorrent.nix
+      ../modules/gimp.nix
     ];
 
   boot.loader.systemd-boot.enable = true;
@@ -27,10 +31,18 @@
   networking.networkmanager.enable = true;
   networking.nameservers = [ "192.168.68.56" "1.1.1.1" "8.8.8.8" ];
 
+  home-manager.users.avravels.home.hyprland.execOnce = [
+    "waybar"
+    "[workspace 1 silent] kitty tmux"
+    "[workspace 1 silent] spotify"
+    "[workspace 2 silent] firefox"
+  ];
+
   networking.interfaces.enp130s0.wakeOnLan.enable = true;
   networking.firewall.allowedUDPPorts = [ 9 ];
 
   services.xserver.videoDrivers = ["nvidia"];
+  services.openssh.settings.X11Forwarding = true;
 
   hardware = {
     graphics.enable = true;
@@ -47,12 +59,6 @@
 
   virtualisation.libvirtd.enable = true;
 
-  specialisation = {
-    zen.configuration = {
-      boot.kernelPackages = pkgs.linuxPackages_zen;
-    };
-  };
-
   services = {
     # Bluetooth fixes
     # Can be removed when https://github.com/NixOS/nixpkgs/pull/499670 is merged and in 25.11

systems/modules/gimp.nix

@@ -0,0 +1,7 @@
+{ config, pkgs, ... } :
+
+{
+  environment.systemPackages = with pkgs; [
+    gimp
+  ];
+}

systems/modules/home-manager-work.nix

@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-
-    users.avravels = import home/home-work.nix;
-  };
-}

systems/modules/home/home-work.nix

@@ -1,32 +0,0 @@
-{ pkgs, lib, ... }:
-
-{
-  # Home Manager state version
-  home.stateVersion = "25.11";
-
-  home.username = "avravels";
-  home.homeDirectory = "/home/avravels";
-
-  imports = [
-    ./other/fonts.nix
-    ./programs/bitwarden.nix
-    ./programs/kitty.nix
-    ./programs/zsh.nix
-    ./programs/direnv.nix
-    ./programs/firefox.nix
-    ./programs/tmux.nix
-    ./programs/git-work.nix
-    ./programs/libreoffice.nix
-    ./programs/nvim.nix
-    ./programs/ripgrep.nix
-    ./programs/vscode.nix
-    ./wm/rofi.nix
-    ./wm/cursor.nix
-    ./wm/dconf.nix
-    ./wm/gtk.nix
-    ./wm/waybar.nix
-    ./wm/hyprland.nix
-    ./wm/hyprpaper.nix
-  ];
-
-}

systems/modules/home/programs/git-work.nix

@@ -1,11 +0,0 @@
-{ pkgs, ... } :
-
-{
-  programs.git = {
-    enable = true;
-    settings.user = {
-      name = "Armel van Ravels";
-      email = "armel@webavance.nl";
-    };
-  };
-}

systems/modules/home/programs/git.nix

@@ -1,11 +1,27 @@
-{ pkgs, ... } :
+{ lib, pkgs, config, ... }:
 
 {
+  options.home.git = {
+    userName = lib.mkOption {
+      type = lib.types.str;
+      default = "Armel van Ravels";
+      description = "Default git user.name for this user";
+    };
+
+    userEmail = lib.mkOption {
+      type = lib.types.str;
+      default = "armel@armel.nl";
+      description = "Default git user.email for this user";
+    };
+  };
+
+  config = {
     programs.git = {
       enable = true;
       settings.user = {
-      name = "Armel van Ravels";
-      email = "armel@armel.nl";
+        name = config.home.git.userName;
+        email = config.home.git.userEmail;
+      };
     };
   };
 }

systems/modules/home/programs/vscode.nix

@@ -10,9 +10,13 @@
       ms-dotnettools.csdevkit
       ms-dotnettools.vscode-dotnet-runtime
       mkhl.direnv   # Direnv integration for VSCode
+      catppuccin.catppuccin-vsc
+      vscodevim.vim
     ];
 
     profiles.default.userSettings = {
+      "editor.lineNumbers" = "relative";
+      "workbench.colorTheme" = "Catppuccin Mocha";
       "direnv.restart.automatic" = true;
       "terminal.integrated.defaultProfile.linux" = "zsh";
       "terminal.integrated.profiles.linux" = {

systems/modules/home/wm/hyprland.nix

@@ -1,6 +1,18 @@
-{ pkgs, ... }:
+{ lib, pkgs, config, ... }:
+
+let
+  cfg = config.home.hyprland;
+in
 
 {
+  options.home.hyprland = {
+    execOnce = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      default = [ "waybar" ];
+      description = "Commands to run once when Hyprland starts (maps to Hyprland `exec-once`).";
+    };
+  };
+  config = {
     home.packages = with pkgs; [
       bzmenu
       hyprshot
@@ -63,9 +75,8 @@
           };
         };
 
-      exec-once = [
-        "waybar"
-      ];
+        # Use the configurable option here (default `[ "waybar" ]`)
+        exec-once = (if cfg == null then { execOnce = [ "waybar" ]; } else cfg).execOnce;
 
         ### INPUT
         input = {
@@ -140,4 +151,5 @@
         ];
       };
     };
+  };
 }

systems/modules/ollama.nix

@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+
+{
+  services.ollama = {
+    enable = true;
+    package = pkgs.ollama-cuda;
+  };
+
+  services.open-webui.enable = true;
+}

systems/modules/postman.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }: 
+
+{
+  environment.systemPackages = with pkgs; [
+    postman
+  ];
+}

systems/modules/qbittorrent.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }: 
+
+{
+  environment.systemPackages = with pkgs; [
+    qbittorrent
+  ];
+}

systems/modules/remmina.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }: 
+
+{
+  environment.systemPackages = with pkgs; [
+    remmina
+  ];
+}

systems/modules/wireguard.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    wireguard-tools
+  ];
+}

systems/work/default.nix

@@ -4,7 +4,7 @@
   imports =
     [
       ./hardware-configuration.nix
-      ../modules/home-manager-work.nix
+      ../modules/home-manager.nix
       ../modules/common.nix
       ../modules/users.nix
       ../modules/locales.nix
@@ -16,6 +16,10 @@
       ../modules/teams-for-linux.nix
       ../modules/azure-data-studio.nix
       ../modules/filezilla.nix
+      ../modules/wireguard.nix
+      ../modules/remmina.nix
+      ../modules/postman.nix
+      ../modules/gimp.nix
     ];
 
   boot.loader.systemd-boot.enable = true;
@@ -29,6 +33,11 @@
 
   networking.hostName = "laptop-armel";
 
+  home-manager.users.avravels.home.hyprland.execOnce = [ "waybar" ];
+
+  home-manager.users.avravels.home.git.userName = "Armel van Ravels";
+  home-manager.users.avravels.home.git.userEmail = "armel@webavance.nl";
+
   networking.networkmanager.enable = true;
   networking.nameservers = [ "192.168.68.56" "1.1.1.1" "8.8.8.8" ];
   networking.firewall.enable = false;