Add kAirPods flake

dotfiles/.gitconfig

@@ -1,7 +1,8 @@
 [user]
 	name = Bart van der Braak
 	email = bart@vanderbraak.nl
-	signingkey = ~/.ssh/id_ed25519.pub
+	# signingkey = 26ED0D75D89D9B61
+
 [alias]
 	p = push
 	st = status
@@ -12,29 +13,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:~/Repositories/blender.org/"]
+
-        path = ~/.config/git/blender.gitconfig
+[includeIf "gitdir:~/Repos/projects.blender.org/"]
+    path = ~/.config/git/blender.gitconfig

nixos/flake.lock

@@ -1,5 +1,23 @@
 {
   "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -8,11 +26,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743604125,
+        "lastModified": 1752603129,
-        "narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=",
+        "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a",
+        "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b",
         "type": "github"
       },
       "original": {
@@ -21,13 +39,32 @@
         "type": "github"
       }
     },
+    "kairpods": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1754608805,
+        "narHash": "sha256-07koS1/4wf2VNxsH9hqJCm+26qn5jdzVlmOTY15bhMI=",
+        "owner": "bartvdbraak",
+        "repo": "kAirPods",
+        "rev": "c763da2883b2196269c1e13668c02913281310c0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "bartvdbraak",
+        "repo": "kAirPods",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1749727998,
+        "lastModified": 1754292888,
-        "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=",
+        "narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd",
+        "rev": "ce01daebf8489ba97bd1609d185ea276efdeb121",
         "type": "github"
       },
       "original": {
@@ -39,11 +76,27 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1743448293,
+        "lastModified": 1754292888,
-        "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=",
+        "narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ce01daebf8489ba97bd1609d185ea276efdeb121",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1752480373,
+        "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3",
+        "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08",
         "type": "github"
       },
       "original": {
@@ -55,21 +108,37 @@
     },
     "root": {
       "inputs": {
-        "nixpkgs": "nixpkgs",
+        "kairpods": "kairpods",
+        "nixpkgs": "nixpkgs_2",
         "zen-browser": "zen-browser"
       }
     },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "zen-browser": {
       "inputs": {
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1749745531,
+        "lastModified": 1754497708,
-        "narHash": "sha256-+nnmuYVhQPbELuW2lZCWpTAJo955Qng/SCcLVO/RP6c=",
+        "narHash": "sha256-ZJBT2qNZy8fOV9UUu0QZ74GMzXWpXHG0TVtWBT/oMbw=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "50ec60bcf3528db062700673f61f86d82ca6cda0",
+        "rev": "d6aa1dd4e37331af1e56c7c0f2774904ee89acca",
         "type": "github"
       },
       "original": {

nixos/flake.nix

@@ -4,6 +4,7 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
     zen-browser.url = "github:0xc000022070/zen-browser-flake";
+    kairpods.url = "github:bartvdbraak/kAirPods";
   };
 
   outputs = { nixpkgs, ... }@inputs: {
@@ -18,7 +19,6 @@
           ./services.nix
           ./modules/bootloader.nix
           ./modules/fonts.nix
-          ./modules/vpn.nix
         ];
       };
       qemu = nixpkgs.lib.nixosSystem {

nixos/hardware/tongfang.nix

@@ -29,29 +29,24 @@ in
     "sdhci_pci"
   ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ 
+  boot.kernelModules = [ "kvm-amd" ];
-    "kvm-amd"
-    "crypto_simd"
-    "cryptd"
-  ];
   boot.extraModulePackages = [ yt6801 ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/292e05de-6ddb-4a31-bc8a-92314b13d5c8";
+    device = "/dev/disk/by-uuid/c7cf28c3-5744-45cc-8a81-456d24e44b7a";
-      fsType = "ext4";
+    fsType = "ext4";
-    };
+  };
 
-  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/CEF6-7DAA";
-  fileSystems."/boot" =
+    fsType = "vfat";
-    { device = "/dev/disk/by-uuid/28FA-4261";
+    options = [
-      fsType = "vfat";
+      "fmask=0077"
-      options = [ "fmask=0077" "dmask=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/devops-tools.nix

@@ -4,7 +4,6 @@
   environment.systemPackages = with pkgs; [
     azure-cli
     opentofu
-    bao
     curl
     go-task
     sops

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-Lk14U5iLc03BrzO5IdjUwORADqwxKSSg6rS3OlH9aa4=";
+      hash = "sha256-IccB0uWWfPCidHYX6sAusuEZX906dVYo8IaqeX7/O88=";
     };
     sf-compact = {
       url = "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg";
-      hash = "sha256-CMNP+sL5nshwK0lGBERp+S3YinscCGTi1LVZVl+PuOM=";
+      hash = "sha256-PlraM6SwH8sTxnVBo6Lqt9B6tAZDC//VCPwr/PNcnlk=";
     };
     sf-mono = {
       url = "https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg";

nixos/packages.nix

@@ -17,6 +17,7 @@ in
     with inputs;
     [
       inputs.zen-browser.packages."${system}".default
+      inputs.kairpods.packages.${system}.default
       firefox
       git
       vim
@@ -44,6 +45,5 @@ in
       powershell
       git-lfs
       ruff
-      meld
     ];
 }

nixos/services.nix

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

nixos/users.nix

@@ -10,6 +10,7 @@
       "libvirtd"
       "docker"
       "dialout" # for nanokvm usb
+      "blueooth" # for kairpods
     ];
     packages = with pkgs; [
       vscodium
@@ -38,9 +39,6 @@
       cloud-utils
       ansible-lint
       zed-editor
-      prismlauncher
-      runelite
-      bolt-launcher
     ];
   };