Changes

dotfiles/.gitconfig

@@ -1,8 +1,7 @@
 [user]
 	name = Bart van der Braak
 	email = bart@vanderbraak.nl
-	# signingkey = 26ED0D75D89D9B61
-
+	signingkey = ~/.ssh/id_ed25519.pub
 [alias]
 	p = push
 	st = status
@@ -13,29 +12,29 @@
 	gl = config --global -l
 	aa = add .
 	pushfwl = push --force-with-lease
-
 [core]
 	excludesfile = ~/.gitignore
 	pager = delta
 	editor = vim
-
 [interactive]
-    diffFilter = delta --color-only
-
+	diffFilter = delta --color-only
 [init]
 	defaultBranch = main
-
+[gpg]
+	format = ssh
+[gpg "ssh"]
+	allowedSignersFile = ~/.ssh/allowed_signers
+	signingKey = ~/.ssh/id_ed25519.pub
+	signingAlgorithm = ssh-ed25519
+	signingNamespace = gitea
 [commit]
-	# gpgsign = true
-
+	gpgsign = true
 [push]
 	autoSetupRemote = true
-
 [filter "lfs"]
 	clean = git-lfs clean -- %f
 	smudge = git-lfs smudge -- %f
 	process = git-lfs filter-process
 	required = true
-
-[includeIf "gitdir:~/Repos/projects.blender.org/"]
-    path = ~/.config/git/blender.gitconfig
+[includeIf "gitdir:~/Repositories/blender.org/"]
+        path = ~/.config/git/blender.gitconfig

nixos/flake.nix

@@ -18,6 +18,7 @@
           ./services.nix
           ./modules/bootloader.nix
           ./modules/fonts.nix
+          ./modules/vpn.nix
         ];
       };
       qemu = nixpkgs.lib.nixosSystem {

nixos/hardware/tongfang.nix

@@ -29,24 +29,29 @@ in
     "sdhci_pci"
   ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
+  boot.kernelModules = [ 
+    "kvm-amd"
+    "crypto_simd"
+    "cryptd"
+  ];
   boot.extraModulePackages = [ yt6801 ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/c7cf28c3-5744-45cc-8a81-456d24e44b7a";
-    fsType = "ext4";
-  };
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/292e05de-6ddb-4a31-bc8a-92314b13d5c8";
+      fsType = "ext4";
+    };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/CEF6-7DAA";
-    fsType = "vfat";
-    options = [
-      "fmask=0077"
-      "dmask=0077"
+  boot.initrd.luks.devices."luks-bbe16a5b-ae1e-4297-a250-ebb8e950e12c".device = "/dev/disk/by-uuid/bbe16a5b-ae1e-4297-a250-ebb8e950e12c";
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/28FA-4261";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/f4aac953-a60d-478a-84bc-ac659360ca03"; }
     ];
-  };
-
-  swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

nixos/modules/fonts.nix

@@ -4,11 +4,11 @@ let
   fontSources = {
     sf-pro = {
       url = "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg";
-      hash = "sha256-IccB0uWWfPCidHYX6sAusuEZX906dVYo8IaqeX7/O88=";
+      hash = "sha256-Lk14U5iLc03BrzO5IdjUwORADqwxKSSg6rS3OlH9aa4=";
     };
     sf-compact = {
       url = "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg";
-      hash = "sha256-PlraM6SwH8sTxnVBo6Lqt9B6tAZDC//VCPwr/PNcnlk=";
+      hash = "sha256-CMNP+sL5nshwK0lGBERp+S3YinscCGTi1LVZVl+PuOM=";
     };
     sf-mono = {
       url = "https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg";

nixos/packages.nix

@@ -44,5 +44,6 @@ in
       powershell
       git-lfs
       ruff
+      meld
     ];
 }

nixos/services.nix

@@ -8,6 +8,10 @@
     wayland.enable = true;
   };
   services.desktopManager.plasma6.enable = true;
+  qt = {
+    enable = true;
+    platformTheme = "kde";
+  };
 
   # Audio system with PipeWire
   # Enable PipeWire and ALSA support