Use different resolution at work

Reviewed-on: #15

README.md

@@ -10,6 +10,7 @@ Each system has its own dedicated configuration module.
 | **gandalf** | Personal system configuration for `gandalf`. |
 | **frodo**   | Personal system configuration for `frodo`. |
 | **legolas** | Personal system configuration for `legolas`. |
+| **balrog**  | Personal system configuration for `balrog`. |
 | **work**    | Work-oriented system configuration for `work`. |
 
 
@@ -18,7 +19,7 @@ Each system has its own dedicated configuration module.
 To rebuild and switch to a specific system:
 
 ```bash
-# Replace <system> with gandalf, frodo, legolas, or work
+# Replace <system> with gandalf, frodo, legolas, balrog or work
 sudo nixos-rebuild switch --flake .#<system>
 ```
 

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773681845,
-        "narHash": "sha256-o8hrZrigP0JYcwnglCp8Zi8jQafWsxbDtRRPzuVwFxY=",
+        "lastModified": 1775425411,
+        "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0759e0e137305bc9d0c52c204c6d8dffe6f601a6",
+        "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe",
         "type": "github"
       },
       "original": {
@@ -21,13 +21,28 @@
         "type": "github"
       }
     },
+    "nix-flatpak": {
+      "locked": {
+        "lastModified": 1777229239,
+        "narHash": "sha256-OwSaWqlBdKn8QIa7BrPtJmlrr46U7AuwMc/toDKuMZw=",
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "rev": "3f1d78b63b6af353c0685b8a7411c04d980426e4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1773814637,
-        "narHash": "sha256-GNU+ooRmrHLfjlMsKdn0prEKVa0faVanm0jrgu1J/gY=",
+        "lastModified": 1777077449,
+        "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fea3b367d61c1a6592bc47c72f40a9f3e6a53e96",
+        "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160",
         "type": "github"
       },
       "original": {
@@ -37,10 +52,28 @@
         "type": "github"
       }
     },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1776949667,
+        "narHash": "sha256-GMSVw35Q+294GlrTUKlx087E31z7KurReQ1YHSKp5iw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "01fbdeef22b76df85ea168fbfe1bfd9e63681b30",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
+        "nix-flatpak": "nix-flatpak",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-unstable": "nixpkgs-unstable"
       }
     }
   },

flake.nix

@@ -6,10 +6,19 @@
       url = "github:nixos/nixpkgs/nixos-25.11";
     };
 
+    nixpkgs-unstable = {
+      url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    };
+
     home-manager = {
       url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    nix-flatpak = {
+      url = "github:gmodena/nix-flatpak";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   # This strange syntax is a workaround for the intentional limitations of `flake.nix` files.

outputs.nix

@@ -1,31 +1,70 @@
-{ nixpkgs, home-manager, ... }:
+{ nixpkgs, nixpkgs-unstable, home-manager, nix-flatpak, ... }:
+
+let
+  mkPkgsUnstable = system: import nixpkgs-unstable {
+    inherit system;
+    config.allowUnfree = true;
+  };
+in
 
 {
   nixosConfigurations = {
     "gandalf" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
+      specialArgs = {
+        pkgsUnstable = mkPkgsUnstable "x86_64-linux";
+        nixFlatpak = nix-flatpak;
+      };
       modules = [
+        nix-flatpak.nixosModules.nix-flatpak
         home-manager.nixosModules.home-manager
         ./systems/gandalf
       ];
     };
     "frodo" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
+      specialArgs = {
+        pkgsUnstable = mkPkgsUnstable "x86_64-linux";
+        nixFlatpak = nix-flatpak;
+      };
       modules = [
+        nix-flatpak.nixosModules.nix-flatpak
         home-manager.nixosModules.home-manager
         ./systems/frodo
       ];
     };
     "legolas" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
+      specialArgs = {
+        pkgsUnstable = mkPkgsUnstable "x86_64-linux";
+        nixFlatpak = nix-flatpak;
+      };
       modules = [
+        nix-flatpak.nixosModules.nix-flatpak
         home-manager.nixosModules.home-manager
         ./systems/legolas
       ];
     };
+    "balrog" = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      specialArgs = {
+        pkgsUnstable = mkPkgsUnstable "x86_64-linux";
+        nixFlatpak = nix-flatpak;
+      };
+      modules = [
+        nix-flatpak.nixosModules.nix-flatpak
+        home-manager.nixosModules.home-manager
+        ./systems/balrog
+      ];
+    };
     "work" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
+      specialArgs = {
+        pkgsUnstable = mkPkgsUnstable "x86_64-linux";
+        nixFlatpak = nix-flatpak;
+      };
       modules = [
+        nix-flatpak.nixosModules.nix-flatpak
         home-manager.nixosModules.home-manager
         ./systems/work
       ];

systems/balrog/default.nix

@@ -0,0 +1,52 @@
+# Edit this configuration file to define what should be installed on
+# your system. Help is available in the configuration.nix(5) man page, on
+# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
+
+{ config, lib, pkgs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+      ../modules/home-manager.nix
+      ../modules/common.nix
+      ../modules/users.nix
+      ../modules/locales.nix
+      ../modules/services.nix
+      ../modules/programs.nix
+      ../modules/docker.nix
+      ../modules/printing.nix
+      ../modules/bambu-studio-flatpak.nix
+    ];
+
+  boot.loader.systemd-boot.enable = false;
+  boot.loader = {
+    efi = {
+      canTouchEfiVariables = true;
+      efiSysMountPoint = "/boot/efi"; # ← use the same mount point here.
+    };
+    grub = {
+       efiSupport = true;
+       device = "nodev";
+    };
+  };
+
+  networking.hostName = "balrog";
+  networking.networkmanager.enable = true;
+  networking.nameservers = [ "192.168.68.56" "1.1.1.1" "8.8.8.8" ];
+
+  hardware.enableAllFirmware = true;
+
+  boot.initrd.kernelModules = [ "wl" ]; boot.kernelModules = [ "wl" "kvm-intel" ];
+
+  boot.extraModulePackages = with config.boot.kernelPackages; [
+    broadcom_sta
+  ];
+
+  nixpkgs.config = {
+    allowInsecurePredicate = pkg: builtins.elem (lib.getName pkg) ["broadcom-sta"]; 
+  };
+  hardware.bluetooth.enable = true;
+  services.blueman.enable = true;
+  system.stateVersion = "25.11"; # Did you read the comment?
+}

systems/balrog/hardware-configuration.nix

@@ -0,0 +1,31 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/6795dc19-3130-4693-b04c-a2c56fbdbd55";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/A202-E19C";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  swapDevices = [ ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

systems/gandalf/default.nix

@@ -18,6 +18,12 @@
       ../modules/matrix.nix
       ../modules/kdenlive.nix
       ../modules/audacity.nix
+      ../modules/ollama.nix
+      ../modules/wireguard.nix
+      ../modules/qbittorrent.nix
+      ../modules/gimp.nix
+      ../modules/openscad.nix
+      ../modules/bambu-studio-flatpak.nix
     ];
 
   boot.loader.systemd-boot.enable = true;
@@ -27,10 +33,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"
+    "[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 +61,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/bambu-studio-flatpak.nix

@@ -0,0 +1,8 @@
+{ pkgs, ...}:
+
+{
+  services.flatpak.enable = true;
+  services.flatpak.packages = [
+    "com.bambulab.BambuStudio"
+  ];
+}

systems/modules/common.nix

@@ -10,9 +10,9 @@
   environment.systemPackages = with pkgs; [
     chromium
     gnumake
-    git
     jetbrains-toolbox
     fastfetch
+    jq
   ];
 
   security.rtkit.enable = true;

systems/modules/enova.nix

@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+{
+  services.dnsmasq = {
+    enable = true;
+    
+    settings = {
+      server = [ "1.1.1.1" "8.8.8.8" ];
+      address = [ "/.enova.local/127.0.0.1" ];
+    };
+  };
+}

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-manager.nix

@@ -1,9 +1,12 @@
-{ pkgs, ... }:
+{ pkgs, pkgsUnstable, ... }:
 
 {
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
+    extraSpecialArgs = {
+      inherit pkgsUnstable;
+    };
 
     users.avravels = import home/home.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,28 @@
-{ pkgs, ... } :
+{ lib, pkgsUnstable, 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;
+      package = pkgsUnstable.git;
       settings.user = {
-      name = "Armel van Ravels";
-      email = "armel@armel.nl";
+        name = config.home.git.userName;
+        email = config.home.git.userEmail;
+      };
     };
   };
 }

systems/modules/home/programs/tmux.nix

@@ -1,5 +1,8 @@
 { pkgs, ... }:
 
 {
-  programs.tmux.enable = true;
+  programs.tmux = { 
+    enable = true;
+    mouse = true;
+  };
 }

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
@@ -15,6 +27,7 @@
       settings = {
         ### MONITOR
         monitor = [
+          "DP-3,1920x1080,auto,1"
           ",preferred,auto,1"
         ];
 
@@ -63,9 +76,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 +152,5 @@
         ];
       };
     };
+  };
 }

systems/modules/home/wm/hyprpaper.nix

@@ -3,6 +3,7 @@
 let
   wallpaper = builtins.toString ../backgrounds/monkey.jpg;
   wallpaper2 = builtins.toString ../backgrounds/bird.jpg;
+  wallpaper3 = builtins.toString ../backgrounds/nix.png;
 in
 {
   services.hyprpaper = {
@@ -12,10 +13,10 @@ in
       preload = [
         wallpaper
         wallpaper2
+        wallpaper3
       ];
       wallpaper = [
-        "DP-2,${wallpaper2}"
-        ",${wallpaper}"
+        ",${wallpaper3}"
       ];
     };
   };

systems/modules/jq.nix

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

systems/modules/ollama.nix

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

systems/modules/openscad.nix

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

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/users.nix

@@ -2,12 +2,13 @@
 
 {
   users.users.avravels = {
+    initialPassword = "welcome";
     isNormalUser = true;
     description = "Armel van Ravels";
     extraGroups = [ "networkmanager" "wheel" "libvirtd" ];
     packages = with pkgs; [
       home-manager
-      discord
+      legcord
       spotify
       protonvpn-gui
     ];

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,12 @@
       ../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
+      ../modules/jq.nix
+      ../modules/enova.nix
     ];
 
   boot.loader.systemd-boot.enable = true;
@@ -29,8 +35,19 @@
 
   networking.hostName = "laptop-armel";
 
+  home-manager.users.avravels.home.hyprland.execOnce = [
+    "waybar"
+    "[workspace 1 silent] kitty"
+    "[workspace 2 silent] firefox"
+    "[workspace 2 silent] teams-for-linux"
+    "[workspace 3 silent] spotify"
+  ];
+
+  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.nameservers = [ "127.0.0.1" "192.168.68.56" "1.1.1.1" "8.8.8.8" ];
   networking.firewall.enable = false;
 
   hardware.graphics.enable = true;