link wallpapers

cleanup hyprland and embrace dms
add networking through secrets
2025-11-07 11:02:20 +01:00 · 2025-11-07 10:39:48 +01:00 · 2025-11-07 10:39:29 +01:00 · 2025-10-30 18:16:10 +01:00 · 2025-10-30 11:02:09 +01:00 · 2025-10-29 15:26:46 +01:00
35 changed files with 632 additions and 978 deletions
--- a/.envrc
+++ b/.envrc
@@ -0,0 +1 @@
+use flake
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 # Result is a symlink to the built iso
-result
+result
+# direnv binaries
+.direnv
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -1,14 +1,12 @@
-# This example uses YAML anchors which allows reuse of multiple keys
-# without having to repeat yourself.
-# Also see https://github.com/Mic92/dotfiles/blob/d6114726d859df36ccaa32891c4963ae5717ef7f/nixos/.sops.yaml
-# for a more complex example.
 keys:
  - &remy_usb age1027e2vu808mvf95m4f0am3aeg88n8vgzt56s04ndpkgm7awzeajspxl6tu
-  - &remy_yoga age1t2stzdjfwrtekk23w43623fdvt9awdujth765f8l6mu9g6l4537q4gw8d0
-  # - &admin_bob age12zlz6lvcdk6eqaewfylg35w0syh58sm7gh53q5vvn7hd7c6nngyseftjxl
+  - &remy_yoga ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAX4zsiXSSWbE75C0wyBVwaHOw6Gsbh/WqQsgEhvPwT8 remy@nyx
+
+  - &host_yoga age1ckqer7nxzq7q58v9xaqy8ac9vx2va69a46t86wp9m78pj5dpuy3sq8xeaj
 creation_rules:
  - path_regex: secrets/[^/]+\.(yaml|json|env|ini)$
    key_groups:
    - age:
      - *remy_usb
      - *remy_yoga
+      - *host_yoga
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1755946532,
-        "narHash": "sha256-POePremlUY5GyA1zfbtic6XLxDaQcqHN6l+bIxdT5gc=",
+        "lastModified": 1761420899,
+        "narHash": "sha256-kxGCip6GNbcbNWKu4J2iKbNYfFTS8Zbjg9CWp0zmFoM=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "81584dae2df6ac79f6b6dae0ecb7705e95129ada",
+        "rev": "62479232aae42c1ef09c2c027c8cfd91df060897",
        "type": "github"
      },
      "original": {
@@ -38,11 +38,11 @@
        "fromYaml": "fromYaml"
      },
      "locked": {
-        "lastModified": 1746562888,
-        "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
+        "lastModified": 1755819240,
+        "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
        "owner": "SenchoPens",
        "repo": "base16.nix",
-        "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
+        "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
        "type": "github"
      },
      "original": {
@@ -54,27 +54,28 @@
    "base16-fish": {
      "flake": false,
      "locked": {
-        "lastModified": 1622559957,
-        "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
+        "lastModified": 1754405784,
+        "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=",
        "owner": "tomyun",
        "repo": "base16-fish",
-        "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
+        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
        "type": "github"
      },
      "original": {
        "owner": "tomyun",
        "repo": "base16-fish",
+        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
        "type": "github"
      }
    },
    "base16-helix": {
      "flake": false,
      "locked": {
-        "lastModified": 1748408240,
-        "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=",
+        "lastModified": 1752979451,
+        "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=",
        "owner": "tinted-theming",
        "repo": "base16-helix",
-        "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e",
+        "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac",
        "type": "github"
      },
      "original": {
@@ -100,14 +101,79 @@
        "type": "github"
      }
    },
+    "dankMaterialShell": {
+      "inputs": {
+        "dgop": "dgop",
+        "dms-cli": [
+          "dms-cli"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1762403774,
+        "narHash": "sha256-CXgW0EEW+WV4jJ/5mxNluQeTgS6wyuuUlUcsZF84bKU=",
+        "owner": "AvengeMedia",
+        "repo": "DankMaterialShell",
+        "rev": "c9ee856f916023563d9446483024a8aec2dce870",
+        "type": "github"
+      },
+      "original": {
+        "owner": "AvengeMedia",
+        "repo": "DankMaterialShell",
+        "type": "github"
+      }
+    },
+    "dgop": {
+      "inputs": {
+        "nixpkgs": [
+          "dankMaterialShell",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1760238269,
+        "narHash": "sha256-7CeGZM/Z/5Qt3AYByCRohGYGR1MRuXYzTTbkV/JxyAs=",
+        "owner": "AvengeMedia",
+        "repo": "dgop",
+        "rev": "95acdfce2d323e28fa8f5a4f345160962034f2b5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "AvengeMedia",
+        "repo": "dgop",
+        "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": {
-        "lastModified": 1748383148,
-        "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=",
+        "lastModified": 1758112371,
+        "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=",
        "owner": "rafaelmardojai",
        "repo": "firefox-gnome-theme",
-        "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf",
+        "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d",
        "type": "github"
      },
      "original": {
@@ -140,11 +206,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1749398372,
-        "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
+        "lastModified": 1756770412,
+        "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
+        "rev": "4524271976b625a4a605beefd893f270620fd751",
        "type": "github"
      },
      "original": {
@@ -194,16 +260,16 @@
    "gnome-shell": {
      "flake": false,
      "locked": {
-        "lastModified": 1744584021,
-        "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
+        "lastModified": 1748186689,
+        "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=",
        "owner": "GNOME",
        "repo": "gnome-shell",
-        "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
+        "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0",
        "type": "github"
      },
      "original": {
        "owner": "GNOME",
-        "ref": "48.1",
+        "ref": "48.2",
        "repo": "gnome-shell",
        "type": "github"
      }
@@ -215,16 +281,15 @@
        ]
      },
      "locked": {
-        "lastModified": 1756679287,
-        "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=",
+        "lastModified": 1762367206,
+        "narHash": "sha256-c/164YOPkV09BH8KIUdvVvJs3VF2LNIbE2piKGgXPxk=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8",
+        "rev": "af119feb17cb242398e0fb97f92b867d25882522",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-25.05",
        "repo": "home-manager",
        "type": "github"
      }
@@ -237,11 +302,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1752603129,
-        "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=",
+        "lastModified": 1762351818,
+        "narHash": "sha256-0ptUDbYwxv1kk/uzEX4+NJjY2e16MaAhtzAOJ6K0TG0=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b",
+        "rev": "b959c67241cae17fc9e4ee7eaf13dfa8512477ea",
        "type": "github"
      },
      "original": {
@@ -295,11 +360,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1756891319,
-        "narHash": "sha256-/e6OXxzbAj/o97Z1dZgHre4bNaVjapDGscAujSCQSbI=",
+        "lastModified": 1760445448,
+        "narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=",
        "owner": "hyprwm",
        "repo": "hyprgraphics",
-        "rev": "621e2e00f1736aa18c68f7dfbf2b9cff94b8cc4d",
+        "rev": "50fb9f069219f338a11cf0bcccb9e58357d67757",
        "type": "github"
      },
      "original": {
@@ -324,11 +389,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1757423991,
-        "narHash": "sha256-tL+b6WC4gJJSo6wjNVIZpQ0DsYg8RmoGHxYuk6jJKbU=",
+        "lastModified": 1762387591,
+        "narHash": "sha256-dbxpwgat8W/+P/cYnLXzoj5Gi8WKdtMgvqHuEzIU8fs=",
        "owner": "hyprwm",
        "repo": "Hyprland",
-        "rev": "150d693fe794a01aab762a18d2d8a2c8bc54b43c",
+        "rev": "c757fd375cce299e3da922190ddf1a0622ce807c",
        "type": "github"
      },
      "original": {
@@ -349,11 +414,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1749046714,
-        "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=",
+        "lastModified": 1759610243,
+        "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
        "owner": "hyprwm",
        "repo": "hyprland-protocols",
-        "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330",
+        "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
        "type": "github"
      },
      "original": {
@@ -417,11 +482,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1753819801,
-        "narHash": "sha256-tHe6XeNeVeKapkNM3tcjW4RuD+tB2iwwoogWJOtsqTI=",
+        "lastModified": 1759080228,
+        "narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=",
        "owner": "hyprwm",
        "repo": "hyprland-qtutils",
-        "rev": "b308a818b9dcaa7ab8ccab891c1b84ebde2152bc",
+        "rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7",
        "type": "github"
      },
      "original": {
@@ -446,11 +511,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1756810301,
-        "narHash": "sha256-wgZ3VW4VVtjK5dr0EiK9zKdJ/SOqGIBXVG85C3LVxQA=",
+        "lastModified": 1758927902,
+        "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=",
        "owner": "hyprwm",
        "repo": "hyprlang",
-        "rev": "3d63fb4a42c819f198deabd18c0c2c1ded1de931",
+        "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da",
        "type": "github"
      },
      "original": {
@@ -471,11 +536,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1756117388,
-        "narHash": "sha256-oRDel6pNl/T2tI+nc/USU9ZP9w08dxtl7hiZxa0C/Wc=",
+        "lastModified": 1762208756,
+        "narHash": "sha256-hC1jb4tdjFfEuU18KQiMgz5XPAO+d5SfbjAUS7haLl4=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "b2ae3204845f5f2f79b4703b441252d8ad2ecfd0",
+        "rev": "164a30b3d8b3174a32ac7326782476f1188e6118",
        "type": "github"
      },
      "original": {
@@ -511,27 +576,47 @@
    },
    "nix-flatpak": {
      "locked": {
-        "lastModified": 1711997201,
-        "narHash": "sha256-J71xzQlVYsjagA4AsVwRazhBh2rZrPpKvxTgs6UzL7c=",
+        "lastModified": 1754777568,
+        "narHash": "sha256-0bBqT+3XncgF8F03RFAamw9vdf0VmaDoIJLTGkjfQZs=",
        "owner": "gmodena",
        "repo": "nix-flatpak",
-        "rev": "b76fa31346db7fc958a9898f3c594696ca71c4fd",
+        "rev": "62f636b87ef6050760a8cb325cadb90674d1e23e",
        "type": "github"
      },
      "original": {
        "owner": "gmodena",
-        "ref": "v0.4.1",
        "repo": "nix-flatpak",
        "type": "github"
      }
    },
+    "nix4vscode": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1762394598,
+        "narHash": "sha256-AbDS8JL8mXAP0gVAXQA1RIUwnH6rUHueCTPf/hxAooE=",
+        "owner": "nix-community",
+        "repo": "nix4vscode",
+        "rev": "4c90ca996c860583f8fc77fa8abd24610439f850",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix4vscode",
+        "type": "github"
+      }
+    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1757068644,
-        "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=",
+        "lastModified": 1762111121,
+        "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9",
+        "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
        "type": "github"
      },
      "original": {
@@ -543,11 +628,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1757347588,
-        "narHash": "sha256-tLdkkC6XnsY9EOZW9TlpesTclELy8W7lL2ClL+nma8o=",
+        "lastModified": 1762111121,
+        "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "b599843bad24621dcaa5ab60dac98f9b0eb1cabe",
+        "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
        "type": "github"
      },
      "original": {
@@ -559,32 +644,16 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1757408970,
-        "narHash": "sha256-aSgK4BLNFFGvDTNKPeB28lVXYqVn8RdyXDNAvgGq+k0=",
+        "lastModified": 1762111121,
+        "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "d179d77c139e0a3f5c416477f7747e9d6b7ec315",
+        "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-25.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1751211869,
-        "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.05",
+        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
@@ -598,15 +667,14 @@
        "nixpkgs": [
          "stylix",
          "nixpkgs"
-        ],
-        "treefmt-nix": "treefmt-nix"
+        ]
      },
      "locked": {
-        "lastModified": 1751320053,
-        "narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=",
+        "lastModified": 1758998580,
+        "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670",
+        "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728",
        "type": "github"
      },
      "original": {
@@ -625,11 +693,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1757239681,
-        "narHash": "sha256-E9spYi9lxm2f1zWQLQ7xQt8Xs2nWgr1T4QM7ZjLFphM=",
+        "lastModified": 1760663237,
+        "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "ab82ab08d6bf74085bd328de2a8722c12d97bd9d",
+        "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
        "type": "github"
      },
      "original": {
@@ -638,34 +706,16 @@
        "type": "github"
      }
    },
-    "quickshell": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1758273351,
-        "narHash": "sha256-wOv1guIi9THD1NjOtBU2Xh/Avg9xv7nIjsfFSkr1NeQ=",
-        "ref": "refs/heads/master",
-        "rev": "e9a574d919a89602d2868621576b2ccae54a5cb0",
-        "revCount": 675,
-        "type": "git",
-        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
-      }
-    },
    "root": {
      "inputs": {
+        "dankMaterialShell": "dankMaterialShell",
+        "dms-cli": "dms-cli",
        "home-manager": "home-manager",
        "hyprland": "hyprland",
        "nix-flatpak": "nix-flatpak",
+        "nix4vscode": "nix4vscode",
        "nixpkgs": "nixpkgs_2",
        "nixpkgs-unstable": "nixpkgs-unstable",
-        "quickshell": "quickshell",
        "sops-nix": "sops-nix",
        "stylix": "stylix",
        "watt": "watt",
@@ -679,11 +729,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1757449901,
-        "narHash": "sha256-qwN8nYdSRnmmyyi+uR6m4gXnVktmy5smG1MOrSFD8PI=",
+        "lastModified": 1760998189,
+        "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "3b4a369df9dd6ee171a7ea4448b50e2528faf850",
+        "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
        "type": "github"
      },
      "original": {
@@ -701,9 +751,11 @@
        "firefox-gnome-theme": "firefox-gnome-theme",
        "flake-parts": "flake-parts",
        "gnome-shell": "gnome-shell",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
        "nur": "nur",
-        "systems": "systems_2",
+        "systems": "systems_3",
        "tinted-foot": "tinted-foot",
        "tinted-kitty": "tinted-kitty",
        "tinted-schemes": "tinted-schemes",
@@ -711,16 +763,15 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1757361712,
-        "narHash": "sha256-GwObJtrAqVim66e4Jb5VzAKT6zGFJ3KOi63rfcrfMV4=",
-        "owner": "danth",
+        "lastModified": 1762264356,
+        "narHash": "sha256-QVfC53Ri+8n3e7Ujx9kq6all3+TLBRRPRnc6No5qY5w=",
+        "owner": "nix-community",
        "repo": "stylix",
-        "rev": "3bf1430ed85a4484e4e1facee2344d2bb20288e6",
+        "rev": "647bb8dd96a206a1b79c4fd714affc88b409e10b",
        "type": "github"
      },
      "original": {
-        "owner": "danth",
-        "ref": "release-25.05",
+        "owner": "nix-community",
        "repo": "stylix",
        "type": "github"
      }
@@ -741,6 +792,22 @@
      }
    },
    "systems_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_3": {
      "locked": {
        "lastModified": 1681028828,
        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -791,11 +858,11 @@
    "tinted-schemes": {
      "flake": false,
      "locked": {
-        "lastModified": 1750770351,
-        "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=",
+        "lastModified": 1757716333,
+        "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=",
        "owner": "tinted-theming",
        "repo": "schemes",
-        "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a",
+        "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559",
        "type": "github"
      },
      "original": {
@@ -807,11 +874,11 @@
    "tinted-tmux": {
      "flake": false,
      "locked": {
-        "lastModified": 1751159871,
-        "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=",
+        "lastModified": 1757811970,
+        "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=",
        "owner": "tinted-theming",
        "repo": "tinted-tmux",
-        "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c",
+        "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e",
        "type": "github"
      },
      "original": {
@@ -823,11 +890,11 @@
    "tinted-zed": {
      "flake": false,
      "locked": {
-        "lastModified": 1751158968,
-        "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=",
+        "lastModified": 1757811247,
+        "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=",
        "owner": "tinted-theming",
        "repo": "base16-zed",
-        "rev": "86a470d94204f7652b906ab0d378e4231a5b3384",
+        "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e",
        "type": "github"
      },
      "original": {
@@ -836,28 +903,6 @@
        "type": "github"
      }
    },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "stylix",
-          "nur",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733222881,
-        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
    "watt": {
      "inputs": {
        "nixpkgs": [
@@ -907,11 +952,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1755354946,
-        "narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=",
+        "lastModified": 1761431178,
+        "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0",
+        "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
        "type": "github"
      },
      "original": {
@@ -928,11 +973,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1757395105,
-        "narHash": "sha256-kwctEcCrHXZg80POmuOfqRqxSjy8bXhdBuNcRWaEpFA=",
+        "lastModified": 1762403216,
+        "narHash": "sha256-BPv/dC0S54hqsurgmxGxUbXb3kJMpK3KNKQDrdO4NRE=",
        "owner": "0xc000022070",
        "repo": "zen-browser-flake",
-        "rev": "d7b87e67233fdb42e655600f3de4c2e8a13bc6a7",
+        "rev": "a3a22c5ad43f46f8ddad7eed8aa7f82ec649765f",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -1,22 +1,31 @@
 {
  description = "Nix config entry point";
-
+  # since secrets live in a submodule, enable submodules by default
+  inputs.self.submodules = true;
  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
    # Home manager
-    home-manager.url = "github:nix-community/home-manager/release-25.05";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
    # Managing flatpak apps
-    nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1";
+    nix-flatpak.url = "github:gmodena/nix-flatpak";
+
    # hyprland, plugins and related utils
    hyprland.url = "github:hyprwm/Hyprland";
-    stylix.url = "github:danth/stylix/release-25.05";
+
+    stylix = {
+      url = "github:nix-community/stylix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
    # zen browser
-    zen-browser.url = "github:0xc000022070/zen-browser-flake";
-    # IMPORTANT: we're using "libgbm" and is only available in unstable so ensure
-    # to have it up-to-date or simply don't specify the nixpkgs input
-    zen-browser.inputs.nixpkgs.follows = "nixpkgs";
+    zen-browser = {
+      url = "github:0xc000022070/zen-browser-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };

    # power management
    watt = {
@@ -25,15 +34,26 @@
    };

    # secrets
-    sops-nix.url = "github:Mic92/sops-nix";
-    sops-nix.inputs.nixpkgs.follows = "nixpkgs";
-
-    # quickshell
-    quickshell = {
-      url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";
+    sops-nix = {
+      url = "github:Mic92/sops-nix";
      inputs.nixpkgs.follows = "nixpkgs";
    };

+    # 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 = {
+      url = "github:nix-community/nix4vscode";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
  };

  outputs = {
@@ -43,102 +63,117 @@
    home-manager,
    stylix,
    sops-nix,
-    quickshell,
+    nix4vscode,
    ...
  } @ inputs:
    let
+      system = "x86_64-linux";
+      username = "remy";
+      name = "Rémy";
+
+      pkgs = nixpkgs.legacyPackages.${system};
+      pkgs-unstable = nixpkgs-unstable.legacyPackages.${system};
+
+      lib = nixpkgs.lib;
+
+      systems = {
+        # HP Spectre x360 2018
+        Nixtre = {
+          hostModules = [
+            ./hosts/spectre-x360-2018
+          ];
+          userModules = [
+            ./users/remy_spectre
+            inputs.nix-flatpak.homeManagerModules.nix-flatpak
+          ];
+          extraModules = [
+            inputs.stylix.nixosModules.stylix
+            inputs.sops-nix.nixosModules.sops
+          ];
+        };
+
+        # Portable usb stick
+        nichts = {
+          hostModules = [
+            ./hosts/mobile-usb
+          ];
+          userModules = [
+            ./users/remy_usb
+            inputs.nix-flatpak.homeManagerModules.nix-flatpak
+          ];
+          extraModules = [
+            inputs.stylix.nixosModules.stylix
+            inputs.sops-nix.nixosModules.sops
+          ];
+        };
+
+        # Lenovo yoga 7 pro
+        nyx = {
+          hostModules = [
+            ./hosts/yoga-7-pro
+          ];
+          userModules = [
+            ./users/remy_yoga
+            inputs.nix-flatpak.homeManagerModules.nix-flatpak
+            inputs.dankMaterialShell.homeModules.dankMaterialShell.default
+
+          ];
+          extraModules = [
+            inputs.stylix.nixosModules.stylix
+            inputs.sops-nix.nixosModules.sops
+            { nixpkgs.overlays = [ inputs.nix4vscode.overlays.default ]; }
+          ];
+        };
+      };
    in
  {
+    # For each entry in `systems` create a nixosConfiguration
+    nixosConfigurations = lib.mapAttrs (_name: cfg:
+      nixpkgs.lib.nixosSystem {
+        inherit system;
+        specialArgs = { inherit inputs pkgs-unstable; };
+        modules =
+          cfg.hostModules ++
+          cfg.extraModules ++
+          [ home-manager.nixosModules.home-manager {
+              # Common home-manager flags
+              home-manager = {
+                backupFileExtension = ".backup";
+                useGlobalPkgs = true;
+                useUserPackages = true;
+                extraSpecialArgs = { inherit inputs pkgs-unstable; };
+              };

-    ## NixOS configurations are the main output of this flake
-    # HP Spectre x360 2018
-    nixosConfigurations.Nixtre = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      specialArgs = { inherit inputs; };
+              # Merge in all the user fragments for this host
+              home-manager.users.remy = lib.mkMerge cfg.userModules;
+            }
+          ]
+        ;
+      }
+    ) systems;

-      modules = [
-        ./hosts/spectre-x360-2018
-        stylix.nixosModules.stylix
-        home-manager.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = { inherit inputs; };

-            home-manager.users.remy.imports = [
-              ./users/remy_spectre
-              inputs.nix-flatpak.homeManagerModules.nix-flatpak
-            ];
-          }
+  #   ## Useful nix build tools
+  #   # iso builder TODO
+  #   nixosConfigurations.bcachefs-iso = nixpkgs.lib.nixosSystem {
+  #     system = "x86_64-linux";
+  #     modules = [
+  #       "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel-no-zfs.nix"
+  #       ({ lib, pkgs, ... }: {
+  #         boot.supportedFilesystems = [ "bcachefs" ];
+  #         boot.kernelPackages = lib.mkOverride 0 pkgs.linuxPackages_latest;
+  #       })
+  #     ];
+  #   };
+
+    # devshell for this configuration
+    devShells.x86_64-linux.default = nixpkgs.legacyPackages.x86_64-linux.mkShell {
+      packages = [
+        pkgs.sops
      ];
-    };

-
-    nixosConfigurations.nichts = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      specialArgs = { inherit inputs; };
-
-      modules = [
-        ./hosts/mobile-usb
-        stylix.nixosModules.stylix
-        home-manager.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = { inherit inputs; };
-
-            home-manager.users.remy.imports = [
-              ./users/remy_usb
-              inputs.nix-flatpak.homeManagerModules.nix-flatpak
-            ];
-          }
-      ];
-    };
-
-
-    nixosConfigurations.nyx = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      specialArgs = { inherit inputs; };
-
-      modules = [
-        ./hosts/yoga-7-pro
-        sops-nix.nixosModules.sops
-        stylix.nixosModules.stylix
-        home-manager.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = { inherit inputs; };
-
-            home-manager.users.remy.imports = [
-              ./users/remy_yoga
-              inputs.nix-flatpak.homeManagerModules.nix-flatpak
-            ];
-          }
-      ];
-    };
-
-    # nixosConfigurations.raspberry-pi = nixpkgs.lib.nixosSystem {
-    #   system = "aarch64-linux";
-    #   modules = [
-    #     ./hosts/raspberry-pi/configuration.nix
-    #   ];
-    # };
-
-    ## Home Manager configurations here?
-
-
-    ## Useful nix build tools
-    # iso builder TODO
-    nixosConfigurations.bcachefs-iso = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      modules = [
-        "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel-no-zfs.nix"
-        ({ lib, pkgs, ... }: {
-          boot.supportedFilesystems = [ "bcachefs" ];
-          boot.kernelPackages = lib.mkOverride 0 pkgs.linuxPackages_latest;
-        })
-      ];
+      # tell sops where the public ssh key to "seed" the age key from is located
+      SOPS_AGE_SSH_PRIVATE_KEY_FILE = "/home/remy/.ssh/main_key";
    };
  };
 }
--- a/hosts/mobile-usb/default.nix
+++ b/hosts/mobile-usb/default.nix
@@ -13,7 +13,6 @@
    imports = [
        ./configuration.nix
        ./hardware-configuration.nix
-        ./usb_config.nix

        # ../../modules/nixos/backup.nix
        ../../modules/nixos/bluetooth.nix
@@ -28,7 +27,7 @@
        ../../modules/nixos/nh.nix
        ../../modules/nixos/pipewire.nix
        ../../modules/nixos/podman.nix
-        # ../../modules/nixos/power.nix
+        ../../modules/nixos/power.nix
        ../../modules/nixos/stylix.nix
        ../../modules/nixos/user.nix

--- a/hosts/mobile-usb/hardware-configuration.nix
+++ b/hosts/mobile-usb/hardware-configuration.nix
@@ -11,7 +11,6 @@
  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
  boot.initrd.kernelModules = [ ];
  boot.kernelModules = [ ];
-  boot.kernelPackages = pkgs.linuxPackages_latest;
  boot.extraModulePackages = [ ];

  fileSystems."/" =
--- a/hosts/mobile-usb/usb_config.nix
+++ b/hosts/mobile-usb/usb_config.nix
@@ -8,7 +8,7 @@

    boot.loader.grub.efiSupport = true;
    # location at install time. Since the drive is a USB drive this is expcected to change on each device
-    boot.loader.grub.devices = ["/dev/sdb"];
+    boot.loader.grub.device = "/dev/sdb";
    boot.loader.grub.efiInstallAsRemovable = true;
    boot.loader.systemd-boot.enable = false;

--- a/hosts/yoga-7-pro/configuration.nix
+++ b/hosts/yoga-7-pro/configuration.nix
@@ -5,17 +5,21 @@
 { config, lib, pkgs, ... }:

 {
-
  boot.loader = {
    systemd-boot.enable = true;
    timeout = 0;
    efi.canTouchEfiVariables = true;
  };

-  # cause it is so inconveniently located
-  services.logind.powerKey = "ignore";
-  services.logind.lidSwitch = "sleep";
-  services.logind.lidSwitchDocked = "ignore";
+  services.logind.settings.Login = {
+    # because it is so inconveniently located
+    HandlePowerKey = "ignore";
+
+    # handled by the dm instead
+    HandleLidSwitch = "ignore";
+    HandleLidSwitchDocked = "ignore";
+  };
+

  # requires too many shenanigans so I just install using --no-root-passwd
  # users.users.root.hashedPassword = "!";
--- a/hosts/yoga-7-pro/default.nix
+++ b/hosts/yoga-7-pro/default.nix
@@ -26,6 +26,7 @@
        ../../modules/nixos/pipewire.nix
        ../../modules/nixos/podman.nix
        ../../modules/nixos/power.nix
+        ../../modules/nixos/sops.nix
        ../../modules/nixos/stylix.nix
        ../../modules/nixos/user.nix

--- a/hosts/yoga-7-pro/hardware-configuration.nix
+++ b/hosts/yoga-7-pro/hardware-configuration.nix
@@ -19,11 +19,16 @@
  ];

  # https://github.com/lwfinger/rtw89/issues/240
-  boot.extraModprobeConfig = ''
-    options rtw89_pci disable_aspm_l1ss=y disable_aspm_l1=y disable_clkreq=y
-    options rtw89_core disable_ps_mode=y
-  '';
+  # boot.extraModprobeConfig = ''
+  #   options rtw89_pci disable_aspm_l1ss=y disable_aspm_l1=y disable_clkreq=y
+  #   options rtw89_core disable_ps_mode=y
+  # '';

+  # ipu is apparently required to make the webcam available as a camera device
+  hardware.ipu6 = {
+    enable = true;
+    platform = "ipu6";
+  };

  services.fwupd.enable = true;

--- a/modules/home-manager/code.nix
+++ b/modules/home-manager/code.nix
@@ -1,24 +1,16 @@
 {pkgs, ...}:
 let
-  baseExtensions = with pkgs.vscode-extensions; [
+  baseExtensions = pkgs.nix4vscode.forVscode [
    # QOL
-    mhutchie.git-graph
-    redhat.vscode-yaml
-    github.copilot
-    github.copilot-chat
-
+    "mhutchie.git-graph"
+    "redhat.vscode-yaml"
+    "github.copilot"
+    "github.copilot-chat"
    # Nix environment selector
-    arrterian.nix-env-selector
+    "arrterian.nix-env-selector"
+    # continue.continue
  ];

-  # baseExtensions = with pkgs; [
-  #   (vscode-with-extensions.override {
-  #     vscodeExtensions = with vscode-extensions; [
-  #       bbenoist.nix
-
-  #     ];
-  #   })
-  # ];

  baseSettings = {
    # visual
@@ -101,31 +93,30 @@ in
 {
  programs.vscode = {
    enable = true;
-    # install vscode in a FHS environment to allow extensions with prebuilt binaries
-    # package = pkgs.vscode.fhs;

    profiles.default = {
      userSettings = baseSettings // {
        "window.newWindowProfile" = "development";
      };
+      extensions = [];
    };

    profiles.development = {
-      extensions = baseExtensions ++ (with pkgs.vscode-extensions; [
+      extensions = baseExtensions ++ pkgs.nix4vscode.forVscode [
        # python
-        ms-python.python
-        ms-python.isort
-        ms-python.debugpy
-        ms-python.vscode-pylance
+        "ms-python.python"
+        "ms-python.isort"
+        "ms-python.debugpy"
+        "ms-python.vscode-pylance"

        # nix language
-        jnoortheen.nix-ide
+        "jnoortheen.nix-ide"

        # Flutter and co
-        dart-code.flutter
-        dart-code.dart-code
+        "dart-code.flutter"
+        "dart-code.dart-code"

-      ]);
+      ];

      keybindings = baseKeybindings;

@@ -134,29 +125,18 @@ in


    profiles.science = {
-      extensions = baseExtensions ++ (with pkgs.vscode-extensions; [
+      extensions = baseExtensions ++ pkgs.nix4vscode.forVscode [
        # python + jupyter
-        ms-python.python
-        ms-python.isort
-        ms-python.debugpy
-        ms-python.vscode-pylance
-        ms-toolsai.vscode-jupyter-slideshow
-        ms-toolsai.jupyter-renderers
+        "ms-python.python"
+        "ms-python.isort"
+        "ms-python.debugpy"
+        "ms-python.vscode-pylance"
+        "ms-toolsai.vscode-jupyter-slideshow"
+        "ms-toolsai.jupyter"
+        "ms-toolsai.jupyter-hub"
+        "ms-toolsai.jupyter-renderers"
        # Typst
-        myriad-dreamin.tinymist
-      ])  ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-        {
-          name = "jupyter";
-          publisher = "ms-toolsai";
-          version = "2025.3.2025032101";
-          sha256 = "sha256-s2qEUl9J6EOije6MasZOnHErYs3NYXBqLSfMT03vEH0=";
-        }
-        {
-          name = "jupyter-hub";
-          publisher = "ms-toolsai";
-          version = "2024.10.1002831100";
-          sha256 = "sha256-5IRczwXbYkDdYEOXvQnnH+HJNLvsRsrZ6fnoVCveqrs=";
-        }
+        "myriad-dreamin.tinymist"
      ];

      keybindings = baseKeybindings ++ [
@@ -196,10 +176,7 @@ in
        "workbench.colorCustomizations" = {
          "statusBar.background" = "#003f9293";
        };
-
      };
    };
-
  };
-
 }
--- a/modules/home-manager/directories.nix
+++ b/modules/home-manager/directories.nix
@@ -11,7 +11,7 @@
    createDirectories = true;
    documents = "${config.home.homeDirectory}/Documents";
    download = "${config.home.homeDirectory}/Downloads";
-    pictures = "${config.home.homeDirectory}/Pictures";#
+    pictures = "${config.home.homeDirectory}/Pictures";
    # do not create the following
    desktop = null;
    music = null;
--- a/modules/home-manager/hypr/default.nix
+++ b/modules/home-manager/hypr/default.nix
@@ -1,9 +1,23 @@
 {
+  config,
+  lib,
+  ...
+}:
+let
+  cfg = config.nix-config.hypr;
+in
+{
+  options = {
+    nix-config.hypr.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+      description = "Enable an opinionated hyprland+quickshell setup as a desktop environment.";
+    };
+  };
+
  imports = [
    ./hyprland
-    ./hyprpaper.nix
    ./hyprlock.nix
    ./hypridle.nix
-    ./waybar.nix
  ];
 }
--- a/modules/home-manager/hypr/hyprland/autostart.nix
+++ b/modules/home-manager/hypr/hyprland/autostart.nix
@@ -9,7 +9,6 @@ in
      default = [
        "gnome-keyring-daemon --start --components=secrets"
        "wl-paste --watch cliphist store"
-        "${lib.getExe pkgs.waybar}"
        "${lib.getExe pkgs.hypridle}"
        # TODO - currently broken
        "${pkgs.owncloud-client}"
--- a/modules/home-manager/hypr/hyprland/general.nix
+++ b/modules/home-manager/hypr/hyprland/general.nix
@@ -19,7 +19,8 @@ in
  };

  config = {
-    wayland.windowManager.hyprland = {
+
+    wayland.windowManager.hyprland = lib.mkIf cfg.enable {
      enable = true;
      systemd.enable = true;
      settings = {
@@ -28,10 +29,11 @@ in
        # };
        general = {
          resize_on_border = true;
-          gaps_in = 5;
-          gaps_out = 5;
+          gaps_in = 3;
+          gaps_out = 3;
          border_size = 1;
          "col.active_border" = "rgb(98971A) rgb(CC241D) 45deg";
+          "col.inactive_border" = "rgba(595959aa)";
          layout = "master";
        };

@@ -61,9 +63,10 @@ in
      };

      decoration = {
-        rounding = 7;
-        # active_opacity = 0.95;
+        rounding = 10;
        inactive_opacity = 0.9;
+        dim_inactive = false;
+        dim_strength = 0.1;

        shadow = {
          enabled = false;
@@ -94,6 +97,16 @@ in
          "float, class:org.gnome.Nautilus"
          # when there is a single window, deactivate border and gaps
          # "border_size 0, onworkspace:w[tv1], "
+
+          # File pickers and dialogs
+          "float, title:^(Save As)$"
+          "float, title:^(Open File)$"
+          "size 50% 50%, title:^(Open File)$"
+          "center, title:^(Open File)$"
+
+          # Disable idle when gaming
+          "idleinhibit always, class:^(steam_app_)"
+          "idleinhibit always, class:^(gamescope)$"
        ];
      };

--- a/modules/home-manager/hypr/hyprland/keybinds.nix
+++ b/modules/home-manager/hypr/hyprland/keybinds.nix
@@ -17,7 +17,7 @@ in
          "$mod, return, exec, kitty"
          "$mod, b, exec, ${cfg.browser}"
          "$mod, s, exec, ${cfg.ide}"
-          "$mod, e, exec, nautilus"
+          "$mod, e, exec, ${lib.getExe pkgs.nautilus}"

          # Lock screen
          "$mod, l, exec, loginctl lock-session"
@@ -54,10 +54,10 @@ in
          "$mod+Ctrl, right, movetoworkspace, +1"

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


          # move to scratch workspace
@@ -101,8 +101,6 @@ in
          "$mod, KP_Subtract, resizeactive, -2% -2%"
          "$mod, PLUS, resizeactive, 2% 2%"
          "$mod, KP_Add, resizeactive, 2% 2%"
-
-
        ];

        # lock-screen bindings
--- a/modules/home-manager/hypr/hyprland/layouts.nix
+++ b/modules/home-manager/hypr/hyprland/layouts.nix
@@ -8,35 +8,33 @@ in
      settings = {

        master = {
-          # TODO - I am not yet happy about the layout + toggle keybinds
-          orientation = "center";
-          # equivalent toalways_center_master = true;
-          slave_count_for_center_master = 0;
-          # new_is_master = false;
-          # allow_small_split = true;
-          # special_scale_factor = 0.80;
-          mfact = 0.34;
+          # no_gaps_when_only = true;
+
+          # default: single app is centered/fullscreen; when more apps are added it splits
+          orientation = "right";
+          # keep center-master behaviour when there is exactly 1 slave (i.e. single app appears fullscreen)
+          slave_count_for_center_master = 1;
+          # only split in two columns
+          mfact = 0.6;
          inherit_fullscreen = false;
-          # always_center_master = false;
-          # allow a maximum of 3 windows in the master area for 3-column layout
        };

-        #create special workspaces with no gaps
-        workspace = [
-          "w[t1], gapsout:0, gapsin:0"
-          "w[tg1], gapsout:0, gapsin:0"
-          "f[1], gapsout:0, gapsin:0"
-        ];
+        # #create special workspaces with no gaps
+        # workspace = [
+        #   "w[t1], gapsout:0, gapsin:0"
+        #   "w[tg1], gapsout:0, gapsin:0"
+        #   "f[1], gapsout:0, gapsin:0"
+        # ];

-        # automatically assign windows to workspaces when there is only one window
-        windowrulev2 = [
-          "bordersize 0, floating:0, onworkspace:w[t1]"
-          "rounding 0, floating:0, onworkspace:w[t1]"
-          "bordersize 0, floating:0, onworkspace:w[tg1]"
-          "rounding 0, floating:0, onworkspace:w[tg1]"
-          "bordersize 0, floating:0, onworkspace:f[1]"
-          "rounding 0, floating:0, onworkspace:f[1]"
-        ];
+        # # automatically assign windows to workspaces when there is only one window
+        # windowrulev2 = [
+        #   "bordersize 0, floating:0, onworkspace:w[t1]"
+        #   "rounding 0, floating:0, onworkspace:w[t1]"
+        #   "bordersize 0, floating:0, onworkspace:w[tg1]"
+        #   "rounding 0, floating:0, onworkspace:w[tg1]"
+        #   "bordersize 0, floating:0, onworkspace:f[1]"
+        #   "rounding 0, floating:0, onworkspace:f[1]"
+        # ];

        misc = {
          vfr = false;
@@ -45,12 +43,14 @@ in

        # Keybind to toggle between 2 and 3 column master layout
        bind = [
-          # Toggle master layout between 2 and 3 columns
-          "$mod, m, exec, hyprctl dispatch layoutmsg orientationleft"
-          "$mod, m, exec, hyprctl dispatch layoutmsg mfact exact 0.5"
-          # "SUPER_SHIFT,C,exec,hyprctl dispatch layoutmsg swap_master_count 2 3"
-        ];
+          # Toggle master layout between 2 and 3 columns (press $mod + m)
+          "$mod, m, exec, hyprctl dispatch layoutmsg orientationcenter"
+          "$mod, m, exec, hyprctl dispatch layoutmsg mfact exact 0.34"

+          # Toggle master layout between 3 and 2 columns (press $mod + Shift + m)
+          "$mod, Shift+m, exec, hyprctl dispatch layoutmsg orientationright"
+          "$mod, Shift+m, exec, hyprctl dispatch layoutmsg mfact exact 0.6"
+        ];
      };
    };
  };
--- a/modules/home-manager/hypr/hyprland/packages.nix
+++ b/modules/home-manager/hypr/hyprland/packages.nix
@@ -9,7 +9,6 @@ in
    pkgs.nautilus
    pkgs.gnome-control-center
    pkgs.gnome-bluetooth # needed by gnome-control-center to manage bluetooth
-    pkgs.brightnessctl
    pkgs.cliphist
    pkgs.wl-clipboard
    pkgs.gcr # Provides org.gnome.keyring.SystemPrompter
--- a/modules/home-manager/hypr/hyprpaper.nix
+++ b/modules/home-manager/hypr/hyprpaper.nix
@@ -1,66 +0,0 @@
-{
-  pkgs,
-  lib,
- ...
-}:
-let
-
-  wallpapers = [
-    ../../../wallpapers/codioful-formerly-gradienta-lweK7Wme_jo-unsplash.jpg
-    ../../../wallpapers/codioful-formerly-gradienta-n2XqPm7Bqhk-unsplash.jpg
-    ../../../wallpapers/luke-chesser-eICUFSeirc0-unsplash.jpg
-    ../../../wallpapers/luke-chesser-pJadQetzTkI-unsplash.jpg
-    ../../../wallpapers/magicpattern-87PP9Zd7MNo-unsplash.jpg
-  ];
-
-  monitor = ""; # leave empty to set the wallpaper on all monitors
-
-  wallpaperPicker = pkgs.writeShellScriptBin "wallpaper-picker" ''
-    #!/usr/bin/env bash
-    # use an array of wallpapers to randomly select one
-    wallpapers=(${pkgs.lib.concatStringsSep " " (map (p: "${p}") wallpapers)})
-    # select a random wallpaper from the array
-    index=$((RANDOM % ${toString (builtins.length wallpapers)}))
-    wallpaper="''${wallpapers[index]}"
-    echo "Setting wallpaper to: $wallpaper"
-
-    hyprctl hyprpaper unload all
-    hyprctl hyprpaper reload "${monitor},$wallpaper"
-  '';
-
-in {
-  home.packages = [wallpaperPicker];
-
-  services.hyprpaper = {
-    enable = true;
-    settings = {
-      ipc = "on";
-    };
-  };
-
-  # systemd.user = {
-  #   services.wallpaperRandomizer = {
-  #     Install = {WantedBy = ["graphical-session.target"];};
-
-  #     Unit = {
-  #       Description = "Set random desktop background using hyprpaper";
-  #       After = ["graphical-session-pre.target"];
-  #       PartOf = ["graphical-session.target"];
-  #     };
-
-  #     Service = {
-  #       Type = "oneshot";
-  #       ExecStart = "${wallpaperRandomizer}/bin/wallpaperRandomizer";
-  #       IOSchedulingClass = "idle";
-  #     };
-  #   };
-
-  #   timers.wallpaperRandomizer = {
-  #     Unit = {Description = "Set random desktop background using hyprpaper on an interval";};
-
-  #     Timer = {OnUnitActiveSec = "6h";};
-
-  #     Install = {WantedBy = ["timers.target"];};
-  #   };
-  # };
-}
--- a/modules/home-manager/hypr/waybar.nix
+++ b/modules/home-manager/hypr/waybar.nix
@@ -1,331 +0,0 @@
-{inputs, pkgs, lib, config, ...}:
-let
-  cfg = config.nix-config.style;
-in
-{
-    options.nix-config.waybar = {
-        burninPrevention = lib.mkOption {
-            type = lib.types.bool;
-            default = true;
-            description = "Enable burn-in prevention for Waybar";
-            example = ''
-                burninPrevention = true;
-            '';
-
-        };
-    };
-
-    config = {
-
-        # required to autoload fonts from packages installed via Home Manager
-        fonts.fontconfig.enable = true;
-
-        # waybar requires font-awesome
-        home.packages = [
-            pkgs.pavucontrol
-        ];
-
-        # enable waybar
-        programs.waybar.enable = true;
-        programs.waybar = {
-            settings = {
-
-                mainBar = {
-                    layer = "top";
-                    position = "top";
-
-                    margin-top = 5;
-                    # margin-bottom = 2;
-                    # margin-left = 5;
-                    # margin-right = 5;
-
-                    # margin between the modules
-                    spacing = 2;
-
-                    modules-left = [
-                        "hyprland/workspaces"
-                        "hyprland/window"
-                    ];
-
-                    modules-center = [
-                        "clock"
-                        "custom/notification"
-                    ];
-
-                    modules-right = [
-                        "tray"
-                        "privacy"
-                        "network"
-                        "bluetooth"
-                        "wireplumber"
-                        "battery"
-                        "backlight"
-                        "idle_inhibitor"
-                    ];
-
-
-                    # module specific settings
-                    "hyprland/workspaces" = {
-                        format = "{icon}";
-                        format-icons = {
-                            active = "●";
-                            default = "○";
-                        };
-                    };
-                    "hyprland/window"= {
-                        "icon" = true;
-                        "separate-outputs" = true;
-                        "format" = "{}";
-                        "rewrite" = {
-                            "(.*) — Mozilla Firefox" = "$1";
-                            "(.*) — Zen Browser" = "$1";
-                            "(.*) - fish" = "> [$1]";
-                            "(.*) - Visual Studio Code" = "$1";
-                        };
-                    };
-                    "clock" = {
-                        format = "{:%H:%M}";
-                        interval = 1;
-                        tooltip-format = "{calendar}";
-                        # calendar = {
-                        #     format = "%Y-%m-%d\n󰃰 %A\n\n%H:%M";
-                        #     start-day = 1; # Monday
-                        #     first-weekday = 1; # Monday
-                        #     week-number = false;
-                        #     long-weekdays = true;
-                        #     hide-if-empty = false;
-                        # };
-                    };
-                    "idle_inhibitor" = {
-                        format = "{icon}";
-                        format-icons = {
-                            activated = "";
-                            deactivated = "☕";
-                        };
-                        tooltip = "true";
-                    };
-                    "bluetooth" = {
-                        format-on = "󰂯";
-                        format-off = "󰂲";
-                        format-disabled = "󰂲";
-                        format-connected-battery = "{device_battery_percentage}% 󰂯";
-                        format-alt = "{device_alias} 󰂯";
-                        tooltip-format = "{controller_alias}\t{controller_address}\n\n{num_connections} connected";
-                        tooltip-format-connected = "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}";
-                        tooltip-format-enumerate-connected = "{device_alias}\n{device_address}";
-                        tooltip-format-enumerate-connected-battery = "{device_alias}\n{device_address}\n{device_battery_percentage}%";
-                        on-click-right = "XDG_CURRENT_DESKTOP=GNOME gnome-control-center bluetooth";
-                    };
-                    "battery" = {
-                        interval = 60;
-                        states = {
-                            good = 80;
-                            warning = 30;
-                            critical = 10;
-                        };
-                        format = "{capacity}% {icon}";
-                        format-charging = "{capacity}% 󰂄";
-                        format-plugged = "{capacity}% 󰂄";
-                        format-icons = [ "󰁻" "󰁼" "󰁾" "󰂀" "󰂂" "󰁹" ];
-                    };
-                    "backlight" = {
-                        # format = "{percent}% {icon}";
-                        format = "{icon}";
-                        tooltip-format = "{percent}%";
-                        format-icons = [ "" "" "" "" "" "" "" "" "" ];
-                    };
-                    "wireplumber" = {
-                        scroll-step = 1;
-                        format = "{volume}% {icon}";# {format_source}";
-                        format-bluetooth = "{volume}% {icon}";# {format_source}";
-                        format-bluetooth-muted = " {icon}";# {format_source}";
-                        format-muted = "";# {format_source}";
-                        format-alt = "{format_source} {icon}";
-                        # format-source = " {volume}%";
-                        # format-source-muted = "";
-                        format-icons = {
-                            headphone = "";
-                            hands-free = "";
-                            headset = "";
-                            phone = "";
-                            portable = "";
-                            default = [
-                                ""
-                                ""
-                                ""
-                            ];
-                        };
-                        on-click = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
-                        on-click-right = "XDG_CURRENT_DESKTOP=GNOME gnome-control-center sound";
-                    };
-                    "memory" = {
-                        interval = 5;
-                        format = "󰍛 {}%";
-                        max-length = 10;
-                    };
-                    "tray" = {
-                        spacing = 5;
-                    };
-                    "custom/notification" = {
-                        format = "{icon} {}";
-                        format-icons = {
-                            notification = "<span foreground='red'><sup></sup></span>";
-                            none = "";
-                            dnd-notification = "<span foreground='red'><sup></sup></span>";
-                            dnd-none = "";
-                            inhibited-notification = "<span foreground='red'><sup></sup></span>";
-                            inhibited-none = "";
-                            dnd-inhibited-notification = "<span foreground='red'><sup></sup></span>";
-                            dnd-inhibited-none = "";
-                        };
-                        return-type = "json";
-                        exec-if = "which swaync-client";
-                        exec = "swaync-client -swb";
-                        on-click = "swaync-client -t -sw";
-                        on-click-right = "swaync-client -d -sw";
-                        escape = true;
-                    };
-                    "network" = {
-                        format =  "󰤭";
-                        format-ethernet = " {ipaddr}";
-                        format-wifi = "{icon}";
-                        format-icons = [ "󰤯" "󰤟" "󰤢" "󰤥" "󰤨" ];
-                        format-disconnected = "󰤭";
-                        tooltip-format = " {ifname} via {gwaddr}";
-                        tooltip-format-wifi = ''
-                            󰤨 {essid}({signalStrength}%), {frequency} GHz (Interface: {ifname})
-                            IP: {ipaddr}    GW: {gwaddr}
-
-                            <span color='#a6da95'>{bandwidthUpBits}</span>    <span color='#ee99a0'>{bandwidthDownBits}</span>    <span color='#c6a0f6'>󰹹{bandwidthTotalBits}</span>
-                        '';
-                        tooltip-format-ethernet = ''
-                             {ifname} - {ipaddr}/{cidr}
-
-                            <span color='#a6da95'>{bandwidthUpBits}</span>    <span color='#ee99a0'>{bandwidthDownBits}</span>    <span color='#c6a0f6'>󰹹{bandwidthTotalBits}</span>
-                        '';
-                        tooltip-format-disconnected = "Disconnected";
-                        on-click = "XDG_CURRENT_DESKTOP=GNOME gnome-control-center wifi";
-                    };
-                    "privacy" = {
-                        icon-spacing = 4;
-                        # icon-size" = 18;
-                        transition-duration = 250;
-                        modules = [
-                            {
-                                type = "screenshare";
-                                tooltip = true;
-                                # tooltip-icon-size = 24
-                            }
-                            {
-                                type = "audio-out";
-                                tooltip = true;
-                                # tooltip-icon-size = 24
-                            }
-                            {
-                                type = "audio-in";
-                                tooltip = true;
-                                # tooltip-icon-size = 24
-                            }
-                        ];
-                    };
-                };
-            };
-
-            style = ''
-                * {
-                    font-family: "${cfg.monospaceFont}";
-                    font-weight: bold;
-                    font-size: ${builtins.toString (cfg.fontSizes.desktop + 5)}px;
-                }
-
-                window#waybar {
-                    background-color: transparent;
-                }
-
-                .module {
-                    background: rgba(0, 0, 0, 0.6);
-                    color: white;
-                    border-radius: 7px;
-                    margin: 1px 3px;
-                    padding: 1px 6px;
-                    animation: bgFade 3600s infinite alternate, textColorFade 3600s infinite alternate;
-                }
-
-                box.module button:hover {
-                    box-shadow: inset 0 -3px #ffffff;
-                }
-
-                /*.modules-left {
-                    padding: 3px;
-                }
-
-                .modules-right {
-                    padding: 3px;
-                }
-
-                .modules-center {
-                    padding: 3px;
-                }*/
-
-                #workspaces button {
-                    color: white;
-                    background: none;
-                    animation: textColorFade 3600s infinite alternate;
-                }
-
-                #battery.warning {
-                    background:rgba(240, 165, 0, 0.6);
-                }
-                #battery.critical {
-                    background:rgba(255, 0, 0, 0.6);
-                }
-                #battery.charging {
-                    background-color:rgba(14, 173, 0, 0.6);
-                }
-
-
-                #privacy {
-                    color: #ffffff;
-                    background:rgba(240, 165, 0, 0.6);
-                    border-radius: 7px;
-                    margin: 1px 3px;
-                    padding: 1px 6px;
-
-                }
-
-
-
-
-
-                @keyframes bgFade {
-                    0% {
-                        background-color: white;
-                    }
-                    100% {
-                        background-color: black;
-                    }
-                }
-
-                @keyframes textColorFade {
-                    0% {
-                        color: black;
-                    }
-                    /* 45% {
-                        color: black;
-                    } */
-                    60% {
-                        color: rgb(29, 38, 96);
-                    }
-                    /* 55% {
-                        color: white;
-                    } */
-                    100% {
-                        color: white;
-                    }
-                }
-
-            '';
-        };
-    };
-}
-
--- a/modules/home-manager/notifications.nix
+++ b/modules/home-manager/notifications.nix
@@ -1,110 +0,0 @@
-{ config, pkgs, lib, ... }:
-let
-  cfg = config.nix-config.style;
-in
-{
-  services.swaync = {
-    enable = true;
-
-    settings = {
-      control-center-margin-top = 13;
-      control-center-margin-bottom = 0;
-      control-center-margin-right = 14;
-      control-center-margin-left = 0;
-      notification-2fa-action = true;
-      notification-inline-replies = true;
-      notification-icon-size = 48;
-      notification-body-image-height = 160;
-      notification-body-image-width = 200;
-      notification-window-width = 400;
-      timeout = 6;
-      timeout-low = 3;
-      timeout-critical = 0;
-
-      image-visibility = "when-available";
-      transition-time = 200;
-      hide-on-clear = false;
-      hide-on-action = true;
-      script-fail-notify = true;
-      widgets = [
-        "dnd"
-        "buttons-grid"
-        "mpris"
-        "volume"
-        "backlight"
-        "title"
-        "notifications"
-      ];
-      widget-config = {
-        title = {
-          text = "Notifications";
-          clear-all-button = true;
-          button-text = "";
-        };
-        dnd = {
-          text = "Do Not Disturb";
-        };
-        label = {
-          max-lines = 1;
-          text = "Notification";
-        };
-        mpris = {
-          image-size = 50;
-          image-radius = 0;
-        };
-        volume = {
-          label = "";
-        };
-        backlight = {
-          label = "󰃠";
-          device = "amdgpu_bl2";
-        };
-        buttons-grid = {
-          actions = [
-            {
-              label = "";
-              command = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
-              type = "toggle";
-            }
-            {
-              label = "";
-              command = "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle";
-              type = "toggle";
-            }
-            {
-              label = "󰤨";
-              command = "nm-connection-editor";
-            }
-            {
-              label = "󰂯";
-              command = "blueman-manager";
-            }
-            {
-              label = "󱡽";
-              command = "bash -c $HOME/.config/hypr/scripts/airplaneMode.sh";
-              type = "toggle";
-            }
-            {
-              label = "";
-              command = "shutdown now";
-            }
-            {
-              label = "";
-              command = "hyprlock";
-            }
-            {
-              label = "";
-              command = "~/.config/hypr/scripts/wlogout.sh";
-            }
-          ];
-        };
-      };
-    };
-
-    style = ''
-      * {
-        font-family: "monospace";
-      }
-    '';
-  };
-}
--- a/modules/home-manager/quickshell/default.nix
+++ b/modules/home-manager/quickshell/default.nix
@@ -1,36 +1,28 @@
 {
-  config,
-  inputs,
  lib,
  pkgs,
-  builtins,
  ...
 }:
-let
-  cfg = config.nix-config.quickshell;
-  qs = inputs.quickshell.packages.x86_64-linux.default;
-in
 {
-  options.nix-config.quickshell.enable = lib.mkEnableOption {
-    name = "quickshell";
-    description = "Whether to enable quickshell.";
-    default = true;
-  };
+  programs.dankMaterialShell.enable = true;

-  config = lib.mkIf cfg.enable {
-    home.packages = [
-      qs
-      pkgs.qt6.qtimageformats
-      pkgs.qt6.qt5compat
-      pkgs.qt6.qtmultimedia
-      pkgs.qt6.qtdeclarative
-      pkgs.qt6.qtsvg
-      pkgs.qt6.qtwayland
-      pkgs.qt6.qtbase
+  programs.dankMaterialShell = {
+    enableSystemd = true;
+    enableSystemMonitoring = false;
+    enableClipboard = true;
+    enableVPN = true;
+    enableBrightnessControl = true;
+    enableColorPicker = false;
+    enableDynamicTheming = true;
+    enableAudioWavelength = false;
+    enableCalendarEvents = false;
+    enableSystemSound = true;

-    ];
+    # default = {
+    #     settings = ''{}'';
+    #     session = ''{}'';
+    # };

-    # add the quickshell config (whole directory) to XDG_CONFIG_HOME
-    # home.file.".config/quickshell/config".source = ./config;
+    # plugins = {};
  };
 }
--- a/modules/home-manager/sops.nix
+++ b/modules/home-manager/sops.nix
--- a/modules/home-manager/stylix.nix
+++ b/modules/home-manager/stylix.nix
@@ -90,7 +90,7 @@ in
                };

                emoji = {
-                    package = pkgs.noto-fonts-emoji;
+                    package = pkgs.noto-fonts-color-emoji;
                    name = "Noto Color Emoji";
                };

--- a/modules/home-manager/wallpaper.nix
+++ b/modules/home-manager/wallpaper.nix
@@ -0,0 +1,11 @@
+# Write an importable nix file that copies a folder from this repo into the store and creates a symlink to a predictible directory in my home file
+{
+  lib, pkgs, ...
+}:
+{
+  # Copy the entire wallpapers directory into the Nix store and symlink it to ~/wallpapers
+  home.file."wallpapers" = {
+    source = ../../wallpapers;
+    target = "Pictures/wallpapers";
+  };
+}
--- a/modules/nixos/gnome.nix
+++ b/modules/nixos/gnome.nix
@@ -12,24 +12,20 @@
  };
  config = lib.mkIf config.nix-config.gnome.enable {
    services = {
-    #   displayManager.gdm.enable = true;
-    #   desktopManager.gnome.enable = true;
+      displayManager.gdm.enable = true;
+      desktopManager.gnome.enable = true;

-    #   gnome = {
-    #     core-apps.enable = false;
-    #     core-developer-tools.enable = false;
-    #     games.enable = false;
-    #   };
+      gnome = {
+        core-apps.enable = false;
+        core-developer-tools.enable = false;
+        games.enable = false;
+      };

-    #   # Exclude some packages to keep the installation lean
-    #   environment.gnome.excludePackages = with pkgs; [
-    #     gnome-tour
-    #     gnome-user-docs
-    #   ];
-    # };
-      xserver.enable = true;
-      xserver.displayManager.gdm.enable = true;
-      xserver.desktopManager.gnome.enable = true;
+      # Exclude some packages to keep the installation lean
+      environment.gnome.excludePackages = with pkgs; [
+        gnome-tour
+        gnome-user-docs
+      ];
    };
  };
 }
--- a/modules/nixos/hyprland.nix
+++ b/modules/nixos/hyprland.nix
@@ -22,7 +22,7 @@ in
      defaultSession = "hyprland";
    };

-    services.xserver.displayManager.gdm = {
+    services.displayManager.gdm = {
      enable = true;
      wayland = true;
    };
--- a/modules/nixos/networking.nix
+++ b/modules/nixos/networking.nix
@@ -13,6 +13,11 @@ in
      type = lib.types.str;
      default = "nixos";
      };
+
+    nix-config.networking.vpn = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+    };
  };

  config = {
@@ -30,6 +35,60 @@ in
    #   enable = false;
    # };

-  };
+    # # VPN setup
+    networking.networkmanager.ensureProfiles = {
+      environmentFiles = [ config.sops.secrets.vpnEnvironment.path ];
+      profiles.wg-home = {
+        connection = {
+          id = "wg-home";
+          type = "wireguard";
+          interface-name = "wgh";
+          autoconnect = false;
+        };

+        ipv4 = {
+          address = "10.0.0.2/32";
+          method = "manual";
+        };
+
+        wireguard = {
+          listen-port = 51820;
+          private-key = "$HOME_PRIVATE_KEY";
+        };
+
+        "wireguard-peer.y/TBD/c0GkrRtekDkCb8TUnYYil8bSRPIjPDY650pz8=" = {
+          endpoint = "$HOME_ENDPOINT";
+          allowed-ips = "192.168.1.0/16";
+        };
+      };
+
+
+
+      profiles.wg-fritzbox = {
+        connection = {
+          id = "wg-fritzbox";
+          type = "wireguard";
+          interface-name = "wgfb";
+          autoconnect = false;
+        };
+
+        ipv4 = {
+          address = "192.168.178.201/24";
+          dns = "192.168.178.1";
+          method = "manual";
+        };
+
+        wireguard = {
+          listen-port = 51820;
+          private-key = "$FRITZBOX_PRIVATE_KEY";
+        };
+
+        "wireguard-peer.Jf/seKAL7kWm2qX9gf5Ln8FiN7OlPQB3CyRovDIOEHw=" = {
+          endpoint = "$FRITZBOX_ENDPOINT";
+          allowed-ips = "192.168.178.0/24;fd73:ea00:5841::/64";
+          preshared-key = "$FRITZBOX_PRESHARED_KEY";
+        };
+      };
+    };
+  };
 }
--- a/modules/nixos/power.nix
+++ b/modules/nixos/power.nix
@@ -23,42 +23,42 @@

  config = {

-    # 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;
+      };
+    };



@@ -69,17 +69,17 @@
      AllowSuspendThenHibernate=yes
    '';

-    services.watt = {
-      enable = true;
-      settings = {
-        battery_charge_thresholds = [
-          40
-          80
-        ];
-      };
-    };
+    # services.watt = {
+    #   enable = true;
+    #   settings = {
+    #     battery_charge_thresholds = [
+    #       40
+    #       80
+    #     ];
+    #   };
+    # };

-    # write the watt-config under /etc/watt.toml
+    services.upower.enable = true;


    services.irqbalance = {
--- a/modules/nixos/sops.nix
+++ b/modules/nixos/sops.nix
@@ -0,0 +1,12 @@
+{
+  inputs,
+  ...
+}:
+{
+  sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
+  sops.defaultSopsFile = ./../../secrets/vpn.env;
+  sops.secrets.vpnEnvironment = {
+    sopsFile = ./../../secrets/vpn.env;
+    format = "dotenv";
+  };
+}
--- a/2
+++ b/2
--- a/users/remy.nix
+++ b/users/remy.nix
@@ -12,8 +12,10 @@
  ## Utils relevant to this user only
  programs.git = {
    enable = true;
-    userName = "Remy Moll";
-    userEmail = "me@moll.re";
+    settings = {
+      user.name = "Remy Moll";
+      user.email = "me@moll.re";
+    };
  };

  ## XDG configuration
@@ -22,6 +24,7 @@
    mimeApps = {
      enable = true;
      defaultApplications = {
+        # TODO
        "inode/directory" = "org.gnome.Nautilus.desktop";
        "application/zip" = "org.gnome.FileRoller.desktop";
        "application/octet-stream" = "org.gnome.GHex.desktop";
--- a/users/remy_usb/default.nix
+++ b/users/remy_usb/default.nix
@@ -3,12 +3,12 @@ with lib.hm.gvariant;
 {
  config = {
    nix-config = {
-      # hypr = {
-      #   internal-screen = {
-      #       resolution = "auto";
-      #       scale = "auto";
-      #   };
-      # };
+      hypr = {
+        internal-screen = {
+            resolution = "auto";
+            scale = "auto";
+        };
+      };
    };
  };

@@ -21,7 +21,7 @@ with lib.hm.gvariant;
    ../../modules/home-manager/documents.nix
    ../../modules/home-manager/fish.nix
    ../../modules/home-manager/flatpaks.nix
-    # ../../modules/home-manager/hypr
+    ../../modules/home-manager/hypr
    ../../modules/home-manager/keepassxc.nix
    ../../modules/home-manager/kitty.nix
    ../../modules/home-manager/kubectl.nix
@@ -31,7 +31,7 @@ with lib.hm.gvariant;
    ../../modules/home-manager/stylix.nix
    ../../modules/home-manager/thunderbird.nix
    ../../modules/home-manager/wofi.nix
-    # ../../modules/home-manager/xdg-portals.nix
+    ../../modules/home-manager/xdg-portals.nix
  ];

 }
--- a/users/remy_yoga/default.nix
+++ b/users/remy_yoga/default.nix
@@ -9,9 +9,9 @@ with lib.hm.gvariant;
            scale = "1.6";
        };
      };
-      quickshell = {
-        enable = true;
-      };
+      # quickshell = {
+      #   enable = true;
+      # };
    };
  };

@@ -31,7 +31,6 @@ with lib.hm.gvariant;
    ../../modules/home-manager/kitty.nix
    ../../modules/home-manager/kubectl.nix
    ../../modules/home-manager/launcher.nix
-    ../../modules/home-manager/notifications.nix
    ../../modules/home-manager/obsidian.nix
    ../../modules/home-manager/owncloud-client.nix
    ../../modules/home-manager/quickshell
@@ -39,7 +38,7 @@ with lib.hm.gvariant;
    ../../modules/home-manager/stylix.nix
    ../../modules/home-manager/thunderbird.nix
    ../../modules/home-manager/uxplay.nix
-    # ../../modules/home-manager/wofi.nix
+    ../../modules/home-manager/wallpaper.nix
    ../../modules/home-manager/xdg-portals.nix
  ];
 }
Author	SHA1	Message	Date
Remy Moll	625039ee58	link wallpapers	2025-11-07 11:02:20 +01:00
Remy Moll	7b9122fe7f	cleanup hyprland and embrace dms	2025-11-07 10:39:48 +01:00
Remy Moll	94f392c388	add networking through secrets	2025-11-07 10:39:29 +01:00
Remy Moll	efe873d714	cleaned up the flake	2025-10-30 18:16:10 +01:00
Remy Moll	a8d8c4dde9	had to switch to unstable for dms to work	2025-10-30 11:02:09 +01:00
Remy Moll	f5d5791efd	fix some regressions	2025-10-29 15:26:46 +01:00