Update flake.lock 2025-04-28

Update flake.lock 2025-04-27
Update flake.lock 2025-04-26
2025-07-05 00:30:42 +00:00 · 2025-07-05 00:30:42 +00:00 · 2025-07-05 00:30:42 +00:00 · 2025-07-05 00:30:42 +00:00 · 2025-07-05 00:30:42 +00:00 · 2025-07-05 00:30:42 +00:00
266 changed files with 4062 additions and 5492 deletions
--- a/.dotter/global.toml
+++ b/.dotter/global.toml
@ -1,61 +0,0 @@
-[helpers]
-
-[default]
-depends = []
-
-[manjaro.files]
-manjaro = "~"
-
-[mc.files]
-mc = "~/.config/mc"
-
-[vim.files]
-# type symbolic prevents interpreting '{{' as template
-"vim/.vimrc" = { target = "~/.vimrc", type = "symbolic" }
-
-[nvim.files]
-"vim/init.vim" = { target = "~/.config/nvim/init.vim", type = "symbolic" }
-
-[i3.files]
-"i3/i3" = "~/.config/i3"
-"i3/i3blocks" = { target = "~/.config/i3blocks", type = "symbolic" }
-"i3/rofi" = "~/.config/rofi"
-"i3/i3-scrot.conf" = "~/.config/i3-scrot.conf"
-"i3/i3status-rust" = "~/.config/i3status-rust"
-"i3/.profile" = "~/.profile"
-
-[i3.variables]
-monitor-primary = "not-specified"
-monitor-secondary = "not-specified"
-screenlayout-script = "echo screenlayout-script not specified"
-bar-font-size = 15
-tray-output = "tray_output primary"
-
-[emacs.files]
-"emacs/doom" = "~/.config/doom"
-# "emacs/spacemacs/.spacemacs" = "~/.spacemacs"
-# "emacs/chemacs/.emacs-profiles.el" = "~/.emacs-profiles.el"
-
-[alacritty.files]
-alacritty = "~/.config/alacritty"
-
-[starship.files]
-starship = "~/.config/"
-
-[zsh.files]
-"zsh/.zshrc" = "~/.zshrc"
-"zsh/custom-plugins" = "~/.oh-my-zsh/custom"
-
-[polybar.files]
-polybar = "~/.config/polybar"
-
-[leftwm.files]
-leftwm = "~/.config/leftwm"
-
-[xmonad.files]
-xmonad = "~/.xmonad"
-
-[nix.files]
-"direnvrc" = "~/.config/direnv/direnvrc"
-"nix/configuration.nix" = "/etc/nixos/configuration.nix"
-"nix/flake.nix" = "/etc/nixos/flake.nix"
--- a/.dotter/kardorf.toml
+++ b/.dotter/kardorf.toml
@ -1,6 +0,0 @@
-[i3.variables]
-monitor-primary = "DVI-D-0"
-monitor-secondary = "DVI-D-1"
-screenlayout-script = "~/.screenlayout/2desktop-dvi.sh"
-bar-font-size = 15
-tray-output = "tray_output DVI-D-1"
--- a/.dotter/laptop-at-home.toml
+++ b/.dotter/laptop-at-home.toml
@ -1,4 +0,0 @@
-[i3.variables]
-monitor-primary = "HDMI-1"
-monitor-secondary = "eDP-1"
-screenlayout-script = "~/.screenlayout/laptop-at-home.sh"
--- a/.dotter/laptop.toml
+++ b/.dotter/laptop.toml
@ -1,5 +0,0 @@
-[i3.variables]
-monitor-primary = "HDMI-1"
-monitor-secondary = "eDP-1"
-tray-output = "tray_output eDP-1"
-screenlayout-script = "$scripts/display-layoutpicker"
--- a/.dotter/local.kardorf.toml
+++ b/.dotter/local.kardorf.toml
@ -1,2 +0,0 @@
-includes = [".dotter/kardorf.toml"]
-packages = ["i3", "emacs", "alacritty", "zsh", "starship", "nix"]
--- a/.dotter/local.laptop.toml
+++ b/.dotter/local.laptop.toml
@ -1,2 +0,0 @@
-includes = [".dotter/laptop.toml"]
-packages = []
--- a/.envrc
+++ b/.envrc
@ -0,0 +1 @@
+use flake
--- a/.gitea/workflows/update-flake.yaml
+++ b/.gitea/workflows/update-flake.yaml
@ -22,22 +22,23 @@ jobs:
          git config user.name "Gitea Actions"
          git config user.email "actions@gitea.local"

-      - name: Merge master branch
+      - name: Rebase from master branch
        shell: bash
        run: |
+            git fetch origin master
            commits_ahead=$(git rev-list --count HEAD..origin/master)
            echo "Commits ahead: $commits_ahead"
            git log --oneline -5
            echo "----------"
            git log --oneline -5 origin/master
+            echo .

            if [ $commits_ahead -ne 0 ]
            then
-              git fetch origin
-              git merge -X theirs --squash origin/master
-              git commit -m "Merge master branch squashed $(date -I)"
+              git rebase -X theirs origin/master
+              git push --force-with-lease origin flake-updates
            else
-              echo "Merge not necessary"
+              echo "Rebase not necessary"
            fi

      - name: Set up Nix
@ -54,4 +55,4 @@ jobs:
          git diff --cached --quiet && echo "No changes to commit." && exit 0

          git commit -m "Update flake.lock $(date -I)"
-          git push origin flake-updates
+          git push --force-with-lease origin flake-updates
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,3 @@
-.dotter/cache.toml
-.dotter/cache
-.dotter/local.toml
-
-nix/result
+.direnv
+result*
+*.qcow2
--- a/.sops.yaml
+++ b/.sops.yaml
@ -3,23 +3,25 @@ keys:
  - &aspi-ssh age1q8lc5340gz5xw2f57nglrss68wv0j0hf36py2pdtrl6ky3yrq9qqk0njr4
  - &pianonix-ssh age1hsmfz8fjxu83sax9lr487h8xr6cyge0apdq4zpge4c8jpcjj2cksj825ct
  - &builder-ssh age1kw4kmdm45zprvdkrrpvgq966l7585vhusmum083qlwnr0xxgd3uqatcyja
+  - &kardorf-ssh age15lxw97z03q40xrdscnxqqugh5ky5aqrerg2t2rphkcqm6rnllurq8v98q5
+
 creation_rules:
-  - path_regex: secrets/secrets.yaml$
+  - path_regex: hosts/common/secrets.yaml$
    key_groups:
    - age:
      - *primary
      - *aspi-ssh
      - *pianonix-ssh
+      - *kardorf-ssh

-  - path_regex: secrets/secrets-builder.yaml$
+  - path_regex: hosts/builder/secrets.yaml$
    key_groups:
    - age:
      - *primary
      - *builder-ssh

-  - path_regex: secrets/.+
+  - path_regex: hosts/pianonix/secrets.yaml$
    key_groups:
    - age:
      - *primary
-      - *aspi-ssh
      - *pianonix-ssh
--- a/flake.lock
+++ b/flake.lock
@ -3,11 +3,11 @@
    "alacritty-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1740080741,
-        "narHash": "sha256-ROer+oqSY/Z5PAxZFJ5U9R+kMfWb596/1CuEWTcoMIk=",
+        "lastModified": 1745230862,
+        "narHash": "sha256-TFomYP13Wa2VSoxKGKaTDyIj8K1/Oi4LOhR93z07Ot4=",
        "owner": "alacritty",
        "repo": "alacritty-theme",
-        "rev": "687675f3f2245c80ff8bfe8180b0eb40dfc0bc86",
+        "rev": "0520b1f8f3eb25678444c0817a97636b6601ac85",
        "type": "github"
      },
      "original": {
@ -36,11 +36,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741282631,
-        "narHash": "sha256-jZE1CmQ53uN1Gq4FjaLFzSSjDqzL0pG4mdRbjBqSmho=",
+        "lastModified": 1744289235,
+        "narHash": "sha256-ZFkHLdimtFzQACsVVyZkZlfYdj4iNy3PkzXfrwmlse8=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "81498562d0f53e613d30368bb5b076784fa86f80",
+        "rev": "c8282f4982b56dfa5e9b9f659809da93f8d37e7a",
        "type": "github"
      },
      "original": {
@ -87,11 +87,11 @@
        "utils": "utils"
      },
      "locked": {
-        "lastModified": 1727447169,
-        "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=",
+        "lastModified": 1749105467,
+        "narHash": "sha256-hXh76y/wDl15almBcqvjryB50B0BaiXJKk20f314RoE=",
        "owner": "serokell",
        "repo": "deploy-rs",
-        "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76",
+        "rev": "6bc76b872374845ba9d645a2f012b764fecd765f",
        "type": "github"
      },
      "original": {
@ -129,11 +129,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1735644329,
-        "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=",
+        "lastModified": 1741473158,
+        "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=",
        "owner": "numtide",
        "repo": "devshell",
-        "rev": "f7795ede5b02664b57035b3b757876703e2c3eac",
+        "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0",
        "type": "github"
      },
      "original": {
@ -149,11 +149,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741786315,
-        "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=",
+        "lastModified": 1745502102,
+        "narHash": "sha256-LqhRwzvIVPEjH0TaPgwzqpyhW6DtCrvz7FnUJDoUZh8=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de",
+        "rev": "ca27b88c88948d96feeee9ed814cbd34f53d0d70",
        "type": "github"
      },
      "original": {
@ -165,11 +165,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
        "type": "github"
      },
      "original": {
@ -181,73 +181,11 @@
    "flake-compat_2": {
      "flake": false,
      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1747046372,
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_3": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733328505,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_4": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_5": {
-      "locked": {
-        "lastModified": 1733328505,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
-        "revCount": 69,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
-      }
-    },
-    "flake-compat_6": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1650374568,
-        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
        "type": "github"
      },
      "original": {
@ -264,11 +202,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741352980,
-        "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
+        "lastModified": 1749398372,
+        "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
+        "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
        "type": "github"
      },
      "original": {
@ -278,6 +216,39 @@
      }
    },
    "flake-utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "locked": {
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_3": {
      "inputs": {
        "systems": "systems_3"
      },
@ -295,64 +266,9 @@
        "type": "github"
      }
    },
-    "flake-utils-plus": {
-      "inputs": {
-        "flake-utils": "flake-utils_5"
-      },
-      "locked": {
-        "lastModified": 1715533576,
-        "narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=",
-        "owner": "gytis-ivaskevicius",
-        "repo": "flake-utils-plus",
-        "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "gytis-ivaskevicius",
-        "repo": "flake-utils-plus",
-        "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_4"
-      },
-      "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_5"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
    "flake-utils_4": {
      "inputs": {
-        "systems": "systems_6"
+        "systems": "systems_5"
      },
      "locked": {
        "lastModified": 1731533236,
@ -399,11 +315,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741379162,
-        "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=",
+        "lastModified": 1742649964,
+        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc",
+        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
        "type": "github"
      },
      "original": {
@ -485,33 +401,26 @@
        ]
      },
      "locked": {
-        "lastModified": 1739757849,
-        "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
+        "lastModified": 1745557122,
+        "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
+        "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-24.11",
        "repo": "home-manager",
        "type": "github"
      }
    },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
+    "impermanence": {
      "locked": {
-        "lastModified": 1739757849,
-        "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
+        "lastModified": 1744743431,
+        "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
+        "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387",
        "type": "github"
      },
      "original": {
@ -537,11 +446,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1738664950,
-        "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=",
+        "lastModified": 1742215578,
+        "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=",
        "owner": "hyprwm",
        "repo": "hyprcursor",
-        "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3",
+        "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719",
        "type": "github"
      },
      "original": {
@ -566,11 +475,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1739049071,
-        "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=",
+        "lastModified": 1745015490,
+        "narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=",
        "owner": "hyprwm",
        "repo": "hyprgraphics",
-        "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73",
+        "rev": "60754910946b4e2dc1377b967b7156cb989c5873",
        "type": "github"
      },
      "original": {
@ -595,11 +504,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1741788549,
-        "narHash": "sha256-Ot/AuQGw5KJwHjyTMHWmyaduNkcE58bOCmyitZ4VxEQ=",
+        "lastModified": 1745795931,
+        "narHash": "sha256-i4zlEa2lnANuOZA1aA/X0cNGM7x9MLZqqmKP6fwfPEA=",
        "owner": "hyprwm",
        "repo": "Hyprland",
-        "rev": "e86d3a14e46d19d8a47f8ceb6410546715d45f10",
+        "rev": "f5c5cfa960c157c8df50b496f621290234ac4505",
        "type": "github"
      },
      "original": {
@ -625,11 +534,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1738966025,
-        "narHash": "sha256-MzgrF0jKlTNnNS33D8PwI5z2MJ1Tzf5MQVf/oms2pdw=",
+        "lastModified": 1745610646,
+        "narHash": "sha256-R8rWH3oFV5/jwl87t7HyVoFgndrPw8QR/2pLwyKJLYM=",
        "owner": "hyprwm",
        "repo": "hyprland-plugins",
-        "rev": "4f48dbe12f3cbbeb4d31c91c67b21edbc5b4b451",
+        "rev": "61ab0385c8d9d456bf89539c76dd9e73becefde3",
        "type": "github"
      },
      "original": {
@ -650,11 +559,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1738422629,
-        "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=",
+        "lastModified": 1743714874,
+        "narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=",
        "owner": "hyprwm",
        "repo": "hyprland-protocols",
-        "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed",
+        "rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2",
        "type": "github"
      },
      "original": {
@ -747,11 +656,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741191527,
-        "narHash": "sha256-kM+11Nch47Xwfgtw2EpRitJuORy4miwoMuRi5tyMBDY=",
+        "lastModified": 1744468525,
+        "narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=",
        "owner": "hyprwm",
        "repo": "hyprlang",
-        "rev": "72df3861f1197e41b078faa3e38eedd60e00018d",
+        "rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df",
        "type": "github"
      },
      "original": {
@ -772,11 +681,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741123584,
-        "narHash": "sha256-mprerMlucqtirmbx6L3VoFnF2bGYc2WSUCj7tuc6xTQ=",
+        "lastModified": 1743950287,
+        "narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "6b0154b183f9539097f13af9b5da78ca24da6df2",
+        "rev": "f2dc70e448b994cef627a157ee340135bd68fbc6",
        "type": "github"
      },
      "original": {
@ -824,16 +733,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1729958008,
-        "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
+        "lastModified": 1748294338,
+        "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=",
        "owner": "NuschtOS",
        "repo": "ixx",
-        "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
+        "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85",
        "type": "github"
      },
      "original": {
        "owner": "NuschtOS",
-        "ref": "v0.0.6",
+        "ref": "v0.0.8",
        "repo": "ixx",
        "type": "github"
      }
@ -862,7 +771,7 @@
    },
    "naersk": {
      "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
        "lastModified": 1736429655,
@ -887,13 +796,13 @@
      "locked": {
        "lastModified": 1707825078,
        "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=",
-        "owner": "Misterio77",
+        "owner": "misterio77",
        "repo": "nix-colors",
        "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1",
        "type": "github"
      },
      "original": {
-        "owner": "Misterio77",
+        "owner": "misterio77",
        "repo": "nix-colors",
        "type": "github"
      }
@ -906,11 +815,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741126078,
-        "narHash": "sha256-ng0a4cIq3c9E3iGKomlwqKzVYs2RLOzQho2U1Mc2sqU=",
+        "lastModified": 1743127615,
+        "narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "c172f50b55b087f8e7801631de977461603bb976",
+        "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c",
        "type": "github"
      },
      "original": {
@ -922,37 +831,38 @@
    },
    "nix-ld": {
      "inputs": {
+        "flake-utils": "flake-utils_2",
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1741597901,
-        "narHash": "sha256-nLUTgXXcFFz+3pd3Khz1H4jUECqX5+OapNPGioPJRQs=",
+        "lastModified": 1744621833,
+        "narHash": "sha256-II6a32kRc+KbLhU/jS8EbuXYt1PNCvsRvuBw2becgQM=",
        "owner": "Mic92",
        "repo": "nix-ld",
-        "rev": "8e0308dd7dd9cd3656866fb2387bc29052fd6d3a",
+        "rev": "9a3812797e25def1d4aed62b517606b7b93989dc",
        "type": "github"
      },
      "original": {
-        "owner": "Mic92",
-        "repo": "nix-ld",
+        "owner": "nix-community",
+        "repo": "nixgl",
        "type": "github"
      }
    },
    "nix-matlab": {
      "inputs": {
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_2",
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1741791880,
-        "narHash": "sha256-0nFAtEaSk0OZXIp3gjeK43e3drbzXjLLSye8RT6hKPU=",
+        "lastModified": 1745506915,
+        "narHash": "sha256-ZonLQ5fDqRRbvHVwf4P53ktwUG2e+OTexXvbxyxForI=",
        "owner": "doronbehar",
        "repo": "nix-matlab",
-        "rev": "a8ea92e365477727c924293255a143026e57a5ba",
+        "rev": "68da9ca66d2e6c51c45e71d624c8bf0ca20846fb",
        "type": "gitlab"
      },
      "original": {
@ -971,11 +881,11 @@
        "pre-commit-hooks": "pre-commit-hooks_2"
      },
      "locked": {
-        "lastModified": 1738246091,
-        "narHash": "sha256-2+KkZsRO+XlOFbXbRgMZbRtlqn5MBNYj4HNmZ/2Tojg=",
+        "lastModified": 1744142264,
+        "narHash": "sha256-h5KyodobZm8dx/HSNN+basgdmjxrQxudjrss4gAQpZk=",
        "owner": "oddlama",
        "repo": "nix-topology",
-        "rev": "5526269fa3eedf4f4bc00c0bf7a03db31d24b029",
+        "rev": "f49121cbbf4a86c560638ade406d99ee58deb7aa",
        "type": "github"
      },
      "original": {
@ -986,27 +896,26 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1741792691,
-        "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=",
+        "lastModified": 1745503349,
+        "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "e1f12151258b12c567f456d8248e4694e9390613",
+        "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1",
        "type": "github"
      },
      "original": {
-        "owner": "NixOS",
-        "ref": "master",
+        "owner": "nixos",
        "repo": "nixos-hardware",
        "type": "github"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1702272962,
-        "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=",
+        "lastModified": 1743014863,
+        "narHash": "sha256-jAIUqsiN2r3hCuHji80U7NNEafpIMBXiwKlSrjWMlpg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d",
+        "rev": "bd3bac8bfb542dbde7ffffb6987a1a1f9d41699f",
        "type": "github"
      },
      "original": {
@ -1031,29 +940,29 @@
        "type": "github"
      }
    },
-    "nixpkgs-unstable": {
+    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1741513245,
-        "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
+        "lastModified": 1745526057,
+        "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
+        "rev": "f771eb401a46846c1aebd20552521b233dd7e18b",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixos-24.11",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1741246872,
-        "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=",
+        "lastModified": 1744932701,
+        "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "10069ef4cf863633f57238f179a0297de84bd8d3",
+        "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
        "type": "github"
      },
      "original": {
@ -1075,47 +984,41 @@
        "type": "indirect"
      }
    },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1741600792,
-        "narHash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=",
+        "lastModified": 1745487689,
+        "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "ebe2788eafd539477f83775ef93c3c7e244421d3",
+        "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixvim": {
      "inputs": {
-        "devshell": "devshell_2",
-        "flake-compat": "flake-compat_5",
        "flake-parts": "flake-parts",
-        "git-hooks": "git-hooks",
-        "home-manager": "home-manager_2",
-        "nix-darwin": "nix-darwin",
        "nixpkgs": [
          "nixpkgs"
        ],
        "nuschtosSearch": "nuschtosSearch",
-        "treefmt-nix": "treefmt-nix"
+        "systems": "systems_4"
      },
      "locked": {
-        "lastModified": 1741533061,
-        "narHash": "sha256-XQ5nJgVwYzH0mHqp3c/59+MLgnsXKoe/bUtkrB1BoCk=",
+        "lastModified": 1745068593,
+        "narHash": "sha256-YuQRMvqLVu+ghl2XzqXyVg/YevH/t3XHVCl7w+UrCH8=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "af8a201b44bd7ccadcdd143cb38b5adcffaddc25",
+        "rev": "d35dc6dfcae3ff1a0c72f2d59491a7d83e5505a3",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "nixos-24.11",
        "repo": "nixvim",
        "type": "github"
      }
@ -1130,11 +1033,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1739738736,
-        "narHash": "sha256-Rl4Fw+3PsLTEzzUGlB8kePaiIersDbv5voAif3D6LoM=",
+        "lastModified": 1745046075,
+        "narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=",
        "owner": "NuschtOS",
        "repo": "search",
-        "rev": "9ff62c8e1fbe5dc649dee680c7eb4935936c8ac3",
+        "rev": "066afe8643274470f4a294442aadd988356a478f",
        "type": "github"
      },
      "original": {
@ -1153,11 +1056,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741379162,
-        "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=",
+        "lastModified": 1742649964,
+        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc",
+        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
        "type": "github"
      },
      "original": {
@ -1195,24 +1098,21 @@
    },
    "root": {
      "inputs": {
-        "alacritty-theme": "alacritty-theme",
        "deploy-rs": "deploy-rs",
        "disko": "disko",
        "home-manager": "home-manager",
-        "hyprland": "hyprland",
-        "hyprland-plugins": "hyprland-plugins",
+        "impermanence": "impermanence",
        "music-reader": "music-reader",
        "nix-colors": "nix-colors",
-        "nix-ld": "nix-ld",
+        "nix-gl": "nix-gl",
        "nix-matlab": "nix-matlab",
-        "nix-topology": "nix-topology",
        "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_4",
-        "nixpkgs-unstable": "nixpkgs-unstable",
+        "nixpkgs": "nixpkgs_3",
+        "nixpkgs-stable": "nixpkgs-stable",
        "nixvim": "nixvim",
        "sheet-organizer": "sheet-organizer",
-        "snowfall-lib": "snowfall-lib",
        "sops-nix": "sops-nix",
+        "systems": "systems_6",
        "yazi-flavors": "yazi-flavors"
      }
    },
@ -1225,11 +1125,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1737048258,
-        "narHash": "sha256-QcprTngXkN/XuaiSKrswJUHEV+Nz3dSzP6zcLq00Y48=",
+        "lastModified": 1742577105,
+        "narHash": "sha256-1VFPRxydmDhq+CQogLeafh2zmNGKTMFYiV4y9NZXApo=",
        "ref": "refs/heads/master",
-        "rev": "67d5dac0d1a1c0ae0beaf972881976a8b0908fd1",
-        "revCount": 73,
+        "rev": "94de09f4298233795996e17163ae6b987cdedbe9",
+        "revCount": 75,
        "type": "git",
        "url": "https://gitlab.julian-mutter.de/julian/sheet-organizer"
      },
@ -1238,28 +1138,6 @@
        "url": "https://gitlab.julian-mutter.de/julian/sheet-organizer"
      }
    },
-    "snowfall-lib": {
-      "inputs": {
-        "flake-compat": "flake-compat_6",
-        "flake-utils-plus": "flake-utils-plus",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1736130495,
-        "narHash": "sha256-4i9nAJEZFv7vZMmrE0YG55I3Ggrtfo5/T07JEpEZ/RM=",
-        "owner": "snowfallorg",
-        "repo": "lib",
-        "rev": "02d941739f98a09e81f3d2d9b3ab08918958beac",
-        "type": "github"
-      },
-      "original": {
-        "owner": "snowfallorg",
-        "repo": "lib",
-        "type": "github"
-      }
-    },
    "sops-nix": {
      "inputs": {
        "nixpkgs": [
@ -1267,11 +1145,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741644481,
-        "narHash": "sha256-E0RrMykMtEv15V3QhpsFutgoSKhL1JBhidn+iZajOyg=",
+        "lastModified": 1745310711,
+        "narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "e653d71e82575a43fe9d228def8eddb73887b866",
+        "rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c",
        "type": "github"
      },
      "original": {
@ -1297,16 +1175,16 @@
    },
    "systems_2": {
      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
        "type": "github"
      },
      "original": {
        "owner": "nix-systems",
-        "repo": "default-linux",
+        "repo": "default",
        "type": "github"
      }
    },
@ -1355,6 +1233,21 @@
        "type": "github"
      }
    },
+    "systems_6": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
    "systems_6": {
      "locked": {
        "lastModified": 1681028828,
@ -1393,11 +1286,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1739829690,
-        "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=",
+        "lastModified": 1744961264,
+        "narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "3d0579f5cc93436052d94b73925b48973a104204",
+        "rev": "8d404a69efe76146368885110f29a2ca3700bee6",
        "type": "github"
      },
      "original": {
@ -1411,11 +1304,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
        "type": "github"
      },
      "original": {
@ -1452,11 +1345,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1737634991,
-        "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=",
+        "lastModified": 1744644585,
+        "narHash": "sha256-p0D/e4J6Sv6GSb+9u8OQcVHSE2gPNYB5ygIfGDyEiXQ=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a",
+        "rev": "be6771e754345f18244fb00aae5c9e5ab21ccc26",
        "type": "github"
      },
      "original": {
@ -1468,11 +1361,11 @@
    "yazi-flavors": {
      "flake": false,
      "locked": {
-        "lastModified": 1741392393,
-        "narHash": "sha256-iTMch0T933Tvofvo3ZzFwk+PNs+dsK0SrAIlJ03v73E=",
+        "lastModified": 1748603166,
+        "narHash": "sha256-m3yk6OcJ9vbCwtxkMRVUDhMMTOwaBFlqWDxGqX2Kyvc=",
        "owner": "yazi-rs",
        "repo": "flavors",
-        "rev": "b929df6bdb56536e14c1fc24c9659f441b961f28",
+        "rev": "d04a298a8d4ada755816cb1a8cfb74dd46ef7124",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -2,150 +2,186 @@
  description = "Home Manager configuration of julian";

  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
-
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
+    systems.url = "github:nix-systems/default-linux";
+    nixos-hardware.url = "github:nixos/nixos-hardware";
+    impermanence.url = "github:nix-community/impermanence";
+    nix-colors.url = "github:misterio77/nix-colors";
    deploy-rs.url = "github:serokell/deploy-rs";

-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
-
    home-manager = {
-      url = "github:nix-community/home-manager/release-24.11";
+      url = "github:nix-community/home-manager";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-
-    snowfall-lib = {
-      url = "github:snowfallorg/lib";
+    sops-nix = {
+      url = "github:Mic92/sops-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    nix-gl = {
+      url = "github:nix-community/nixgl";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-
    disko = {
      url = "github:nix-community/disko";
      inputs.nixpkgs.follows = "nixpkgs";
    };

-    alacritty-theme = {
-      url = "github:alacritty/alacritty-theme";
-      flake = false;
-    };
-
+    # Various flakes
    yazi-flavors = {
      url = "github:yazi-rs/flavors";
      flake = false;
    };
-
    nixvim = {
-      url = "github:nix-community/nixvim/nixos-24.11";
-      # If using a stable channel you can use `url = "github:nix-community/nixvim/nixos-<version>"`
+      url = "github:nix-community/nixvim";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    nix-matlab = {
+      url = "gitlab:doronbehar/nix-matlab";
      inputs.nixpkgs.follows = "nixpkgs";
    };

-    nix-matlab.url = "gitlab:doronbehar/nix-matlab";
-    nix-matlab.inputs.nixpkgs.follows = "nixpkgs";
-
-    sops-nix.url = "github:Mic92/sops-nix";
-    sops-nix.inputs.nixpkgs.follows = "nixpkgs";
-
-    hyprland.url = "github:hyprwm/Hyprland?submodules=1";
-    # hyprland.inputs.nixpkgs.follows = "nixpkgs";
-
-    hyprland-plugins = {
-      url = "github:hyprwm/hyprland-plugins";
-      inputs.hyprland.follows = "hyprland";
+    # My projects
+    sheet-organizer = {
+      url = "git+https://gitlab.julian-mutter.de/julian/sheet-organizer";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    music-reader = {
+      url = "git+https://gitlab.julian-mutter.de/julian/music-reader";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
  };

-    nix-colors.url = "github:Misterio77/nix-colors";
-
-    nix-topology.url = "github:oddlama/nix-topology";
-    nix-topology.inputs.nixpkgs.follows = "nixpkgs";
-
-    nix-ld.url = "github:Mic92/nix-ld";
-    nix-ld.inputs.nixpkgs.follows = "nixpkgs";
-
-    ## My projects
-    sheet-organizer.url = "git+https://gitlab.julian-mutter.de/julian/sheet-organizer";
-    sheet-organizer.inputs.nixpkgs.follows = "nixpkgs";
-
-    music-reader.url = "git+https://gitlab.julian-mutter.de/julian/music-reader";
-    music-reader.inputs.nixpkgs.follows = "nixpkgs";
-  };
-
-  outputs =
-    inputs:
-    inputs.snowfall-lib.mkFlake {
-      inherit inputs;
-      # Must always be ./.
-      src = ./.;
-
-      # Add overlays for the `nixpkgs` channel.
-      overlays = with inputs; [
-        nix-matlab.overlay
-        nix-topology.overlays.default
+  outputs = {
+    self,
+    nixpkgs,
+    home-manager,
+    systems,
+    ...
+  } @ inputs: let
+    inherit (self) outputs;
+    lib = nixpkgs.lib // home-manager.lib;
+    forEachSystem = f: lib.genAttrs (import systems) (system: f pkgsFor.${system});
+    pkgsFor = lib.genAttrs (import systems) (
+      system:
+        import nixpkgs {
+          inherit system;
+          config.allowUnfree = true;
+          config.permittedInsecurePackages = [
+            "olm-3.2.16"
          ];
-
-      snowfall = {
-        # The root of the snowfall config
-        root = ./.;
-        # lib, package and overlay namespace
-        namespace = "frajul"; # defaults to "internal"
-
-        meta = {
-          name = "Julian's dotfiles";
-          title = "Julian's dotfiles";
-        };
-      };
-
-      # The attribute set specified here will be passed directly to NixPkgs when
-      # instantiating the package set.
-      channels-config = {
-        # Allow unfree packages.
-        allowUnfree = true;
-        nvidia.acceptLicense = true;
-
-        # Allow certain insecure packages
-        permittedInsecurePackages = [ "olm-3.2.16" ];
-      };
-
-      systems.modules.nixos = with inputs; [
-        nix-topology.nixosModules.default
-        sops-nix.nixosModules.sops
-        disko.nixosModules.disko
-      ];
-      systems.hosts.pianonix.modules = with inputs; [ nixos-hardware.nixosModules.raspberry-pi-4 ];
-
-      # topology =
-      #   with inputs;
-      #   let
-      #     host = self.nixosConfigurations.${builtins.head (builtins.attrNames self.nixosConfigurations)};
-      #   in
-      #   import nix-topology {
-      #     inherit (host) pkgs; # Only this package set must include nix-topology.overlays.default
-      #     modules = [
-      #       (import ./topology { inherit (host) config; })
-      #       { inherit (self) nixosConfigurations; }
-      #     ];
-      #   };
+          warn-dirty = false;
        }
-    // {
+    );
+  in {
+    inherit lib;
+
+    nixosModules = import ./modules/nixos;
+    homeManagerModules = import ./modules/home-manager;
+
+    overlays = import ./overlays {inherit inputs outputs;};
+    # hydraJobs = import ./hydra.nix { inherit inputs outputs; }; # TODO add hydra jobs here?
+
+    packages = forEachSystem (pkgs: import ./pkgs {inherit pkgs;});
+    devShells = forEachSystem (pkgs: import ./shell.nix {inherit pkgs;});
+    formatter = forEachSystem (pkgs: pkgs.alejandra);
+
+    nixosConfigurations = {
+      # Main laptop
+      aspi = lib.nixosSystem {
+        modules = [./hosts/aspi];
+        specialArgs = {
+          inherit inputs outputs;
+        };
+      };
+      # Piano raspberry pi
+      pianonix = lib.nixosSystem {
+        modules = [./hosts/pianonix];
+        specialArgs = {
+          inherit inputs outputs;
+        };
+      };
+      kardorf = lib.nixosSystem {
+        modules = [./hosts/kardorf];
+        specialArgs = {
+          inherit inputs outputs;
+        };
+      };
+      builder = lib.nixosSystem {
+        modules = [./hosts/builder];
+        specialArgs = {
+          inherit inputs outputs;
+        };
+      };
+    };
+
+    # Standalone HM
+    homeConfigurations = {
+      # Main laptop
+      "julian@aspi" = lib.homeManagerConfiguration {
+        modules = [
+          ./homes/julian/aspi.nix
+          ./homes/julian/hm-standalone-config.nix
+        ];
+        pkgs = pkgsFor.x86_64-linux;
+        extraSpecialArgs = {
+          inherit inputs outputs;
+        };
+      };
+      # Media server (RPi)
+      "julian@pianonix" = lib.homeManagerConfiguration {
+        modules = [
+          ./homes/julian/pianonix.nix
+          ./homes/julian/hm-standalone-config.nix
+        ];
+        pkgs = pkgsFor.aarch64-linux;
+        extraSpecialArgs = {
+          inherit inputs outputs;
+        };
+      };
+      "julian@kardorf" = lib.homeManagerConfiguration {
+        modules = [
+          ./homes/julian/kardorf.nix
+          ./homes/julian/hm-standalone-config.nix
+        ];
+        pkgs = pkgsFor.x86_64-linux;
+        extraSpecialArgs = {
+          inherit inputs outputs;
+        };
+      };
+      "julian@v3ms" = lib.homeManagerConfiguration {
+        modules = [
+          ./homes/julian/v3ms
+          ./homes/julian/hm-standalone-config.nix
+        ];
+        pkgs = pkgsFor.x86_64-linux;
+        extraSpecialArgs = {
+          inherit inputs outputs;
+        };
+      };
+    };
+
    # deploy-rs node configuration
-      deploy.nodes.pianonix = {
+    deploy.nodes = {
+      pianonix = {
        hostname = "pianonix.local";
        profiles.system = {
          sshUser = "root";
          user = "root";
-          path = inputs.deploy-rs.lib.aarch64-linux.activate.nixos inputs.self.nixosConfigurations.pianonix;
+          path = inputs.deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.pianonix;
          confirmTimeout = 90; # default: 30s; raspberrypi takes a little longer restarting services
        };
      };

-      deploy.nodes.builder = {
+      builder = {
        hostname = "builder.julian-mutter.de";
        profiles.system = {
          sshUser = "root";
          user = "root";
-          path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.builder;
+          path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.builder;
          remoteBuild = true;
        };
      };
    };
+  };
 }
--- a/homes/julian/aspi.nix
+++ b/homes/julian/aspi.nix
@ -0,0 +1,56 @@
+{
+  imports = [
+    ./global
+
+    ./features/fish
+    ./features/direnv
+    ./features/topgrade
+    ./features/neovim
+    ./features/ghostty
+    ./features/wezterm
+    ./features/alacritty
+    ./features/yazi
+    ./features/emacs
+
+    ./features/hyprland
+
+    ./features/suites/cli
+    ./features/suites/desktop
+    ./features/suites/development
+  ];
+
+  hostName = "aspi";
+  is-nixos = true;
+  terminal = "alacritty";
+
+  #  -------   ----------
+  # | eDP-1 | | HDMI-A-1 |
+  #  -------   ----------
+  monitors = [
+    {
+      name = "HDMI-A-1";
+      # width = 1680;
+      # height = 1050;
+      workspaces = [
+        "1"
+        "2"
+        "3"
+        "4"
+        "5"
+      ];
+      primary = true;
+    }
+    {
+      name = "eDP-1";
+      # width = 1680;
+      # height = 1050;
+      workspaces = [
+        "6"
+        "7"
+        "8"
+        "9"
+        "10"
+      ];
+    }
+  ];
+}
--- a/homes/julian/features/alacritty/default.nix
+++ b/homes/julian/features/alacritty/default.nix
@ -0,0 +1,13 @@
+{
+  lib,
+  config,
+  ...
+}: {
+  programs.alacritty = {
+    enable = true;
+    settings = {};
+    theme = "smoooooth";
+  };
+
+  home.sessionVariables.TERMINAL = lib.mkIf (config.terminal == "alacritty") "alacritty";
+}
--- a/homes/julian/features/direnv/default.nix
+++ b/homes/julian/features/direnv/default.nix
@ -0,0 +1,6 @@
+{
+  programs.direnv = {
+    enable = true;
+    nix-direnv.enable = true;
+  };
+}
--- a/homes/julian/features/emacs/default.nix
+++ b/homes/julian/features/emacs/default.nix
@ -0,0 +1,73 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+with lib; let
+  doomRepoUrl = "https://github.com/doomemacs/doomemacs";
+  configRepoUrl = "https://gitlab.julian-mutter.de/julian/emacs-config";
+in {
+  home.sessionPath = ["/home/julian/.config/emacs/bin"];
+
+  home.packages = with pkgs;
+    [
+      binutils # native-comp needs 'as', provided by this
+
+      ## Doom dependencies
+      git
+      (ripgrep.override {withPCRE2 = true;})
+
+      ## Optional dependencies
+      fd # faster projectile indexing
+      imagemagick # for image-dired
+      zstd # for undo-fu-session/undo-tree compression
+
+      ## Module dependencies
+      (aspellWithDicts (
+        ds:
+          with ds; [
+            en
+            en-computers
+            en-science
+            de
+          ]
+      ))
+
+      hunspell
+      hunspellDicts.de_DE
+      hunspellDicts.en_US
+
+      sqlite
+
+      # Code formatters for use with doom emacs
+      nixfmt-rfc-style # nix
+      alejandra # nix
+
+      nixd # nix lsp
+      dockfmt # docker
+      google-java-format # java
+      black # python
+      rustfmt # rust
+      shfmt
+      pyright
+      clang-tools # c++ lsp etc
+      ltex-ls # latex languagetool
+
+      graphviz
+      # Lsps for use with doom emacs
+      # neocmakelsp # cmake
+
+      emacs-all-the-icons-fonts
+    ]
+    ++ lib.optional config.is-nixos emacs;
+
+  home.activation.installDoomEmacs = lib.hm.dag.entryAfter ["writeBoundary"] ''
+    if [ ! -d "/home/julian/.config/emacs" ]; then
+       $DRY_RUN_CMD ${pkgs.git}/bin/git clone --depth=1 --single-branch "${doomRepoUrl}" "/home/julian/.config/emacs"
+    fi
+    if [ ! -d "/home/julian/.config/doom" ]; then
+       $DRY_RUN_CMD ${pkgs.git}/bin/git clone "${configRepoUrl}" "/home/julian/.config/doom"
+    fi
+  '';
+}
--- a/homes/julian/features/fish/default.nix
+++ b/homes/julian/features/fish/default.nix
@ -0,0 +1,52 @@
+{
+  lib,
+  pkgs,
+  ...
+}:
+with lib; {
+  home.file = {
+    ".config/starship.toml".source = ./starship.toml;
+    ".config/fish/conf.d/last-working-dir.fish".source = ./last-working-dir.fish;
+  };
+
+  home.packages = with pkgs; [
+    starship
+    lazygit
+  ];
+
+  home.shellAliases = {
+    g = "lazygit";
+    ls = "ls --color";
+    la = "ls -Alh --color";
+    grep = "grep --color";
+    conf = "edit-config";
+  };
+
+  programs.starship = {
+    enable = true;
+    enableFishIntegration = true;
+  };
+
+  programs.fish = {
+    enable = true;
+
+    interactiveShellInit = "set fish_greeting"; # Disable default greeting
+
+    functions = {
+      mkcd = ''
+        mkdir $argv
+        cd $argv
+      '';
+      run = ''
+        nix run nixpkgs#"$argv[1]" -- $argv[2..-1]
+      '';
+      shell = ''
+        set args
+        for arg in $argv
+            set args $args nixpkgs#$arg
+        end
+        nix shell $args
+      '';
+    };
+  };
+}
--- a/homes/julian/features/fish/last-working-dir.fish
+++ b/homes/julian/features/fish/last-working-dir.fish
--- a/homes/julian/features/fish/starship.toml
+++ b/homes/julian/features/fish/starship.toml
--- a/homes/julian/features/fonts/default.nix
+++ b/homes/julian/features/fonts/default.nix
@ -0,0 +1,21 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+with lib; {
+  fonts.fontconfig.enable = true; # required to autoload fonts from packages
+  home.packages = with pkgs; [
+    nerd-fonts.fira-code
+    font-awesome
+    dejavu_fonts
+    noto-fonts
+    noto-fonts-cjk-sans
+    noto-fonts-emoji
+    liberation_ttf
+    fira-code
+    fira-code-symbols
+    source-code-pro
+  ];
+}
--- a/homes/julian/features/gammastep/default.nix
+++ b/homes/julian/features/gammastep/default.nix
@ -0,0 +1,13 @@
+{
+  services.gammastep = {
+    enable = true;
+    provider = "geoclue2";
+    temperature = {
+      day = 6000;
+      night = 4600;
+    };
+    settings = {
+      general.adjustment-method = "wayland";
+    };
+  };
+}
--- a/homes/julian/features/ghostty/default.nix
+++ b/homes/julian/features/ghostty/default.nix
@ -0,0 +1,16 @@
+{
+  lib,
+  config,
+  ...
+}: {
+  programs.ghostty = {
+    enable = true;
+    enableFishIntegration = true;
+    settings = {
+      theme = "catppuccin-mocha";
+      font-size = 12;
+    };
+  };
+
+  home.sessionVariables.TERMINAL = lib.mkIf (config.terminal == "ghostty") "ghostty";
+}
--- a/homes/julian/features/gtk/default.nix
+++ b/homes/julian/features/gtk/default.nix
@ -0,0 +1,33 @@
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}: let
+  inherit (inputs.nix-colors.lib-contrib {inherit pkgs;}) gtkThemeFromScheme;
+in {
+  # Do not make conditional, just toggle things on and off
+  imports = [inputs.nix-colors.homeManagerModules.default]; # TODO: what does this do
+
+  # home.sessionVariables.GTK_THEME = "Catppuccin-Mocha-Compact-Blue-dark";
+  gtk = {
+    enable = true;
+    theme = {
+      name = inputs.nix-colors.colorschemes.${config.colorscheme.name}.slug;
+      package = gtkThemeFromScheme {
+        scheme = inputs.nix-colors.colorschemes.${config.colorscheme.name};
+      };
+    };
+    iconTheme = {
+      name = "Papirus-Dark";
+      package = pkgs.papirus-icon-theme;
+    };
+    cursorTheme = {
+      package = pkgs.apple-cursor;
+      name = "macOS";
+      size = 24;
+    };
+  };
+
+  xdg.portal.extraPortals = [pkgs.xdg-desktop-portal-gtk];
+}
--- a/homes/julian/features/hyprland/default.nix
+++ b/homes/julian/features/hyprland/default.nix
@ -0,0 +1,405 @@
+{
+  pkgs,
+  inputs,
+  config,
+  lib,
+  ...
+}: let
+  inherit
+    (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
+    palette
+    ;
+in {
+  imports = [
+    # inputs.hyprland.homeManagerModules.default
+    ./waybar
+    ./wofi
+    ./mako
+    # ./hyprlock
+    ./wlogout
+    ../gammastep
+
+    ./swayidle.nix
+    ./swaylock.nix
+    ./zathura.nix
+    ./waypipe.nix
+
+    ./hyprbars.nix
+  ];
+
+  xdg.portal = {
+    extraPortals = [pkgs.xdg-desktop-portal-wlr];
+    config.hyprland = {
+      default = [
+        "wlr"
+        "gtk"
+      ];
+    };
+  };
+
+  programs.imv.enable = true; # TODO: what is that
+
+  home.packages = with pkgs; [
+    hyprpicker
+    brightnessctl
+    frajul.hyprshot-gui
+    frajul.wl-ocr
+
+    wf-recorder
+    wl-clipboard
+
+    (pkgs.writeShellScriptBin "toggle-screen-mirroring" (
+      builtins.readFile ./toggle-screen-mirroring.sh
+    ))
+
+    (pkgs.writeShellScriptBin "correct-workspace-locations" (
+      lib.concatStringsSep "\n" (
+        builtins.concatLists (
+          map (
+            monitor:
+              map (ws: "hyprctl dispatch moveworkspacetomonitor ${ws} ${monitor.name}") monitor.workspaces
+          )
+          config.monitors
+        )
+      )
+    ))
+  ];
+
+  services.cliphist = {
+    enable = true;
+  };
+
+  home.sessionVariables = {
+    MOZ_ENABLE_WAYLAND = 1;
+    QT_QPA_PLATFORM = "wayland";
+    LIBSEAT_BACKEND = "logind";
+  };
+
+  # services.hypridle = {
+  #   enable = true;
+  #   settings = {
+  #     general = {
+  #       after_sleep_cmd = "hyprctl dispatch dpms on";
+  #       ignore_dbus_inhibit = false;
+  #       lock_cmd = "hyprlock";
+  #     };
+
+  #     listener = [
+  #       {
+  #         timeout = 300; # 5min
+  #         on-timeout = "brightnessctl -s set 10"; # set monitor backlight to minimum, avoid 0 on OLED monitor.
+  #         on-resume = "brightnessctl -r"; # monitor backlight restore.
+  #       }
+
+  #       {
+  #         timeout = 360; # 6min
+  #         on-timeout = "hyprlock"; # lock screen when timeout has passed
+  #       }
+
+  #       {
+  #         timeout = 600; # 10min
+  #         on-timeout = "hyprctl dispatch dpms off"; # screen off when timeout has passed
+  #         on-resume = "hyprctl dispatch dpms on"; # screen on when activity is detected after timeout has fired.
+  #       }
+  #     ];
+  #   };
+  # };
+
+  # services.hypridle.enable = true; # can be configured
+
+  services.network-manager-applet.enable = true;
+
+  wayland.windowManager.hyprland = {
+    # Whether to enable Hyprland wayland compositor
+    enable = true;
+    # package = config.lib.nixGL.wrap (
+    #   pkgs.hyprland.override {
+    #     # nixgl needed?
+    #     wrapRuntimeDeps = false;
+    #   }
+    # );
+
+    systemd = {
+      enable = true;
+      # Same as default, but stop graphical-session too
+      extraCommands = lib.mkBefore [
+        "systemctl --user stop graphical-session.target"
+        "systemctl --user start hyprland-session.target"
+      ];
+      variables = [
+        "DISPLAY"
+        "HYPRLAND_INSTANCE_SIGNATURE"
+        "WAYLAND_DISPLAY"
+        "XDG_CURRENT_DESKTOP"
+      ];
+    };
+
+    # package = inputs.hyprland.packages."${pkgs.system}".hyprland; # does only work with nixos-unstable
+
+    # The hyprland package to use (simplifies use of plugins)
+    # package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+    # Whether to enable XWayland
+    xwayland.enable = true;
+
+    # Optional
+    # Whether to enable hyprland-session.target on hyprland startup
+    # systemd.enable = true;
+    # Make PATH available to systemd services
+    # systemd.variables = [ "--all" ];
+
+    plugins = [
+      # inputs.hyprland-plugins.packages.${pkgs.system}.hyprbars # does only work with nixos-unstable
+      # hyprlandPlugins.hyprbars
+    ];
+
+    settings = {
+      "$mod" = "SUPER";
+
+      # Environment variables programs like emacs have access to
+      env = "TERMINAL,${config.terminal}";
+
+      # Monitors
+      monitor = ",preferred,auto,1";
+
+      # Autostart
+      exec-once = ["firefox"];
+
+      # Look and Feel
+      general = {
+        gaps_in = 5;
+        gaps_out = 5;
+
+        layout = "dwindle";
+
+        # "col.active_border" = "0xff${palette.base0C} 0xff${palette.base0D} 270deg";
+        # "col.inactive_border" = "0xff${palette.base00}";
+      };
+
+      decoration = {
+        # power saving
+        blur.enabled = false;
+        # power saving
+        shadow.enabled = false;
+      };
+
+      # Dwindle layout
+      dwindle = {
+        pseudotile = true; # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
+        preserve_split = true; # You probably want this
+        smart_split = false;
+        smart_resizing = false;
+        force_split = 2;
+        # no_gaps_when_only = 2; # with border
+      };
+
+      # Master layout
+      master = {
+        new_status = "slave";
+        # no_gaps_when_only = 2; # with border
+        mfact = 0.5; # Do not make master bigger
+      };
+
+      animations = {
+        enabled = true;
+
+        animation = [
+          "windows,1,3,default,slide"
+          "fade,1,3,default"
+          "layers,1,3,default,slide"
+          "border,1,3,default"
+          "workspaces,1,3,default,slide"
+        ];
+      };
+
+      exec = [
+        "hyprctl setcursor ${config.gtk.cursorTheme.name} ${toString config.gtk.cursorTheme.size}"
+        "correct-workspace-locations"
+      ];
+
+      misc = {
+        # disable auto polling for config file changes
+        disable_autoreload = true;
+
+        force_default_wallpaper = 0;
+
+        vfr = true; # power saving
+      };
+
+      render = {
+        # we do, in fact, want direct scanout
+        direct_scanout = true;
+      };
+
+      # Input
+      input = {
+        kb_layout = "de";
+        natural_scroll = false;
+        follow_mouse = 1;
+      };
+
+      # Window rules
+      windowrulev2 = [
+        "suppressevent maximize, class:.*"
+        "workspace 1, class:firefox"
+        "workspace 9, class:nheko"
+        "workspace 9, class:org.telegram.desktop"
+        "workspace 10, class:thunderbird"
+        "float, class:qalculate-gtk"
+        "tile, class:MATLAB, title:MATLAB"
+      ];
+
+      # Workspace rules
+      workspace =
+        [
+          # smart gaps (none when only one window in workspace)
+          "w[t1], gapsin:0, gapsout:0, border:1"
+          "w[tg1], gapsin:0, gapsout:0, border:1"
+          "f[1], gapsin:0, gapsout:0, border:1"
+        ]
+        # builds like "1, e-DP1" "2, HDMI-1" etc.
+        ++ builtins.concatLists (
+          map (monitor: map (ws: "${ws}, monitor:${monitor.name}") monitor.workspaces) config.monitors
+        );
+
+      # Mouse binds
+      bindm = [
+        "$mod, mouse:272, movewindow" # leftclick
+        "$mod, mouse:273, resizewindow" # rightclick
+      ];
+
+      # binds
+      bind =
+        [
+          # compositor commands
+          "$mod, Space, focuswindow, floating"
+          "$mod SHIFT, Space, togglefloating,"
+          "$mod, F, fullscreen,"
+          "$mod, X, killactive,"
+
+          "$mod, O, togglesplit," # dwindle
+
+          # opening applications
+          "$mod, D, exec, wofi --show drun,run"
+          "$mod, E, exec, pcmanfm"
+          "$mod, Return, exec, ${config.terminal}"
+          "$mod, B, exec, firefox"
+          "$mod, C, exec, qalculate-gtk"
+
+          # other commands
+          "$mod SHIFT, E, exec, wlogout -p layer-shell"
+          "$mod, Escape, exec, wlogout -p layer-shell"
+          "$mod SHIFT, R, exec, hyprctl reload"
+          "$mod, Print, exec, hyprshot-gui"
+          ", Print, exec, hyprshot-gui"
+          "$mod, P, exec, toggle-screen-mirroring; correct-workspace-locations"
+
+          # "$mod SHIFT, E, exec, pkill Hyprland"
+          # "$mod, G, togglegroup,"
+          # "$mod SHIFT, N, changegroupactive, f"
+          # "$mod SHIFT, P, changegroupactive, b"
+          # "$mod ALT, ,resizeactive,"
+
+          # media keys
+          ", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
+          ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
+          ", XF86AudioPlay, exec, playerctl play-pause"
+          ", XF86AudioPause, exec, playerctl pause"
+          ", XF86AudioStop, exec, playerctl stop"
+          ", XF86AudioNext, exec, playerctl next"
+          ", XF86AudioPrev, exec, playerctl previous"
+          ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
+          ", XF86MonBrightnessUp, exec, brightnessctl --class backlight set 5%+"
+          ", XF86MonBrightnessDown, exec, brightnessctl --class backlight set 5%-"
+
+          # move focus
+          "$mod, left, movefocus, l"
+          "$mod, H, movefocus, l"
+          "$mod, right, movefocus, r"
+          "$mod, L, movefocus, r"
+          "$mod, up, movefocus, u"
+          "$mod, K, movefocus, u"
+          "$mod, down, movefocus, d"
+          "$mod, J, movefocus, d"
+
+          # move window
+          "$mod SHIFT, left, movewindow, l"
+          "$mod SHIFT, H, movewindow, l"
+          "$mod SHIFT, right, movewindow, r"
+          "$mod SHIFT, L, movewindow, r"
+          "$mod SHIFT, up, movewindow, u"
+          "$mod SHIFT, K, movewindow, u"
+          "$mod SHIFT, down, movewindow, d"
+          "$mod SHIFT, J, movewindow, d"
+
+          # Switch workspaces with mainMod + [0-9]
+          "$mod, 1, workspace, 1"
+          "$mod, 2, workspace, 2"
+          "$mod, 3, workspace, 3"
+          "$mod, 4, workspace, 4"
+          "$mod, 5, workspace, 5"
+          "$mod, 6, workspace, 6"
+          "$mod, 7, workspace, 7"
+          "$mod, 8, workspace, 8"
+          "$mod, 9, workspace, 9"
+          "$mod, 0, workspace, 10"
+
+          # Move active window to a workspace with mainMod + SHIFT + [0-9]
+          "$mod SHIFT, 1, movetoworkspace, 1"
+          "$mod SHIFT, 2, movetoworkspace, 2"
+          "$mod SHIFT, 3, movetoworkspace, 3"
+          "$mod SHIFT, 4, movetoworkspace, 4"
+          "$mod SHIFT, 5, movetoworkspace, 5"
+          "$mod SHIFT, 6, movetoworkspace, 6"
+          "$mod SHIFT, 7, movetoworkspace, 7"
+          "$mod SHIFT, 8, movetoworkspace, 8"
+          "$mod SHIFT, 9, movetoworkspace, 9"
+          "$mod SHIFT, 0, movetoworkspace, 10"
+
+          # Move active window to a workspace without following with mainMod + CTRL + [0-9]
+          "$mod CTRL, 1, movetoworkspacesilent, 1"
+          "$mod CTRL, 2, movetoworkspacesilent, 2"
+          "$mod CTRL, 3, movetoworkspacesilent, 3"
+          "$mod CTRL, 4, movetoworkspacesilent, 4"
+          "$mod CTRL, 5, movetoworkspacesilent, 5"
+          "$mod CTRL, 6, movetoworkspacesilent, 6"
+          "$mod CTRL, 7, movetoworkspacesilent, 7"
+          "$mod CTRL, 8, movetoworkspacesilent, 8"
+          "$mod CTRL, 9, movetoworkspacesilent, 9"
+          "$mod CTRL, 0, movetoworkspacesilent, 10"
+        ]
+        ++
+        # Screen lock
+        (
+          let
+            swaylock = lib.getExe config.programs.swaylock.package;
+          in
+            lib.optionals config.programs.swaylock.enable [
+              "$mod,TAB,exec,${swaylock} --daemonize"
+            ]
+        )
+        ++
+        # Notification manager
+        (
+          let
+            makoctl = lib.getExe' config.services.mako.package "makoctl";
+          in
+            lib.optionals config.services.mako.enable [
+              "$mod,w,exec,${makoctl} dismiss"
+              "$mod SHIFT,W,exec,${makoctl} restore"
+            ]
+        );
+
+      # plugin = {
+      #   hyprbars = {
+      #     bar_text_size = 10;
+      #     bar_height = 16;
+      #     bar_text_font = "Ubuntu Nerd Font";
+      #     bar_precedence_over_border = true;
+      #     bar_color = "rgb(${palette.base01})";
+
+      #     hyprbars-button = [ "rgb(${palette.base03}), 14, 󰖭, hyprctl dispatch killactive" ];
+      #   };
+      # };
+    };
+  };
+}
--- a/homes/julian/features/hyprland/hyprbars.nix
+++ b/homes/julian/features/hyprland/hyprbars.nix
@ -0,0 +1,76 @@
+{
+  config,
+  pkgs,
+  lib,
+  outputs,
+  ...
+}: let
+  getHostname = x: lib.last (lib.splitString "@" x);
+  # remoteColorschemes = lib.mapAttrs' (n: v: {
+  #   name = getHostname n;
+  #   value = v.config.colorscheme.rawColorscheme.colors.${config.colorscheme.mode};
+  # }) outputs.homeConfigurations;
+  rgb = color: "rgb(${lib.removePrefix "#" color})";
+  rgba = color: alpha: "rgba(${lib.removePrefix "#" color}${alpha})";
+
+  hyprbars =
+    (pkgs.hyprlandPlugins.hyprbars.override {
+      # Make sure it's using the same hyprland package as we are
+      hyprland = config.wayland.windowManager.hyprland.package;
+    }).overrideAttrs
+    (old: {
+      # Yeet the initialization notification (I hate it)
+      postPatch =
+        (old.postPatch or "")
+        + ''
+          ${lib.getExe pkgs.gnused} -i '/Initialized successfully/d' main.cpp
+        '';
+    });
+in {
+  wayland.windowManager.hyprland = {
+    plugins = [hyprbars];
+    settings = {
+      "plugin:hyprbars" = {
+        bar_height = 25;
+        # bar_color = rgba config.colorscheme.colors.surface "dd";
+        # "col.text" = rgb config.colorscheme.colors.primary;
+        # bar_text_font = config.fontProfiles.regular.name;
+        # bar_text_size = config.fontProfiles.regular.size;
+        bar_part_of_window = true;
+        bar_precedence_over_border = true;
+        hyprbars-button = let
+          closeAction = "hyprctl dispatch killactive";
+
+          isOnSpecial = ''hyprctl activewindow -j | jq -re 'select(.workspace.name == "special")' >/dev/null'';
+          moveToSpecial = "hyprctl dispatch movetoworkspacesilent special";
+          moveToActive = "hyprctl dispatch movetoworkspacesilent name:$(hyprctl -j activeworkspace | jq -re '.name')";
+          minimizeAction = "${isOnSpecial} && ${moveToActive} || ${moveToSpecial}";
+
+          maximizeAction = "hyprctl dispatch fullscreen 1";
+        in [
+          # Red close button
+          # "${rgb config.colorscheme.colors.red},12,,${closeAction}"
+          # # Yellow "minimize" (send to special workspace) button
+          # "${rgb config.colorscheme.colors.yellow},12,,${minimizeAction}"
+          # # Green "maximize" (fullscreen) button
+          # "${rgb config.colorscheme.colors.green},12,,${maximizeAction}"
+        ];
+      };
+
+      # windowrulev2 =
+      #   [
+      #     "plugin:hyprbars:bar_color ${rgba config.colorscheme.colors.primary "ee"}, focus:1"
+      #     "plugin:hyprbars:title_color ${rgb config.colorscheme.colors.on_primary}, focus:1"
+      #   ]
+      #   ++ (lib.flatten (
+      #     lib.mapAttrsToList (name: colors: [
+      #       "plugin:hyprbars:bar_color ${rgba colors.primary_container "dd"}, title:\\[${name}\\].*"
+      #       "plugin:hyprbars:title_color ${rgb colors.on_primary_container}, title:\\[${name}\\].*"
+
+      #       "plugin:hyprbars:bar_color ${rgba colors.primary "ee"}, title:\\[${name}\\].*, focus:1"
+      #       "plugin:hyprbars:title_color ${rgb colors.on_primary}, title:\\[${name}\\].*, focus:1"
+      #     ]) remoteColorschemes
+      #   ));
+    };
+  };
+}
--- a/homes/julian/features/hyprland/hyprlock/default.nix
+++ b/homes/julian/features/hyprland/hyprlock/default.nix
@ -0,0 +1,46 @@
+{
+  options,
+  config,
+  lib,
+  pkgs,
+  inputs,
+  ...
+}: let
+  inherit
+    (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
+    palette
+    ;
+in {
+  programs.hyprlock.enable = true;
+  programs.hyprlock.settings = {
+    general = {
+      disable_loading_bar = true;
+      hide_cursor = true;
+      ignore_empty_input = true;
+    };
+
+    background = [
+      {
+        color = "#${palette.base00}";
+        # path = "screenshot";
+        # blur_passes = 3;
+        # blur_size = 8;
+      }
+    ];
+
+    input-field = [
+      {
+        size = "200, 50";
+        position = "0, -80";
+        monitor = "";
+        dots_center = true;
+        fade_on_empty = false;
+        font_color = "#${palette.base0B}";
+        inner_color = "#${palette.base01}";
+        outer_color = "#${palette.base05}";
+        outline_thickness = 5;
+        placeholder_text = "Password...";
+      }
+    ];
+  };
+}
--- a/homes/julian/features/hyprland/mako/default.nix
+++ b/homes/julian/features/hyprland/mako/default.nix
@ -0,0 +1,30 @@
+{
+  options,
+  config,
+  lib,
+  pkgs,
+  inputs,
+  ...
+}: let
+  inherit
+    (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
+    palette
+    ;
+in {
+  home.packages = with pkgs; [libnotify];
+
+  services.mako = {
+    enable = true;
+    settings = {
+      defaultTimeout = "5000"; # milliseconds, can be overwritten by notification sender
+      backgroundColor = "#${palette.base00}";
+      textColor = "#${palette.base05}";
+      borderColor = "#${palette.base0D}";
+      progressColor = "over #${palette.base02}";
+      extraConfig = ''
+          [urgency=high]
+          border-color=#${palette.base09}
+        # '';
+    };
+  };
+}
--- a/homes/julian/features/hyprland/swayidle.nix
+++ b/homes/julian/features/hyprland/swayidle.nix
@ -0,0 +1,58 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: let
+  swaylock = "${config.programs.swaylock.package}/bin/swaylock";
+  pgrep = "${pkgs.procps}/bin/pgrep";
+  pactl = "${pkgs.pulseaudio}/bin/pactl";
+  hyprctl = "${config.wayland.windowManager.hyprland.package}/bin/hyprctl";
+  swaymsg = "${config.wayland.windowManager.sway.package}/bin/swaymsg";
+
+  isLocked = "${pgrep} -x ${swaylock}";
+  lockTime = 4 * 60; # TODO: configurable desktop (10 min)/laptop (4 min)
+
+  # Makes two timeouts: one for when the screen is not locked (lockTime+timeout) and one for when it is.
+  afterLockTimeout = {
+    timeout,
+    command,
+    resumeCommand ? null,
+  }: [
+    {
+      timeout = lockTime + timeout;
+      inherit command resumeCommand;
+    }
+    {
+      command = "${isLocked} && ${command}";
+      inherit resumeCommand timeout;
+    }
+  ];
+in {
+  services.swayidle = {
+    enable = true;
+    systemdTarget = "graphical-session.target";
+    timeouts =
+      # Lock screen
+      [
+        {
+          timeout = lockTime;
+          command = "${swaylock} --daemonize --grace 15";
+        }
+      ]
+      ++
+      # Turn off displays (hyprland)
+      (lib.optionals config.wayland.windowManager.hyprland.enable (afterLockTimeout {
+        timeout = 300;
+        command = "${hyprctl} dispatch dpms off";
+        resumeCommand = "${hyprctl} dispatch dpms on";
+      }))
+      ++
+      # Turn off displays (sway)
+      (lib.optionals config.wayland.windowManager.sway.enable (afterLockTimeout {
+        timeout = 300;
+        command = "${swaymsg} 'output * dpms off'";
+        resumeCommand = "${swaymsg} 'output * dpms on'";
+      }));
+  };
+}
--- a/homes/julian/features/hyprland/swaylock.nix
+++ b/homes/julian/features/hyprland/swaylock.nix
@ -0,0 +1,16 @@
+{
+  config,
+  pkgs,
+  ...
+}: let
+  inherit (config.colorscheme) colors;
+in {
+  programs.swaylock = {
+    enable = true;
+    settings = {
+      color = "000000";
+      ignore-empty-password = true;
+      indicator-idle-visible = false;
+    };
+  };
+}
--- a/homes/julian/features/hyprland/toggle-screen-mirroring.sh
+++ b/homes/julian/features/hyprland/toggle-screen-mirroring.sh
@ -0,0 +1,67 @@
+#! /usr/bin/env sh
+
+# A hyprland script for a laptop-external-monitor setup, toggling between which is in use
+
+# Launch at startup to make hyprland disable the internal monitor if an external monitor is detected and enabled
+# Additionally it's called with a keybind to switch between a laptop monitor and an external display
+# Ideally the conditional monitor behaviour was instead done directly in hyprland.conf, but I'm not sure whether that's possible
+#
+# Relevant info:
+# - hyprctl monitors: identifies currently enabled monitors
+# - hyprctl monitors all: identifies ALL connected monitors - including those not in use
+#
+# Suggested use:
+# Add this line somewhere after the regular monitor configuration in hyprland.conf:
+# exec = /path/to/hyprland-monitors-toggle.sh
+# Add a keybind to run this script on demand:
+# bind =,SomeKeyHere, exec, /path/to/hyprland-monitors-toggle.sh
+
+#move_all_workspaces_to_monitor() {
+#  TARGET_MONITOR="$1"
+
+#  hyprctl workspaces | grep ^workspace | cut --delimiter ' ' --fields 3 | xargs -I '{}' hyprctl dispatch moveworkspacetomonitor '{}' "$TARGET_MONITOR"
+
+#  # Previous approach
+#  #hyprctl swapactiveworkspaces $EXTERNAL_MONITOR $INTERNAL_MONITOR
+#}
+
+# TODO: Detect these instead of hardcoding them
+INTERNAL_MONITOR="eDP-1"
+EXTERNAL_MONITOR="HDMI-A-1"
+
+# NUM_MONITORS=$(hyprctl monitors all | grep --count Monitor)
+# NUM_MONITORS_ACTIVE=$(hyprctl monitors | grep --count Monitor)
+
+# Make sure all
+# if [ "$NUM_MONITORS_ACTIVE" -eq 1 ]; then
+#     move_all_workspaces_to_monitor $INTERNAL_MONITOR
+#     exit
+# fi
+
+MIRROR_SETTING=$(hyprctl monitors all -j | jq -r '.[] | select(.name == "HDMI-A-1") | .mirrorOf')
+
+# # For dynamically toggling which monitor is active later via a keybind
+# if [ "$NUM_MONITORS" -gt 1 ]; then # Handling multiple monitors
+#   if hyprctl monitors | cut --delimiter ' ' --fields 2 | grep --quiet ^$EXTERNAL_MONITOR; then
+#     hyprctl keyword monitor $INTERNAL_MONITOR,preferred,0x0,1
+#     move_all_workspaces_to_monitor $INTERNAL_MONITOR
+#     hyprctl keyword monitor "$EXTERNAL_MONITOR, disable"
+#   else
+#     hyprctl keyword monitor $EXTERNAL_MONITOR,preferred,0x0,1
+#     move_all_workspaces_to_monitor $EXTERNAL_MONITOR
+#     hyprctl keyword monitor "$INTERNAL_MONITOR, disable"
+#   fi
+# else  # If the external monitor is disconnected without running this script first, it might become the case that no monitor is on - therefore turn on the laptop monitor!
+#     hyprctl keyword monitor $INTERNAL_MONITOR,preferred,0x0,1
+#     move_all_workspaces_to_monitor $INTERNAL_MONITOR
+# fi
+
+echo setting:
+echo $MIRROR_SETTING
+if [ "$MIRROR_SETTING" = "none" ]; then
+    echo "mirroring..."
+    hyprctl keyword monitor "$EXTERNAL_MONITOR, preferred, auto, 1, mirror, $INTERNAL_MONITOR"
+else
+    hyprctl keyword monitor "$EXTERNAL_MONITOR, disable" # shortly disable monitor so waybar recognizes the new monitor again # TODO: find better solution
+    hyprctl keyword monitor "$EXTERNAL_MONITOR, preferred, auto, 1"
+fi
--- a/homes/julian/features/hyprland/waybar/config.json
+++ b/homes/julian/features/hyprland/waybar/config.json
@ -75,9 +75,9 @@
            "warning": 30,
            "critical": 15
        },
-        "format": "{icon}  {capacity}% ({time})",
-        "format-charging": "  {capacity}% ({time})",
-        "format-plugged": "  {capacity}% ({time})",
+        "format": "{icon}  {capacity}%",
+        "format-charging": "  {capacity}%",
+        "format-plugged": "  {capacity}%",
        "format-full": "{icon} ",
        "format-icons": ["", "", "", "", ""]
    },
--- a/homes/julian/features/hyprland/waybar/default.nix
+++ b/homes/julian/features/hyprland/waybar/default.nix
@ -0,0 +1,36 @@
+{
+  options,
+  config,
+  pkgs,
+  lib,
+  inputs,
+  ...
+}: let
+  palette = (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name}).palette;
+in {
+  programs.waybar = {
+    enable = true;
+    systemd.enable = true;
+    settings.mainBar = builtins.fromJSON (builtins.readFile ./config.json);
+  };
+
+  xdg.configFile."waybar/style.css".source = ./style.css;
+  xdg.configFile."waybar/theme.css".text = ''
+    /*
+    bg - background
+    fg - foreground
+    */
+
+    /* Main Colors */
+    @define-color background        #${palette.base00};
+    @define-color foreground        #${palette.base05};
+
+    /* Workspace Button Colors */
+    @define-color hover-bg          #${palette.base01};
+    @define-color hover-fg          #${palette.base05};
+    @define-color active-bg         #${palette.base02};
+    @define-color active-fg         #${palette.base0A};
+    @define-color urgent-bg         #${palette.base08};
+    @define-color urgent-fg         #${palette.base00};
+  '';
+}
--- a/homes/julian/features/hyprland/waybar/style.css
+++ b/homes/julian/features/hyprland/waybar/style.css
--- a/homes/julian/features/hyprland/waypipe.nix
+++ b/homes/julian/features/hyprland/waypipe.nix
@ -0,0 +1,29 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: {
+  home.packages = [pkgs.waypipe];
+  systemd.user.services = {
+    waypipe-client = {
+      Unit.Description = "Runs waypipe on startup to support SSH forwarding";
+      Service = {
+        ExecStartPre = "${lib.getExe' pkgs.coreutils "mkdir"} %h/.waypipe -p";
+        ExecStart = "${lib.getExe (config.lib.nixGL.wrap pkgs.waypipe)} --socket %h/.waypipe/client.sock client";
+        ExecStopPost = "${lib.getExe' pkgs.coreutils "rm"} -f %h/.waypipe/client.sock";
+      };
+      Install.WantedBy = ["graphical-session.target"];
+    };
+    waypipe-server = {
+      Unit.Description = "Runs waypipe on startup to support SSH forwarding";
+      Service = {
+        Type = "simple";
+        ExecStartPre = "${lib.getExe' pkgs.coreutils "mkdir"} %h/.waypipe -p";
+        ExecStart = "${lib.getExe (config.lib.nixGL.wrap pkgs.waypipe)} --socket %h/.waypipe/server.sock --title-prefix '[%H] ' --login-shell --display wayland-waypipe server -- ${lib.getExe' pkgs.coreutils "sleep"} infinity";
+        ExecStopPost = "${lib.getExe' pkgs.coreutils "rm"} -f %h/.waypipe/server.sock %t/wayland-waypipe";
+      };
+      Install.WantedBy = ["default.target"];
+    };
+  };
+}
--- a/homes/julian/features/hyprland/wlogout/default.nix
+++ b/homes/julian/features/hyprland/wlogout/default.nix
@ -0,0 +1,39 @@
+{
+  options,
+  config,
+  lib,
+  pkgs,
+  inputs,
+  ...
+}: let
+  inherit
+    (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
+    palette
+    ;
+in {
+  home.packages = with pkgs; [wlogout];
+
+  # xdg.configFile."wlogout/style.css".text = ''
+  #    * {
+  #      all: unset;
+  #      font-family: JetBrains Mono Nerd Font;
+  #    }
+
+  #    window {
+  #      background-color: #${palette.base00};
+  #    }
+
+  #    button {
+  #      color: #${palette.base01};
+  #      font-size: 64px;
+  #      background-color: rgba(0,0,0,0);
+  #      outline-style: none;
+  #      margin: 5px;
+  #   }
+
+  #    button:focus, button:active, button:hover {
+  #      color: #${palette.base0D};
+  #      transition: ease 0.4s;
+  #    }
+  # '';
+}
--- a/homes/julian/features/hyprland/wofi/config
+++ b/homes/julian/features/hyprland/wofi/config
--- a/homes/julian/features/hyprland/wofi/default.nix
+++ b/homes/julian/features/hyprland/wofi/default.nix
@ -0,0 +1,86 @@
+{
+  options,
+  config,
+  lib,
+  pkgs,
+  inputs,
+  ...
+}: let
+  inherit
+    (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
+    palette
+    ;
+in {
+  home.packages = with pkgs; [wofi];
+
+  xdg.configFile."wofi/config".source = ./config;
+  xdg.configFile."wofi/style.css".text = ''
+    window {
+        margin: 5px;
+        border: 5px solid #181926;
+        background-color: #${palette.base00};
+        border-radius: 15px;
+        font-family: "JetBrainsMono";
+        font-size: 14px;
+      }
+
+      #input {
+        all: unset;
+        min-height: 36px;
+        padding: 4px 10px;
+        margin: 4px;
+        border: none;
+        color: #${palette.base05};
+        font-weight: bold;
+        background-color: #${palette.base01};
+        outline: none;
+        border-radius: 15px;
+        margin: 10px;
+        margin-bottom: 2px;
+      }
+
+      #inner-box {
+        margin: 4px;
+        padding: 10px;
+        font-weight: bold;
+        border-radius: 15px;
+      }
+
+      #outer-box {
+        margin: 0px;
+        padding: 3px;
+        border: none;
+        border-radius: 15px;
+        border: 5px solid #${palette.base01};
+      }
+
+      #scroll {
+        margin-top: 5px;
+        border: none;
+        border-radius: 15px;
+        margin-bottom: 5px;
+      }
+
+      #text:selected {
+        color: #${palette.base01};
+        margin: 0px 0px;
+        border: none;
+        border-radius: 15px;
+      }
+
+      #entry {
+        margin: 0px 0px;
+        border: none;
+        border-radius: 15px;
+        background-color: transparent;
+      }
+
+      #entry:selected {
+        margin: 0px 0px;
+        border: none;
+        border-radius: 15px;
+        background: #${palette.base0D};
+        background-size: 400% 400%;
+      }
+  '';
+}
--- a/homes/julian/features/hyprland/zathura.nix
+++ b/homes/julian/features/hyprland/zathura.nix
@ -0,0 +1,33 @@
+{config, ...}: let
+  inherit (config.colorscheme) colors;
+in {
+  programs.zathura = {
+    enable = true;
+    options = {
+      selection-clipboard = "clipboard";
+      # TODO fix
+      # font = "${config.fontProfiles.regular.name} ${toString config.fontProfiles.regular.size}";
+      # recolor = true;
+      # default-bg = "${colors.surface}";
+      # default-fg = "${colors.surface_bright}";
+      # statusbar-bg = "${colors.surface_container}";
+      # statusbar-fg = "${colors.on_surface_variant}";
+      # inputbar-bg = "${colors.surface}";
+      # inputbar-fg = "${colors.on_secondary}";
+      # notification-bg = "${colors.surface}";
+      # notification-fg = "${colors.on_secondary}";
+      # notification-error-bg = "${colors.error}";
+      # notification-error-fg = "${colors.on_error}";
+      # notification-warning-bg = "${colors.error}";
+      # notification-warning-fg = "${colors.on_error}";
+      # highlight-color = "${colors.tertiary}";
+      # highlight-active-color = "${colors.secondary}";
+      # completion-bg = "${colors.surface_bright}";
+      # completion-fg = "${colors.on_surface}";
+      # completions-highlight-bg = "${colors.secondary}";
+      # completions-highlight-fg = "${colors.on_secondary}";
+      # recolor-lightcolor = "${colors.surface}";
+      # recolor-darkcolor = "${colors.inverse_surface}";
+    };
+  };
+}
--- a/homes/julian/features/i3/default.nix
+++ b/homes/julian/features/i3/default.nix
@ -0,0 +1,53 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}: {
+  imports = [../rofi];
+
+  services.dunst.enable = true;
+
+  programs = {
+    i3status-rust = {
+      enable = true;
+    };
+  };
+  home.packages = with pkgs; [
+    nitrogen
+    xfce.xfce4-screenshooter
+    pulseaudio # For pactl commands
+  ];
+  xsession.enable = true; # Give gui programs access to sessionVariables
+  # Prevent screen from going blank (check these settings with `xset q`)
+  # And disable bell sound (b)
+  xsession.initExtra = ''
+    ${pkgs.xorg.xset}/bin/xset s off
+    ${pkgs.xorg.xset}/bin/xset -dpms
+    ${pkgs.xorg.xset}/bin/xset b off
+  '';
+  xsession.windowManager.i3 = {
+    enable = true;
+    package = pkgs.i3-gaps;
+  };
+
+  xsession.importedVariables = [];
+
+  # Overwrite default home-manager config file
+  xdg.configFile."i3/config".source = lib.mkForce (
+    if config.hostName == "kardorf"
+    then ./i3/config-kardorf
+    else ./i3/config
+  );
+
+  home.file = {
+    ".config/i3/scripts" = {
+      source = ./i3/scripts;
+      recursive = true;
+    };
+    ".config/i3/workspace-messaging.json".source = ./i3/workspace-chat-element-tele.json;
+    ".config/i3status-rust/config.toml".source = ./i3status-rust/config.toml;
+  };
+
+  home.sessionPath = ["/home/julian/.config/i3/scripts"];
+}
--- a/homes/julian/features/i3/i3-scrot.conf
+++ b/homes/julian/features/i3/i3-scrot.conf
--- a/homes/julian/features/i3/i3/config
+++ b/homes/julian/features/i3/i3/config
--- a/homes/julian/features/i3/i3/config-kardorf
+++ b/homes/julian/features/i3/i3/config-kardorf
@ -142,8 +142,8 @@ bindsym $mod+Shift+9 move container to workspace number $ws9; workspace $ws9
 bindsym $mod+Shift+0 move container to workspace number $ws10; workspace $ws10

 # Monitor config
-set $monitor_left "DVI-D-0"
-set $monitor_right "DVI-D-1"
+set $monitor_left "DVI-D-1"
+set $monitor_right "DVI-D-2"

 workspace $ws1 output $monitor_left
 workspace $ws2 output $monitor_left
--- a/homes/julian/features/i3/i3/manjaro-default-config
+++ b/homes/julian/features/i3/i3/manjaro-default-config
--- a/homes/julian/features/i3/i3/scripts/display-layoutpicker
+++ b/homes/julian/features/i3/i3/scripts/display-layoutpicker
--- a/homes/julian/features/i3/i3/scripts/display-toggle-mirror
+++ b/homes/julian/features/i3/i3/scripts/display-toggle-mirror
--- a/homes/julian/features/i3/i3/scripts/jupyter-calculator
+++ b/homes/julian/features/i3/i3/scripts/jupyter-calculator
--- a/homes/julian/features/i3/i3/scripts/mymatlab.sh
+++ b/homes/julian/features/i3/i3/scripts/mymatlab.sh
--- a/homes/julian/features/i3/i3/scripts/rofi_calc
+++ b/homes/julian/features/i3/i3/scripts/rofi_calc
--- a/homes/julian/features/i3/i3/scripts/setupZoom
+++ b/homes/julian/features/i3/i3/scripts/setupZoom
--- a/homes/julian/features/i3/i3/workspace-chat-element-tele.json
+++ b/homes/julian/features/i3/i3/workspace-chat-element-tele.json
--- a/homes/julian/features/i3/i3/workspace-chat-schildi-tele-rocket.json
+++ b/homes/julian/features/i3/i3/workspace-chat-schildi-tele-rocket.json
--- a/homes/julian/features/i3/i3/workspace-chat-schildi-tele.json
+++ b/homes/julian/features/i3/i3/workspace-chat-schildi-tele.json
--- a/homes/julian/features/i3/i3/workspace-zoom.json
+++ b/homes/julian/features/i3/i3/workspace-zoom.json
--- a/homes/julian/features/i3/i3status-rust/config.toml
+++ b/homes/julian/features/i3/i3status-rust/config.toml
--- a/homes/julian/features/kitty/default.nix
+++ b/homes/julian/features/kitty/default.nix
@ -0,0 +1,27 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}: {
+  programs.kitty = {
+    enable = true;
+    shellIntegration.enableFishIntegration = true;
+    themeFile = "gruvbox-dark";
+    settings = {
+      enable_audio_bell = false;
+      confirm_os_window_close = 0; # no ask on quit
+    };
+    font = {
+      package = pkgs.dejavu_fonts;
+      name = "DejaVu Sans";
+      size = 12;
+    };
+  };
+
+  # home.shellAliases = {
+  #   ssh = "kitten ssh"; # Copy kitten terminfo to remote
+  # };
+
+  home.sessionVariables.TERMINAL = lib.mkIf (config.terminal == "kitty") "kitty";
+}
--- a/homes/julian/features/neovim/default.nix
+++ b/homes/julian/features/neovim/default.nix
@ -0,0 +1,159 @@
+{
+  lib,
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [inputs.nixvim.homeManagerModules.nixvim];
+
+  home.sessionVariables = {
+    EDITOR = "nvim";
+    VISUAL = "nvim";
+  };
+
+  home.packages = with pkgs; [
+    git
+    gnumake
+    gcc
+    ripgrep
+    fd
+    stylua
+    black
+    nixfmt-rfc-style # nixfmt
+  ];
+
+  programs.nixvim = {
+    enable = true;
+    viAlias = true;
+    vimAlias = true;
+
+    colorschemes.catppuccin = {
+      enable = true;
+      settings.flavour = "mocha";
+    };
+
+    globals.mapleader = " ";
+    opts = {
+      number = false;
+      relativenumber = false;
+    };
+    clipboard.register = "unnamedplus"; # Use system clipboard
+
+    keymaps = [
+      {
+        action = "<cmd>Telescope live_grep<cr>";
+        key = "<leader>/";
+      }
+      {
+        action = "<cmd>Telescope find_files<cr>";
+        key = "<leader><space>";
+      }
+      {
+        action = "<cmd>Telescope file_browser<cr>";
+        key = "<leader>.";
+      }
+      {
+        action = "<cmd>Neogit<cr>";
+        key = "<leader>gg";
+      }
+      {
+        key = "<C-s>";
+        action = "<esc><cmd>lua require('conform').format()<cr><cmd>write<cr>";
+        mode = [
+          "i"
+          "x"
+          "n"
+          "s"
+        ];
+      }
+    ];
+
+    plugins = {
+      lualine.enable = true;
+      commentary.enable = true;
+      which-key.enable = true;
+      treesitter.enable = true; # enables all grammar packages
+      neogit.enable = true; # like magit
+      trouble.enable = true;
+      web-devicons.enable = true;
+
+      # Shows file trees
+      oil = {
+        enable = true;
+        settings = {
+          view_options.show_hidden = true;
+        };
+      };
+
+      # Code formatting
+      conform-nvim = {
+        enable = true;
+        settings.formatters_by_ft = with pkgs; {
+          lua = ["stylua"];
+          python = ["black"];
+          nix = ["nixfmt"];
+        };
+        # extraOptions = {
+        #   default_format_opts.lsp_format = "fallback";
+        # };
+      };
+
+      # autocomplete
+      cmp = {
+        enable = true;
+        autoEnableSources = true;
+        settings.sources = [
+          {name = "nvim_lsp";}
+          {name = "path";}
+          {name = "buffer";}
+        ];
+        settings.mapping = {
+          "<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
+          "<C-j>" = "cmp.mapping.select_next_item()";
+          "<C-k>" = "cmp.mapping.select_prev_item()";
+          "<C-e>" = "cmp.mapping.abort()";
+          "<CR>" = "cmp.mapping.confirm({ select = true })";
+        };
+      };
+
+      # Fuzzy finder
+      telescope = {
+        enable = true;
+        settings.defaults.mappings = {
+          i = {
+            "<C-j>".__raw = "require('telescope.actions').move_selection_next";
+            "<C-k>".__raw = "require('telescope.actions').move_selection_previous";
+            "<tab>".__raw = "require('telescope.actions').select_default";
+          };
+        };
+        extensions = {
+          fzf-native.enable = true;
+          file-browser = {
+            enable = true;
+            settings = {
+              hidden = true; # show hidden files
+              follow_symlinks = true;
+              no_ignore = true;
+            };
+          };
+        };
+      };
+
+      lsp = {
+        enable = true;
+        servers = {
+          rust_analyzer = {
+            enable = true;
+            installCargo = true;
+            installRustc = true;
+          };
+          nixd.enable = true;
+          pyright.enable = true;
+          dockerls.enable = true;
+          lua_ls.enable = true;
+          clangd.enable = true;
+        };
+      };
+    };
+  };
+}
--- a/homes/julian/features/nix-helper/default.nix
+++ b/homes/julian/features/nix-helper/default.nix
@ -0,0 +1,12 @@
+{pkgs, ...}: {
+  home.sessionVariables = {
+    NH_FLAKE = "/home/julian/.dotfiles";
+  };
+
+  home.shellAliases = {
+    "os" = "nh os switch";
+    "hs" = "nh home switch";
+  };
+
+  home.packages = with pkgs; [nh];
+}
--- a/homes/julian/features/rofi/config.rasi
+++ b/homes/julian/features/rofi/config.rasi
--- a/homes/julian/features/rofi/default.nix
+++ b/homes/julian/features/rofi/default.nix
@ -0,0 +1,14 @@
+{
+  lib,
+  pkgs,
+  ...
+}: {
+  # this would need you to config rofi using home-manager
+  # programs.rofi = { enable = true; };
+
+  home.packages = with pkgs; [rofi];
+
+  home.file = {
+    ".config/rofi/config.rasi".source = ./config.rasi;
+  };
+}
--- a/homes/julian/features/suites/cli/default.nix
+++ b/homes/julian/features/suites/cli/default.nix
@ -0,0 +1,49 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    bat
+    du-dust # Like du tree but better
+    fd # better find
+    fdupes # find and delete duplicate files
+    ffmpeg
+    findutils # locate
+    fzf # Fuzzy finder
+    ghostscript # needed for imagemagick with pdfs
+    imagemagick
+    git
+    gnupg
+    htop
+    jq # Command line JSON processor
+    killall
+    languagetool # Grammar checker
+    lazygit # Git client
+    links2 # Tui web-browser
+    lnav # log analyzing tool
+    mc # Tui file browser
+    # nix-index
+    nmap
+    p7zip # unzip 7zip archives
+    parted
+    pciutils # lspci
+    poppler_utils # Pdf utils including pdfimages
+    libqalculate # Nice tui calculator (qalc)
+    ripgrep # better grep
+    rnr # renaming tool
+    sage # Maths notebooks
+    tealdeer # tldr
+    topgrade # System update
+    tree
+    unetbootin # TODO
+    unixtools.procps # TODO
+    unzip
+    usbutils # lsusb
+    wget
+    wireguard-tools # wg-quick
+    xorg.xkill
+    zip
+
+    ## My scripts
+    frajul.edit-config
+    frajul.lntocp
+    frajul.sos
+  ];
+}
--- a/homes/julian/features/suites/desktop/default.nix
+++ b/homes/julian/features/suites/desktop/default.nix
@ -0,0 +1,68 @@
+{pkgs, ...}: {
+  imports = [../../gtk];
+
+  services.blueman-applet.enable = true;
+  services.nextcloud-client.enable = true;
+  services.nextcloud-client.startInBackground = true;
+  services.network-manager-applet.enable = true;
+
+  services.syncthing.tray.enable = true;
+  services.syncthing.tray.command = "syncthingtray --wait"; # Wait for tray to become available
+
+  programs.chromium = {
+    enable = true;
+    extensions = [
+      # Tampermonkey
+      {id = "dhdgffkkebhmkfjojejmpbldmpobfkfo";}
+    ];
+  };
+
+  home.packages = with pkgs; [
+    arandr
+    calibre # ebook manager and viewer
+    # digikam
+    discord
+    # dvdisaster
+    # element-desktop
+    # rocketchat-desktop
+    thunderbird
+    tdesktop # telegram
+    # schildichat-desktop # not updated regularly
+    nheko
+    evince # Simple pdf reader, good for focusing on document content
+    firefox
+    # geogebra
+    cheese
+    handbrake
+    # kitty # Terminal, already available as feature
+    libnotify
+    libreoffice
+    mate.engrampa
+    nomacs # Image viewer
+    kdePackages.okular # Pdf reader with many features, good for commenting documents
+    pavucontrol
+    pdfsam-basic # Split, merge, etc for pdfs
+    qalculate-gtk # Nice gui calculator
+    qpdfview
+    # qutebrowser
+    # realvnc-vnc-viewer
+    rpi-imager # make isos
+    # rustdesk
+    tor-browser
+    unstable.path-of-building # Path of Building
+    # frajul.pob-dev-version # Path of Building
+    vlc
+    wineWowPackages.stable # 32-bit and 64-bit wine
+    winetricks
+    xclip # x11 clipboard access from terminal
+    xfce.mousepad # simple text editor
+    xournalpp # Edit pdf files
+    zoom-us # Video conferencing
+    zotero # Manage papers and other sources
+    pdfpc # Present slides in pdf form
+
+    ## My scripts
+    frajul.open-messaging
+    frajul.xwacomcalibrate
+  ];
+}
--- a/homes/julian/features/suites/development/default.nix
+++ b/homes/julian/features/suites/development/default.nix
@ -0,0 +1,85 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    watchexec # Run command when any file in current dir changes
+    android-tools # adb
+    # shellcheck # Check bash scripts for common errors
+    sqlite
+    scrcpy # Mirror android screen to pc
+    cargo
+    clippy
+    cntr # nix debugger
+    conda
+    micromamba # a better, faster conda
+    devcontainer # development container
+    devenv # devbox alternative
+    dbeaver-bin
+    devbox # dev environments using nix
+    distrobox # run commands inside docker containers
+    gcc
+    gradle
+    hexedit
+    unstable.zed-editor
+    jdk
+    julia-bin
+    (texlive.combine {
+      # for rendering latex in inkscape
+      inherit
+        (texlive)
+        scheme-medium
+        standalone
+        amsmath
+        preview
+        # needed for org mode export
+        wrapfig
+        capt-of
+        biblatex
+        ;
+    })
+    matlab # Using nix-matlab overlay defined in flake
+    maven
+    nodejs
+    pkg-config # Often needed to build something
+    # pwndbg # improved gdb (debugger)
+    python3
+    rust-analyzer
+    rustc
+    rustfmt
+    # (pkgs.inkscape-with-extensions.override {
+    #   inkscapeExtensions = [ pkgs.inkscape-extensions.textext ];
+    # })
+    # inkscape-with-extensions
+    # inkscape-extensions.textext
+    inkscape
+    gcolor3 # Color picker
+    gimp
+    drawio
+    audacity
+
+    deploy-rs
+    sops
+    pandoc # markdown preview
+    docker-compose
+
+    ## My scripts
+    frajul.deploy-to-pianopi
+    frajul.rtklib
+
+    (pkgs.writeShellScriptBin "matlab-rsp" ''
+      matlab -desktop -sd "/home/julian/git/uwa-channel-model" -softwareopengl
+    '')
+
+    (pkgs.writeShellScriptBin "matlab-paper" ''
+      matlab -desktop -sd "/home/julian/dev/phdthesis/Phase B/mainSimulation" -softwareopengl
+    '')
+    (pkgs.writeShellScriptBin "matlab-robotik" ''
+      matlab -desktop -sd "/home/julian/nas-sync/Studium/Vorlesungen-Master/ss24/Robotik2" -softwareopengl
+    '')
+    (pkgs.writeShellScriptBin "matlab-gram" ''
+      export GTK_PATH=/usr/lib/gtk-3.0
+      nix shell nixpkgs#gcc11 --command matlab -desktop -sd "/home/julian/dev/matlab-gram" -softwareopengl
+    '')
+    (pkgs.writeShellScriptBin "expenses-tracker" ''
+      java -jar /home/julian/dev/expensestracker/app/build/libs/app.jar
+    '')
+  ];
+}
--- a/homes/julian/features/topgrade/default.nix
+++ b/homes/julian/features/topgrade/default.nix
@ -0,0 +1,28 @@
+{
+  programs.topgrade = {
+    enable = true;
+    settings = {
+      misc.no_self_update = true;
+      misc.pre_sudo = true; # Cache sudo password for 5 more minutes
+      misc.assume_yes = true;
+      misc.no_retry = true;
+
+      # pre_commands."Update flake" = "git -C /home/julian/.dotfiles checkout origin/flake-updates -- flake.lock";
+
+      linux.nix_arguments = "--flake /home/julian/.dotfiles";
+      linux.home_manager_arguments = [
+        "--flake"
+        "/home/julian/.dotfiles"
+      ];
+
+      git = {
+        # Additional git repositories to pull
+        repos = [
+          "~/.dotfiles"
+          "~/dev/*"
+          "~/.config/doom"
+        ];
+      };
+    };
+  };
+}
--- a/homes/julian/features/wezterm/default.nix
+++ b/homes/julian/features/wezterm/default.nix
@ -0,0 +1,34 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}: {
+  programs.wezterm = {
+    enable = true;
+    extraConfig = ''
+      local wezterm = require 'wezterm'
+      local config = {}
+
+      config.color_scheme = 'Catppuccin Mocha'
+      -- config.font = wezterm.font 'JetBrains Mono'
+      -- config.font_size = 12.0
+      config.hide_tab_bar_if_only_one_tab = true
+      config.audible_bell = 'Disabled'
+      config.enable_wayland = false -- Somehow only works for wayland if this is set to false
+
+      config.window_close_confirmation = 'NeverPrompt'
+
+      return config
+    '';
+  };
+
+  home.sessionVariables.TERMINAL = lib.mkIf (config.terminal == "wezterm") "wezterm-start-here";
+
+  # Otherwise wezterm does not start in directory of parent process
+  home.packages = [
+    (pkgs.writeShellScriptBin "wezterm-start-here" ''
+      wezterm start --cwd "$PWD"
+    '')
+  ];
+}
--- a/homes/julian/features/yazi/default.nix
+++ b/homes/julian/features/yazi/default.nix
@ -0,0 +1,90 @@
+{
+  pkgs,
+  inputs,
+  ...
+}: {
+  programs.zoxide.enable = true;
+  programs.zoxide.enableFishIntegration = true;
+
+  home.packages = with pkgs; [
+    exiftool
+    unar # extract archives
+    xdragon # dragndrop
+    poppler_utils # pdf preview
+    fd
+    ripgrep
+    fzf
+    jq # json preview
+    ffmpegthumbnailer
+    xclip
+  ];
+
+  home.shellAliases = {
+    y = "yy"; # Yazi shell wrapper (cd on quit)
+  };
+
+  programs.yazi.enable = true;
+  programs.yazi.enableFishIntegration = true;
+  programs.yazi.settings.manager = {
+    sort_by = "mtime";
+    sort_reverse = true;
+    show_hidden = true;
+  };
+
+  programs.yazi.keymap = {
+    manager.prepend_keymap = [
+      # Override defaults
+      {
+        on = ["e"];
+        run = ''shell --orphan --confirm "pcmanfm &"'';
+        desc = "Open gui file manager";
+      }
+      {
+        on = ["<C-o>"];
+        run = ''shell "$SHELL" --block --confirm'';
+        desc = "Open shell here";
+      }
+      {
+        on = ["<C-n>"];
+        run = ''shell 'dragon -x -i -T "$1"' --confirm'';
+        desc = "Dragndrop via dragon";
+      }
+      {
+        on = ["<Enter>"];
+        run = "plugin --sync smart-enter";
+        desc = "Enter the child directory, or open the file";
+      }
+    ];
+    input.prepend_keymap = [
+      {
+        on = ["<Esc>"];
+        run = "close";
+        desc = "Cancel input";
+      }
+    ];
+  };
+
+  programs.yazi.settings.opener = {
+    play = [
+      {
+        run = ''vlc "$1"'';
+        orphan = true;
+      }
+    ];
+  };
+
+  xdg.configFile."yazi/flavors" = {
+    source = "${inputs.yazi-flavors}";
+  };
+  xdg.configFile."yazi/plugins/smart-enter.yazi/init.lua".text = ''
+    return {
+      entry = function()
+        local h = cx.active.current.hovered
+        ya.manager_emit(h and h.cha.is_dir and "enter" or "open", { hovered = true })
+      end,
+    }
+  '';
+  programs.yazi.theme = {
+    flavor.use = "catppuccin-mocha";
+  };
+}
--- a/homes/julian/features/zsh/default.nix
+++ b/homes/julian/features/zsh/default.nix
@ -0,0 +1,44 @@
+{
+  lib,
+  pkgs,
+  ...
+}: {
+  home.file = {
+    ".config/starship.toml".source = ./starship.toml;
+  };
+
+  home.packages = with pkgs; [starship];
+
+  programs.starship = {
+    enable = true;
+    enableZshIntegration = true;
+  };
+
+  programs.zsh = {
+    enable = true;
+
+    initExtra =
+      builtins.readFile ./key-bindings.zsh
+      + builtins.readFile ./functions.zsh
+      + builtins.readFile ./last-working-dir.zsh
+      + builtins.readFile ./dir-navigation.zsh;
+
+    zplug = {
+      enable = true;
+      plugins = [
+        # list of plugins: https://github.com/unixorn/awesome-zsh-plugins
+        {name = "agkozak/zsh-z";}
+        {
+          name = "zsh-users/zsh-completions";
+        }
+
+        # make it behave like fish
+        {name = "zsh-users/zsh-autosuggestions";}
+        {name = "zsh-users/zsh-history-substring-search";}
+        {
+          name = "zsh-users/zsh-syntax-highlighting";
+        } # must be last sourced plugin
+      ];
+    };
+  };
+}
--- a/homes/julian/features/zsh/dir-navigation.zsh
+++ b/homes/julian/features/zsh/dir-navigation.zsh
--- a/homes/julian/features/zsh/functions.zsh
+++ b/homes/julian/features/zsh/functions.zsh
--- a/homes/julian/features/zsh/key-bindings.zsh
+++ b/homes/julian/features/zsh/key-bindings.zsh
--- a/homes/julian/features/zsh/last-working-dir.zsh
+++ b/homes/julian/features/zsh/last-working-dir.zsh
--- a/homes/julian/features/zsh/starship.toml
+++ b/homes/julian/features/zsh/starship.toml
--- a/homes/julian/global/default.nix
+++ b/homes/julian/global/default.nix
@ -0,0 +1,53 @@
+{
+  lib,
+  pkgs,
+  config,
+  outputs,
+  ...
+}: {
+  imports =
+    [
+      ../features/fonts
+      ../features/nix-helper
+    ]
+    ++ (builtins.attrValues outputs.homeManagerModules);
+
+  nix = {
+    package = lib.mkDefault pkgs.nix;
+    settings = {
+      experimental-features = [
+        "nix-command"
+        "flakes"
+        "ca-derivations"
+      ];
+      # warn-dirty = false; # TODO: do I want it? also for systems
+    };
+  };
+
+  colorscheme.name = "catppuccin-mocha";
+
+  # systemd.user.startServices = "sd-switch"; # TODO: what is this
+
+  programs = {
+    home-manager.enable = true;
+    git.enable = true;
+  };
+
+  home = {
+    username = lib.mkDefault "julian";
+    homeDirectory = lib.mkDefault "/home/${config.home.username}";
+    stateVersion = lib.mkDefault "23.11";
+
+    sessionPath = ["$HOME/.local/bin"];
+  };
+
+  # TODO: colorscheme
+  # colorscheme.mode = lib.mkOverride 1499 "dark";
+  # specialisation = {
+  #   dark.configuration.colorscheme.mode = lib.mkOverride 1498 "dark";
+  #   light.configuration.colorscheme.mode = lib.mkOverride 1498 "light";
+  # };
+  # home.file = {
+  #   ".colorscheme.json".text = builtins.toJSON config.colorscheme;
+  # };
+}
--- a/homes/x86_64-linux/julian@aspi/mimeapps.nix
+++ b/homes/x86_64-linux/julian@aspi/mimeapps.nix
@ -6,9 +6,11 @@
 #   inherit pkgs;
 #   inherit lib;
 # };
-
-{ lib, pkgs, ... }:
-let
+{
+  lib,
+  pkgs,
+  ...
+}: let
  package-names = with pkgs; {
    "x-scheme-handler/tg" = telegram-desktop;
    "x-scheme-handler/mailto" = thunderbird;
@ -40,6 +42,7 @@ let
    "inode/directory" = pcmanfm;
  };
 in
-lib.mapAttrs (mimeType: package: [
+  lib.mapAttrs (mimeType: package: [
    "${package}/share/applications/${package.pname}.desktop"
-]) package-names
+  ])
+  package-names
--- a/homes/julian/hm-standalone-config.nix
+++ b/homes/julian/hm-standalone-config.nix
@ -0,0 +1,43 @@
+# Only apply this to home-manager standalone
+{outputs, ...}: {
+  # Apply overlays
+  nixpkgs = {
+    overlays = builtins.attrValues outputs.overlays;
+    config = {
+      allowUnfree = true;
+      allowUnfreePredicate = _: true; # TODO: what is this
+      permittedInsecurePackages = [
+        "olm-3.2.16"
+      ];
+      warn-dirty = false;
+    };
+  };
+
+  # Setup binary caches
+  nix.settings = {
+    substituters = [
+      "https://nix-community.cachix.org"
+      "https://cache.nixos.org/"
+      "https://hyprland.cachix.org"
+      "http://binarycache.julian-mutter.de"
+    ];
+    trusted-public-keys = [
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+      "binarycache.julian-mutter.de:oJ67uRFwRhNPKL58CHzy3QQLv38Kx7OA1K+6xlEPu7E="
+    ];
+
+    trusted-users = [
+      "root"
+      "@wheel"
+    ];
+
+    experimental-features = [
+      "nix-command"
+      "flakes"
+      "ca-derivations"
+    ];
+
+    # nix.settings. # warn-dirty = false; # TODO: do I want this
+  };
+}
--- a/homes/julian/kardorf.nix
+++ b/homes/julian/kardorf.nix
@ -0,0 +1,56 @@
+{
+  imports = [
+    ./global
+
+    ./features/fish
+    ./features/direnv
+    ./features/topgrade
+    ./features/neovim
+    ./features/ghostty
+    ./features/wezterm
+    ./features/yazi
+    ./features/emacs
+
+    # ./features/hyprland
+    ./features/i3
+
+    ./features/suites/cli
+    ./features/suites/desktop
+    ./features/suites/development
+  ];
+
+  hostName = "kardorf";
+  is-nixos = true;
+  terminal = "ghostty";
+
+  #  ---------   ---------
+  # | DVI-D-1 | | DVI-D-2 |
+  #  ---------   ---------
+  monitors = [
+    {
+      name = "DVI-D-1";
+      width = 1680;
+      height = 1050;
+      workspaces = [
+        "1"
+        "2"
+        "3"
+        "4"
+        "5"
+      ];
+      primary = true;
+    }
+    {
+      name = "DVI-D-2";
+      width = 1680;
+      height = 1050;
+      workspaces = [
+        "6"
+        "7"
+        "8"
+        "9"
+        "10"
+      ];
+    }
+  ];
+}
--- a/homes/julian/pianonix.nix
+++ b/homes/julian/pianonix.nix
@ -0,0 +1,37 @@
+{pkgs, ...}: {
+  imports = [
+    ./global
+
+    ./features/fish
+    ./features/topgrade
+    ./features/neovim
+    ./features/wezterm
+    ./features/yazi
+    ./features/gtk
+  ];
+
+  hostName = "pianonix";
+  is-nixos = true;
+  terminal = "wezterm";
+
+  services.syncthing.tray.enable = true;
+  services.syncthing.tray.command = "syncthingtray --wait"; # Wait for tray to become available
+
+  home.packages = with pkgs; [
+    music-reader
+    sheet-organizer
+
+    xournalpp
+    musescore
+
+    onboard
+  ];
+
+  # Autostart link
+  home.file = {
+    ".config/autostart/sheet-organizer.desktop".source = "${pkgs.sheet-organizer}/share/applications/sheet-organizer.desktop";
+    ".config/sheet-organizer/config.toml".text = ''
+      working_directory = "/home/julian/Klavier"
+    '';
+  };
+}
--- a/homes/julian/ssh.pub
+++ b/homes/julian/ssh.pub
@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFjSZYdoF/51F+ykcBAYVCzCPTF5EEigWBL1APiR0h+H
--- a/homes/julian/v3ms/default.nix
+++ b/homes/julian/v3ms/default.nix
@ -0,0 +1,30 @@
+{
+  lib,
+  pkgs,
+  ...
+}: {
+  imports = [
+    ../global
+
+    ../features/fish
+    ../features/direnv
+    ../features/topgrade
+    ../features/neovim
+    ../features/yazi
+    ../features/emacs
+    ../features/nix-helper
+  ];
+
+  hostName = "aspi";
+  is-nixos = false;
+  # terminal = "kitty";
+
+  home.sessionPath = ["/snap/bin"];
+
+  home.packages =
+    lib.lists.concatMap (packages-list-file: import packages-list-file {inherit pkgs;})
+    [
+      ./fonts.nix
+      ./packages.nix
+    ];
+}
--- a/homes/x86_64-linux/julian@v3ms/fonts.nix
+++ b/homes/x86_64-linux/julian@v3ms/fonts.nix
@ -1,8 +1,6 @@
-{ pkgs, ... }:
-
-with pkgs;
-[
-  (nerdfonts.override { fonts = [ "FiraCode" ]; })
+{pkgs, ...}:
+with pkgs; [
+  nerd-fonts.fira-code
  font-awesome
  dejavu_fonts
  noto-fonts
--- a/homes/x86_64-linux/julian@v3ms/packages.nix
+++ b/homes/x86_64-linux/julian@v3ms/packages.nix
@ -1,7 +1,5 @@
-{ pkgs, ... }:
-
-with pkgs;
-[
+{pkgs, ...}:
+with pkgs; [
  # Rust setup
  rustc
  rustfmt
--- a/homes/x86_64-linux/julian@aspi/default.nix
+++ b/homes/x86_64-linux/julian@aspi/default.nix
@ -1,71 +0,0 @@
-{
-  # Snowfall Lib provides a customized `lib` instance with access to your flake's library
-  # as well as the libraries available from your flake's inputs.
-  lib,
-  # An instance of `pkgs` with your overlays and packages applied is also available.
-  pkgs,
-  # You also have access to your flake's inputs.
-  inputs,
-
-  # Additional metadata is provided by Snowfall Lib.
-  namespace, # The namespace used for your flake, defaulting to "internal" if not set.
-  home, # The home architecture for this host (eg. `x86_64-linux`).
-  target, # The Snowfall Lib target for this home (eg. `x86_64-home`).
-  format, # A normalized name for the home target (eg. `home`).
-  virtual, # A boolean to determine whether this home is a virtual target using nixos-generators.
-  host, # The host name for this home.
-
-  # All other arguments come from the home home.
-  config,
-  ...
-}:
-{
-  home.username = "julian";
-  home.homeDirectory = "/home/julian";
-
-  modules = {
-    non-nixos.is-nixos = true;
-    shell = {
-      # zsh.enable = true;
-      fish.enable = true;
-      direnv.enable = true;
-    };
-    topgrade.enable = true;
-    neovim.enable = true;
-    kitty = {
-      enable = true;
-      mkDefault = true;
-    };
-    wezterm = {
-      enable = true;
-      mkDefault = false;
-    };
-    alacritty = {
-      enable = true;
-      mkDefault = false;
-    };
-    yazi.enable = true;
-    emacs.enable = true;
-
-    i3.enable = true;
-
-    # hyprland.enable = true;
-    nix-helper.enable = true;
-
-    desktop.enable = true;
-    fonts.enable = true;
-
-    suites = {
-      cli.enable = true;
-      desktop.enable = true;
-      development.enable = true;
-    };
-  };
-
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
-
-  # ======================== DO NOT CHANGE THIS ========================
-  home.stateVersion = "23.11";
-  # ======================== DO NOT CHANGE THIS ========================
-}
--- a/homes/x86_64-linux/julian@kardorf/default.nix
+++ b/homes/x86_64-linux/julian@kardorf/default.nix
@ -1,57 +0,0 @@
-{
-  # Snowfall Lib provides a customized `lib` instance with access to your flake's library
-  # as well as the libraries available from your flake's inputs.
-  lib,
-  # An instance of `pkgs` with your overlays and packages applied is also available.
-  pkgs,
-  # You also have access to your flake's inputs.
-  inputs,
-
-  # Additional metadata is provided by Snowfall Lib.
-  namespace, # The namespace used for your flake, defaulting to "internal" if not set.
-  home, # The home architecture for this host (eg. `x86_64-linux`).
-  target, # The Snowfall Lib target for this home (eg. `x86_64-home`).
-  format, # A normalized name for the home target (eg. `home`).
-  virtual, # A boolean to determine whether this home is a virtual target using nixos-generators.
-  host, # The host name for this home.
-
-  # All other arguments come from the home home.
-  config,
-  ...
-}:
-{
-  home.username = "julian";
-  home.homeDirectory = "/home/julian";
-
-  modules = {
-    non-nixos.is-nixos = true;
-    shell = {
-      fish.enable = true;
-      direnv.enable = true;
-    };
-    topgrade.enable = true;
-    neovim.enable = true;
-    # alacritty.enable = true;
-    kitty.enable = true;
-    yazi.enable = true;
-    emacs.enable = true;
-    i3.enable = true;
-    nix-helper.enable = true;
-
-    desktop.enable = true;
-    fonts.enable = true;
-
-    suites = {
-      cli.enable = true;
-      desktop.enable = true;
-      development.enable = true;
-    };
-  };
-
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
-
-  # ======================== DO NOT CHANGE THIS ========================
-  home.stateVersion = "23.11";
-  # ======================== DO NOT CHANGE THIS ========================
-}
--- a/homes/x86_64-linux/julian@pianonix/default.nix
+++ b/homes/x86_64-linux/julian@pianonix/default.nix
@ -1,70 +0,0 @@
-{
-  # Snowfall Lib provides a customized `lib` instance with access to your flake's library
-  # as well as the libraries available from your flake's inputs.
-  lib,
-  # An instance of `pkgs` with your overlays and packages applied is also available.
-  pkgs,
-  # You also have access to your flake's inputs.
-  inputs,
-
-  # Additional metadata is provided by Snowfall Lib.
-  namespace, # The namespace used for your flake, defaulting to "internal" if not set.
-  home,
-  target, # The Snowfall Lib target for this home (eg. `x86_64-home`).
-  format, # A normalized name for the home target (eg. `home`).
-  virtual, # A boolean to determine whether this home is a virtual target using nixos-generators.
-  host, # The host name for this home.
-
-  # All other arguments come from the home home.
-  config,
-  ...
-}@arguments:
-{
-  home.username = "julian";
-  home.homeDirectory = "/home/julian";
-
-  modules = {
-    non-nixos.is-nixos = true;
-
-    shell = {
-      fish.enable = true;
-    };
-    yazi.enable = true;
-    topgrade.enable = true;
-    neovim.enable = true;
-    wezterm.enable = true;
-    nix-helper.enable = true;
-
-    desktop.enable = true;
-    fonts.enable = true;
-  };
-
-  services.syncthing.tray.enable = true;
-  services.syncthing.tray.command = "syncthingtray --wait"; # Wait for tray to become available
-
-  home.packages = with pkgs; [
-    music-reader
-    sheet-organizer
-
-    xournalpp
-    musescore
-
-    onboard
-  ];
-
-  # Autostart link
-  home.file = {
-    ".config/autostart/sheet-organizer.desktop".source =
-      "${pkgs.sheet-organizer}/share/applications/sheet-organizer.desktop";
-    ".config/sheet-organizer/config.toml".text = ''
-      working_directory = "/home/julian/Klavier"
-    '';
-  };
-
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
-
-  # ======================== DO NOT CHANGE THIS ========================
-  home.stateVersion = "23.11";
-  # ======================== DO NOT CHANGE THIS ========================
-}
--- a/homes/x86_64-linux/julian@v3ms/default.nix
+++ b/homes/x86_64-linux/julian@v3ms/default.nix
@ -1,53 +0,0 @@
-{
-  # Snowfall Lib provides a customized `lib` instance with access to your flake's library
-  # as well as the libraries available from your flake's inputs.
-  lib,
-  # An instance of `pkgs` with your overlays and packages applied is also available.
-  pkgs,
-  # You also have access to your flake's inputs.
-  inputs,
-
-  # Additional metadata is provided by Snowfall Lib.
-  namespace, # The namespace used for your flake, defaulting to "internal" if not set.
-  home, # The home architecture for this host (eg. `x86_64-linux`).
-  target, # The Snowfall Lib target for this home (eg. `x86_64-home`).
-  format, # A normalized name for the home target (eg. `home`).
-  virtual, # A boolean to determine whether this home is a virtual target using nixos-generators.
-  host, # The host name for this home.
-
-  # All other arguments come from the home home.
-  config,
-  ...
-}:
-{
-  home.username = "julian";
-  home.homeDirectory = "/home/julian";
-
-  modules = {
-    non-nixos.is-nixos = false;
-    shell = {
-      fish.enable = true;
-      direnv.enable = true;
-    };
-    topgrade.enable = true;
-    neovim.enable = true;
-    yazi.enable = true;
-    emacs.enable = true;
-
-    nix-helper.enable = true;
-  };
-
-  home.packages =
-    lib.lists.concatMap (packages-list-file: import packages-list-file { inherit pkgs; })
-      [
-        ./fonts.nix
-        ./packages.nix
-      ];
-
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
-
-  # ======================== DO NOT CHANGE THIS ========================
-  home.stateVersion = "23.11";
-  # ======================== DO NOT CHANGE THIS ========================
-}
--- a/hosts/aspi/default.nix
+++ b/hosts/aspi/default.nix
@ -0,0 +1,50 @@
+{
+  imports = [
+    ./hardware-configuration.nix
+
+    ../common/global
+    ../common/users/julian
+    ../common/optional/binarycaches.nix
+
+    ../common/optional/remote-builder.nix
+    ../common/optional/boot-efi.nix
+
+    ../common/optional/greetd.nix
+    ../common/optional/authentication.nix
+    ../common/optional/pcmanfm.nix
+    ../common/optional/pipewire.nix
+
+    ../common/optional/gamemode.nix
+    ../common/optional/virtualbox.nix
+
+    ../common/optional/podman.nix
+    ../common/optional/wireguard.nix
+    ../common/optional/flatpak.nix
+
+    ../common/optional/avahi.nix
+  ];
+
+  networking.hostName = "aspi";
+  system.stateVersion = "24.05";
+
+  modules = {
+    syncthing = {
+      enable = true;
+      overrideSettings = false;
+    };
+  };
+
+  services.blueman.enable = true;
+  services.upower.enable = true;
+
+  programs.steam.enable = true;
+
+  # TODO: not working
+  services.logind.lidSwitch = "lock";
+  services.logind.lidSwitchDocked = "lock";
+
+  programs.kdeconnect.enable = true;
+
+  # Enable touchpad support
+  services.libinput.enable = true;
+}
--- a/hosts/aspi/hardware-configuration.nix
+++ b/hosts/aspi/hardware-configuration.nix
@ -0,0 +1,78 @@
+{
+  config,
+  lib,
+  ...
+}: {
+  boot.initrd.availableKernelModules = [
+    "vmd"
+    "xhci_pci"
+    "ahci"
+    "nvme"
+    "usb_storage"
+    "usbhid"
+    "sd_mod"
+  ];
+  boot.initrd.kernelModules = ["dm-snapshot"];
+  boot.kernelModules = ["kvm-intel"];
+  boot.extraModulePackages = [];
+  boot.blacklistedKernelModules = ["pcspkr"]; # Disables "beep"
+  boot.binfmt.emulatedSystems = ["aarch64-linux"];
+
+  boot.initrd.luks.devices = {
+    root = {
+      device = "/dev/disk/by-uuid/a4dc9a2c-725b-4252-8fbb-093a271c31ba";
+      preLVM = true;
+      allowDiscards = true;
+    };
+  };
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/bbc45be3-75f5-40c5-8427-2a425de8422c";
+    fsType = "btrfs";
+    options = [
+      "subvol=root"
+      "compress=zstd"
+    ];
+  };
+
+  fileSystems."/home" = {
+    device = "/dev/disk/by-uuid/bbc45be3-75f5-40c5-8427-2a425de8422c";
+    fsType = "btrfs";
+    options = [
+      "subvol=home"
+      "compress=zstd"
+    ];
+  };
+
+  fileSystems."/nix" = {
+    device = "/dev/disk/by-uuid/bbc45be3-75f5-40c5-8427-2a425de8422c";
+    fsType = "btrfs";
+    options = [
+      "subvol=nix"
+      "compress=zstd"
+      "noatime"
+    ];
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/7040-F37C";
+    fsType = "vfat";
+  };
+
+  swapDevices = [
+    {device = "/dev/disk/by-uuid/26140b4a-0579-406d-a484-35aa31b32e80";}
+  ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.nvidia.open = false;
+}
--- a/hosts/aspi/ssh_host_ed25519_key.pub
+++ b/hosts/aspi/ssh_host_ed25519_key.pub
@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDmZH4AYoERGx5t8gXXmrZetSchwzps8UYwkz8E6SI8D
--- a/systems/x86_64-linux/builder/default.nix
+++ b/systems/x86_64-linux/builder/default.nix
@ -1,44 +1,15 @@
 # sudo nixos-rebuild switch --flake .#builder --target-host root@192.168.3.118
 # or
 # deploy .#builder
-{ config, pkgs, ... }:
+{config, ...}: {
+  imports = [
+    ./hardware-configuration.nix

-{
-  imports = [ ./hardware-configuration.nix ];
-
-  # hardware.graphics = {
-  #   enable = true;
-  #   extraPackages = with pkgs; [
-  #     rocmPackages.clr.icd
-  #     linuxPackages.amdgpu-pro
-  #   ];
-  # };
-
-  # boot.kernelParams = [
-  #   "radeon.si_support=0"
-  #   "radeon.cik_support=1"
-  #   "amdgpu.si_support=0"
-  #   "amdgpu.cik_support=1"
-  # ];
-  # boot.extraModulePackages = with config.boot.kernelPackages; [ amdgpu-pro ];
-  # boot.blacklistedKernelModules = [ "radeon" ];
-
-  boot.loader.grub.enable = true;
-  boot.loader.grub.device = "/dev/sda";
-
-  # Emulated systems used as alternative to cross-compiling
-  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
+    ../common/global
+  ];

  networking.hostName = "builder";
-  networking.networkmanager.enable = true;
-
-  time.timeZone = "Europe/Berlin";
-
-  modules = {
-    keymap.enable = true;
-    locales.enable = true;
-    sops.enable = true;
-  };
+  system.stateVersion = "23.11";

  users.users.nix = {
    isNormalUser = true;
@ -59,17 +30,21 @@
    substituters = [
      "https://nix-community.cachix.org"
      "https://cache.nixos.org/"
+      "https://hyprland.cachix.org"
+    ];
+    trusted-public-keys = [
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
    ];
-    trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ];

-    trusted-users = [ "nix" ];
+    trusted-users = ["nix"];
    max-jobs = "auto";
    cores = 0;
  };

  # optimize store by hardlinking store files
  nix.optimise.automatic = true;
-  nix.optimise.dates = [ "03:15" ];
+  nix.optimise.dates = ["03:15"];

  # nix.gc.automatic = true;
  # nix.gc.dates = "daily";
@ -84,17 +59,6 @@
    max-free = ${toString (100 * 1024 * 1024 * 1024)}
  '';

-  environment.systemPackages = with pkgs; [
-    vim
-    htop
-    mc
-
-    # # AMD GPU tools
-    # pciutils
-    # nvtopPackages.amd
-    # linuxPackages.amdgpu-pro
-  ];
-
  nix.nrBuildUsers = 64;

  # prevent memory to get filled
@ -208,8 +172,7 @@
    };

    virtualHosts."binarycache.julian-mutter.de" = {
-      locations."/".proxyPass =
-        "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}";
+      locations."/".proxyPass = "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}";
    };

    clientMaxBodySize = "2G";
@ -224,7 +187,7 @@
    url = "https://gitlab.julian-mutter.de";
    name = "builder";
    tokenFile = config.sops.secrets."gitea_token".path;
-    labels = [ ]; # use default labels
+    labels = []; # use default labels
  };

  virtualisation.docker.enable = true;
@ -238,7 +201,7 @@

  sops.secrets."gitea_token" = {
    owner = config.users.users.nix.name;
-    sopsFile = ../../../secrets/secrets-builder.yaml;
+    sopsFile = ./secrets.yaml;
  };

  # =========== Binary Cache ==========
@ -248,7 +211,7 @@
  };

  # =========== Binary Cache with attic ==========
-  sops.secrets."attic_token".sopsFile = ../../../secrets/secrets-builder.yaml;
+  sops.secrets."attic_token".sopsFile = ./secrets.yaml;

  services.atticd = {
    enable = true;
@ -256,7 +219,7 @@
    settings = {
      listen = "[::]:8080";

-      jwt = { };
+      jwt = {};

      # Data chunking
      #
@ -282,8 +245,4 @@
      };
    };
  };
-
-  # ======================== DO NOT CHANGE THIS ========================
-  system.stateVersion = "23.11";
-  # ======================== DO NOT CHANGE THIS ========================
 }
--- a/systems/x86_64-linux/builder/hardware-configuration.nix
+++ b/systems/x86_64-linux/builder/hardware-configuration.nix
@ -1,17 +1,4 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
-
-{
-  imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
-
+{lib, ...}: {
  boot.initrd.availableKernelModules = [
    "ata_piix"
    "uhci_hcd"
@ -21,8 +8,8 @@
    "sr_mod"
  ];
  # boot.initrd.kernelModules = [ "amdgpu" ]; # GPU support
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
+  boot.kernelModules = [];
+  boot.extraModulePackages = [];

  fileSystems."/" = {
    device = "/dev/disk/by-uuid/f088fe8e-bf3d-4a89-98bd-ead9852d381f";
@ -37,4 +24,27 @@
  # networking.interfaces.ens18.useDHCP = lib.mkDefault true;

  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+
+  # hardware.graphics = {
+  #   enable = true;
+  #   extraPackages = with pkgs; [
+  #     rocmPackages.clr.icd
+  #     linuxPackages.amdgpu-pro
+  #   ];
+  # };
+
+  # boot.kernelParams = [
+  #   "radeon.si_support=0"
+  #   "radeon.cik_support=1"
+  #   "amdgpu.si_support=0"
+  #   "amdgpu.cik_support=1"
+  # ];
+  # boot.extraModulePackages = with config.boot.kernelPackages; [ amdgpu-pro ];
+  # boot.blacklistedKernelModules = [ "radeon" ];
+
+  boot.loader.grub.enable = true;
+  boot.loader.grub.device = "/dev/sda";
+
+  # Emulated systems used as alternative to cross-compiling
+  boot.binfmt.emulatedSystems = ["aarch64-linux"];
 }
--- a/secrets/secrets-builder.yaml
+++ b/secrets/secrets-builder.yaml
--- a/hosts/common/global/auto-upgrade.nix
+++ b/hosts/common/global/auto-upgrade.nix
@ -0,0 +1,16 @@
+{
+  inputs,
+  config,
+  ...
+}: {
+  system.hydraAutoUpgrade = {
+    # Only enable if not dirty
+    enable = inputs.self ? rev;
+    dates = "*:0/10"; # Every 10 minutes
+    instance = "http://hydra.julian-mutter.de";
+    project = "dotfiles";
+    jobset = "main";
+    job = "hosts.${config.networking.hostName}";
+    oldFlakeRef = "self";
+  };
+}
--- a/hosts/common/global/default.nix
+++ b/hosts/common/global/default.nix
@ -0,0 +1,35 @@
+# Common config for all hosts
+{
+  inputs,
+  outputs,
+  ...
+}: {
+  imports =
+    [
+      ./fish.nix # fish for admin
+      ./locale.nix
+      ./nix.nix
+      ./sops.nix
+      ./root.nix
+    ]
+    ++ [
+      inputs.home-manager.nixosModules.home-manager
+    ]
+    ++ (builtins.attrValues outputs.nixosModules);
+
+  # Replaces the (modulesPath + "/installer/scan/not-detected.nix") from default hardware-configuration.nix
+  # Enables non-free firmware
+  hardware.enableRedistributableFirmware = true;
+
+  # Networking
+  networking.networkmanager.enable = true;
+  services.resolved.enable = true;
+
+  programs.dconf.enable = true;
+
+  # HM
+  home-manager.useGlobalPkgs = true;
+  home-manager.extraSpecialArgs = {
+    inherit inputs outputs;
+  };
+}
--- a/hosts/common/global/fish.nix
+++ b/hosts/common/global/fish.nix
@ -0,0 +1,10 @@
+{
+  programs.fish = {
+    enable = true;
+    vendor = {
+      completions.enable = true;
+      config.enable = true;
+      functions.enable = true;
+    };
+  };
+}
--- a/hosts/common/global/locale.nix
+++ b/hosts/common/global/locale.nix
@ -0,0 +1,26 @@
+{
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_US.UTF-8";
+
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "de_DE.UTF-8";
+    LC_IDENTIFICATION = "de_DE.UTF-8";
+    LC_MEASUREMENT = "de_DE.UTF-8";
+    LC_MONETARY = "de_DE.UTF-8";
+    LC_NAME = "de_DE.UTF-8";
+    LC_NUMERIC = "en_US.UTF-8";
+    LC_PAPER = "de_DE.UTF-8";
+    LC_TELEPHONE = "de_DE.UTF-8";
+    LC_TIME = "de_DE.UTF-8";
+  };
+
+  # Keymap
+  services.xserver.xkb = {
+    layout = "de";
+    variant = "";
+  };
+
+  console.keyMap = "de";
+
+  time.timeZone = "Europe/Berlin";
+}
--- a/hosts/common/global/nix.nix
+++ b/hosts/common/global/nix.nix
@ -0,0 +1,43 @@
+{
+  lib,
+  outputs,
+  ...
+}: {
+  # Apply overlays
+  nixpkgs = {
+    # TODO: apply this to hm and nixos without duplicate code
+    overlays = builtins.attrValues outputs.overlays;
+    config = {
+      nvidia.acceptLicense = true;
+      allowUnfree = true;
+      allowUnfreePredicate = _: true; # TODO: what is this
+      warn-dirty = false;
+      permittedInsecurePackages = [
+        "olm-3.2.16"
+      ];
+    };
+  };
+
+  nix.settings.auto-optimise-store = lib.mkDefault true;
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+    "ca-derivations"
+  ];
+  # warn-dirty = false;
+
+  nix.gc = {
+    automatic = true;
+    dates = "weekly";
+    # Keep the last 3 generations
+    options = "--delete-older-than +3";
+  };
+
+  programs.nix-ld.enable = true;
+
+  # TODO: is this useful?, what does it do?
+  # nix.settings.flake-registry = ""; # Disable global flake registry
+  # Add each flake input as a registry and nix_path
+  # registry = lib.mapAttrs (_: flake: { inherit flake; }) flakeInputs;
+  # nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
+}
--- a/hosts/common/global/root.nix
+++ b/hosts/common/global/root.nix
@ -0,0 +1,9 @@
+{pkgs, ...}: {
+  # Packages needed as root
+  environment.systemPackages = with pkgs; [
+    vim
+    htop
+    mc
+    gparted-xhost # needs to be installed as system package so it can be actually opened
+  ];
+}
--- a/hosts/common/global/sops.nix
+++ b/hosts/common/global/sops.nix
@ -0,0 +1,22 @@
+{
+  inputs,
+  config,
+  ...
+}: let
+  isEd25519 = k: k.type == "ed25519";
+  getKeyPath = k: k.path;
+  keys = builtins.filter isEd25519 config.services.openssh.hostKeys;
+in {
+  imports = [inputs.sops-nix.nixosModules.sops];
+
+  sops.age = {
+    sshKeyPaths = map getKeyPath keys;
+
+    # TODO: remove? only rely on ssh or pgp keys (e.g. ubikey like misterio is using!!!)
+    keyFile = "/home/julian/.config/sops/age/keys.txt";
+    # Generate key if none of the above worked. With this, building will still work, just without secrets
+    generateKey = false; # TODO: building should not work without secrets!?
+  };
+
+  sops.defaultSopsFile = ../secrets.yaml;
+}
--- a/hosts/common/optional/authentication.nix
+++ b/hosts/common/optional/authentication.nix
@ -0,0 +1,29 @@
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  # Make programs like nextcloud client access saved passwords
+  services.gnome.gnome-keyring.enable = true;
+
+  programs.seahorse.enable = true;
+  programs.ssh.askPassword = lib.mkForce "${pkgs.seahorse}/libexec/seahorse/ssh-askpass"; # Solve conflicting definition in seahorse and plasma6
+
+  # Make authentication work for e.g. gparted
+  security.polkit.enable = true;
+  systemd = {
+    user.services.polkit-gnome-authentication-agent-1 = {
+      description = "polkit-gnome-authentication-agent-1";
+      wantedBy = ["graphical-session.target"];
+      wants = ["graphical-session.target"];
+      after = ["graphical-session.target"];
+      serviceConfig = {
+        Type = "simple";
+        ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
+        Restart = "on-failure";
+        RestartSec = 1;
+        TimeoutStopSec = 10;
+      };
+    };
+  };
+}
--- a/hosts/common/optional/avahi.nix
+++ b/hosts/common/optional/avahi.nix
@ -0,0 +1,9 @@
+{
+  # MDNS on local network
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+    publish.enable = true;
+    publish.addresses = true;
+  };
+}
--- a/hosts/common/optional/binarycaches.nix
+++ b/hosts/common/optional/binarycaches.nix
@ -0,0 +1,25 @@
+{
+  lib,
+  outputs,
+  ...
+}: {
+  # Setup binary caches
+  nix.settings = {
+    substituters = [
+      "https://nix-community.cachix.org"
+      "https://cache.nixos.org/"
+      "https://hyprland.cachix.org"
+      "http://binarycache.julian-mutter.de"
+    ];
+    trusted-public-keys = [
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+      "binarycache.julian-mutter.de:oJ67uRFwRhNPKL58CHzy3QQLv38Kx7OA1K+6xlEPu7E="
+    ];
+
+    trusted-users = [
+      "root"
+      "@wheel"
+    ]; # needed for devenv to add custom caches
+  };
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Gitea Actions	b57e5eb080	Update flake.lock 2025-04-28	2025-07-05 00:30:42 +00:00
Gitea Actions	a583779e73	Update flake.lock 2025-04-27	2025-07-05 00:30:42 +00:00
Gitea Actions	70b99a7b6b	Update flake.lock 2025-04-26	2025-07-05 00:30:42 +00:00
Gitea Actions	4cbc594c24	Update flake.lock 2025-04-25	2025-07-05 00:30:42 +00:00
Gitea Actions	910d8bbaec	Update flake.lock 2025-04-24	2025-07-05 00:30:42 +00:00
Gitea Actions	d9b4e05070	Update flake.lock 2025-04-23	2025-07-05 00:30:42 +00:00
Gitea Actions	7a1c6b95f1	Update flake.lock 2025-04-22	2025-07-05 00:30:42 +00:00
Gitea Actions	cb3b6bcf27	Update flake.lock 2025-04-21	2025-07-05 00:30:42 +00:00
Gitea Actions	d555564526	Update flake.lock 2025-04-20	2025-07-05 00:30:42 +00:00
Gitea Actions	7f66e6ab6a	Update flake.lock 2025-04-19	2025-07-05 00:30:42 +00:00
Gitea Actions	9b94b3fbfd	Update flake.lock 2025-04-18	2025-07-05 00:30:42 +00:00
Gitea Actions	9394144ac8	Update flake.lock 2025-04-17	2025-07-05 00:30:42 +00:00
Gitea Actions	03331f8d56	Update flake.lock 2025-04-16	2025-07-05 00:30:42 +00:00
Gitea Actions	be7cb3c4ff	Update flake.lock 2025-04-15	2025-07-05 00:30:42 +00:00
Gitea Actions	81b297338a	Update flake.lock 2025-04-14	2025-07-05 00:30:42 +00:00
Gitea Actions	478edca189	Update flake.lock 2025-04-13	2025-07-05 00:30:42 +00:00
Gitea Actions	d4a2769dea	Update flake.lock 2025-04-12	2025-07-05 00:30:42 +00:00
Gitea Actions	3a049cafd7	Update flake.lock 2025-04-11	2025-07-05 00:30:42 +00:00
Gitea Actions	743dfa7279	Update flake.lock 2025-04-10	2025-07-05 00:30:42 +00:00
Gitea Actions	a826fc1cfb	Update flake.lock 2025-04-09	2025-07-05 00:30:42 +00:00
Gitea Actions	af591c6dc9	Update flake.lock 2025-04-08	2025-07-05 00:30:42 +00:00
Gitea Actions	0aa21054e5	Update flake.lock 2025-04-07	2025-07-05 00:30:42 +00:00
Gitea Actions	4f91021047	Update flake.lock 2025-04-06	2025-07-05 00:30:42 +00:00
Gitea Actions	98f437fb11	Update flake.lock 2025-04-05	2025-07-05 00:30:42 +00:00
Gitea Actions	1741ea5d80	Update flake.lock 2025-04-04	2025-07-05 00:30:42 +00:00
Gitea Actions	194b9c114d	Update flake.lock 2025-04-03	2025-07-05 00:30:42 +00:00
Gitea Actions	da3aa8fd0c	Update flake.lock 2025-04-02	2025-07-05 00:30:42 +00:00
Gitea Actions	f22746f65b	Update flake.lock 2025-04-01	2025-07-05 00:30:42 +00:00
Gitea Actions	400177ed26	Update flake.lock 2025-03-31	2025-07-05 00:30:42 +00:00
Gitea Actions	010e2302be	Update flake.lock 2025-03-30	2025-07-05 00:30:42 +00:00
Gitea Actions	58e2d2fe48	Update flake.lock 2025-03-29	2025-07-05 00:30:42 +00:00
Gitea Actions	58a8c00b7a	Update flake.lock 2025-03-28	2025-07-05 00:30:42 +00:00
Gitea Actions	e7babd43eb	Update flake.lock 2025-03-27	2025-07-05 00:30:42 +00:00
Gitea Actions	cf7fc689ab	Update flake.lock 2025-03-26	2025-07-05 00:30:42 +00:00
Gitea Actions	66f505d656	Update flake.lock 2025-03-25	2025-07-05 00:30:42 +00:00
Gitea Actions	5a0e072eb4	Update flake.lock 2025-03-24	2025-07-05 00:30:42 +00:00
Gitea Actions	6cf2d6dbc6	Update flake.lock 2025-03-23	2025-07-05 00:30:42 +00:00
Julian Mutter	7f4c41429e	update flake Some checks failed Update Nix Flake / update-flake (push) Failing after 15s Details	2025-07-04 14:44:51 +02:00
Julian Mutter	6d21fe4262	format code	2025-07-04 14:44:31 +02:00
Julian Mutter	c081f95aaf	open-messaging: adapt to new telegram program name	2025-07-04 14:44:01 +02:00
Julian Mutter	452a34c7e8	Neovim: add clangd	2025-07-04 14:43:51 +02:00
Julian Mutter	15c4616b91	Fix emacs not having TERMINAL env var	2025-07-04 14:43:45 +02:00
Julian Mutter	07274a0364	Update alacritty config, use as default	2025-07-04 14:41:58 +02:00
Julian Mutter	3bb8db1349	Fix builder using itself as remote subsituter	2025-07-04 14:40:58 +02:00
Julian Mutter	65a3dcdc08	Use ghostty as primary terminal Some checks failed Update Nix Flake / update-flake (push) Failing after 16s Details	2025-06-30 08:37:24 +02:00
Julian Mutter	9fe40bfd13	package rtklib	2025-05-26 21:51:07 +02:00
Julian Mutter	07943d4f95	format file Some checks failed Update Nix Flake / update-flake (push) Failing after 12s Details	2025-05-23 09:59:30 +02:00
Julian Mutter	815a79ff41	kardorf: fix seahorse and plasma6 config conflict	2025-05-23 09:58:59 +02:00
Julian Mutter	32ddceba8f	kardorf: use i3 instead of hyprland	2025-05-23 09:58:38 +02:00
Julian Mutter	55ba4125d6	add latex packages to fix org mode exporting Some checks failed Update Nix Flake / update-flake (push) Failing after 11s Details	2025-05-21 23:01:09 +02:00
Julian Mutter	b9274f546f	update flake	2025-05-21 23:01:03 +02:00
Julian Mutter	fd246d7daf	Add hydra-auto-upgrade module, still wip Some checks failed Update Nix Flake / update-flake (push) Failing after 16s Details	2025-05-16 13:13:47 +02:00
Julian Mutter	edae0d2bb0	Delete i3 scripts also available in my nix pkgs	2025-05-16 12:56:22 +02:00
Julian Mutter	1cb23dd0a4	Add todo	2025-05-16 12:53:20 +02:00
Julian Mutter	ab1052193a	rename deprecated options	2025-05-16 12:12:22 +02:00
Julian Mutter	6dadb2008c	kardorf: enable ssh access	2025-05-16 12:11:45 +02:00
Julian Mutter	18f9cc3fa8	Add user julian to dialout for serial port access	2025-05-16 08:27:45 +02:00
Julian Mutter	9295ad7010	add kardorf ssh key to common secrets.yaml	2025-05-16 08:27:45 +02:00
Julian Mutter	e3cf2379ab	yazi: update config to new version	2025-05-16 08:27:45 +02:00
Julian Mutter	f6c3f676b2	update flake	2025-05-16 08:27:45 +02:00
Julian Mutter	d57017382a	v3ms: add /snap/bin to path Some checks failed Update Nix Flake / update-flake (push) Failing after 14s Details	2025-05-09 11:41:21 +02:00
Julian Mutter	1d7690eab4	Fix mako settings Some checks failed Update Nix Flake / update-flake (push) Failing after 14s Details	2025-05-06 07:50:35 +02:00
Julian Mutter	67d68a9946	Fix waybar not visible on second monitor after toggling mirroring twice Some checks failed Update Nix Flake / update-flake (push) Failing after 15s Details	2025-05-05 15:10:07 +02:00
Julian Mutter	9af362b5c8	hyprland: quick and dirty screen mirroring	2025-05-05 14:56:22 +02:00
Julian Mutter	a0ae09452f	hyprland: install hyprpicker	2025-05-05 08:24:26 +02:00
Julian Mutter	711859e660	hyprland: fix cursor theme not applied	2025-05-05 08:24:09 +02:00
Julian Mutter	1c1e496425	use NH_FLAKE instead of FLAKE for nh	2025-05-05 07:11:28 +02:00
Julian Mutter	97229a521f	Add discord to open-messaging	2025-05-05 07:11:02 +02:00
Julian Mutter	7d8190210b	Mako: disable usage of deprecated config value Some checks failed Update Nix Flake / update-flake (push) Failing after 15s Details	2025-05-04 20:42:53 +02:00
Julian Mutter	a1dfeff98b	topgrade: disable "update flake" step	2025-05-04 20:29:11 +02:00
Julian Mutter	9e512c2863	Update flake	2025-05-04 20:29:06 +02:00
Julian Mutter	136653b0fa	Use hashed password for julian	2025-05-04 13:52:36 +02:00
Julian Mutter	75fb0f54ec	Delete unused hyprland nixos config	2025-05-04 13:52:27 +02:00
Julian Mutter	a3282f3eb3	Configure kardorf host config	2025-05-04 13:52:13 +02:00
Julian Mutter	843dfb986d	Fix type of monitor.workspaces	2025-05-04 13:51:54 +02:00
Julian Mutter	3eba0fe092	Make nvidia on kardorf work	2025-05-04 13:51:44 +02:00
Julian Mutter	fdc8b03d9b	Add user wolfi	2025-05-04 13:51:22 +02:00
Julian Mutter	d86321cfe6	Add monitor configuration to aspi and kardorf homes	2025-05-04 13:51:00 +02:00
Julian Mutter	881c930fdb	Fix wrong architectures used for v3ms and kardorf	2025-05-04 13:50:36 +02:00
Julian Mutter	dc3f9fe681	Add kardorf ssh key to sops	2025-05-04 13:50:23 +02:00
Julian Mutter	d73ff17327	Delete deprecated .dotter files	2025-05-04 13:49:24 +02:00
Julian Mutter	67468ba6fa	Fix kardorf using aspi config	2025-05-01 22:09:02 +02:00
Julian Mutter	6d2a7f50df	workflow: add git fetch before rebasing Some checks failed Update Nix Flake / update-flake (push) Failing after 15s Details	2025-04-30 13:15:25 +02:00
Julian Mutter	3cf8f19fcc	Disable autostart for wireguard comu Some checks failed Update Nix Flake / update-flake (push) Failing after 14s Details	2025-04-29 21:44:54 +02:00
Julian Mutter	d335f6c892	builder: fix config Some checks failed Update Nix Flake / update-flake (push) Failing after 15s Details	2025-04-28 22:44:33 +02:00
Julian Mutter	8d94428f77	Fix lsp warnings for clean code	2025-04-28 22:27:16 +02:00
Julian Mutter	903776dca6	Clean up aspi and home hm config	2025-04-28 22:24:30 +02:00
Julian Mutter	b6dc568215	Rename desktop feature to gtk	2025-04-28 22:24:21 +02:00
Julian Mutter	130c341816	Remove wallpaper directory	2025-04-28 22:23:42 +02:00
Julian Mutter	8d0430ae52	Delete unused config file for shells	2025-04-28 22:19:00 +02:00
Julian Mutter	68da077c72	Format code with alejandra	2025-04-28 22:17:11 +02:00
Julian Mutter	7d17c52192	Clean up aspi and kardorf configs	2025-04-28 22:02:24 +02:00
Julian Mutter	c217e3297b	hyprland: enable direct_scanout	2025-04-28 09:14:47 +02:00
Julian Mutter	c41a642593	hyprland: add smart gaps	2025-04-28 09:14:35 +02:00
Julian Mutter	d02f28ad89	waybar: do not show time left for battery	2025-04-26 19:02:20 +02:00
Julian Mutter	7d18d2bd50	Properly configure swaylock	2025-04-25 15:42:09 +02:00
Julian Mutter	68c37c0f42	hyprland dwindle: always split to same direction	2025-04-25 15:04:58 +02:00
Julian Mutter	20e2b5e20e	Disable mimeapp managing by hm	2025-04-25 15:04:50 +02:00
Julian Mutter	08d3844778	Add wol-ocr script	2025-04-25 15:04:39 +02:00
Julian Mutter	34084e45aa	hyprland: make splitting and resizing deterministic	2025-04-25 08:41:16 +02:00
Julian Mutter	7c1c51954e	Remove unneeded commented line	2025-04-25 08:36:24 +02:00
Julian Mutter	659d235fc7	Tune hyprland animations and cursor	2025-04-25 08:36:15 +02:00
Julian Mutter	64958b068f	Delete unnecessary nixos wayland config	2025-04-24 14:06:32 +02:00
Julian Mutter	95d9f9cf61	Add gamemode	2025-04-24 14:06:27 +02:00
Julian Mutter	6f57594884	Fix hyprland	2025-04-24 13:41:09 +02:00
Julian Mutter	b077da4998	Add pob2 package, not working yet	2025-04-24 08:06:06 +02:00
Julian Mutter	8aaf0b81c2	Do not install digikam	2025-04-24 08:05:46 +02:00
Julian Mutter	439b4d769e	Fix fonts	2025-04-24 08:05:39 +02:00
Julian Mutter	66bde6646f	Remove unneccesary comments	2025-04-23 22:56:22 +02:00
Julian Mutter	c323a747ea	Fix deprecated config	2025-04-23 22:55:20 +02:00
Julian Mutter	d87cec971a	Migrate left hosts and homes configurations	2025-04-23 22:53:43 +02:00
Julian Mutter	7db055ca27	Squash bugs and make aspi config work	2025-04-23 09:59:02 +02:00
Julian Mutter	532bbe8675	Migrate old home-manager modules	2025-04-22 23:47:08 +02:00
Julian Mutter	dcdc97aad8	Migrate remaining nixos modules	2025-04-22 23:11:45 +02:00
Julian Mutter	94498a0038	Migrate aspi host config	2025-04-22 22:47:36 +02:00
Julian Mutter	05350e1c1c	Add common hosts config	2025-04-22 22:12:45 +02:00
Julian Mutter	142b16fa9c	Add aspi public ssh key	2025-04-22 22:12:30 +02:00
Julian Mutter	6f2de694a0	Add todos	2025-04-22 22:12:24 +02:00
Julian Mutter	3f9442fd02	Rename systems folder to hosts	2025-04-22 21:34:44 +02:00
Julian Mutter	fb2626372f	Delete legacy non-nix configs	2025-04-22 21:30:30 +02:00
Julian Mutter	c18b1a7341	Add pkg to activate acer battery health mode	2025-04-22 21:30:05 +02:00
Julian Mutter	1e4d267ce7	delete lib	2025-04-22 21:25:44 +02:00
Julian Mutter	63c3d1af27	Add real home-manager and nixos modules	2025-04-22 21:24:36 +02:00
Julian Mutter	2e20534bba	Rename modules/home to modules/home-manager	2025-04-22 21:19:29 +02:00
Julian Mutter	3f0b46f3d8	Update .gitignore	2025-04-22 21:15:27 +02:00
Julian Mutter	9659bbff1e	Update lock file	2025-04-22 21:15:21 +02:00
Julian Mutter	73c440c9cd	Add shell and direnv	2025-04-22 21:15:13 +02:00
Julian Mutter	d0942d018b	Migrate packages	2025-04-22 21:14:51 +02:00
Julian Mutter	642398da4b	Clean up overlays	2025-04-22 20:50:11 +02:00
Julian Mutter	07a321c79a	Restructure flake	2025-04-22 20:48:18 +02:00
Julian Mutter	459c6ac27e	Clean up flake inputs, use unstable by default	2025-04-22 20:41:04 +02:00
Julian Mutter	02cc4f8ed8	workflow: use rebase instead of merge All checks were successful Update Nix Flake / update-flake (push) Successful in 1m24s Details	2025-03-23 19:09:18 +01:00
				`@ -0,0 +1 @@`
				`ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFjSZYdoF/51F+ykcBAYVCzCPTF5EEigWBL1APiR0h+H`
				`@ -0,0 +1 @@`
				`ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDmZH4AYoERGx5t8gXXmrZetSchwzps8UYwkz8E6SI8D`