Various fixes and move to hyprland lua config

Reviewed-on: #17
Co-authored-by: Armel van Ravels <armel@armel.nl>
Co-committed-by: Armel van Ravels <armel@armel.nl>

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,32 +7,63 @@
         ]
       },
       "locked": {
-        "lastModified": 1773681845,
+        "lastModified": 1781184346,
-        "narHash": "sha256-o8hrZrigP0JYcwnglCp8Zi8jQafWsxbDtRRPzuVwFxY=",
+        "narHash": "sha256-cZRlW47U6A2nWvAmnZeeO6Xvq23gxYbVLel4KxqOrcQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0759e0e137305bc9d0c52c204c6d8dffe6f601a6",
+        "rev": "ea6d221d7aa85652d014b6f719dddf036037515b",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.11",
+        "ref": "release-26.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
+    "nix-flatpak": {
+      "locked": {
+        "lastModified": 1780908363,
+        "narHash": "sha256-llGS4y3Qh1eUkli3/Y2VY9FV3GOUKFZR1E2BDftt45Q=",
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "rev": "1df08625f0f8c7d6e300a0e5df7955bbb877d809",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1773814637,
+        "lastModified": 1780902259,
-        "narHash": "sha256-GNU+ooRmrHLfjlMsKdn0prEKVa0faVanm0jrgu1J/gY=",
+        "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fea3b367d61c1a6592bc47c72f40a9f3e6a53e96",
+        "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.11",
+        "ref": "nixos-26.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1781141223,
+        "narHash": "sha256-Eye4UQJjC4TLobclolFCMl6MrjgiF6Bk1cOI5x8SH00=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "b503dde361500433ca25a32e8f4d218bf58fb659",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -40,7 +71,9 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
+        "nix-flatpak": "nix-flatpak",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-unstable": "nixpkgs-unstable"
       }
     }
   },

flake.nix

@@ -3,11 +3,20 @@
 
   inputs = {
     nixpkgs = {
-      url = "github:nixos/nixpkgs/nixos-25.11";
+      url = "github:nixos/nixpkgs/nixos-26.05";
+    };
+
+    nixpkgs-unstable = {
+      url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     };
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.11";
+      url = "github:nix-community/home-manager/release-26.05";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    nix-flatpak = {
+      url = "github:gmodena/nix-flatpak";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };

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,57 @@
+# 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
+      ../modules/arduino-ide.nix
+      ../modules/devenv.nix
+#      ../modules/bitwarden.nix
+    ];
+
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
+  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,7 +18,17 @@
       ../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
+      ../modules/arduino-ide.nix
+      ../modules/bitwarden.nix
     ];
+  
+  boot.kernelPackages = pkgs.linuxPackages_latest;
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -26,11 +36,20 @@
   networking.hostName = "gandalf";
   networking.networkmanager.enable = true;
   networking.nameservers = [ "192.168.68.56" "1.1.1.1" "8.8.8.8" ];
+  networking.firewall.enable = false;
+
+  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 +66,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/arduino-ide.nix

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

systems/modules/bambu-studio-flatpak.nix

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

systems/modules/bitwarden.nix

@@ -0,0 +1,12 @@
+{ config, pkgs, ... }:
+
+{
+  nixpkgs.config.permittedInsecurePackages = [
+    "electron-39.8.10"
+  ];
+
+  environment.systemPackages = with pkgs; [
+    bitwarden-desktop
+  ];
+}
+

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

@@ -0,0 +1,10 @@
+
+{ config, pkgsUnstable, ... } :
+
+{
+  environment.systemPackages = with pkgsUnstable; [
+    devenv
+  ];
+
+  nix.settings.trusted-users = [ "root" "avravels" ];
+}

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

@@ -9,7 +9,7 @@
 
   imports = [
     ./other/fonts.nix
-    ./programs/bitwarden.nix
+#    ./programs/bitwarden.nix
     ./programs/kitty.nix
     ./programs/zsh.nix
     ./programs/direnv.nix

systems/modules/home/programs/firefox.nix

@@ -1,9 +1,9 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 
 {
   programs.firefox = {
     enable = true;
-
+    configPath = "${config.xdg.configHome}/mozilla/firefox";
     profiles.default = {
       settings = {
         "extensions.activeThemeID" = "firefox-compact-dark@mozilla.org";

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, ... }:
 
 {
-  programs.git = {
+  options.home.git = {
-    enable = true;
+    userName = lib.mkOption {
-    settings.user = {
+      type = lib.types.str;
-      name = "Armel van Ravels";
+      default = "Armel van Ravels";
-      email = "armel@armel.nl";
+      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 = config.home.git.userName;
+        email = config.home.git.userEmail;
+      };
     };
   };
 }

systems/modules/home/programs/nvim.nix

@@ -3,6 +3,8 @@
 {
   programs.neovim = {
     enable = true;
+    withRuby = false;
+    withPython3 = false;
     defaultEditor = true;
     extraLuaPackages = ps: [ ps.magick ];
     extraPackages = [
@@ -27,7 +29,7 @@
       image-nvim
     ];
 
-    extraLuaConfig = ''
+    initLua = ''
       vim.cmd("colorscheme catppuccin-mocha")
       -- Basic settings
       vim.o.number = true

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

@@ -1,18 +1,24 @@
-{ pkgs, ... }:
+{ pkgs, pkgsUnstable, ... }:
 
 {
   programs.vscode = {
     enable = true;
 
-    package = pkgs.vscode.fhs;
+    package = pkgsUnstable.vscode.fhs;
     profiles.default.extensions = with pkgs.vscode-extensions; [
       ms-dotnettools.csharp
       ms-dotnettools.csdevkit
       ms-dotnettools.vscode-dotnet-runtime
       mkhl.direnv   # Direnv integration for VSCode
+      catppuccin.catppuccin-vsc
+      bmewburn.vscode-intelephense-client
+      continue.continue
     ];
 
     profiles.default.userSettings = {
+      "editor.lineNumbers" = "relative";
+      "workbench.colorTheme" = "Catppuccin Mocha";
+      "workbench.editor.enablePreview" = false;
       "direnv.restart.automatic" = true;
       "terminal.integrated.defaultProfile.linux" = "zsh";
       "terminal.integrated.profiles.linux" = {

systems/modules/home/wm/gtk.nix

@@ -15,6 +15,7 @@
       name = "Adwaita";
       package = pkgs.adwaita-icon-theme;
     };
+    gtk4.theme = null;
   };
 
   home.sessionVariables = {

systems/modules/home/wm/hyprland.nix

@@ -1,143 +1,169 @@
-{ pkgs, ... }:
+{ lib, pkgs, config, ... }:
+
+let
+  cfg = config.home.hyprland;
+in
 
 {
-  home.packages = with pkgs; [
+  options.home.hyprland = {
-    bzmenu
+    execOnce = lib.mkOption {
-    hyprshot
+      type = lib.types.listOf lib.types.str;
-    hyprlock
+      default = [ "waybar" ];
-    playerctl
+      description = "Commands to run once when Hyprland starts (maps to Hyprland `exec-once`).";
-    speedcrunch
+    };
-  ];
+  };
+  config = {
+    home.packages = with pkgs; [
+      bzmenu
+      hyprshot
+      hyprlock
+      playerctl
+      speedcrunch
+    ];
 
-  wayland.windowManager.hyprland = {
+    wayland.windowManager.hyprland = {
-    enable = true;
+      enable = true;
+      configType = "lua";
+      settings =
+      let
+        mkLuaInline = lib.generators.mkLuaInline;
+        toLua = lib.generators.toLua;
+        mkArgs = args: { _args = args; };
+        bind =
+          keys: dispatcher: options:
+          mkArgs [
+            keys
+            dispatcher
+            options
+          ];
+        dsp = {
+          exec_cmd = app: mkLuaInline ''hl.dsp.exec_cmd("${app}")'';
+          focus = arg: mkLuaInline "hl.dsp.focus(${toLua { } arg})";
+          window = {
+            move = arg: mkLuaInline "hl.dsp.window.move(${toLua { } arg})";
+            drag = mkLuaInline "hl.dsp.window.drag()";
+            resize = mkLuaInline "hl.dsp.window.resize()";
+            close = mkLuaInline "hl.dsp.window.close()";
+            kill = mkLuaInline "hl.dsp.window.kill()";
+            fullscreen = mkLuaInline "hl.dsp.window.fullscreen()";
+          };
+          exit = mkLuaInline "hl.dsp.exit()";
+          workspace = {
+            move = arg: mkLuaInline "hl.dsp.workspace.move(${toLua { } arg})";
+          };
+        };
+        mod = "SUPER";
+        workspaces = lib.stringToCharacters "abcdefgimnopqrstuvwxyz";
+      in
+      {
+        config = {
+          general = {
+            resize_on_border = true;
+            allow_tearing = true;
+          };
 
-    settings = {
+          animations.enabled = true;
-      ### MONITOR
-      monitor = [
-        ",preferred,auto,1"
-      ];
 
-      ### VARIABLES
+          decoration = {
-      "$mod" = "SUPER";
+            inactive_opacity = 0.8;
-      "$terminal" = "kitty";
+            active_opacity = 0.9;
-      "$menu" = "rofi -show drun";
+            rounding = 5;
-      "$bluetoothMenu" = "bzmenu --launcher rofi";
+            rounding_power = 2.5;
-      "$files" = "rofi -show filebrowser";
+            blur = {
+              enabled = true;
+              brightness = 1.0;
+              contrast = 1.0;
+              noise = 0.01;
 
-      ### BASIC LAYOUT
+              vibrancy = 0.2;
-      general = {
+              vibrancy_darkness = 0.5;
-        layout = "dwindle";
-        resize_on_border = true;
-      };
 
-      decoration = {
+              passes = 4;
-        inactive_opacity = 0.8;
+              size = 7;
-        active_opacity = 0.9;
-        rounding = 5;
-        rounding_power = 2.5;
-        blur = {
-          enabled = true;
-          brightness = 1.0;
-          contrast = 1.0;
-          noise = 0.01;
 
-          vibrancy = 0.2;
+              popups = true;
-          vibrancy_darkness = 0.5;
+              popups_ignorealpha = 0.2;
+            };
+            shadow = {
+              enabled = true;
+              color = "rgba(00000055)";
+              offset = "0 15";
+              range = 100;
+              render_power = 2;
+              scale = 0.97;
+            };
+          };
 
-          passes = 4;
+          misc = {
-          size = 7;
+            focus_on_activate = true;
-
+          };
-          popups = true;
-          popups_ignorealpha = 0.2;
         };
 
-        shadow = {
+        bind = lib.flatten [
-          enabled = true;
+          (bind "${mod} + Q" (dsp.window.kill) { })
-          color = "rgba(00000055)";
+          (bind "${mod} + L" (dsp.exec_cmd "hyprlock") { })
-          ignore_window = true;
+          (bind "${mod} + D" (dsp.exec_cmd "rofi -show drun") { })
-          offset = "0 15";
+          (bind "${mod} + B" (dsp.exec_cmd "bzmenu --launcher rofi") { })
-          range = 100;
+          (bind "${mod} + F" (dsp.window.fullscreen) { })
-          render_power = 2;
+          (bind "${mod} + Z" (dsp.exec_cmd "hyprshot -m region") { })
-          scale = 0.97;
+          (bind "${mod} + M" (dsp.exit) { })
-        };
+          (bind "${mod} + SPACE" (dsp.exec_cmd "firefox") { })
+          (bind "${mod} + RETURN" (dsp.exec_cmd "kitty") { })
+
+          (bind "${mod} + SHIFT + LEFT" (dsp.window.move { direction = "l"; }) { })
+          (bind "${mod} + SHIFT + DOWN" (dsp.window.move { direction = "d"; }) { })
+          (bind "${mod} + SHIFT + UP" (dsp.window.move { direction = "u"; }) { })
+          (bind "${mod} + SHIFT + RIGHT" (dsp.window.move { direction = "r"; }) { })
+
+          (bind "${mod} + LEFT" (dsp.focus { direction = "l"; }) { })
+          (bind "${mod} + DOWN" (dsp.focus { direction = "d"; }) { })
+          (bind "${mod} + UP" (dsp.focus { direction = "u"; }) { })
+          (bind "${mod} + RIGHT" (dsp.focus { direction = "r"; }) { })
+
+          (bind "${mod} + 1" (dsp.focus { workspace = 1; }) {})
+          (bind "${mod} + 2" (dsp.focus { workspace = 2; }) {})
+          (bind "${mod} + 3" (dsp.focus { workspace = 3; }) {})
+          (bind "${mod} + 4" (dsp.focus { workspace = 4; }) {})
+          (bind "${mod} + 5" (dsp.focus { workspace = 5; }) {})
+          (bind "${mod} + 6" (dsp.focus { workspace = 6; }) {})
+          (bind "${mod} + 7" (dsp.focus { workspace = 7; }) {})
+          (bind "${mod} + 8" (dsp.focus { workspace = 8; }) {})
+          (bind "${mod} + 9" (dsp.focus { workspace = 9; }) {})
+
+          (bind "${mod} + SHIFT + 1" (dsp.window.move { workspace = 1; }) {})
+          (bind "${mod} + SHIFT + 2" (dsp.window.move { workspace = 2; }) {})
+          (bind "${mod} + SHIFT + 3" (dsp.window.move { workspace = 3; }) {})
+          (bind "${mod} + SHIFT + 4" (dsp.window.move { workspace = 4; }) {})
+          (bind "${mod} + SHIFT + 5" (dsp.window.move { workspace = 5; }) {})
+          (bind "${mod} + SHIFT + 6" (dsp.window.move { workspace = 6; }) {})
+          (bind "${mod} + SHIFT + 7" (dsp.window.move { workspace = 7; }) {})
+          (bind "${mod} + SHIFT + 8" (dsp.window.move { workspace = 8; }) {})
+          (bind "${mod} + SHIFT + 9" (dsp.window.move { workspace = 9; }) {})
+
+          (bind "XF86AudioLowerVolume" (dsp.exec_cmd "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-") {
+            repeating = true;
+            locked = true;
+          })
+          (bind "XF86AudioRaiseVolume" (dsp.exec_cmd "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+") {
+            repeating = true;
+            locked = true;
+          })
+          (bind "XF86AudioPlay" (dsp.exec_cmd "playerctl play-pause") { locked = true; })
+          (bind "XF86AudioPrev" (dsp.exec_cmd "playerctl previous") { locked = true; })
+          (bind "XF86AudioNext" (dsp.exec_cmd "playerctl next") { locked = true; })
+
+          (bind "${mod} + mouse:272" dsp.window.drag { mouse = true; })
+          (bind "${mod} + mouse:273" dsp.window.resize { mouse = true; })
+        ];
+
+        on = mkArgs [
+          "hyprland.start"
+          (mkLuaInline ''
+            function()
+              hl.exec_cmd("waybar")
+            end'')
+        ];
       };
-
-      exec-once = [
-        "waybar"
-      ];
-
-      ### INPUT
-      input = {
-        kb_layout = "us";
-      };
-
-      ### KEYBINDINGS
-      bind = [
-        # Apps
-        "$mod, RETURN, exec, $terminal"
-        "$mod, D, exec, $menu"
-        "$mod, B, exec, $bluetoothMenu"
-        "$mod, G, exec, $files"
-        "$mod, Q, killactive"
-        "$mod, F, fullscreen"
-        "$mod, M, exit"
-        "$mod, L, exec, hyprlock"
-
-	# show/hide waybar
-        "$mod, W, exec, pkill -SIGUSR1 -f '^waybar$'"
-
-        # Focus
-        "$mod, LEFT,  movefocus, l"
-        "$mod, RIGHT, movefocus, r"
-        "$mod, UP,    movefocus, u"
-        "$mod, DOWN,  movefocus, d"
-
-        # Workspaces
-        "$mod, 1, workspace, 1"
-        "$mod, 2, workspace, 2"
-        "$mod, 3, workspace, 3"
-        "$mod, 4, workspace, 4"
-        "$mod, 5, workspace, 5"
-        "$mod, 6, workspace, 6"
-        "$mod, 7, workspace, 7"
-        "$mod, 8, workspace, 8"
-        "$mod, 9, workspace, 9"
-
-        "$mod SHIFT, 1, movetoworkspace, 1"
-        "$mod SHIFT, 2, movetoworkspace, 2"
-        "$mod SHIFT, 3, movetoworkspace, 3"
-        "$mod SHIFT, 4, movetoworkspace, 4"
-        "$mod SHIFT, 5, movetoworkspace, 5"
-        "$mod SHIFT, 6, movetoworkspace, 6"
-        "$mod SHIFT, 7, movetoworkspace, 7"
-        "$mod SHIFT, 8, movetoworkspace, 8"
-        "$mod SHIFT, 9, movetoworkspace, 9"
-
-        # Window movement
-        "$mod SHIFT, LEFT,  movewindow, l"
-        "$mod SHIFT, RIGHT, movewindow, r"
-        "$mod SHIFT, UP,    movewindow, u"
-        "$mod SHIFT, DOWN,  movewindow, d"
-
-        # Hyprshot
-        "$mod, Z, exec, hyprshot -m region"
-
-	# Media keys
-	", XF86AudioPlay,        exec, playerctl play-pause"
-	", XF86AudioMute,        exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
-	", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
-	", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
-        ", XF86AudioNext,        exec, playerctl next"
-        ", XF86AudioPrev,        exec, playerctl previous"
-
-        ", XF86Calculator,       exec, speedcrunch"
-      ];
-
-      bindm = [
-        "$mod, mouse:272, movewindow"
-        "$mod, mouse:273, resizewindow"
-      ];
     };
   };
 }

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}"
+        ",${wallpaper3}"
-        ",${wallpaper}"
       ];
     };
   };

systems/modules/jq.nix

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

systems/modules/ollama.nix

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

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,14 +2,15 @@
 
 {
   users.users.avravels = {
+    initialPassword = "welcome";
     isNormalUser = true;
     description = "Armel van Ravels";
-    extraGroups = [ "networkmanager" "wheel" "libvirtd" ];
+    extraGroups = [ "networkmanager" "wheel" "libvirtd" "dialout"];
     packages = with pkgs; [
       home-manager
       legcord
       spotify
-      protonvpn-gui
+      proton-vpn
     ];
     shell = pkgs.zsh;
   };

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,8 +16,18 @@
       ../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
+      ../modules/devenv.nix
+      ../modules/bitwarden.nix
     ];
 
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
@@ -26,11 +36,21 @@
   boot.initrd.systemd.enable = true;
 
   programs.nix-ld.enable = true;
-
   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;