switch back to yabai for tiling. experimental shift of zen setup

moore tiling
initial macos setup
2025-12-10 10:04:45 +01:00 · 2025-12-05 17:20:44 +01:00 · 2025-12-02 23:17:14 +01:00 · 2025-12-02 22:06:53 +00:00 · 2025-12-02 23:04:02 +01:00
27 changed files with 464 additions and 514 deletions
--- a/README.md
+++ b/README.md
@@ -53,7 +53,10 @@ Initial install of nix using the determinate nix installer. Then a "full" bootst
 sudo nix run nix-darwin/master#darwin-rebuild -- switch --flake .#Remys-MacBook-Pro
 ```
 > some modifications might be necessary (i.e. due to faulty git setup at that stage).
-
+```
+# could also try something like this:
+nix-shell -p git nh
+```
 Finally, the desired state has been reached where `nh` is available:
 ```
 nh darwin switch .
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1761420899,
-        "narHash": "sha256-kxGCip6GNbcbNWKu4J2iKbNYfFTS8Zbjg9CWp0zmFoM=",
+        "lastModified": 1764370710,
+        "narHash": "sha256-7iZklFmziy6Vn5ZFy9mvTSuFopp3kJNuPxL5QAvtmFQ=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "62479232aae42c1ef09c2c027c8cfd91df060897",
+        "rev": "561ae7fbe1ca15dfd908262ec815bf21a13eef63",
        "type": "github"
      },
      "original": {
@@ -120,19 +120,16 @@
    "dankMaterialShell": {
      "inputs": {
        "dgop": "dgop",
-        "dms-cli": [
-          "dms-cli"
-        ],
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1762403774,
-        "narHash": "sha256-CXgW0EEW+WV4jJ/5mxNluQeTgS6wyuuUlUcsZF84bKU=",
+        "lastModified": 1764741581,
+        "narHash": "sha256-CbeO9Ie4Ecf8TsQWBJCrOenFmESC8XOSJ0UY69/ZTCw=",
        "owner": "AvengeMedia",
        "repo": "DankMaterialShell",
-        "rev": "c9ee856f916023563d9446483024a8aec2dce870",
+        "rev": "0ea0602aecf5ec6814988c61d4d43ff36c613f18",
        "type": "github"
      },
      "original": {
@@ -149,11 +146,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760238269,
-        "narHash": "sha256-7CeGZM/Z/5Qt3AYByCRohGYGR1MRuXYzTTbkV/JxyAs=",
+        "lastModified": 1762435535,
+        "narHash": "sha256-QhzRn7pYN35IFpKjjxJAj3GPJECuC+VLhoGem3ezycc=",
        "owner": "AvengeMedia",
        "repo": "dgop",
-        "rev": "95acdfce2d323e28fa8f5a4f345160962034f2b5",
+        "rev": "6cf638dde818f9f8a2e26d0243179c43cb3458d7",
        "type": "github"
      },
      "original": {
@@ -162,26 +159,6 @@
        "type": "github"
      }
    },
-    "dms-cli": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1762404200,
-        "narHash": "sha256-/GhnVY1AwcgxOVhSXdrejVQNbi27kXRNMD93C2nH5ho=",
-        "owner": "AvengeMedia",
-        "repo": "danklinux",
-        "rev": "b94cc56f44e7fb987d293e4880871fa0845da8ed",
-        "type": "github"
-      },
-      "original": {
-        "owner": "AvengeMedia",
-        "repo": "danklinux",
-        "type": "github"
-      }
-    },
    "firefox-gnome-theme": {
      "flake": false,
      "locked": {
@@ -201,11 +178,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1747046372,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "lastModified": 1761588595,
+        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
        "type": "github"
      },
      "original": {
@@ -313,18 +290,20 @@
    "gnome-shell": {
      "flake": false,
      "locked": {
-        "lastModified": 1748186689,
-        "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=",
+        "host": "gitlab.gnome.org",
+        "lastModified": 1762869044,
+        "narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=",
        "owner": "GNOME",
        "repo": "gnome-shell",
-        "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0",
-        "type": "github"
+        "rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad",
+        "type": "gitlab"
      },
      "original": {
+        "host": "gitlab.gnome.org",
        "owner": "GNOME",
-        "ref": "48.2",
+        "ref": "gnome-49",
        "repo": "gnome-shell",
-        "type": "github"
+        "type": "gitlab"
      }
    },
    "home-manager": {
@@ -334,11 +313,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1762367206,
-        "narHash": "sha256-c/164YOPkV09BH8KIUdvVvJs3VF2LNIbE2piKGgXPxk=",
+        "lastModified": 1764736867,
+        "narHash": "sha256-Q/+03EAvtzCbhGXv7yLsYh+pXIzLUgibpQKxo5CI2bk=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "af119feb17cb242398e0fb97f92b867d25882522",
+        "rev": "bcc7afa1d873ead5932fbb4d42f1916a9627c084",
        "type": "github"
      },
      "original": {
@@ -355,11 +334,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1762351818,
-        "narHash": "sha256-0ptUDbYwxv1kk/uzEX4+NJjY2e16MaAhtzAOJ6K0TG0=",
+        "lastModified": 1762964643,
+        "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "b959c67241cae17fc9e4ee7eaf13dfa8512477ea",
+        "rev": "827f2a23373a774a8805f84ca5344654c31f354b",
        "type": "github"
      },
      "original": {
@@ -413,11 +392,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760445448,
-        "narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=",
+        "lastModified": 1763733840,
+        "narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=",
        "owner": "hyprwm",
        "repo": "hyprgraphics",
-        "rev": "50fb9f069219f338a11cf0bcccb9e58357d67757",
+        "rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a",
        "type": "github"
      },
      "original": {
@@ -431,8 +410,8 @@
        "aquamarine": "aquamarine",
        "hyprcursor": "hyprcursor",
        "hyprgraphics": "hyprgraphics",
+        "hyprland-guiutils": "hyprland-guiutils",
        "hyprland-protocols": "hyprland-protocols",
-        "hyprland-qtutils": "hyprland-qtutils",
        "hyprlang": "hyprlang",
        "hyprutils": "hyprutils",
        "hyprwayland-scanner": "hyprwayland-scanner",
@@ -442,11 +421,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1762387591,
-        "narHash": "sha256-dbxpwgat8W/+P/cYnLXzoj5Gi8WKdtMgvqHuEzIU8fs=",
+        "lastModified": 1764725443,
+        "narHash": "sha256-A2UyZwPSHSdNfvW17J5GhxIo1TS0Z0rYv+Xgdp+w5wc=",
        "owner": "hyprwm",
        "repo": "Hyprland",
-        "rev": "c757fd375cce299e3da922190ddf1a0622ce807c",
+        "rev": "3cf0280b11f370c11e6839275e547779a33f4a19",
        "type": "github"
      },
      "original": {
@@ -455,6 +434,52 @@
        "type": "github"
      }
    },
+    "hyprland-guiutils": {
+      "inputs": {
+        "aquamarine": [
+          "hyprland",
+          "aquamarine"
+        ],
+        "hyprgraphics": [
+          "hyprland",
+          "hyprgraphics"
+        ],
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "hyprtoolkit": "hyprtoolkit",
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1764616927,
+        "narHash": "sha256-wRT0MKkpPo11ijSX3KeMN+EQWnpSeUlRtyF3pFLtlRU=",
+        "owner": "hyprwm",
+        "repo": "hyprland-guiutils",
+        "rev": "25cedbfdc5b3ea391d8307c9a5bea315e5df3c52",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-guiutils",
+        "type": "github"
+      }
+    },
    "hyprland-protocols": {
      "inputs": {
        "nixpkgs": [
@@ -480,74 +505,6 @@
        "type": "github"
      }
    },
-    "hyprland-qt-support": {
-      "inputs": {
-        "hyprlang": [
-          "hyprland",
-          "hyprland-qtutils",
-          "hyprlang"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "hyprland-qtutils",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "hyprland-qtutils",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1749154592,
-        "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=",
-        "owner": "hyprwm",
-        "repo": "hyprland-qt-support",
-        "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-qt-support",
-        "type": "github"
-      }
-    },
-    "hyprland-qtutils": {
-      "inputs": {
-        "hyprland-qt-support": "hyprland-qt-support",
-        "hyprlang": [
-          "hyprland",
-          "hyprlang"
-        ],
-        "hyprutils": [
-          "hyprland",
-          "hyprland-qtutils",
-          "hyprlang",
-          "hyprutils"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1759080228,
-        "narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=",
-        "owner": "hyprwm",
-        "repo": "hyprland-qtutils",
-        "rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-qtutils",
-        "type": "github"
-      }
-    },
    "hyprlang": {
      "inputs": {
        "hyprutils": [
@@ -564,11 +521,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1758927902,
-        "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=",
+        "lastModified": 1764612430,
+        "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=",
        "owner": "hyprwm",
        "repo": "hyprlang",
-        "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da",
+        "rev": "0d00dc118981531aa731150b6ea551ef037acddd",
        "type": "github"
      },
      "original": {
@@ -577,6 +534,58 @@
        "type": "github"
      }
    },
+    "hyprtoolkit": {
+      "inputs": {
+        "aquamarine": [
+          "hyprland",
+          "hyprland-guiutils",
+          "aquamarine"
+        ],
+        "hyprgraphics": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprgraphics"
+        ],
+        "hyprlang": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprlang"
+        ],
+        "hyprutils": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "hyprland-guiutils",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "hyprland-guiutils",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1764592794,
+        "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=",
+        "owner": "hyprwm",
+        "repo": "hyprtoolkit",
+        "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprtoolkit",
+        "type": "github"
+      }
+    },
    "hyprutils": {
      "inputs": {
        "nixpkgs": [
@@ -589,11 +598,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1762208756,
-        "narHash": "sha256-hC1jb4tdjFfEuU18KQiMgz5XPAO+d5SfbjAUS7haLl4=",
+        "lastModified": 1764637132,
+        "narHash": "sha256-vSyiKCzSY48kA3v39GFu6qgRfigjKCU/9k1KTK475gg=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "164a30b3d8b3174a32ac7326782476f1188e6118",
+        "rev": "2f2413801beee37303913fc3c964bbe92252a963",
        "type": "github"
      },
      "original": {
@@ -614,11 +623,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1755184602,
-        "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=",
+        "lastModified": 1763640274,
+        "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=",
        "owner": "hyprwm",
        "repo": "hyprwayland-scanner",
-        "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d",
+        "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671",
        "type": "github"
      },
      "original": {
@@ -694,11 +703,11 @@
        "systems": "systems_3"
      },
      "locked": {
-        "lastModified": 1762394598,
-        "narHash": "sha256-AbDS8JL8mXAP0gVAXQA1RIUwnH6rUHueCTPf/hxAooE=",
+        "lastModified": 1764727495,
+        "narHash": "sha256-sAxuKAnUf8CWsaW6TquDsdDDK4WA4cFNJi/NoccibOw=",
        "owner": "nix-community",
        "repo": "nix4vscode",
-        "rev": "4c90ca996c860583f8fc77fa8abd24610439f850",
+        "rev": "97019369dd7847a198267a4d4ea8a9d3daf66f6a",
        "type": "github"
      },
      "original": {
@@ -709,11 +718,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1762111121,
-        "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
+        "lastModified": 1764517877,
+        "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
+        "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
        "type": "github"
      },
      "original": {
@@ -725,11 +734,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1762111121,
-        "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
+        "lastModified": 1764517877,
+        "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
+        "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
        "type": "github"
      },
      "original": {
@@ -773,11 +782,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1762111121,
-        "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
+        "lastModified": 1764517877,
+        "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
+        "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
        "type": "github"
      },
      "original": {
@@ -822,11 +831,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760663237,
-        "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
+        "lastModified": 1763988335,
+        "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
+        "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce",
        "type": "github"
      },
      "original": {
@@ -838,7 +847,6 @@
    "root": {
      "inputs": {
        "dankMaterialShell": "dankMaterialShell",
-        "dms-cli": "dms-cli",
        "home-manager": "home-manager",
        "hyprland": "hyprland",
        "mac-app-util": "mac-app-util",
@@ -849,7 +857,6 @@
        "nixpkgs-unstable": "nixpkgs-unstable",
        "sops-nix": "sops-nix",
        "stylix": "stylix",
-        "watt": "watt",
        "zen-browser": "zen-browser"
      }
    },
@@ -860,11 +867,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760998189,
-        "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
+        "lastModified": 1764483358,
+        "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
+        "rev": "5aca6ff67264321d47856a2ed183729271107c9c",
        "type": "github"
      },
      "original": {
@@ -894,11 +901,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1762264356,
-        "narHash": "sha256-QVfC53Ri+8n3e7Ujx9kq6all3+TLBRRPRnc6No5qY5w=",
+        "lastModified": 1764722003,
+        "narHash": "sha256-s+rXjTHsjC39zcFFq8UkQPdpy/uzdhQU+RGvehYJQm0=",
        "owner": "nix-community",
        "repo": "stylix",
-        "rev": "647bb8dd96a206a1b79c4fd714affc88b409e10b",
+        "rev": "ddc49fd564a599474d6587df25553cbfd7325ece",
        "type": "github"
      },
      "original": {
@@ -1067,27 +1074,6 @@
        "type": "github"
      }
    },
-    "watt": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1749377316,
-        "narHash": "sha256-hw3rL4rlIlYJMTeE7DlQ3lRhQDJURAhE+PC/NT4VAAQ=",
-        "owner": "NotAShelf",
-        "repo": "watt",
-        "rev": "154724c7b1bd49654ea55df719e1eb3219ec2000",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NotAShelf",
-        "ref": "v0.3.2",
-        "repo": "watt",
-        "type": "github"
-      }
-    },
    "xdph": {
      "inputs": {
        "hyprland-protocols": [
@@ -1137,11 +1123,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1762403216,
-        "narHash": "sha256-BPv/dC0S54hqsurgmxGxUbXb3kJMpK3KNKQDrdO4NRE=",
+        "lastModified": 1764736168,
+        "narHash": "sha256-CQcj/oWKH4zN8Xkc1RglX+uOJTW1fwNWvMQWRXRlEys=",
        "owner": "0xc000022070",
        "repo": "zen-browser-flake",
-        "rev": "a3a22c5ad43f46f8ddad7eed8aa7f82ec649765f",
+        "rev": "df63ce4f706567e6efa083ba63d5e7792bf70ffa",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,7 @@
 {
  description = "Nix config entry point";
  # since secrets live in a submodule, enable submodules by default
-  # inputs.self.submodules = true;
+  inputs.self.submodules = true;
  inputs = {
    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
@@ -27,12 +27,6 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };

-    # power management
-    watt = {
-      url = "github:NotAShelf/watt/?ref=v0.3.2";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
    # secrets
    sops-nix = {
      url = "github:Mic92/sops-nix";
@@ -40,14 +34,9 @@
    };

    # quickshell
-    dms-cli = {
-      url = "github:AvengeMedia/danklinux";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
    dankMaterialShell = {
      url = "github:AvengeMedia/DankMaterialShell";
      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.dms-cli.follows = "dms-cli";
    };

    nix4vscode = {
@@ -177,7 +166,7 @@
            mac-app-util.homeManagerModules.default
          ];
        }
-        # mac-app-util.darwinModules.default
+        mac-app-util.darwinModules.default
        { nixpkgs.overlays = [ inputs.nix4vscode.overlays.default ]; }
        ./hosts/macbook-pro
      ];
--- a/hosts/macbook-pro/configuration.nix
+++ b/hosts/macbook-pro/configuration.nix
@@ -6,10 +6,8 @@
    };
    system.primaryUser = "remy";

-    environment.systemPackages = [ pkgs.git ]; # required because git is hardcoded into mac
    nix.enable=false;
    nixpkgs.config.allowUnfree = true;
-    # nixpkgs.config.allowUnsupportedSystem = true;
    security.pam.services.sudo_local.touchIdAuth = true;

    # Necessary for using flakes on this system.
--- a/hosts/macbook-pro/default.nix
+++ b/hosts/macbook-pro/default.nix
@@ -10,6 +10,6 @@
    # Merge the configuration and hardware configuration
    imports = [
        ./configuration.nix
-        ../../modules/nixos/macos-tiling
+        ../../modules/macos/tiling.nix
    ];
 }
--- a/hosts/yoga-7-pro/configuration.nix
+++ b/hosts/yoga-7-pro/configuration.nix
@@ -16,7 +16,7 @@
    HandlePowerKey = "ignore";

    # handled by the dm instead
-    HandleLidSwitch = "ignore";
+    # HandleLidSwitch = "ignore"; # needs to be set because it is not passed to other events
    HandleLidSwitchDocked = "ignore";
  };

--- a/modules/home-manager/browser.nix
+++ b/modules/home-manager/browser.nix
@@ -1,12 +1,27 @@
 {pkgs, inputs, ...}:
 {
-  programs.firefox = {
-    ## Enable the Firefox web browser
+  imports = [
+    inputs.zen-browser.homeModules.beta
+  ];
+
+  programs.zen-browser = {
    enable = true;
+
    ## Global preferences
    policies = {
      BlockAboutConfig = true;
-      DefaultDownloadDirectory = "\${home}/Downloads";
+      AutofillAddressEnabled = false;
+      AutofillCreditCardEnabled = false;
+
+      DisableAppUpdate = true;
+      DisableFeedbackCommands = true;
+      DisableTelemetry = true;
+      DisablePocket = true;
+
+      DontCheckDefaultBrowser = true;
+      OfferToSaveLogins = false;
+
+
      ExtensionSettings = with builtins;
        let extension = shortId: uuid: {
          name = uuid;
@@ -17,128 +32,20 @@
        };
        in listToAttrs [
          (extension "ublock-origin" "uBlock0@raymondhill.net")
-          (extension "tabliss" "extension@tabliss.io")
-          (extension "clearurls" "{74145f27-f039-47ce-a470-a662b129930a}")
-          (extension "keepassxc-browser" "keepassxc-browser@keepassxc.org")
          (extension "ghostery" "firefox@ghostery.com")
+          (extension "clearurls" "{74145f27-f039-47ce-a470-a662b129930a}")
        ];
    };

-    ## Per-profile preferences
-    profiles.default = {
-      search = {
-        force = true;
-        default = "ddg";
-        privateDefault = "ddg";
-        order = ["ddg" "google"];
-      };
-      settings = {
-        "browser.startup.homepage" = "about:home";
-
-        # Disable irritating first-run stuff
-        "browser.disableResetPrompt" = true;
-        "browser.download.panel.shown" = true;
-        "browser.feeds.showFirstRunUI" = false;
-        "browser.messaging-system.whatsNewPanel.enabled" = false;
-        "browser.rights.3.shown" = true;
-        "browser.shell.checkDefaultBrowser" = false;
-        "browser.shell.defaultBrowserCheckCount" = 1;
-        "browser.startup.homepage_override.mstone" = "ignore";
-        "browser.uitour.enabled" = false;
-        "startup.homepage_override_url" = "";
-        "trailhead.firstrun.didSeeAboutWelcome" = true;
-        "browser.bookmarks.restore_default_bookmarks" = false;
-        "browser.bookmarks.addedImportButton" = true;
-
-        # Disable "save password" prompt
-        "signon.rememberSignons" = false;
-
-        # Harden
-        "privacy.trackingprotection.enabled" = true;
-        "dom.security.https_only_mode" = true;
-
-        # Disable Pocket
-        "extensions.pocket.enabled" = false;
-
-        # Disable telemetry
-        "toolkit.telemetry.enabled" = false;
-
-        # Remove bookmarks toolbar
-        "browser.toolbars.bookmarks.visibility" = "never";
-
-        # Restore session on startup
-        "browser.startup.page" = 3;
-
-        # Automatically enable extensions
-        "extensions.autoDisableScopes" = 0;
-
-
-      };
-
-    };
+    # ## Per-profile preferences
+    # profiles.default = {
+    #   search = {
+    #     force = true;
+    #     default = "ddg";
+    #     privateDefault = "ddg";
+    #     order = ["ddg" "google"];
+    #   };
+    # };
  };

-  home.packages = with pkgs; [
-    inputs.zen-browser.packages."${system}".default
-
-    # inputs.zen-browser.packages."${system}".default.override {
-    #   policies = {
-    #     DisableAppUpdate = true;
-    #     DisableTelemetry = true;
-
-    #     OfferToSaveLogins = false;
-    #     AutofillAddressEnabled = true;
-    #     AutofillCreditCardEnabled = false;
-    #     # BlockAboutConfig = true;
-
-    #     DefaultDownloadDirectory = "\${home}/Downloads";
-
-    #     ExtensionSettings = with builtins;
-    #       let extension = shortId: uuid: {
-    #         name = uuid;
-    #         value = {
-    #           install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi";
-    #           installation_mode = "normal_installed";
-    #         };
-    #       };
-    #       in listToAttrs [
-    #         (extension "ublock-origin" "uBlock0@raymondhill.net")
-    #         (extension "ghostery" "firefox@ghostery.com")
-    #         (extension "keepassxc-browser" "keepassxc-browser@keepassxc.org")
-    #         (extension "morphine" "{b252db54-e4f6-440f-914a-1f017a3a390d}")
-    #       ];
-    #   };
-    # }
-
-  ];
-  # programs.zen-browser = {
-  #   enable = true;
-
-  #   policies = {
-  #     DisableAppUpdate = true;
-  #     DisableTelemetry = true;
-
-  #     OfferToSaveLogins = false;
-  #     AutofillAddressEnabled = true;
-  #     AutofillCreditCardEnabled = false;
-  #     # BlockAboutConfig = true;
-
-  #     DefaultDownloadDirectory = "\${home}/Downloads";
-
-  #     ExtensionSettings = with builtins;
-  #       let extension = shortId: uuid: {
-  #         name = uuid;
-  #         value = {
-  #           install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi";
-  #           installation_mode = "normal_installed";
-  #         };
-  #       };
-  #       in listToAttrs [
-  #         (extension "ublock-origin" "uBlock0@raymondhill.net")
-  #         (extension "ghostery" "firefox@ghostery.com")
-  #         (extension "keepassxc-browser" "keepassxc-browser@keepassxc.org")
-  #         (extension "morphine" "{b252db54-e4f6-440f-914a-1f017a3a390d}")
-  #       ];
-  #   };
-  # };
 }
--- a/modules/home-manager/code.nix
+++ b/modules/home-manager/code.nix
@@ -4,14 +4,13 @@ let
    # QOL
    "mhutchie.git-graph"
    "redhat.vscode-yaml"
-    "github.copilot"
-    "github.copilot-chat"
    # Nix environment selector
    "arrterian.nix-env-selector"
    # continue.continue
+    "github.copilot"
+    "github.copilot-chat"
  ];

-
  baseSettings = {
    # visual
    "window.titleBarStyle" = "native";
@@ -115,7 +114,6 @@ in
        # Flutter and co
        "dart-code.flutter"
        "dart-code.dart-code"
-
      ];

      keybindings = baseKeybindings;
@@ -178,5 +176,15 @@ in
        };
      };
    };
+
+    profiles.cloud = {
+      extensions = baseExtensions ++ pkgs.nix4vscode.forVscode [
+        "Tim-Koehler.helm-intellisense"
+        "HashiCorp.terraform"
+        "signageos.signageos-vscode-sops"
+      ];
+      keybindings = baseKeybindings;
+      userSettings = baseSettings;
+    };
  };
 }
--- a/modules/home-manager/fish.nix
+++ b/modules/home-manager/fish.nix
@@ -13,18 +13,12 @@

  programs.fish = {
    enable = true;
-    # enableCompletion = true;
+    generateCompletions = true;
+
    plugins = [
-      {
-        name = "fzf-fish";
-        src = pkgs.fetchFromGitHub {
-          owner = "PatrickF1";
-          repo = "fzf.fish";
-          rev = "v10.3";
-          sha256 = "sha256-T8KYLA/r/gOKvAivKRoeqIwE2pINlxFQtZJHpOy9GMM=";
-        };
-      }
-      # add others here
+      { name = "fzf"; src = pkgs.fishPlugins.fzf-fish.src; }
+      { name = "z"; src = pkgs.fishPlugins.z.src; }
+      { name = "pure"; src = pkgs.fishPlugins.pure.src; }
    ];

    functions = {
@@ -47,4 +41,5 @@
      fi
    '';
  };
+
 }
--- a/modules/home-manager/fusuma.nix
+++ b/modules/home-manager/fusuma.nix
@@ -1,47 +0,0 @@
-{pkgs, config, lib, ...}:
-let
-  hyprctl = "${pkgs.hyprland}/bin/hyprctl";
-in
-{
-  config = {
-    services.fusuma = {
-      enable = true;
-      settings = {
-        swipe = {
-          "3" = {
-            up = {
-              command = "exec ${hyprctl} dispatch fullscreen 1";
-            };
-
-            down = {
-              command = "exec ${lib.getExe config.nix-config.launcher}";
-            };
-          };
-        };
-
-        pinch = {
-          "4" = {
-            "in" = {
-              command = "exec ${hyprctl} dispatch togglespecialworkspace magic";
-            };
-            "out" = {
-              command = "exec ${hyprctl} dispatch togglespecialworkspace magic";
-            };
-          };
-        };
-
-
-        hold = {
-          "5" = {
-            command = "exec ${lib.getExe config.nix-config.launcher}";
-            threshold = 0.1;
-          };
-        };
-
-        threshold = {
-          pinch = 0.1;
-        };
-      };
-    };
-  };
-}
--- a/modules/home-manager/hypr/hyprland/default.nix
+++ b/modules/home-manager/hypr/hyprland/default.nix
@@ -2,6 +2,7 @@
  imports = [
    ./autostart.nix
    ./general.nix
+    ./gestures.nix
    ./keybinds.nix
    ./layouts.nix
    ./packages.nix
--- a/modules/home-manager/hypr/hyprland/general.nix
+++ b/modules/home-manager/hypr/hyprland/general.nix
@@ -56,12 +56,6 @@ in
        sensitivity = 0.5;
      };

-      gestures = {
-        workspace_swipe = true;
-        workspace_swipe_fingers = 4;
-        workspace_swipe_touch = true;
-      };
-
      decoration = {
        rounding = 10;
        inactive_opacity = 0.9;
--- a/modules/home-manager/hypr/hyprland/gestures.nix
+++ b/modules/home-manager/hypr/hyprland/gestures.nix
@@ -0,0 +1,21 @@
+{inputs, pkgs, lib, config, ...}:
+let
+  cfg = config.nix-config.hypr;
+in
+{
+  config = {
+    wayland.windowManager.hyprland = {
+      settings = {
+        gesture = [
+          # 4 finger swipe to switch workspace
+          "4, horizontal, workspace"
+
+          "3, up, fullscreen"
+          "3, down, float"
+
+          "4, vertical, scale: 0.5, special, magic"
+        ];
+      };
+    };
+  };
+}
--- a/modules/home-manager/hypr/hyprland/keybinds.nix
+++ b/modules/home-manager/hypr/hyprland/keybinds.nix
@@ -1,3 +1,4 @@
+# Note that some keybindings are delegated to other components, e.g. the quickshell module
 {inputs, pkgs, lib, config, ...}:
 let
  cfg = config.nix-config.hypr;
@@ -5,8 +6,6 @@ in
 {
  config = {
    wayland.windowManager.hyprland = {
-      enable = true;
-      systemd.enable = true;
      settings = {
        "$mod" = "SUPER";

@@ -22,9 +21,6 @@ in
          # Lock screen
          "$mod, l, exec, loginctl lock-session"

-          # Clipboard management
-          "$mod, V, exec, cliphist list | ${lib.getExe config.nix-config.launcher} --dmenu | cliphist decode | wl-copy"
-
          # Close window
          "$mod, Q, killactive,"
          # Force close window
@@ -54,10 +50,10 @@ in
          "$mod+Ctrl, right, movetoworkspace, +1"

          # Switch workspace
-          "$mod, left, workspace, prev"
-          "$mod, right, workspace, next"
-          "$mod, mouse_down, workspace, prev"
-          "$mod, mouse_up, workspace, next"
+          "$mod, left, workspace, e-1"
+          "$mod, right, workspace, e+1"
+          "$mod, mouse_down, workspace, e-1"
+          "$mod, mouse_up, workspace, e+1"


          # move to scratch workspace
@@ -79,9 +75,6 @@ in
          ", XF86Cut, exec, hyprshot -m region -o ~/Pictures/Screenshots"
          "Shift, XF86Cut, exec, hyprshot -m window -o ~/Pictures/Screenshots"

-          # Power menu
-          ", XF86PowerOff, exec, ${lib.getExe config.nix-config.powerMenu}"
-
          # Other pickers using the same launcher
          "$mod+Ctrl, space, exec, ${lib.getExe config.nix-config.filePicker}"
          "$mod, period, exec, ${lib.getExe config.nix-config.emojiPicker}"
@@ -89,13 +82,6 @@ in

        # repeatable bindings
        binde = [
-          # Fn keys
-          ", XF86MonBrightnessDown, exec, brightnessctl set 5%-"
-          ", XF86MonBrightnessUp, exec, brightnessctl set +5%"
-          ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"
-          ", XF86AudioLowerVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%-"
-          ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
-
          # Reshape the window in focus
          "$mod, MINUS, resizeactive, -2% -2%"
          "$mod, KP_Subtract, resizeactive, -2% -2%"
@@ -133,20 +119,17 @@ in
          "$mod, mouse:273, resizewindow"
        ];

-
-
      };

-      extraConfig = ''
-        bind= , XF86AudioMicMute, submap, player_submap
-
-        submap=player_submap
-        bind=, XF86AudioRaiseVolume, exec, notify-send previous; hyprctl dispatch submap reset
-        bind=, XF86AudioLowerVolume, exec, notify-send next; hyprctl dispatch submap reset
-        bind=, XF86AudioMicMute, exec, notify-send pause; hyprctl dispatch submap reset
-        submap=reset
-      '';
+      # extraConfig = ''
+      #   bind= , XF86AudioMicMute, submap, player_submap

+      #   submap=player_submap
+      #   bind=, XF86AudioRaiseVolume, exec, notify-send previous; hyprctl dispatch submap reset
+      #   bind=, XF86AudioLowerVolume, exec, notify-send next; hyprctl dispatch submap reset
+      #   bind=, XF86AudioMicMute, exec, notify-send pause; hyprctl dispatch submap reset
+      #   submap=reset
+      # '';
    };
  };
 }
--- a/modules/home-manager/kubectl.nix
+++ b/modules/home-manager/kubectl.nix
@@ -1,13 +1,25 @@
 {pkgs, ...}:
 {
    home.packages = [
-        pkgs.kubie
        pkgs.kubectl
    ];

+
    # Add the shell alias
    programs.fish.shellAliases = {
        k = "kubectl";
    };

+    # set the kubectl autocompletions for fish
+    # the fish functions are generated by kubectl itself, we do this at compile time and write them a single time to avoid generating them at each shell start
+    # the command is kubectl completion fish
+    # which becomes
+    programs.fish.completions."kubectl" = builtins.readFile "${pkgs.runCommand "kubectl-completion" {} ''
+        ${pkgs.kubectl}/bin/kubectl completion fish > $out
+    ''}";
+
+    programs.kubeswitch = {
+        enable = true;
+        enableFishIntegration = true;
+    };
 }
--- a/modules/home-manager/macos-fixes.nix
+++ b/modules/home-manager/macos-fixes.nix
@@ -0,0 +1,21 @@
+{pkgs, ...}:
+
+{
+  # on macos we don't set the default shell to fish
+  # instead we just tell the terminal to run fish as the first command
+  # this means that the first thing fish should do is to clear the screen
+  programs.fish = {
+      interactiveShellInit = "clear";
+  };
+
+
+  # stylix will be tricky as well, so we just install the fonts manually
+  fonts.fontconfig.enable = true;
+
+  home.packages = with pkgs; [
+    nerd-fonts.fira-code
+    noto-fonts-color-emoji
+  ] ++ [ # some more packages that are not available as flatpaks
+    pkgs.spotify
+  ];
+}
--- a/modules/home-manager/quickshell/default.nix
+++ b/modules/home-manager/quickshell/default.nix
@@ -25,4 +25,35 @@

    # plugins = {};
  };
+
+  wayland.windowManager.hyprland = {
+    settings = {
+      binde = [
+          # Brightness
+          ", XF86MonBrightnessDown, exec, dms ipc call brightness decrement 5 \"\""
+          ", XF86MonBrightnessUp, exec, dms ipc call brightness increment 5 \"\""
+
+          # Audio volume + playback
+          ", XF86AudioMute, exec, dms ipc call audio mute"
+          ", XF86AudioLowerVolume, exec, dms ipc call audio decrement 5"
+          ", XF86AudioRaiseVolume, exec, dms ipc call audio increment 5"
+
+          "$mod, XF86AudioMute, exec, dms ipc call mpris playPause"
+          "$mod, XF86AudioLowerVolume, exec, dms ipc call mpris previous"
+          "$mod, XF86AudioRaiseVolume, exec, dms ipc call mpris next"
+          # also allow the dedicated media keys to control playback
+          ", XF86AudioPlay, exec, dms ipc call mpris playPause"
+          ", XF86AudioPrev, exec, dms ipc call mpris previous"
+          ", XF86AudioNext, exec, dms ipc call mpris next"
+
+      ];
+
+      bind = [
+        ", XF86PowerOff, exec, dms ipc call powermenu toggle"
+        # used to be ", XF86PowerOff, exec, ${lib.getExe config.nix-config.powerMenu}"
+        "$mod, V, exec, dms ipc call clipboard toggle"
+        # used to be "$mod, V, exec, cliphist list | ${lib.getExe config.nix-config.launcher} --dmenu | cliphist decode | wl-copy"
+      ];
+    };
+  };
 }
--- a/modules/home-manager/work/aliases.nix
+++ b/modules/home-manager/work/aliases.nix
@@ -0,0 +1,11 @@
+{pkgs, ...}:
+{
+  # Add aliases for the various environments in aws so that their contexts can be easily switched
+  programs.fish.shellAliases = {
+    cdev = "aws-vault exec dev --";
+    cstage = "aws-vault exec stage --";
+    cprod = "aws-vault exec prod --";
+    clogs = "aws-vault exec logs --";
+    cshared = "aws-vault exec shared --";
+  };
+}
--- a/modules/home-manager/work/default.nix
+++ b/modules/home-manager/work/default.nix
@@ -11,7 +11,9 @@ in
  };

  imports = [
+    ./aliases.nix
    ./cryptography.nix
+    ./git.nix
    ./kluster.nix
  ];
 }
--- a/modules/home-manager/work/git.nix
+++ b/modules/home-manager/work/git.nix
@@ -0,0 +1,14 @@
+{
+  config,
+  lib,
+  ...
+}:
+{
+  programs.git = {
+      enable = true;
+      settings = {
+          user.name = "Remy Moll";
+          user.email = "remy.moll@artidis.com";
+      };
+  };
+}
--- a/modules/home-manager/work/kluster.nix
+++ b/modules/home-manager/work/kluster.nix
@@ -2,8 +2,13 @@
 {
    home.packages = [
        pkgs.kubernetes-helm
-        pkgs.awscli
+        pkgs.awscli2
        pkgs.aws-vault
        pkgs.k9s
+
+        # some parsers
+        pkgs.ripgrep
+        pkgs.jq
+        pkgs.yq
    ];
 }
--- a/modules/macos/tiling.nix
+++ b/modules/macos/tiling.nix
@@ -0,0 +1,79 @@
+{ config, pkgs, lib, ... }:
+
+{
+  # Enable yabai service
+  # Caution: at the very least yabai requires Accessibility permissions to be granted
+  # https://github.com/koekeishiya/yabai/issues/2688
+  services.yabai = {
+    enable = true;
+    config = {
+      layout = "bsp";
+      focus_follows_mouse = "autoraise";
+
+      window_placement = "second_child";
+      window_topmost = "on";
+      window_shadow = "float";
+
+      # by default, set balanced split ratio and auto balance => three windows will be evenly spaced on an ultrawide monitor
+      split_ratio = "0.50";
+      auto_balance = "on";
+
+      mouse_modifier = "alt";
+      mouse_action1 = "move";#
+      mouse_action2 = "resize";
+
+      window_opacity = "on";
+      normal_window_opacity = 0.9;
+
+      top_padding = 0;
+      bottom_padding = 0;
+      left_padding = 0;
+      right_padding = 0;
+      window_gap = 10;
+    };
+
+    extraConfig = ''
+      # Example: rules for floating windows
+      yabai -m rule --add app="System Preferences" manage=off
+    '';
+  };
+
+  # # Enable skhd service
+  # services.skhd = {
+  #   enable = true;
+  #   package = pkgs.skhd;
+  #   skhdConfig = ''
+  #     # Focus windows with Command + Arrow keys
+  #     cmd - left  : yabai -m window --focus west
+  #     cmd - right : yabai -m window --focus east
+  #     cmd - up    : yabai -m window --focus north
+  #     cmd - down  : yabai -m window --focus south
+
+  #     # Swap windows with Command + Shift + Arrow keys
+  #     cmd + shift - left  : yabai -m window --swap west
+  #     cmd + shift - right : yabai -m window --swap east
+  #     cmd + shift - up    : yabai -m window --swap north
+  #     cmd + shift - down  : yabai -m window --swap south
+
+  #     # Move windows with Command + Control + Arrow keys
+  #     cmd + ctrl - left  : yabai -m window --warp west
+  #     cmd + ctrl - right : yabai -m window --warp east
+  #     cmd + ctrl - up    : yabai -m window --warp north
+  #     cmd + ctrl - down  : yabai -m window --warp south
+
+  #     # Resize windows with Command + Option + Arrow keys
+  #     cmd + alt - left  : yabai -m window --resize left:-50:0
+  #     cmd + alt - right : yabai -m window --resize right:50:0
+  #     cmd + alt - up    : yabai -m window --resize top:0:-50
+  #     cmd + alt - down  : yabai -m window --resize bottom:0:50
+
+  #     # Toggle window float with Command + F
+  #     cmd - f : yabai -m window --toggle float
+
+  #     # Toggle window fullscreen with Command + Enter
+  #     cmd - return : yabai -m window --toggle zoom-fullscreen
+
+  #   '';
+  # };
+
+}
--- a/modules/nixos/macos-tiling/default.nix
+++ b/modules/nixos/macos-tiling/default.nix
@@ -1,16 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-let
-  cfg = config.nix-config.macos;
-in
-{
-  options = {
-  };
-
-  imports = [
-    ./tiling.nix
-  ];
-}
--- a/modules/nixos/macos-tiling/tiling.nix
+++ b/modules/nixos/macos-tiling/tiling.nix
@@ -1,41 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
-    yabai
-    skhd
-  ];
-  environment.variables.EDITOR = "code";
-
-
-  # skhd service and config
-  services.skhd = {
-    enable = true;
-    skhdConfig = ''
-      # toggle window split type
-      alt - e : yabai -m window --toggle split
-
-      # rotate tree
-      alt - r : yabai -m space --rotate 90
-    '';
-  };
-
-  # yabai service and config
-  services.yabai = {
-    enable = true;
-    package = pkgs.yabai;
-    enableScriptingAddition = true;
-    config = {
-      focus_follows_mouse = "autoraise";
-      window_placement = "second_child";
-      window_shadow = "on";
-      window_opacity = "off";
-    };
-    extraConfig = ''
-      sudo yabai --load-sa
-      yabai -m signal --add event=dock_did_restart action="sudo yabai --load-sa"
-      yabai -m space 1 --label i
-      yabai -m space 2 --label ii
-      yabai -m space 3 --label iii
-      yabai -m space 4 --label iv
-    '';
-  };
-}
--- a/modules/nixos/power.nix
+++ b/modules/nixos/power.nix
@@ -22,43 +22,47 @@


  config = {
+    # environment.systemPackages = [
+    #   pkgs.power-profiles-daemon
+    # ];
+    services.power-profiles-daemon.enable = true;

-    services.tlp = {
-      enable = true;
-      settings = {
-        # processor chooses frequencies itself but respects the limits set by the user
-        CPU_DRIVER_OPMODE_ON_AC = "guided";
-        CPU_DRIVER_OPMODE_ON_BAT = "guided";
+    # services.tlp = {
+    #   enable = true;
+    #   settings = {
+    #     # # processor chooses frequencies itself but respects the limits set by the user
+    #     # CPU_DRIVER_OPMODE_ON_AC = "guided";
+    #     # CPU_DRIVER_OPMODE_ON_BAT = "guided";

-        # governor dictates global behavior of the CPU
-        CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
-        CPU_SCALING_GOVERNOR_ON_AC = "performance";
+    #     # # governor dictates global behavior of the CPU
+    #     # CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
+    #     # CPU_SCALING_GOVERNOR_ON_AC = "performance";

-        # energy performance policy (EPP) sets the energy/performance balance
-        CPU_ENERGY_PERF_POLICY_ON_BAT = "balance_power";
-        CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
+    #     # # energy performance policy (EPP) sets the energy/performance balance
+    #     # CPU_ENERGY_PERF_POLICY_ON_BAT = "balance_power";
+    #     # CPU_ENERGY_PERF_POLICY_ON_AC = "performance";


-        # clock speeds reported by `sudo tlp-stat`
-        # 623377 [kHz] and 5090910 [kHz]
-        CPU_SCALING_MIN_FREQ_ON_AC = 623377;
-        CPU_SCALING_MAX_FREQ_ON_AC = 5090910;
-        CPU_SCALING_MIN_FREQ_ON_BAT = 0;
-        # reduce max frequency on battery to save power
-        CPU_SCALING_MAX_FREQ_ON_BAT = 3000000;
+    #     # # clock speeds reported by `sudo tlp-stat`
+    #     # # 623377 [kHz] and 5090910 [kHz]
+    #     # CPU_SCALING_MIN_FREQ_ON_AC = 623377;
+    #     # CPU_SCALING_MAX_FREQ_ON_AC = 5090910;
+    #     # CPU_SCALING_MIN_FREQ_ON_BAT = 0;
+    #     # # reduce max frequency on battery to save power
+    #     # CPU_SCALING_MAX_FREQ_ON_BAT = 3000000;

-        # Allow the CPU to boost
-        CPU_BOOST_ON_AC = 1;
-        CPU_BOOST_ON_BAT = 1;
+    #     # # Allow the CPU to boost
+    #     # CPU_BOOST_ON_AC = 1;
+    #     # CPU_BOOST_ON_BAT = 1;


-        RADEON_DPM_PERF_LEVEL_ON_AC = "high";
-        # WIFI_PWR_ON_BAT = "off";
+    #     # RADEON_DPM_PERF_LEVEL_ON_AC = "high";
+    #     # # WIFI_PWR_ON_BAT = "off";

-        # enable battery charge thresholds on the default battery
-        STOP_CHARGE_THRESH_BAT0 = 1;
-      };
-    };
+    #     # enable battery charge thresholds on the default battery
+    #     STOP_CHARGE_THRESH_BAT0 = 1;
+    #   };
+    # };



--- a/users/remy_macos/default.nix
+++ b/users/remy_macos/default.nix
@@ -3,20 +3,11 @@ with lib.hm.gvariant;
 {
    config = {
        home.stateVersion = "24.05";
-        programs.git = {
-        enable = true;
-        settings = {
-            user.name = "Remy Moll";
-            user.email = "remy.moll@artidis.com";
-        };
-  };
-
    };



    imports = [
-
        ../../modules/home-manager/browser.nix
        ../../modules/home-manager/code.nix

@@ -24,9 +15,9 @@ with lib.hm.gvariant;
        ../../modules/home-manager/fish.nix

        ../../modules/home-manager/kubectl.nix
+        ../../modules/home-manager/macos-fixes.nix
        ../../modules/home-manager/nh.nix
+        ../../modules/home-manager/obsidian.nix
        ../../modules/home-manager/work
    ];
-
-
 }
--- a/users/remy_yoga/default.nix
+++ b/users/remy_yoga/default.nix
@@ -25,7 +25,6 @@ with lib.hm.gvariant;
    ../../modules/home-manager/documents.nix
    ../../modules/home-manager/fish.nix
    ../../modules/home-manager/flatpaks.nix
-    ../../modules/home-manager/fusuma.nix
    ../../modules/home-manager/hypr
    ../../modules/home-manager/keepassxc.nix
    ../../modules/home-manager/kitty.nix
Author	SHA1	Message	Date
Remy Moll	5a26b08ba3	switch back to yabai for tiling. experimental shift of zen setup	2025-12-10 10:04:45 +01:00
Remy Moll	895a6011a0	moore tiling	2025-12-05 17:20:44 +01:00
Remy Moll	6ee9e50a01	initial macos setup	2025-12-02 23:17:14 +01:00
Remy Moll	5ab5be9644	Merge pull request 'Feature creep' (#2 ) from feature/quickshell into main Reviewed-on: #2	2025-12-02 22:06:53 +00:00
Remy Moll	8772229192	more refinements to vscode + fish + hyprland	2025-12-02 23:04:02 +01:00