Merge pull request 'mac2' (#3) from mac2 into master

Reviewed-on: https://git.sortug.com/polwex/nixconf/pulls/3

14 files changed, 222 insertions, 414 deletions

diff --git a/flake.lock b/flake.lock
index e066e7c..b0a796c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -64,29 +64,6 @@
         "type": "gitlab"
       }
     },
-    "claude-desktop": {
-      "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1738150082,
-        "narHash": "sha256-8CTUXRlFbybm5aGgnAkfAX3KO4NnqP4OgXr6RLU6leM=",
-        "ref": "refs/heads/master",
-        "rev": "c50cb8dd2b058355514e7a254d28b4cdcfc7c4f8",
-        "revCount": 15,
-        "type": "git",
-        "url": "file://git:file:/home/y/code/nix/claude-desktop-linux-flake"
-      },
-      "original": {
-        "type": "git",
-        "url": "file://git:file:/home/y/code/nix/claude-desktop-linux-flake"
-      }
-    },
     "crane": {
       "locked": {
         "lastModified": 1725409566,
@@ -162,11 +139,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738148035,
-        "narHash": "sha256-KYOATYEwaKysL3HdHdS5kbQMXvzS4iPJzJrML+3TKAo=",
+        "lastModified": 1739841949,
+        "narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "18d0a984cc2bc82cf61df19523a34ad463aa7f54",
+        "rev": "15dbf8cebd8e2655a883b74547108e089f051bf0",
         "type": "github"
       },
       "original": {
@@ -275,11 +252,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1736143030,
-        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
+        "lastModified": 1738453229,
+        "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
+        "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
         "type": "github"
       },
       "original": {
@@ -314,11 +291,11 @@
         "nixpkgs-lib": "nixpkgs-lib_2"
       },
       "locked": {
-        "lastModified": 1736143030,
-        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
+        "lastModified": 1738453229,
+        "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
+        "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
         "type": "github"
       },
       "original": {
@@ -330,28 +307,6 @@
     "flake-parts_4": {
       "inputs": {
         "nixpkgs-lib": [
-          "nixpkgs-wayland",
-          "nix-eval-jobs",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1736143030,
-        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_5": {
-      "inputs": {
-        "nixpkgs-lib": [
           "nur",
           "nixpkgs"
         ]
@@ -586,11 +541,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1738073973,
-        "narHash": "sha256-+Bjgq2LuCrFQ8RA/25dWSAguFLH53TxoQZWuX7fb4gc=",
+        "lastModified": 1740074307,
+        "narHash": "sha256-1duOlzdBv61aLohv45urOtqqzwi3RPcG/JTtxx0V4K8=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "6049f2035be3e218da327b51d8e4bfd36242dd43",
+        "rev": "0deb8bbce6f33124f3434c94c22f5177cb8caa9f",
         "type": "github"
       },
       "original": {
@@ -660,11 +615,11 @@
       },
       "locked": {
         "dir": "nix",
-        "lastModified": 1737901920,
-        "narHash": "sha256-KTWNHAR8FaavuDCWoq0tOR9BP1/zMQO1Ctw1eRKYSNY=",
+        "lastModified": 1739962668,
+        "narHash": "sha256-ns7btNiKU6+JViXt6k3g7iQp2Xyy0ZCi3wf59y3lS6s=",
         "owner": "kmonad",
         "repo": "kmonad",
-        "rev": "b527946b680ee2af25b99fc6bf9386cf175cc02f",
+        "rev": "356c69f45b8cbb3c875616c91892f8b28ce40c13",
         "type": "github"
       },
       "original": {
@@ -684,11 +639,11 @@
         "rust-overlay": "rust-overlay_3"
       },
       "locked": {
-        "lastModified": 1737639419,
-        "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=",
+        "lastModified": 1739186342,
+        "narHash": "sha256-2j+sln9RwQn+g7J4GmdFFgvqXnLkvWBNMaUzONlkzUE=",
         "owner": "nix-community",
         "repo": "lanzaboote",
-        "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e",
+        "rev": "3bdeebbc484a09391c4f0ec8a37bb77809426660",
         "type": "github"
       },
       "original": {
@@ -703,11 +658,11 @@
         "nixpkgs-lib": "nixpkgs-lib_3"
       },
       "locked": {
-        "lastModified": 1737893510,
-        "narHash": "sha256-AzUuPAdHSSiYQm+gOtOdyazY432QN8+s8nLPtqbTXjw=",
+        "lastModified": 1739708078,
+        "narHash": "sha256-ePo0EHEEKb/853zI4/or8Jea2aYE/dUgO/rUDXSakCA=",
         "owner": "nix-community",
         "repo": "lib-aggregate",
-        "rev": "8bfb3946eb1aa6f8b56b2b26c8479b20f5e6c04e",
+        "rev": "af2561272f74dd3d489d62efb98fe5f0b28fdbbe",
         "type": "github"
       },
       "original": {
@@ -723,11 +678,11 @@
         "spectrum": "spectrum"
       },
       "locked": {
-        "lastModified": 1737981104,
-        "narHash": "sha256-7AGmPPBgLHHWgzzFYDJcyhv/NiuCrpgzg8IyA7Q/H9o=",
+        "lastModified": 1739104176,
+        "narHash": "sha256-bNvtud2PUcbYM0i5Uq1v01Dcgq7RuhVKfjaSKkW2KRI=",
         "owner": "astro",
         "repo": "microvm.nix",
-        "rev": "3768f4937f38334898c67e03f40e244a57a74caa",
+        "rev": "d3a9b7504d420a1ffd7c83c1bb8fe57deaf939d2",
         "type": "github"
       },
       "original": {
@@ -739,15 +694,15 @@
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs-darwin"
+          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1738033138,
-        "narHash": "sha256-qlIM8A3bdL9c6PexhpS+QyZLO9y/8a3V75HVyJgDE5Q=",
+        "lastModified": 1739933872,
+        "narHash": "sha256-UhuvTR4OrWR+WBaRCZm4YMkvjJhZ1KZo/jRjE41m+Ek=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "349a74c66c596ef97ee97b4d80a3ca61227b6120",
+        "rev": "6ab392f626a19f1122d1955c401286e1b7cf6b53",
         "type": "github"
       },
       "original": {
@@ -756,39 +711,17 @@
         "type": "github"
       }
     },
-    "nix-eval-jobs": {
-      "inputs": {
-        "flake-parts": "flake-parts_4",
-        "nix-github-actions": "nix-github-actions",
-        "nixpkgs": "nixpkgs_12",
-        "treefmt-nix": "treefmt-nix"
-      },
-      "locked": {
-        "lastModified": 1737635767,
-        "narHash": "sha256-/AhicHbKv5eVbHhA1zDkUTU4JEZ8P9sPB6r2+iZhERU=",
-        "owner": "nix-community",
-        "repo": "nix-eval-jobs",
-        "rev": "6521196d5900db73e4e18b84a2162486b19c141b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nix-eval-jobs",
-        "type": "github"
-      }
-    },
     "nix-gaming": {
       "inputs": {
         "flake-parts": "flake-parts_3",
-        "nixpkgs": "nixpkgs_7",
-        "umu": "umu"
+        "nixpkgs": "nixpkgs_7"
       },
       "locked": {
-        "lastModified": 1737855374,
-        "narHash": "sha256-RRGX2C+c+GaR3YMiYm6l/Tp5N/KZtYpiTplUrBwH/og=",
+        "lastModified": 1740102075,
+        "narHash": "sha256-4ZFfFwcPTWVVxZKcfouAVx8eDBDTaHUSySHJCe+xQus=",
         "owner": "fufexan",
         "repo": "nix-gaming",
-        "rev": "4845fe94cda365c7550d9fd1ef899d45df0bc18a",
+        "rev": "e319f4c8f0082f2b69cf7580b41cf577211f3742",
         "type": "github"
       },
       "original": {
@@ -797,28 +730,6 @@
         "type": "github"
       }
     },
-    "nix-github-actions": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs-wayland",
-          "nix-eval-jobs",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1731952509,
-        "narHash": "sha256-p4gB3Rhw8R6Ak4eMl8pqjCPOLCZRqaehZxdZ/mbFClM=",
-        "owner": "nix-community",
-        "repo": "nix-github-actions",
-        "rev": "7b5f051df789b6b20d259924d349a9ba3319b226",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nix-github-actions",
-        "type": "github"
-      }
-    },
     "nixlib": {
       "locked": {
         "lastModified": 1736643958,
@@ -915,11 +826,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1737751639,
-        "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=",
+        "lastModified": 1740089251,
+        "narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4",
+        "rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30",
         "type": "github"
       },
       "original": {
@@ -939,11 +850,11 @@
         "nixpkgs-24_11": "nixpkgs-24_11"
       },
       "locked": {
-        "lastModified": 1737201600,
-        "narHash": "sha256-JBh5+g8oQteQdQqbO07dGHBRQo/NGI61JPlTjdfQ1pk=",
+        "lastModified": 1739121270,
+        "narHash": "sha256-EmJhpy9U8sVlepl2QPjG019VfG67HcucsQNItTqW6cA=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "ade37b2765032f83d2d4bd50b6204a40a4c05eb4",
+        "rev": "8c1c4640b878c692dd3d8055e8cdea0a2bbd8cf3",
         "type": "gitlab"
       },
       "original": {
@@ -979,11 +890,11 @@
         "nixpkgs": "nixpkgs_9"
       },
       "locked": {
-        "lastModified": 1736095716,
-        "narHash": "sha256-csysw/Szu98QDiA2lhWk9seYOyCebeVEWL89zh1cduM=",
+        "lastModified": 1740046902,
+        "narHash": "sha256-Xbhz8eEqBmNpvqaGFbF5JopmfNJccWUr8eExtU/iGX4=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "63c3b4ed1712a3a0621002cd59bfdc80875ecbb0",
+        "rev": "c4f6ae89468939d9fcf1a317c062cf5dd02004ea",
         "type": "github"
       },
       "original": {
@@ -1042,35 +953,35 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1735774519,
-        "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=",
+        "lastModified": 1738452942,
+        "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
       }
     },
     "nixpkgs-lib_2": {
       "locked": {
-        "lastModified": 1735774519,
-        "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=",
+        "lastModified": 1738452942,
+        "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
       }
     },
     "nixpkgs-lib_3": {
       "locked": {
-        "lastModified": 1737853225,
-        "narHash": "sha256-ZqbbvE9MVNHxSObvAoqRExBsQpfz81u3Ry77agBJIyo=",
+        "lastModified": 1739667890,
+        "narHash": "sha256-7QtSNdCEbYG1v+ZVrFWhBkhlo2GWehPffWC0BP1VZSo=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "31d08f4e55442d13eb8766b4d6852d9fb8292382",
+        "rev": "9b883b6d4d3bd580734ddb4b5bfde8ebffd26559",
         "type": "github"
       },
       "original": {
@@ -1116,11 +1027,11 @@
         "nixpkgs": "nixpkgs_11"
       },
       "locked": {
-        "lastModified": 1737987762,
-        "narHash": "sha256-lwlwj99u58bJ7c992XGSLmCMUaNNP6OlayuESHu0zes=",
+        "lastModified": 1739974972,
+        "narHash": "sha256-2h+XbO6bNo9tIsncEYyToaSYPurPJQ+jlspucuMGjQw=",
         "owner": "numtide",
         "repo": "nixpkgs-unfree",
-        "rev": "9738e3dcfa7507f53eb542ac31da8ab186ac19d6",
+        "rev": "4ca196c1dc39328d1cd8e873519bbd9b74c55a95",
         "type": "github"
       },
       "original": {
@@ -1134,17 +1045,16 @@
       "inputs": {
         "flake-compat": "flake-compat_5",
         "lib-aggregate": "lib-aggregate",
-        "nix-eval-jobs": "nix-eval-jobs",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1738147148,
-        "narHash": "sha256-/RXuwK2UD1wbs7MKrE5nCN60j1KY0U1qEsexSkK9pv4=",
+        "lastModified": 1740103589,
+        "narHash": "sha256-i79q3sG+2ArHhp/e3ipbUFMd4w7JD39sllRI/fjwCac=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "f1cc3583a7c06857f3e26a850b34766431a15442",
+        "rev": "127a41eaf7e8e55f592225bda7230b05bb2dd2c1",
         "type": "github"
       },
       "original": {
@@ -1155,11 +1065,11 @@
     },
     "nixpkgs_10": {
       "locked": {
-        "lastModified": 1737885589,
-        "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
+        "lastModified": 1739866667,
+        "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
+        "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
         "type": "github"
       },
       "original": {
@@ -1171,11 +1081,11 @@
     },
     "nixpkgs_11": {
       "locked": {
-        "lastModified": 1737885589,
-        "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
+        "lastModified": 1739866667,
+        "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
+        "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
         "type": "github"
       },
       "original": {
@@ -1185,27 +1095,11 @@
     },
     "nixpkgs_12": {
       "locked": {
-        "lastModified": 1736042175,
-        "narHash": "sha256-jdd5UWtLVrNEW8K6u5sy5upNAFmF3S4Y+OIeToqJ1X8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "bf689c40d035239a489de5997a4da5352434632e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_13": {
-      "locked": {
-        "lastModified": 1737885589,
-        "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
+        "lastModified": 1739866667,
+        "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
+        "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
         "type": "github"
       },
       "original": {
@@ -1215,7 +1109,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_14": {
+    "nixpkgs_13": {
       "locked": {
         "lastModified": 1702151865,
         "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=",
@@ -1313,11 +1207,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1737717945,
-        "narHash": "sha256-ET91TMkab3PmOZnqiJQYOtSGvSTvGeHoegAv4zcTefM=",
+        "lastModified": 1739451785,
+        "narHash": "sha256-3ebRdThRic9bHMuNi2IAA/ek9b32bsy8F5R4SvGTIog=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ecd26a469ac56357fd333946a99086e992452b6a",
+        "rev": "1128e89fd5e11bb25aedbfc287733c6502202ea9",
         "type": "github"
       },
       "original": {
@@ -1345,32 +1239,32 @@
     },
     "nixpkgs_9": {
       "locked": {
-        "lastModified": 1733384649,
-        "narHash": "sha256-K5DJ2LpPqht7K76bsxetI+YHhGGRyVteTPRQaIIKJpw=",
+        "lastModified": 1739624908,
+        "narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "190c31a89e5eec80dd6604d7f9e5af3802a58a13",
+        "rev": "a60651b217d2e529729cbc7d989c19f3941b9250",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nur": {
       "inputs": {
-        "flake-parts": "flake-parts_5",
-        "nixpkgs": "nixpkgs_13",
-        "treefmt-nix": "treefmt-nix_2"
+        "flake-parts": "flake-parts_4",
+        "nixpkgs": "nixpkgs_12",
+        "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1738149250,
-        "narHash": "sha256-ueJsDHnApfukmNu0ctIZL1AKR8KNaPuiAPVADFC+ans=",
+        "lastModified": 1740129850,
+        "narHash": "sha256-dn7INoviCjX6mhHErHJ9IGQsJY26muWGZEdwiZacBuc=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "d221a29d4b156f902fd43c95ae242b406fc01846",
+        "rev": "883d1900bad792b7e9c6717cd5e7be92b19a7d3f",
         "type": "github"
       },
       "original": {
@@ -1458,7 +1352,6 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
-        "claude-desktop": "claude-desktop",
         "disko": "disko",
         "flake-parts": "flake-parts",
         "flake-utils": "flake-utils_2",
@@ -1485,6 +1378,7 @@
         "nur": "nur",
         "polybar-themes": "polybar-themes",
         "waybar": "waybar",
+        "windsurf": "windsurf",
         "wrapper-manager": "wrapper-manager"
       }
     },
@@ -1675,28 +1569,6 @@
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs-wayland",
-          "nix-eval-jobs",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1736154270,
-        "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
-    "treefmt-nix_2": {
-      "inputs": {
-        "nixpkgs": [
           "nur",
           "nixpkgs"
         ]
@@ -1715,55 +1587,47 @@
         "type": "github"
       }
     },
-    "umu": {
+    "waybar": {
       "inputs": {
+        "flake-compat": "flake-compat_6",
         "nixpkgs": [
-          "nix-gaming",
           "nixpkgs"
         ]
       },
       "locked": {
-        "dir": "packaging/nix",
-        "lastModified": 1737834175,
-        "narHash": "sha256-fhyc89qqYM3ql0k4hJVibAhXvEXOch96hnsEGB7Av3I=",
-        "ref": "refs/heads/main",
-        "rev": "4d1860eefd79d6c04e964774155dbe13be65121a",
-        "revCount": 911,
-        "submodules": true,
-        "type": "git",
-        "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
+        "lastModified": 1740125099,
+        "narHash": "sha256-VpT3ePqmo75Ni6/02KFGV6ltnpiV70/ovG/p1f2wKkU=",
+        "owner": "alexays",
+        "repo": "waybar",
+        "rev": "8490a1d9b9a5c8770dd63e9faca0a5e01acedcae",
+        "type": "github"
       },
       "original": {
-        "dir": "packaging/nix",
-        "submodules": true,
-        "type": "git",
-        "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
+        "owner": "alexays",
+        "repo": "waybar",
+        "type": "github"
       }
     },
-    "waybar": {
+    "windsurf": {
       "inputs": {
-        "flake-compat": "flake-compat_6",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1737793892,
-        "narHash": "sha256-Dl7JEjpno+4dv66ZhqQyHT3zWw6d51fJ0cphu0Aejqk=",
-        "owner": "alexays",
-        "repo": "waybar",
-        "rev": "481b01d9af1e34b7501665bbfc0b19fce5082eb5",
-        "type": "github"
+        "lastModified": 1,
+        "narHash": "sha256-7nSTttkAXUSMi3onSp8Nk1vFxLLssSudtlASzb5hFXo=",
+        "path": "derivations/windsurf",
+        "type": "path"
       },
       "original": {
-        "owner": "alexays",
-        "repo": "waybar",
-        "type": "github"
+        "path": "derivations/windsurf",
+        "type": "path"
       }
     },
     "wrapper-manager": {
       "inputs": {
-        "nixpkgs": "nixpkgs_14"
+        "nixpkgs": "nixpkgs_13"
       },
       "locked": {
         "lastModified": 1724503599,
diff --git a/flake.nix b/flake.nix
index b70b44d..0a338a5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,7 +8,7 @@
     nixpkgs-unfree.url = "github:numtide/nixpkgs-unfree?ref=nixos-unstable";
     nix-darwin = {
       url = "github:lnl7/nix-darwin";
-      inputs.nixpkgs.follows = "nixpkgs-darwin";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
     flake-utils.url = "github:numtide/flake-utils";
 
@@ -70,11 +70,6 @@
       url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    claude-desktop = {
-      url = "git:file:/home/y/code/nix/claude-desktop-linux-flake";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
-    };
     windsurf = {
       url = "path:derivations/windsurf";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -96,10 +91,6 @@
 
     nixos-rk3588.url = "github:ryan4yin/nixos-rk3588";
 
-    devenv = {
-      url = "github:cachix/devenv";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
   outputs = inputs: import ./outputs.nix inputs;
 }
diff --git a/hosts/base.nix b/hosts/base.nix
index 96df7c4..aea25e9 100644
--- a/hosts/base.nix
+++ b/hosts/base.nix
@@ -1,11 +1,10 @@
 {pkgs, ...}: {
   # fucking linux vulnerability
-  services.printing.enable = false;
   # enable flakes
   nix = {
     gc = {
       automatic = true;
-      dates = "weekly";
+      interval = {Weekday = 0; Hour = 20; Minute = 0;};
       options = "--delete-older-than 7d";
     };
     # package = pkgs.nixFlakes;
diff --git a/hosts/darwin.nix b/hosts/darwin.nix
index 909322b..78de32f 100644
--- a/hosts/darwin.nix
+++ b/hosts/darwin.nix
@@ -1,6 +1,6 @@
 inputs: let
   mkDarwinSystem = system: path:
-    inputs.nixpkgs.lib.darwinSystem {
+    inputs.nix-darwin.lib.darwinSystem {
       inherit system;
       specialArgs = {inherit inputs;};
       modules = import (./. + "/${path}") inputs;
diff --git a/hosts/editors.nix b/hosts/editors.nix
index b3e6e69..241ea57 100644
--- a/hosts/editors.nix
+++ b/hosts/editors.nix
@@ -7,8 +7,8 @@
   environment.variables.F = "hx";
   environment.systemPackages = [
     pkgs.neovim
-    inputs.helix.packages.${pkgs.system}.helix
+    #inputs.helix.packages.${pkgs.system}.helix
     pkgs.nodePackages.prettier
-    # pkgs.helix
+     pkgs.helix
   ];
 }
diff --git a/hosts/local/i3.nix b/hosts/local/i3.nix
index ba84982..210c0d0 100644
--- a/hosts/local/i3.nix
+++ b/hosts/local/i3.nix
@@ -90,6 +90,7 @@
     easyeffects
     # games!
     ryujinx
+    wineWowPackages.staging
   ];
   services.flatpak.enable = true;
 
diff --git a/hosts/local/wayland.nix b/hosts/local/wayland.nix
index 8f588c8..b56967c 100644
--- a/hosts/local/wayland.nix
+++ b/hosts/local/wayland.nix
@@ -120,6 +120,8 @@
     #    espeak-ng
     #    espeak-ng-data
     ghostty
+    wineWowPackages.staging
+    wineWowPackages.waylandFull
   ];
   services.speechd.enable = true;
 
diff --git a/hosts/mac/m1mba/configuration.nix b/hosts/mac/m1mba/configuration.nix
index 373f781..ed64688 100644
--- a/hosts/mac/m1mba/configuration.nix
+++ b/hosts/mac/m1mba/configuration.nix
@@ -1,18 +1,11 @@
 {...}: {
   imports = [
     ../../base.nix
+    ../../users.nix
+    ../../editors.nix
+    ../../pkgs.nix
     ../mac.nix
-    ./users.nix
-    ./pkgs.nix
+    
   ];
 
-  # Auto upgrade nix package and the daemon service.
-  services.nix-daemon.enable = true;
-  # nix.package = pkgs.nix;
-  # Used for backwards compatibility, please read the changelog before changing.
-  # $ darwin-rebuild changelog
-  system.stateVersion = 4;
-
-  # The platform the configuration will be used on.
-  nixpkgs.hostPlatform = "aarch64-darwin";
 }
diff --git a/hosts/mac/m1mba/default.nix b/hosts/mac/m1mba/default.nix
new file mode 100644
index 0000000..3370bb0
--- /dev/null
+++ b/hosts/mac/m1mba/default.nix
@@ -0,0 +1,4 @@
+inputs: [
+  #inputs.kmonad.nixosModules.default
+  ./configuration.nix
+]
diff --git a/hosts/mac/m1mba/mac.nix b/hosts/mac/m1mba/mac.nix
deleted file mode 100644
index dba3035..0000000
--- a/hosts/mac/m1mba/mac.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-{
-  fonts.fontDir.enable = true;
-  fonts.fonts = with pkgs; [
-    recursive
-    (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
-  ];
-  system.keyboard = {
-    enableKeyMapping = true;
-    remapCapsLockToEscape = true;
-  };
-}
diff --git a/hosts/mac/m1mba/pkgs.nix b/hosts/mac/m1mba/pkgs.nix
deleted file mode 100644
index dffcd66..0000000
--- a/hosts/mac/m1mba/pkgs.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ pkgs, kmonad, unstablePkgs, ...}:
-
-{
-# custom
-#  y.kmonad.enable = true;
- environment.systemPackages = with unstablePkgs; [
-     # custom
-     pkgs.overlays.yabai
-     #unfree
-#     slack
-#     spotify
-#     corefonts
-#     symbola
-     #gui
-     alacritty
-     vscodium
-     tdesktop
-     # terminal
-     #     
-     vim
-     neovim
-     helix
-     # ---
-     wget
-     htop
-     bat
-     gitAndTools.gitFull
-     lazygit
-     git-lfs
-     lsd
-     lsof
-     tmux
-     tmate
-     curlFull
-     ripgrep
-     ranger
-     minio
-     minio-client
-     zip
-     unzip
-     jq
-     vifm
-     nnn
-     # neovim asks for a c compiler just to run nvim-treesitter commands. let's see
-     fzf
-     killall
-     tree
-     deluge
-     ncdu
-     edir
-     bottom
-     pigz
-     rclone
-     # direnv
-     direnv
-     nix-direnv
-     # scraping
-     python310Packages.yt-dlp
-     # code
-     nodejs
-     node2nix
-     zig
-     gcc
-     gnumake
-     sqlite
-  ];
-}
-
diff --git a/hosts/mac/mac.nix b/hosts/mac/mac.nix
index dba3035..651e2e4 100644
--- a/hosts/mac/mac.nix
+++ b/hosts/mac/mac.nix
@@ -1,12 +1,29 @@
 { pkgs, ... }:
 {
-  fonts.fontDir.enable = true;
-  fonts.fonts = with pkgs; [
+# custom
+#  y.kmonad.enable = true;
+  environment.systemPackages = with pkgs;[
+    alacritty
+    #overlays.yabai
+  ];
+  fonts.packages = with pkgs; [
     recursive
-    (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
+    pkgs.nerd-fonts.droid-sans-mono
+ #   (pkgs.nerd-fonts.override { fonts = [ "JetBrainsMono" ]; })
   ];
+  #system.configurationRevision = self.rev or self.dirtyRev or null;
   system.keyboard = {
     enableKeyMapping = true;
     remapCapsLockToEscape = true;
   };
+  #pkgs = import nixpkgs {
+  #  overlays = builtins.attrValues self.overlays;
+  #  system = "aarch64-darwin";
+  #};
+  nixpkgs.hostPlatform = "aarch64-darwin";
+  system.stateVersion = 6;
+  ids.gids.nixbld = 30000;
+  #services.nix-daemon.enable = true;
+
+  
 }
diff --git a/hosts/pkgs.nix b/hosts/pkgs.nix
index 953b7fd..2f55c40 100644
--- a/hosts/pkgs.nix
+++ b/hosts/pkgs.nix
@@ -1,87 +1,100 @@
 {
   inputs,
   pkgs,
+  lib,
   ...
 }: {
   environment.systemPackages = with pkgs; [
-    moreutils
-    alejandra
-    # nixfmt
-    #
-    busybox
-    usbutils
-    xdg-utils
-    rlwrap
-    wget
-    htop
-    btop
-    bat
-    gitAndTools.gitFull
-    lazygit
-    git-lfs
-    lsd
-    lsof
-    tmux
-    socat
-    tmate
-    curlFull
-    ripgrep
-    ranger
-    minio
-    minio-client
-    zip
-    unzip
-    jq
-    vifm
-    nnn
-    fzf
-    killall
-    tree
-    qrcp
-    deluge
-    ncdu
-    edir
-    bottom
-    pigz
-    rclone
-    gparted
-    autossh
-    #hardware problems
-    lm_sensors
-    linuxKernel.packages.linux_hardened.cpupower
-    # linuxKernel.packages.linux_latest_libre.cpupower
+    # networking
+     minio
+     minio-client
+     curlFull
+     wget
+     deluge
+     autossh
+     sshfs
+    # terminal basics
+
+     htop
+     rlwrap
+     bat
+     gitAndTools.gitFull
+     lazygit
+     git-lfs
+     lsd
+     lsof
+     tmux
+     tmate
+     jq
+     vifm
+     killall
+     tree
+     qrcp
+     edir
+     bottom
+     pigz
+     rclone
+    # files/disk
+     nnn
+     ranger
+     ripgrep
+     fzf
+     ncdu
+     zip
+     unzip
+    
     # images
     imagemagick
-    sxiv
-    # audio debug
-    alsa-firmware
-    # wine
-    #wineWowPackages.staging
-    #wineWowPackages.waylandFull
-    appimage-run
-    # code
+    # nix
     nil
+    alejandra
+    #nixfmt
     direnv
     nix-direnv
-    # devenv
-    inputs.devenv.packages.${pkgs.system}.default
+    devenv
+    #inputs.devenv.packages.${pkgs.system}.default
     # scraping
     python312Packages.yt-dlp
     # markdown lsp
     marksman
     # disk automount
-    udiskie
     #crypto
     # electrum
     # yacreader
-    nethogs
     superhtml
-    sshfs
-    sxiv
 
     # ai stuff!
     # aider-chat
-    yek
+    # yek
     # python312Packages.google-generativeai
+  ] ++ lib.optionals pkgs.stdenv.isLinux [
+    # linuxKernel.packages.linux_latest_libre.cpupower
+      gparted
+      moreutils
+      busybox
+      usbutils
+      xdg-utils
+      #hardware problems
+      lm_sensors
+      linuxKernel.packages.linux_hardened.cpupower
+     nethogs
+     #networking
+     # images
+     sxiv
+     # audio debug
+     alsa-firmware
+     # wine
+     appimage-run
+     # disk automount
+     udiskie
+     # /mac
+  ] ++ lib.optionals pkgs.stdenv.isDarwin [
+     # mostly for mcp stuff
+     nodejs
+     node2nix
+     zig
+     gcc
+     gnumake
+     bun
   ];
 }
diff --git a/hosts/users.nix b/hosts/users.nix
index 3572fbc..a32407c 100644
--- a/hosts/users.nix
+++ b/hosts/users.nix
@@ -1,6 +1,7 @@
 {
   config,
   pkgs,
+  lib,
   ...
 }: let
   shellAliases = {
@@ -33,9 +34,14 @@ in {
   users = {
     users = {
       y = {
-        group = "users";
+        createHome = true;
+        home = "/home/y";
+        shell = pkgs.fish;
+      } // (if !pkgs.stdenv.isDarwin then {
+        isSystemUser = false;
         isNormalUser = true;
-        extraGroups = [
+        group = "users";
+        extraGroups = (!pkgs.stdenv.isDarwin) [
           "systemd-journal"
           "wheel"
           "networkmanager"
@@ -46,11 +52,9 @@ in {
           "uinput"
           "jellyfin"
         ];
-        createHome = true;
-        home = "/home/y";
-        isSystemUser = false;
-        shell = pkgs.fish;
-      };
+      } else {});
     };
   };
 }
+
+