Add desktop changes

7 files changed, 99 insertions, 46 deletions

diff --git a/.gitignore b/.gitignore
index f50ed43..7b9fe24 100755
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@ nixpkgs/
 result
 wg/
 opensuse/
-modules/opensuse/
\ No newline at end of file
+modules/opensuse/
+/*.qcow2
diff --git a/build.sh b/build.sh
index a5abb3c..1f70971 100755
--- a/build.sh
+++ b/build.sh
@@ -18,7 +18,7 @@ if [ "${ROOT}" = "/" ]; then
     [ -f "host/${CONFIG}/hooks/pre-rebuild.sh" ] && host/${CONFIG}/hooks/pre-rebuild.sh
     [ ! -f "hardware-configuration.nix" ] && nixos-generate-config --show-hardware-config > hardware-configuration.nix
     git add -f hardware-configuration.nix
-    nom build $DERIVATION $EXTRA_NIX_FLAGS && sudo nixos-rebuild switch --flake .#${CONFIG} --upgrade-all $EXTRA_NIX_FLAGS || exit 1
+    nom build $DERIVATION $EXTRA_NIX_FLAGS && nixos-rebuild switch --flake .#${CONFIG} --upgrade-all $EXTRA_NIX_FLAGS --use-remote-sudo || exit 1
     #nixos-rebuild switch --flake ".#${CONFIG}" -j`nproc` --upgrade-all -L || exit 1
     [ -f "host/${CONFIG}/hooks/post-rebuild.sh" ] && host/${CONFIG}/hooks/post-rebuild.sh
     git rm --cached hardware-configuration.nix
diff --git a/flake.lock b/flake.lock
index 789d9b6..33ea0a6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -183,11 +183,11 @@
     "draupnirSrc": {
       "flake": false,
       "locked": {
-        "lastModified": 1728642588,
-        "narHash": "sha256-PMz1f/5C/nCubUkbGbAmJJLcv4QcCV6D21DyO8tMCJY=",
+        "lastModified": 1729943224,
+        "narHash": "sha256-d9K0fSQTfdRNhfrAx7MuOR0yDGC9m+kRfygwijrScZs=",
         "owner": "the-draupnir-project",
         "repo": "Draupnir",
-        "rev": "57071b93695486d3b1814969a19da6c71a638f36",
+        "rev": "c2786e2c4817818f5e84255f5e3a362f7b3bea77",
         "type": "github"
       },
       "original": {
@@ -439,11 +439,11 @@
       },
       "locked": {
         "host": "gitlab.computer.surgery",
-        "lastModified": 1727994504,
-        "narHash": "sha256-FC6M1KKX58HbU9LG+cG6EJRr02J9lE/o0iiDi6m1gv8=",
+        "lastModified": 1729889318,
+        "narHash": "sha256-YnTz6r4e3ix82SRqTncHNY/JMUz8w4nGEwa+svVKXJs=",
         "owner": "matrix",
         "repo": "grapevine-fork",
-        "rev": "5a490a4397f0c6a36dab1cb631dadc67a849deab",
+        "rev": "70ee206031649490d6b48bc38a3fbe215c54036c",
         "type": "gitlab"
       },
       "original": {
@@ -458,11 +458,11 @@
         "nixpkgs": "nixpkgs_5"
       },
       "locked": {
-        "lastModified": 1728685293,
-        "narHash": "sha256-1WowL96pksT/XCi+ZXHgqiQ9NiU5oxWuNIQYWqOoEYc=",
+        "lastModified": 1730016908,
+        "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2b13611eaed8326789f76f70d21d06fbb14e3e47",
+        "rev": "e83414058edd339148dc142a8437edb9450574c8",
         "type": "github"
       },
       "original": {
@@ -492,11 +492,11 @@
     "nhekoSrc": {
       "flake": false,
       "locked": {
-        "lastModified": 1728437959,
-        "narHash": "sha256-4Lfwoc3M/ofRkpJTbqt8AHyrgGuoi+v/WEcXKrIw+o0=",
+        "lastModified": 1728857949,
+        "narHash": "sha256-NsbZQVZ/LJCt0vBWRqHkw0OzAVBwEOqZxHk03Z/SftU=",
         "owner": "Nheko-reborn",
         "repo": "nheko",
-        "rev": "27683bedc41375ac97ddf87ce430fd98aac9fc7c",
+        "rev": "2f967978f23381a5e9f2bc8c1561b033d38bd58d",
         "type": "github"
       },
       "original": {
@@ -544,11 +544,11 @@
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1728588346,
-        "narHash": "sha256-P1j+Nf+pzxPYK2Qe7lF2yB0vR3YvW8Td5sD0ZvrKIq8=",
+        "lastModified": 1730120924,
+        "narHash": "sha256-I6hwd+YlgefioLfmsM04MxzbEAES1N328/T+VqhcWnQ=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "0fc8d9bb51cc46b31d950513df6d088905c8fe55",
+        "rev": "b124084667fb4c912fda68fdd9d05f59e18b6ef7",
         "type": "github"
       },
       "original": {
@@ -607,11 +607,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1728694577,
-        "narHash": "sha256-BsBprsoB5v+BUlhkO3g9/jpRhoXxuU/UiBRT3zLdZaE=",
+        "lastModified": 1730149251,
+        "narHash": "sha256-qeeMo0LQ36XDJu9/BpuNwf+1GqGJmpqGuN345FM57z8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "299a94a7edbe8d29264013b2f983004580463737",
+        "rev": "03cf384b1f7473854754baee947735f50cf37fc3",
         "type": "github"
       },
       "original": {
@@ -655,11 +655,11 @@
     },
     "nixpkgs-stable_3": {
       "locked": {
-        "lastModified": 1728156290,
-        "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=",
+        "lastModified": 1729973466,
+        "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "17ae88b569bb15590549ff478bab6494dde4a907",
+        "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
         "type": "github"
       },
       "original": {
@@ -719,11 +719,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1728241625,
-        "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=",
+        "lastModified": 1729880355,
+        "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1",
+        "rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
         "type": "github"
       },
       "original": {
@@ -735,11 +735,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1728193676,
-        "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=",
+        "lastModified": 1729973466,
+        "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6",
+        "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
         "type": "github"
       },
       "original": {
@@ -751,11 +751,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1728492678,
-        "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
+        "lastModified": 1729880355,
+        "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
+        "rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
         "type": "github"
       },
       "original": {
@@ -767,11 +767,11 @@
     },
     "nixpkgs_8": {
       "locked": {
-        "lastModified": 1728093190,
-        "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=",
+        "lastModified": 1729951556,
+        "narHash": "sha256-bpb6r3GjzhNW8l+mWtRtLNg5PhJIae041sPyqcFNGb4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e2f08f4d8b3ecb5cf5c9fd9cb2d53bb3c71807da",
+        "rev": "4e0eec54db79d4d0909f45a88037210ff8eaffee",
         "type": "github"
       },
       "original": {
@@ -851,11 +851,11 @@
         "nixpkgs-stable": "nixpkgs-stable_3"
       },
       "locked": {
-        "lastModified": 1728345710,
-        "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=",
+        "lastModified": 1729999681,
+        "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b",
+        "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56",
         "type": "github"
       },
       "original": {
diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix
index db6615d..0623850 100644
--- a/host/Rory-desktop/configuration.nix
+++ b/host/Rory-desktop/configuration.nix
@@ -14,14 +14,15 @@ args@{
     # (import ../../modules/base-secrets.nix {  path = "/home/rory/.config/sops/config.yaml"; })
     ../../modules/packages/vim.nix
     #      ../../modules/environments/home.nix
-    #    ../../modules/software-templates/profilers.nix
+    ../../modules/software-templates/profilers.nix
+    ../../modules/packages/overlays/openvpn.nix # Temporary: Fix a build failure
     ./postgres.nix
     ./nginx.nix
 
     # hardware-specific imports
     ./optional/hardware-specific/amd.nix
 
-    ./optional/gui/x11.nix
+    #./optional/gui/x11.nix
     ./optional/gui/wayland.nix
 
     ./printing.nix
@@ -32,6 +33,7 @@ args@{
     kernelPackages = pkgs.linuxPackages_latest;
     loader = {
       grub = {
+        configurationLimit = 10;
         enable = true;
         device = "nodev"; # nodev for EFI only
         # EFI
@@ -50,6 +52,8 @@ args@{
     #readOnlyNixStore = false;
   };
   programs.noisetorch.enable = true;
+  programs.gamemode.enable = true;
+  users.users.Rory.extraGroups = ["gamemode"];
 
   environment.sessionVariables = {
     ZSH_DISABLE_COMPFIX = "true";
@@ -136,9 +140,9 @@ args@{
     # - IDEs
     #jetbrains-toolbox
     jetbrains.rider
-    #jetbrains.webstorm
+    jetbrains.webstorm
     #jetbrains.clion
-    github-copilot-intellij-agent
+    #github-copilot-intellij-agent
 
     dbeaver-bin
     #insomnia
@@ -166,10 +170,10 @@ args@{
     #ungoogled-chromium #needed for Rider in order to debug WASM
 
     #yuzu-early-access
-    wineWowPackages.unstableFull
-    winetricks
+    #wineWowPackages.unstableFull
+    #winetricks
     #fragments
-    peek
+    #peek
 
     unrar-wrapper
 
@@ -187,7 +191,16 @@ args@{
     # (dwarf-fortress-packages.dwarf-fortress-full.override { enableStoneSense = true; enableFPS = true; theme = dwarf-fortress-packages.themes.spacefox; })
     mangohud
     prismlauncher
+
+    thunderbird
+
+    p11-kit
+    opensc
+    eid-mw
   ];
+  environment.etc."pkcs11/modules/opensc-pkcs11".text = ''
+    module: ${pkgs.opensc}/lib/opensc-pkcs11.so
+  '';
 
   programs.steam.enable = true;
   programs.steam.gamescopeSession.enable = true;
@@ -274,6 +287,20 @@ args@{
   networking.hosts."127.0.0.1" = builtins.attrNames config.services.nginx.virtualHosts;
   
   services.gvfs.enable = true;
+  zramSwap = {
+    enable = true;
+    memoryPercent = 200;
+  };
+  services.pcscd.enable = true;
+
+
+  virtualisation.vmVariant = {
+    users = {
+      mutableUsers = false;
+      users.Rory.password = "password";
+    };
+    networking.interfaces.enp34s0 = lib.mkForce {};
+  };
 
   system.stateVersion = "22.11"; # DO NOT EDIT!
 }
diff --git a/modules/packages/overlays/openvpn-iomanip.patch b/modules/packages/overlays/openvpn-iomanip.patch
new file mode 100644
index 0000000..f334a34
--- /dev/null
+++ b/modules/packages/overlays/openvpn-iomanip.patch
@@ -0,0 +1,13 @@
+diff --git a/src/tests/unit/machine-id.cpp b/src/tests/unit/machine-id.cpp
+index 8131947..a875743 100644
+--- a/src/tests/unit/machine-id.cpp
++++ b/src/tests/unit/machine-id.cpp
+@@ -15,6 +15,7 @@
+ #include "build-config.h"
+ 
+ #include <iostream>
++#include <iomanip>
+ #include <fstream>
+ #include <string>
+ #include <vector>
+
diff --git a/modules/packages/overlays/openvpn.nix b/modules/packages/overlays/openvpn.nix
new file mode 100644
index 0000000..f927f80
--- /dev/null
+++ b/modules/packages/overlays/openvpn.nix
@@ -0,0 +1,12 @@
+{...}:
+{
+  nixpkgs.overlays = [
+    (final: prev: {
+      openvpn3 = prev.openvpn3.overrideAttrs (old: {
+        patches = (old.patches or []) ++ [
+          ./openvpn-iomanip.patch
+        ];
+      });
+    })
+  ];
+}
diff --git a/modules/software-templates/profilers.nix b/modules/software-templates/profilers.nix
index 4381193..0df43f7 100644
--- a/modules/software-templates/profilers.nix
+++ b/modules/software-templates/profilers.nix
@@ -3,7 +3,7 @@
 {
   environment.systemPackages = with pkgs; [
     kcachegrind
-    linuxKernel.packages.linux_5_15.perf
+    linuxKernel.packages.linux_6_11.perf
     hotspot
     valgrind
   ];