changed wlan interface

Merge

.gitignore

@@ -0,0 +1 @@
+result

.sops.yaml

@@ -0,0 +1,7 @@
+keys:
+  - &v-th-ctr-01 age1cs2p7tgk9356tjmet6526k3ghwq9we82nz6z7qggqns656paku6sx30tkg
+  - &p-th-rpi-01 age1dd7xpgnak6z6zmwa9889pjd6hmj42zaxq7ea8s47dlk3v6u5f37sldkt97
+creation_rules:
+  - path_regex: secrets/deploy.yaml$
+    age: >-
+      age1cs2p7tgk9356tjmet6526k3ghwq9we82nz6z7qggqns656paku6sx30tkg,age12gjtehffgmepyga9vaqkurn9fyvte8n7wsklmg866z5usezvuqlsr2m5mp

README.md

@@ -3,6 +3,7 @@
 ## New system install guide
 
 ### 1. Install Nixos with ISO
+
 [Nixos download](https://nixos.org/download)
 
 ### 2. Copy hardware configuration to hosts directory
@@ -10,14 +11,85 @@
 ### 3. Generate ssh-keys
 
 **Archserver**
+
 1. `ssh-keygen -f ~/.ssh/archserver`
 2. `ssh-copy-id -i ~/.ssh/archserver 192.168.1.20`
 
 **Gitea**
+
 1. `ssh-keygen -f ~/.ssh/gitea -t ed25519 -C "me+gitea@xeovalyte.dev"`
 2. Upload to [Gitea](https://gitea.xeovalyt.dev)
 3. Verify ssh key (follow instructions on Gitea)
 
 ### 4. Add SSH keys
+
 1. `ssh-add ~/.ssh/gitea`
 2. `ssh-add ~/.ssh/archserver`
+
+## Homelab
+
+List over services
+
+| Service        | Description                        | Link                                                                   |
+| -------------- | ---------------------------------- | ---------------------------------------------------------------------- |
+| Caddy          | Reverse proxy                      | -                                                                      |
+| Kanidm         | Openid provider                    | [auth.tbmrs.nl](https://auth.tbmrs.nl)                                 |
+| Forgejo        | Git provider                       | [git.tbmrs.nl](https://git.tbmrs.nl)                                   |
+| Immich         | Photo and videos                   | [photos.tbmrs.nl](https://photos.tbmrs.nl)                             |
+| Homepage       | Dashboard                          | [home.tbmrs.nl](https://home.tbmrs.nl)                                 |
+| Uptime Kuma    | Uptime monitor                     | [uptime.tbmrs.nl](https://uptime.tbmrs.nl)                             |
+| Pingvin share  | Sharing of files                   | [share.tbmrs.nl](https://share.tbmrs.nl)                               |
+| Vaultwarden    | Password manager                   | [vault.local.tbmrs.nl](https://vault.local.tbmrs.nl)                   |
+| Paperless NGX  | Documents management               | [paperless.local.tbmrs.nl](https://paperless.local.tbmrs.nl)           |
+| Beszel         | Resource usage                     | [monitor.local.tbmrs.nl](https://monitor.local.tbmrs.nl)               |
+| Dufs           | File manager                       | [files.tbmrs.nl](https://files.tbmrs.nl)                               |
+| Syncthing      | File syncing                       | [syncthing.local.tbmrs.nl](https://syncthing.local.tbmrs.nl)           |
+| Home Assistant | Home automation                    | [home-assistant.local.tbmrs.nl](https://home-assistant.local.tbmrs.nl) |
+| ~~Karakeep~~   | Bookmarking                        | ~~[karakeep.local.tbmrs.nl](https://karakeep.local.tbmrs.nl)~~         |
+| Vikunja        | Tasks management                   | [vikunja.local.tbmrs.nl](https://vikunja.local.tbmrs.nl)               |
+| Stalwart       | Mailserver                         | [mail.tbmrs.nl](https://mail.tbmrs.nl)                                 |
+| Linkding       | Bookmark managment                 | [links.local.tbmrs.nl](https://links.local.tbmrs.nl)                   |
+| Jellyfin       | Movies, series and music streaming | [stream.local.tbmrs.nl](https://stream.local.tbmrs.nl)                 |
+
+### Todo
+
+- Install koreader selfhosted sync
+
+### Openid commands
+
+#### Configure new openid client
+
+From: [Kanidm Docs](https://kanidm.github.io/kanidm/master/integrations/oauth2/examples.html)
+
+Replace `<service>` with the name of the service.
+
+1. Create a new Kanidm group, and add your regular account to it:
+
+```bash
+$ kanidm group create <service>_users
+$ kanidm group add-members <service>_users your_username
+```
+
+2. Create a new OAuth2 application configuration in Kanidm, configure the redirect URL, and scope access to the group:
+
+```bash
+$ kanidm system oauth2 create <service> <servicename> <service_login_url>
+$ kanidm system oauth2 add-redirect-url <service> <redirect_url>
+$ kanidm system oauth2 update-scope-map <service> <service>_users email openid profile groups
+```
+
+3. (Optional) Disable PKCE
+
+```bash
+$ kanidm system oauth2 warning-insecure-client-disable-pkce <service>
+```
+
+4. Get the OAuth2 client secret from Kanidm
+
+```bash
+$ kanidm system oauth2 show-basic-secret <service>
+```
+
+## Useful links
+
+Womier keyboard permissions denied or not finding: https://github.com/the-via/releases/issues/257

dockerfiles/caddy.Dockerfile

@@ -0,0 +1,8 @@
+FROM caddy:2.8-builder AS builder
+
+RUN xcaddy build \
+  --with github.com/caddy-dns/transip
+
+FROM caddy:2.8
+
+COPY --from=builder /usr/bin/caddy /usr/bin/caddy

flake.lock

@@ -1,5 +1,55 @@
 {
   "nodes": {
+    "base16": {
+      "inputs": {
+        "fromYaml": "fromYaml"
+      },
+      "locked": {
+        "lastModified": 1746562888,
+        "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
+        "owner": "SenchoPens",
+        "repo": "base16.nix",
+        "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SenchoPens",
+        "repo": "base16.nix",
+        "type": "github"
+      }
+    },
+    "base16-fish": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1622559957,
+        "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
+        "owner": "tomyun",
+        "repo": "base16-fish",
+        "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tomyun",
+        "repo": "base16-fish",
+        "type": "github"
+      }
+    },
+    "base16-helix": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1748408240,
+        "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=",
+        "owner": "tinted-theming",
+        "repo": "base16-helix",
+        "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-helix",
+        "type": "github"
+      }
+    },
     "base16-schemes": {
       "flake": false,
       "locked": {
@@ -16,6 +66,113 @@
         "type": "github"
       }
     },
+    "base16-vim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1732806396,
+        "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=",
+        "owner": "tinted-theming",
+        "repo": "base16-vim",
+        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-vim",
+        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
+        "type": "github"
+      }
+    },
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1751854533,
+        "narHash": "sha256-U/OQFplExOR1jazZY4KkaQkJqOl59xlh21HP9mI79Vc=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "16b74a1e304197248a1bc663280f2548dbfcae3c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
+    "firefox-gnome-theme": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1748383148,
+        "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=",
+        "owner": "rafaelmardojai",
+        "repo": "firefox-gnome-theme",
+        "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rafaelmardojai",
+        "repo": "firefox-gnome-theme",
+        "type": "github"
+      }
+    },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "stylix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1749398372,
+        "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "fromYaml": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1731966426,
+        "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
+        "owner": "SenchoPens",
+        "repo": "fromYaml",
+        "rev": "106af9e2f715e2d828df706c386a685698f3223b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SenchoPens",
+        "repo": "fromYaml",
+        "type": "github"
+      }
+    },
+    "gnome-shell": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1744584021,
+        "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
+        "owner": "GNOME",
+        "repo": "gnome-shell",
+        "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "GNOME",
+        "ref": "48.1",
+        "repo": "gnome-shell",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -23,20 +180,76 @@
         ]
       },
       "locked": {
-        "lastModified": 1720042825,
+        "lastModified": 1751810233,
-        "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
+        "narHash": "sha256-kllkNbIqQi3VplgTMeGzuh1t8Gk8TauvkTRt93Km+tQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
+        "rev": "9b0873b46c9f9e4b7aa01eb634952c206af53068",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.05",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
+    "niri": {
+      "inputs": {
+        "niri-stable": "niri-stable",
+        "niri-unstable": "niri-unstable",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-stable": "nixpkgs-stable",
+        "xwayland-satellite-stable": "xwayland-satellite-stable",
+        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
+      },
+      "locked": {
+        "lastModified": 1752057206,
+        "narHash": "sha256-f8fNAag3K3WAq+lJr2EEu2f3xVSFLPddLgJKZRzXa3M=",
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "rev": "90c2edcf32d0fcb511fee9a0b8c580a18178c109",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "type": "github"
+      }
+    },
+    "niri-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1748151941,
+        "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "ref": "v25.05.1",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
+    "niri-unstable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1750791124,
+        "narHash": "sha256-F5iVU/hjoSHSSe0gllxm0PcAaseEtGNanYK5Ha3k2Tg=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "37458d94b288945f6cfbd3c5c233f634d59f246c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
     "nix-colors": {
       "inputs": {
         "base16-schemes": "base16-schemes",
@@ -56,19 +269,36 @@
         "type": "github"
       }
     },
-    "nixpkgs": {
+    "nixos-hardware": {
       "locked": {
-        "lastModified": 1725001927,
+        "lastModified": 1752048960,
-        "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=",
+        "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=",
         "owner": "NixOS",
-        "repo": "nixpkgs",
+        "repo": "nixos-hardware",
-        "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421",
+        "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
+        "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "master",
-        "type": "indirect"
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1751792365,
+        "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixpkgs-lib": {
@@ -86,21 +316,29 @@
         "type": "github"
       }
     },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1751943650,
+        "narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "88983d4b665fb491861005137ce2b11a9f89f203",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-unstable": {
       "locked": {
-<<<<<<< HEAD
+        "lastModified": 1751792365,
-        "lastModified": 1724819573,
+        "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=",
-        "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
+        "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb",
-=======
-        "lastModified": 1725103162,
-        "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
->>>>>>> 5655c8a056d725790ff88631d9bcc98875ef0333
         "type": "github"
       },
       "original": {
@@ -109,12 +347,292 @@
         "type": "indirect"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1751943650,
+        "narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "88983d4b665fb491861005137ce2b11a9f89f203",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-25.05",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1744868846,
+        "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1751211869,
+        "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nur": {
+      "inputs": {
+        "flake-parts": [
+          "stylix",
+          "flake-parts"
+        ],
+        "nixpkgs": [
+          "stylix",
+          "nixpkgs"
+        ],
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1751320053,
+        "narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "NUR",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
+        "disko": "disko",
         "home-manager": "home-manager",
+        "niri": "niri",
         "nix-colors": "nix-colors",
-        "nixpkgs": "nixpkgs",
+        "nixos-hardware": "nixos-hardware",
-        "nixpkgs-unstable": "nixpkgs-unstable"
+        "nixpkgs": "nixpkgs_2",
+        "nixpkgs-unstable": "nixpkgs-unstable",
+        "sops-nix": "sops-nix",
+        "stylix": "stylix"
+      }
+    },
+    "sops-nix": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1751606940,
+        "narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=",
+        "owner": "Mic92",
+        "repo": "sops-nix",
+        "rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mic92",
+        "repo": "sops-nix",
+        "type": "github"
+      }
+    },
+    "stylix": {
+      "inputs": {
+        "base16": "base16",
+        "base16-fish": "base16-fish",
+        "base16-helix": "base16-helix",
+        "base16-vim": "base16-vim",
+        "firefox-gnome-theme": "firefox-gnome-theme",
+        "flake-parts": "flake-parts",
+        "gnome-shell": "gnome-shell",
+        "nixpkgs": "nixpkgs_4",
+        "nur": "nur",
+        "systems": "systems",
+        "tinted-foot": "tinted-foot",
+        "tinted-kitty": "tinted-kitty",
+        "tinted-schemes": "tinted-schemes",
+        "tinted-tmux": "tinted-tmux",
+        "tinted-zed": "tinted-zed"
+      },
+      "locked": {
+        "lastModified": 1752014016,
+        "narHash": "sha256-Gn6cnUPchPenxUFDt+dh7836CNu3GM13aghTabfZUrU=",
+        "owner": "danth",
+        "repo": "stylix",
+        "rev": "26042c1f59ae868193fa4378f85e4f6240f25ff8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "danth",
+        "ref": "release-25.05",
+        "repo": "stylix",
+        "type": "github"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "tinted-foot": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1726913040,
+        "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
+        "owner": "tinted-theming",
+        "repo": "tinted-foot",
+        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "tinted-foot",
+        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
+        "type": "github"
+      }
+    },
+    "tinted-kitty": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1735730497,
+        "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
+        "owner": "tinted-theming",
+        "repo": "tinted-kitty",
+        "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "tinted-kitty",
+        "type": "github"
+      }
+    },
+    "tinted-schemes": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1750770351,
+        "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=",
+        "owner": "tinted-theming",
+        "repo": "schemes",
+        "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "schemes",
+        "type": "github"
+      }
+    },
+    "tinted-tmux": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1751159871,
+        "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=",
+        "owner": "tinted-theming",
+        "repo": "tinted-tmux",
+        "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "tinted-tmux",
+        "type": "github"
+      }
+    },
+    "tinted-zed": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1751158968,
+        "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=",
+        "owner": "tinted-theming",
+        "repo": "base16-zed",
+        "rev": "86a470d94204f7652b906ab0d378e4231a5b3384",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-zed",
+        "type": "github"
+      }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "stylix",
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733222881,
+        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
+    "xwayland-satellite-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1748488455,
+        "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Supreeeme",
+        "ref": "v0.6",
+        "repo": "xwayland-satellite",
+        "type": "github"
+      }
+    },
+    "xwayland-satellite-unstable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1751228685,
+        "narHash": "sha256-MENtauGBhJ+kDeFaawvWGXaFG3Il6qQzjaP0RmtfM0k=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "557ebeb616e03d5e4a8049862bbbd1f02c6f020b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "type": "github"
       }
     }
   },

flake.nix

@@ -1,93 +1,154 @@
 {
-  description = "Nixos configuration for Xeovalyte";
+  description = "Nixos configuration for Timo";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-24.05";
+    nixpkgs.url = "nixpkgs/nixos-25.05";
 
     nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-24.05";
+      url = "github:nix-community/home-manager/release-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+
     nix-colors.url = "github:misterio77/nix-colors";
+
+    stylix.url = "github:danth/stylix/release-25.05";
+
+    sops-nix.url = "github:Mic92/sops-nix";
+    niri.url = "github:sodiboo/niri-flake";
+
+    disko.url = "github:nix-community/disko";
+    disko.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, home-manager, nix-colors, ... }:
+  outputs = {
-  let
+    self,
-    system = "x86_64-linux";
+    nixpkgs,
-    overlay-unstable = final: prev: {
+    home-manager,
-      unstable = import nixpkgs-unstable {
+    nix-colors,
-        config.allowUnfree = true;
+    stylix,
-        localSystem = { inherit system; };
+    sops-nix,
-      };
+    niri,
-    };
+    disko,
+    ...
+  } @ inputs: let
+    inherit (self) outputs;
+    systems = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
+    forAllSystems = nixpkgs.lib.genAttrs systems;
   in 
   {
-    # Laptop Configuration
+    packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system} );
+    overlays = import ./overlays { inherit inputs; };
+  
     nixosConfigurations = {
-      xv-laptop = nixpkgs.lib.nixosSystem {
+      ti-clt-lpt01 = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
+        specialArgs = { inherit inputs outputs; };
-        specialArgs = { inherit inputs; };
         modules = [
-          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
+          inputs.nixos-hardware.nixosModules.framework-13-7040-amd
 
-          ./hosts/laptop
+          ./hosts/ti-clt-lpt01/configuration.nix
+        ];
+      };
+
+      ch-clt-dsk01 = nixpkgs.lib.nixosSystem {
+        specialArgs = { inherit inputs outputs; };
+        modules = [
+          ./hosts/ch-clt-dsk01/configuration.nix
+        ];
+      };
+
+      ti-clt-tbl01 = nixpkgs.lib.nixosSystem {
+        specialArgs = { inherit inputs outputs; };
+        modules = [
+          inputs.nixos-hardware.nixosModules.microsoft-surface-go
+
+          ./hosts/ti-clt-tbl01/configuration.nix
+        ];
+      };
+
+      # Timo's desktop
+      ti-clt-dsk01 = nixpkgs.lib.nixosSystem {
+        specialArgs = { inherit inputs outputs; };
+        modules = [
+          ./hosts/ti-clt-dsk01/configuration.nix
+        ];
+      };
+
+      v-th-ctr-01 = nixpkgs.lib.nixosSystem {
+        specialArgs = { inherit inputs outputs; };
+        modules = [
+          ./hosts/v-th-ctr-01/configuration.nix
+        ];
+      };
+
+      # Raspberry pi
+      p-th-rpi-01 = nixpkgs.lib.nixosSystem {
+        specialArgs = { inherit inputs outputs; };
+        modules = [
+          ./hosts/p-th-rpi-01/configuration.nix
         ];
       };
     };
 
     homeConfigurations = {
-      "xeovalyte@xv-laptop" = home-manager.lib.homeManagerConfiguration {
+      # Timo
+      "xeovalyte@ti-clt-lpt01" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages.x86_64-linux;
-        extraSpecialArgs = { inherit inputs nix-colors; };
+        extraSpecialArgs = { inherit inputs outputs; };
         modules = [
-          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
+          ./hosts/ti-clt-lpt01/home.nix
-        
-          ./hosts/laptop/home.nix
         ];
       };
-    };
 
-    nixosConfigurations = {
+      "xeovalyte@ti-clt-tbl01" = home-manager.lib.homeManagerConfiguration {
-      xv-desktop = nixpkgs.lib.nixosSystem {
+        pkgs = nixpkgs.legacyPackages.x86_64-linux;
-        system = "x86_64-linux";
+        extraSpecialArgs = { inherit inputs outputs; };
-        specialArgs = { inherit inputs; };
         modules = [
-          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
+          ./hosts/ti-clt-tbl01/home.nix
-
-          ./hosts/desktop
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.backupFileExtension = "backup";
-            home-manager.extraSpecialArgs = { inherit inputs nix-colors; };
-            home-manager.users.xeovalyte.imports = [ ./hosts/desktop/home.nix ];
-          }
         ];
       };
-    };
 
-    nixosConfigurations = {
+      "xeovalyte@ti-clt-dsk01" = home-manager.lib.homeManagerConfiguration {
-      vnix-ctr = nixpkgs.lib.nixosSystem {
+        pkgs = nixpkgs.legacyPackages.x86_64-linux;
-        system = "x86_64-linux";
+        extraSpecialArgs = { inherit inputs outputs; };
-        specialArgs = { inherit inputs; };
         modules = [
-          ({ config, pkgs, ... }: {
+          ./hosts/ti-clt-dsk01/home.nix
-            nixpkgs.overlays = [ overlay-unstable ];
+        ];
-            networking.hostName = "vnix-ctn01";
+      };
-          })
 
-          ./hosts/vnix-ctr
+      # Christa
-          home-manager.nixosModules.home-manager
+      "kiiwy@ch-clt-dsk01" = home-manager.lib.homeManagerConfiguration {
-          {
+        pkgs = nixpkgs.legacyPackages.x86_64-linux;
-            home-manager.useGlobalPkgs = true;
+        extraSpecialArgs = { inherit inputs outputs; };
-            home-manager.extraSpecialArgs = { inherit inputs nix-colors; };
+        modules = [
-            home-manager.users.xeovalyte.imports = [ ./hosts/vnix-ctr/home.nix ];
+          ./hosts/ch-clt-dsk01/home.nix
-          }
+        ];
+      };
+
+      # Deploy
+      "deploy@v-th-ctr-01" = home-manager.lib.homeManagerConfiguration {
+        pkgs = nixpkgs.legacyPackages.x86_64-linux;
+        extraSpecialArgs = { inherit inputs outputs; };
+        modules = [
+          ./hosts/v-th-ctr-01/home.nix
+        ];
+      };
+
+      # Deploy
+      "deploy@p-th-rpi-01" = home-manager.lib.homeManagerConfiguration {
+        pkgs = nixpkgs.legacyPackages.aarch64-linux;
+        extraSpecialArgs = { inherit inputs outputs; };
+        modules = [
+          ./hosts/p-th-rpi-01/home.nix
         ];
       };
     };
   };
 }
+

homelab/caddy/docker-compose.yml

@@ -1,19 +0,0 @@
-services:
-  caddy:
-    image: caddy:2.8
-    container_name: caddy
-    restart: unless-stopped
-    cap_add:
-      - NET_ADMIN
-    ports:
-      - 80:80
-      - 443:443
-      - 443:443/udp
-    volumes:
-      - caddy_data:/data
-      - caddy_config:/config
-      - ./caddyfiles:/etc/caddy/
-
-volumes:
-  caddy_data:
-  caddy_config:

hosts/ch-clt-dsk01/configuration.nix

@@ -0,0 +1,58 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    # Import hardware configuration
+    ./hardware-configuration.nix
+
+    # Import modules
+    ../../modules/system
+  ];
+
+  settings = {
+    hostname = "ch-clt-dsk01";
+    display-manager = "gdm";
+    desktop-environments = {
+      cosmic.enable = false;
+      hyprland.enable = false;
+      gnome.enable = true;
+    };
+    applications = {
+      common.enable = true;
+      steam.enable = true;
+      thunar.enable = false;
+    };
+    services = {
+      docker.enable = false;
+      quickemu.enable = false;
+      sunshine.enable = false;
+      garbage-collection.enable = true;
+    };
+    hardware = {
+      fprint.enable = false;
+      printing.enable = true;
+      bluetooth.enable = false;
+      firewall.enable = true;
+      locale.enable = true;
+      nvidia.enable = true;
+    };
+  };
+
+  # Users
+  users.users.kiiwy = {
+    isNormalUser = true;
+    description = "Christa Boomers";
+    extraGroups = [ "networkmanager" "wheel" "dialout" ];
+  };
+
+  # Bootloader
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.grub = {
+    enable = true;
+    efiSupport = true;
+    device = "nodev";
+    configurationLimit = 32;
+  };
+
+  system.stateVersion = "24.11";
+}

hosts/ch-clt-dsk01/home.nix

@@ -0,0 +1,61 @@
+{ pkgs, lib, ... }:
+
+{
+  imports = [
+    # Modules
+    ../../modules/home/default.nix
+  ];
+
+  config = {
+    home = {
+      username = "kiiwy";
+      homeDirectory = "/home/kiiwy";
+    };
+
+    settings = {
+      host = "c-clt-dsk01";
+
+      applications.common.enable = true;
+      applications.alacritty.enable = true;
+      applications.devenv.enable = false;
+      applications.firefox.enable = true;
+      applications.git.enable = true;
+      applications.helix.enable = true;
+      applications.zsh.enable = true;
+      applications.ssh.enable = true;
+      applications.thunderbird.enable = false;
+      applications.yazi.enable = false;
+      applications.zellij.enable = false;
+      applications.wezterm.enable = false;
+
+      services.nextcloud-sync.enable = false;
+
+      theming.fonts.enable = true;
+      theming.stylix.enable = true;
+      theming.stylix.wallpaper = "kiiwy.png";
+      theming.stylix.theme = "theme";
+
+      desktop-environments.hyprland.enable = false;
+    };
+
+    home.packages = with pkgs; [
+      # Desktop Applications
+      prismlauncher
+      unstable.signal-desktop
+      unstable.vesktop
+      unstable.webcord
+      unstable.prusa-slicer
+      blender
+
+      brave
+
+      # Office
+      libreoffice
+    ];
+
+    # Enable home-manager
+    programs.home-manager.enable = true;
+
+    home.stateVersion = "24.05";
+  };
+}

hosts/desktop/default.nix

@@ -1,67 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  imports = [ # Include the results of the hardware scan.
-    ./hardware-configuration.nix
-
-    # GUI
-    ../../modules/system/gui/steam.nix
-    ../../modules/system/gui/hyprland.nix
-    ../../modules/system/gui/thunar.nix
-
-    # CLI
-    ../../modules/system/cli/common.nix
-    ../../modules/system/cli/podman.nix
-
-    # Hardware
-    ../../modules/system/hardware/firewall.nix
-    ../../modules/system/hardware/garbage-collection.nix
-    ../../modules/system/hardware/locale.nix
-    ../../modules/system/hardware/nvidia.nix
-
-    # Containers
-    # ../../modules/containers/adguard.nix
-    # ../../modules/containers/caddy.nix
-  ];
-
-  nix.settings = {
-    experimental-features = [ "nix-command" "flakes" ];
-
-    substituters = [
-      "https://nix-community.cachix.org"
-    ];
-  };
-
-
-  # Bootloader.
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.grub = {
-    enable = true;
-    efiSupport = true;
-    device = "nodev";
-  };
-
-  networking.hostName = "xv-desktop"; # Define your hostname.
-  networking.interfaces.enp7s0.wakeOnLan.enable = true;
-
-  users.users.xeovalyte = {
-    isNormalUser = true;
-    description = "Timo Boomers";
-    extraGroups = [ "networkmanager" "wheel" "dialout" "fuse" ];
-  };
-
-  services.openssh.enable = true;
-
-  # boot.kernelPackages = pkgs.linuxPackages_latest;
-
-  # sunshine
-  services.sunshine = {
-    enable = true;
-    autoStart = true;
-    capSysAdmin = true;
-    openFirewall = true;
-  };
-
-  system.stateVersion = "24.05";
-
-}

hosts/desktop/home.nix

@@ -1,41 +0,0 @@
-{ pkgs, lib, ... }:
-
-{
-  imports = [
-    # GUI
-    ../../modules/home/gui/common
-    ../../modules/home/gui/hyprland
-    ../../modules/home/gui/nextcloud.nix
-    ../../modules/home/gui/theming.nix
-
-    # CLI
-    ../../modules/home/cli/common
-  ];
-
-  options = {
-    host = lib.mkOption {
-      type = with lib.types; str;
-      description = ''
-        Define the host of the machine
-      '';
-    };
-  };
-
-  config = {
-    home = {
-      username = "xeovalyte";
-      homeDirectory = "/home/xeovalyte";
-    };
-
-    host = "xv-desktop";
-
-    home.packages = with pkgs; [
-      unstable.prismlauncher
-      unstable.modrinth-app
-      unstable.vesktop
-      unstable.blender
-    ];
-
-    home.stateVersion = "24.05";
-  };
-}

hosts/laptop/default.nix

@@ -1,63 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  imports = [
-    ./hardware-configuration.nix
-
-    # GUI
-    ../../modules/system/gui/hyprland.nix
-    ../../modules/system/gui/steam.nix
-    ../../modules/system/gui/thunar.nix
-    # ../../modules/system/gui/plasma.nix
-    
-    # CLI
-    ../../modules/system/cli/common.nix
-    ../../modules/system/cli/docker.nix
-
-    # Hardware
-    ../../modules/system/hardware/amd.nix
-    ../../modules/system/hardware/bluetooth.nix
-    ../../modules/system/hardware/firewall.nix
-    ../../modules/system/hardware/garbage-collection.nix
-    ../../modules/system/hardware/laptop.nix
-    ../../modules/system/hardware/locale.nix
-    ../../modules/system/hardware/printing.nix
-  ];
-
-  nix.settings = {
-    experimental-features = [ "nix-command" "flakes" ];
-
-    substituters = [
-      "https://nix-community.cachix.org"
-    ];
-  };
-
-  # Bootloader.
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.grub = {
-    enable = true;
-    efiSupport = true;
-    device = "nodev";
-    configurationLimit = 32;
-  };
-
-  networking.hostName = "xv-laptop"; # Define your hostname.
-
-  users.users.xeovalyte = {
-    isNormalUser = true;
-    description = "Timo Boomers";
-    extraGroups = [ "networkmanager" "wheel" "dialout" ];
-  };
-
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
-  # Configure wacom tablet
-  hardware.opentabletdriver = {
-    enable = true;
-  };
-
-  services.libinput.enable = true;
-
-  system.stateVersion = "24.05";
-
-}

hosts/laptop/home.nix

@@ -1,68 +0,0 @@
-{ pkgs, lib, config, ... }:
-
-{
-  imports = [
-    # GUI
-    ../../modules/home/gui/common
-    ../../modules/home/gui/hyprland
-    ../../modules/home/gui/nextcloud.nix
-    ../../modules/home/gui/theming.nix
-    ../../modules/home/gui/thunderbird.nix
-
-    # CLI
-    ../../modules/home/cli/common
-    ../../modules/home/cli/develop.nix
-    ../../modules/home/cli/ssh.nix
-  ];
-
-
-  options = {
-    host = lib.mkOption {
-      type = with lib.types; str;
-      description = ''
-        Define the host of the machine
-      '';
-    };
-  };
-
-  config = {
-    home = {
-      username = "xeovalyte";
-      homeDirectory = "/home/xeovalyte";
-    };
-
-    host = "xv-laptop";
-
-    home.packages = with pkgs; [
-      # Desktop Applications
-      kdenlive
-      unstable.prismlauncher
-      unstable.joplin-desktop
-      unstable.moonlight-qt
-      unstable.prusa-slicer
-      signal-desktop
-      unstable.vesktop
-      unstable.rnote
-      unstable.blender
-      unstable.openscad-unstable
-
-      # Office
-      libreoffice
-      unstable.onlyoffice-bin
-
-      # Image editing
-      gimp
-      inkscape
-      unstable.obs-studio
-
-      # Development
-      unstable.drawio
-    ];
-
-    # Enable home-manager
-    programs.home-manager.enable = true;
-
-    home.stateVersion = "24.05";
-  };
-
-}

hosts/p-th-rpi-01/configuration.nix

@@ -0,0 +1,69 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ modulesPath, ... }:
+
+{
+  imports = [
+    ./hardware-configuration.nix
+    # Include the container-specific autogenerated configuration.
+    ../../modules/system/default.nix
+  ];
+
+  settings = {
+    hostname = "p-th-rpi-01";
+    display-manager = "none";
+    desktop-environments = {
+      cosmic.enable = false;
+      hyprland.enable = false;
+      gnome.enable = false;
+    };
+    applications = {
+      common.enable = true;
+      steam.enable = false;
+      thunar.enable = false;
+    };
+    services = {
+      docker.enable = false;
+      podman.enable = true;
+      quickemu.enable = false;
+      sunshine.enable = false;
+      garbage-collection.enable = true;
+      incus.enable = false;
+      ssh.enable = true;
+    };
+    hardware = {
+      fprint.enable = false;
+      printing.enable = false;
+      bluetooth.enable = false;
+      firewall.enable = true;
+      locale.enable = true;
+      nvidia.enable = false;
+    };
+  };
+
+  users.users.deploy = {
+    isNormalUser = true;
+    description = "Deploy";
+    extraGroups = [ "networkmanager" "wheel" "dialout" ];
+    linger = true;
+  };
+
+  # networking
+  networking = {
+    dhcpcd.enable = false;
+    useDHCP = false;
+    useHostResolvConf = false;
+  };
+
+  networking.hosts = {
+    "127.0.0.1" = [ "tbmrs.nl" ];
+  };
+
+  networking.firewall = {
+    enable = true;
+    allowedTCPPorts = [ 1080 1443 1053 ];
+    allowedUDPPorts = [ 1080 1443 1053 ];
+  };
+}

hosts/p-th-rpi-01/home.nix

@@ -0,0 +1,76 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    # Modules
+    ../../modules/home/default.nix
+  ];
+
+  config = {
+    home = {
+      username = "deploy";
+      homeDirectory = "/home/deploy";
+    };
+
+    settings = {
+      host = "p-th-rpi-01";
+    
+      applications.common.enable = false;
+      applications.alacritty.enable = false;
+      applications.devenv.enable = false;
+      applications.firefox.enable = false;
+      applications.git.enable = false;
+      applications.helix.enable = true;
+      applications.zsh.enable = true;
+      applications.ssh.enable = true;
+      applications.thunderbird.enable = false;
+      applications.yazi.enable = true;
+      applications.zellij.enable = true;
+      applications.wezterm.enable = false;
+
+      services.nextcloud-sync.enable = false;
+      services.podman.enable = true;
+      services.sops.enable = true;
+
+      theming.fonts.enable = false;
+      theming.stylix.enable = false;
+      theming.stylix.wallpaper = "wallpaper-2.png";
+      theming.stylix.theme = "da-one-ocean";
+
+      desktop-environments.hyprland.enable = false;
+
+      containers = {
+        network.enable = true;
+
+        nginx.enable = false;
+        caddy.enable = true;
+        kanidm.enable = false;
+        forgejo.enable = false;
+        immich.enable = false;
+        homepage.enable = false;
+        uptime-kuma.enable = false;
+        pingvin-share.enable = false;
+        vaultwarden.enable = false;
+        paperless-ngx.enable = false;
+        beszel.enable = false;
+        storage.enable = false;
+        homeassistant.enable = false;
+        karakeep.enable = false;
+        vikunja.enable = false;
+        stalwart.enable = false;
+        linkding.enable = false;
+        static.enable = true;
+      };
+    };
+
+    home.packages = with pkgs; [
+      unstable.helix
+      lazygit
+    ];
+
+    # Enable home-manager
+    programs.home-manager.enable = true;
+
+    home.stateVersion = "24.05";
+  };
+}

hosts/ti-clt-dsk01/configuration.nix

@@ -0,0 +1,97 @@
+{ inputs, outputs, pkgs, lib, ... }:
+
+{
+	imports = [
+		./hardware-configuration.nix
+
+		../../modules/system
+	];
+
+  settings = {
+		hostname = "ti-clt-dsk01";
+    display-manager = "greetd";
+    desktop-environments = {
+      cosmic.enable = false;
+      hyprland.enable = false;
+      gnome.enable = false;
+      niri.enable = true;
+    };
+    applications = {
+      common.enable = true;
+      steam.enable = true;
+      thunar.enable = false;
+    };
+    services = {
+      docker.enable = true;
+      quickemu.enable = false;
+      sunshine.enable = true;
+      garbage-collection.enable = true;
+			ssh.enable = true;
+    };
+    hardware = {
+      fprint.enable = false;
+      printing.enable = true;
+      bluetooth.enable = true;
+      firewall.enable = true;
+      locale.enable = true;
+      nvidia.enable = true;
+    };
+  };
+
+	# Users
+	users.users.xeovalyte = {
+		isNormalUser = true;
+		description = "Timo Boomers";
+		extraGroups = [ "wheel" ];
+	};
+
+	# Boot
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.grub = {
+    enable = true;
+    efiSupport = true;
+    device = "nodev";
+  };
+
+	# Networking
+	networking.interfaces.enp7s0.wakeOnLan.enable = true;
+  networking.hosts = {
+    "192.168.100.118" = [
+      "tbmrs.nl"
+      "auth.tbmrs.nl"
+      "git.tbmrs.nl"
+      "photos.tbmrs.nl"
+      "home.tbmrs.nl"
+      "uptime.tbmrs.nl"
+      "share.tbmrs.nl"
+      "files.tbmrs.nl"
+      "mail.tbmrs.nl"
+      "vault.local.tbmrs.nl"
+      "paperless.local.tbmrs.nl"
+      "monitor.local.tbmrs.nl"
+      "syncthing.local.tbmrs.nl"
+      "home-assistant.local.tbmrs.nl"
+      "tasks.local.tbmrs.nl"
+      "links.local.tbmrs.nl"
+      "stream.local.tbmrs.nl"
+    ];
+  };
+
+  # Temp keyboard override
+  environment.systemPackages = with pkgs; [
+    via
+    vial
+  ];
+  services.udev.packages = with pkgs; [
+    via
+    vial
+  ];
+
+  # manual udev override
+  # services.udev.extraRules = ''
+  #   KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{serial}=="*vial:f64c2b3c*", ATTRS{idVendor}=="320f", ATTRS{idProduct}=="5055", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl"
+  # '';
+
+  # state version
+  system.stateVersion = "24.11";
+}

hosts/ti-clt-dsk01/home.nix

@@ -0,0 +1,81 @@
+{ pkgs, lib, ... }:
+
+{
+  imports = [
+    # Modules
+    ../../modules/home/default.nix
+  ];
+
+  config = {
+    home = {
+      username = "xeovalyte";
+      homeDirectory = "/home/xeovalyte";
+    };
+
+    settings = {
+      host = "ti-clt-dsk01";
+
+      applications.common.enable = true;
+      applications.alacritty.enable = false;
+      applications.devenv.enable = true;
+      applications.firefox.enable = true;
+      applications.git.enable = true;
+      applications.helix = {
+        enable = true;
+        markdown = true;
+        rust = true;
+        systemverilog = true;
+        nix = true;
+        latex = true;
+        vue = true;
+      };
+      applications.zsh.enable = true;
+      applications.ssh.enable = true;
+      applications.thunderbird.enable = true;
+      applications.yazi.enable = true;
+      applications.zellij.enable = true;
+      applications.wezterm.enable = true;
+      applications.typst.enable = true;
+      applications.obs-studio.enable = true;
+
+      services.nextcloud-sync.enable = true;
+
+      theming.fonts.enable = true;
+      theming.stylix.enable = true;
+      theming.stylix.wallpaper = "wallpaper-2.png";
+      theming.stylix.theme = "da-one-ocean";
+
+      desktop-environments.hyprland.enable = false;
+      desktop-environments.niri.enable = true;
+    };
+
+    home.packages = with pkgs; [
+      unstable.prismlauncher
+      vesktop
+      unstable.rnote
+      unstable.inkscape
+      unstable.gimp
+      unstable.brave
+      unstable.freecad
+      hoppscotch
+      unstable.blender
+      unstable.signal-desktop
+      unstable.ladybird
+      unstable.prusa-slicer
+
+      unstable.surfer # waveform viewer
+      pomodoro-gtk
+
+      # Office
+      libreoffice
+
+      # Scripts
+      (import ../../modules/scripts/save_image.nix { inherit pkgs; })
+    ];
+
+    # Enable home-manager
+    programs.home-manager.enable = true;
+
+    home.stateVersion = "24.05";
+  };
+}

hosts/ti-clt-lpt01/configuration.nix

@@ -0,0 +1,109 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    # Import hardware configuration
+    ./hardware-configuration.nix
+
+    # Import modules
+    ../../modules/system
+  ];
+
+  settings = {
+    hostname = "ti-clt-lpt01";
+    display-manager = "greetd";
+    desktop-environments = {
+      cosmic.enable = false;
+      hyprland.enable = false;
+      gnome.enable = false;
+      niri.enable = true;
+    };
+    applications = {
+      common.enable = true;
+      steam.enable = true;
+      thunar.enable = true;
+    };
+    services = {
+      docker.enable = false;
+      quickemu.enable = true;
+      sunshine.enable = false;
+      garbage-collection.enable = true;
+      incus.enable = true;
+    };
+    hardware = {
+      fprint.enable = true;
+      printing.enable = true;
+      bluetooth.enable = true;
+      firewall.enable = true;
+      locale.enable = true;
+      nvidia.enable = false;
+    };
+  };
+
+  # Users
+  users.users.xeovalyte = {
+    isNormalUser = true;
+    description = "Timo Boomers";
+    extraGroups = [ "networkmanager" "wheel" "dialout" "adbusers" ];
+  };
+
+  networking.networkmanager.enable = true;
+
+  programs.nix-ld.enable = true;
+  programs.adb.enable = true;
+  services.power-profiles-daemon.enable = true;
+  
+  # Boot.
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.grub = {
+    enable = true;
+    efiSupport = true;
+    device = "nodev";
+    configurationLimit = 32;
+  };
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.supportedFilesystems = [ "nfs" ];
+
+  # Networking
+  networking.hosts = {
+    "127.0.0.1" = [
+      "tbmrs.nl"
+      "auth.tbmrs.nl"
+      "git.tbmrs.nl"
+      "photos.tbmrs.nl"
+      "home.tbmrs.nl"
+      "uptime.tbmrs.nl"
+      "share.tbmrs.nl"
+      "vault.local.tbmrs.nl"
+      "paperless.local.tbmrs.nl"
+      "monitor.local.tbmrs.nl"
+    ];
+  };
+
+  networking.firewall = {
+    enable = true;
+    allowedTCPPorts = [ 22 80 443 53 ];
+    allowedUDPPorts = [ 80 443 53 ];
+  };
+
+  # Obs
+  programs.obs-studio = {
+    enable = true;
+
+    # optional Nvidia hardware acceleration
+    package = (
+      pkgs.obs-studio.override {
+        cudaSupport = true;
+      }
+    );
+
+    plugins = with pkgs.obs-studio-plugins; [
+      wlrobs
+      obs-vaapi #optional AMD hardware acceleration
+      obs-gstreamer
+      obs-vkcapture
+    ];
+  };
+
+  system.stateVersion = "24.05";
+}

hosts/ti-clt-lpt01/home.nix

@@ -0,0 +1,90 @@
+{ pkgs, lib, inputs, ... }:
+
+{
+  imports = [
+    # Modules
+    ../../modules/home/default.nix
+  ];
+
+  config = {
+    home = {
+      username = "xeovalyte";
+      homeDirectory = "/home/xeovalyte";
+    };
+
+    settings = {
+      host = "ti-clt-lpt01";
+
+      applications.common.enable = true;
+      applications.alacritty.enable = true;
+      applications.devenv.enable = true;
+      applications.firefox.enable = true;
+      applications.git.enable = true;
+      applications.helix = {
+        enable = true;
+        markdown = true;
+        rust = true;
+        systemverilog = true;
+        nix = true;
+        latex = true;
+        vue = true;
+      };
+      applications.zsh.enable = true;
+      applications.ssh.enable = true;
+      applications.thunderbird.enable = true;
+      applications.yazi.enable = true;
+      applications.zellij.enable = true;
+      applications.wezterm.enable = true;
+      applications.nushell.enable = false;
+      applications.typst.enable = true;
+      # applications.obs-studio.enable = true;
+
+      services.nextcloud-sync.enable = true;
+
+      theming.fonts.enable = true;
+      theming.stylix.enable = true;
+      theming.stylix.wallpaper = "wallpaper-2.png";
+      theming.stylix.theme = "da-one-ocean";
+
+      desktop-environments.hyprland.enable = false;
+      desktop-environments.niri.enable = true;
+    };
+
+    home.packages = with pkgs; [
+      # Desktop Applications
+      prismlauncher
+      unstable.prusa-slicer
+      signal-desktop
+      unstable.vesktop
+      unstable.webcord
+      blender
+      unstable.freecad-wayland
+      loupe
+      unstable.rnote
+      unstable.bottles
+      unstable.hoppscotch
+      unstable.apostrophe
+      unstable.surfer # waveform viewer
+      unstable.vscode
+      pomodoro-gtk
+      unstable.brave
+
+      # Office
+      libreoffice
+
+      # Image editing
+      gimp
+      inkscape
+
+      unstable.moonlight-qt
+
+      # Scripts
+      (import ../../modules/scripts/save_image.nix { inherit pkgs; })
+    ];
+
+    # Enable home-manager
+    programs.home-manager.enable = true;
+
+    home.stateVersion = "24.05";
+  };
+}

hosts/ti-clt-tbl01/configuration.nix

@@ -0,0 +1,60 @@
+{ lib, pkgs, ... }:
+
+{
+  imports = [
+    # Import hardware configuration
+    ./hardware-configuration.nix
+
+    # Import modules
+    ../../modules/system
+  ];
+
+  settings = {
+    hostname = "ti-clt-tbl01";
+    display-manager = "gdm";
+    desktop-environments = {
+      cosmic.enable = false;
+      hyprland.enable = false;
+      gnome.enable = true;
+    };
+    applications = {
+      common.enable = true;
+      steam.enable = false;
+      thunar.enable = false;
+    };
+    services = {
+      docker.enable = false;
+      quickemu.enable = false;
+      sunshine.enable = false;
+      garbage-collection.enable = true;
+    };
+    hardware = {
+      fprint.enable = false;
+      printing.enable = false;
+      bluetooth.enable = true;
+      firewall.enable = true;
+      locale.enable = true;
+      nvidia.enable = false;
+    };
+  };
+
+  # Users
+  users.users.xeovalyte = {
+    isNormalUser = true;
+    description = "Timo Boomers";
+    extraGroups = [ "networkmanager" "wheel" "dialout" ];
+  };
+
+  # Bootloader.
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.grub = {
+    enable = true;
+    efiSupport = true;
+    device = "nodev";
+    configurationLimit = 32;
+  };
+  boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest;
+
+  system.stateVersion = "24.11";
+
+}

hosts/ti-clt-tbl01/hardware-configuration.nix

@@ -0,0 +1,40 @@
+# 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 + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" "rtsx_pci_sdmmc" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/4d44a7fb-9a4f-4d55-8daf-1c93f08485dd";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/30EC-F045";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/e803d3e2-28f0-427d-88e2-e0daf62f47fa"; }
+    ];
+
+  # 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.wlp1s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

hosts/ti-clt-tbl01/home.nix

@@ -0,0 +1,53 @@
+{ pkgs, lib, ... }:
+
+{
+  imports = [
+    # Modules
+    ../../modules/home/default.nix
+  ];
+
+  config = {
+    home = {
+      username = "xeovalyte";
+      homeDirectory = "/home/xeovalyte";
+    };
+
+    settings = {
+      host = "ti-clt-tbl01";
+
+      applications.common.enable = true;
+      applications.alacritty.enable = false;
+      applications.devenv.enable = false;
+      applications.firefox.enable = true;
+      applications.git.enable = true;
+      applications.helix.enable = true;
+      applications.zsh.enable = true;
+      applications.ssh.enable = false;
+      applications.thunderbird.enable = false;
+      applications.yazi.enable = true;
+      applications.zellij.enable = false;
+      applications.wezterm.enable = false;
+
+      services.nextcloud-sync.enable = true;
+
+      theming.fonts.enable = true;
+      theming.stylix.enable = true;
+      theming.stylix.wallpaper = "wallpaper-2.png";
+      theming.stylix.theme = "da-one-ocean";
+
+      desktop-environments.hyprland.enable = false;
+    };
+
+    home.packages = with pkgs; [
+      # Desktop Applications
+      unstable.rnote
+      unstable.xournalpp
+      unstable.koreader
+    ];
+
+    # Enable home-manager
+    programs.home-manager.enable = true;
+
+    home.stateVersion = "24.05";
+  };
+}

hosts/v-th-ctr-01/configuration.nix

@@ -0,0 +1,84 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ modulesPath, lib, ... }:
+
+{
+  imports = [
+    # Include the default incus configuration.
+    "${modulesPath}/virtualisation/lxc-container.nix"
+    # Include the container-specific autogenerated configuration.
+    ../../modules/system/default.nix
+  ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+
+  settings = {
+    hostname = "v-th-ctr-01";
+    display-manager = "none";
+    desktop-environments = {
+      cosmic.enable = false;
+      hyprland.enable = false;
+      gnome.enable = false;
+    };
+    applications = {
+      common.enable = true;
+      steam.enable = false;
+      thunar.enable = false;
+    };
+    services = {
+      docker.enable = false;
+      podman.enable = true;
+      quickemu.enable = false;
+      sunshine.enable = false;
+      garbage-collection.enable = true;
+      incus.enable = false;
+      ssh.enable = true;
+    };
+    hardware = {
+      fprint.enable = false;
+      printing.enable = false;
+      bluetooth.enable = false;
+      firewall.enable = true;
+      locale.enable = true;
+      nvidia.enable = false;
+    };
+  };
+
+  users.users.deploy = {
+    isNormalUser = true;
+    description = "Deploy";
+    extraGroups = [ "networkmanager" "wheel" "dialout" ];
+    linger = true;
+  };
+
+  # networking
+  networking = {
+    dhcpcd.enable = false;
+    useDHCP = false;
+    useHostResolvConf = false;
+  };
+
+  networking.hosts = {
+    "127.0.0.1" = [ "tbmrs.nl" ];
+  };
+
+  networking.firewall = {
+    enable = true;
+    allowedTCPPorts = [ 1080 1443 1053 ];
+    allowedUDPPorts = [ 1080 1443 1053 ];
+  };
+
+  systemd.network = {
+    enable = true;
+    networks."50-eth0" = {
+      matchConfig.Name = "eth0";
+      networkConfig = {
+        DHCP = "ipv4";
+        IPv6AcceptRA = true;
+      };
+      linkConfig.RequiredForOnline = "routable";
+    };
+  };
+}

hosts/v-th-ctr-01/home.nix

@@ -0,0 +1,76 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    # Modules
+    ../../modules/home/default.nix
+  ];
+
+  config = {
+    home = {
+      username = "deploy";
+      homeDirectory = "/home/deploy";
+    };
+
+    settings = {
+      host = "v-th-ctr-01";
+
+      applications.common.enable = false;
+      applications.alacritty.enable = false;
+      applications.devenv.enable = false;
+      applications.firefox.enable = false;
+      applications.git.enable = false;
+      applications.helix.enable = true;
+      applications.zsh.enable = true;
+      applications.ssh.enable = true;
+      applications.thunderbird.enable = false;
+      applications.yazi.enable = true;
+      applications.zellij.enable = true;
+      applications.wezterm.enable = false;
+
+      services.nextcloud-sync.enable = false;
+      services.podman.enable = true;
+      services.sops.enable = true;
+
+      theming.fonts.enable = false;
+      theming.stylix.enable = false;
+      theming.stylix.wallpaper = "wallpaper-2.png";
+      theming.stylix.theme = "da-one-ocean";
+
+      desktop-environments.hyprland.enable = false;
+
+      containers = {
+        network.enable = true;
+
+        nginx.enable = true;
+        caddy.enable = true;
+        kanidm.enable = true;
+        forgejo.enable = true;
+        immich.enable = true;
+        homepage.enable = true;
+        uptime-kuma.enable = true;
+        pingvin-share.enable = true;
+        vaultwarden.enable = true;
+        paperless-ngx.enable = true;
+        beszel.enable = true;
+        storage.enable = true;
+        homeassistant.enable = true;
+        karakeep.enable = false;
+        vikunja.enable = true;
+        stalwart.enable = true;
+        linkding.enable = true;
+        jellyfin.enable = true;
+      };
+    };
+
+    home.packages = with pkgs; [
+      unstable.helix
+      lazygit
+    ];
+
+    # Enable home-manager
+    programs.home-manager.enable = true;
+
+    home.stateVersion = "24.05";
+  };
+}

hosts/vnix-ctr/default.nix

@@ -1,53 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  imports = [ # Include the results of the hardware scan.
-    ./hardware-configuration.nix
-
-    # CLI
-    ../../modules/system/cli/common.nix
-    ../../modules/system/cli/podman.nix
-
-    # Hardware
-    ../../modules/system/hardware/firewall.nix
-    ../../modules/system/hardware/garbage-collection.nix
-    ../../modules/system/hardware/locale.nix
-  ];
-
-  nix.settings = {
-    experimental-features = [ "nix-command" "flakes" ];
-
-    substituters = [
-      "https://nix-community.cachix.org"
-      "https://cache.nixos.org/"
-    ];
-    trusted-public-keys = [
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-    ];
-  };
-
-  # Bootloader
-  boot.loader.grub = {
-    enable = true;
-    device = "/dev/sda";
-    useOSProber = true;
-  };
-
-  # Networking
-  networking.networkmanager.enable = true;
-
-  networking.firewall = {
-    allowedTCPPorts = [ 80 443 1080 ];
-    allowedUDPPorts = [ 53 ];
-  };
-
-  # Configure user
-  users.users.xeovalyte = {
-    isNormalUser = true;
-    description = "Timo Boomers";
-    extraGroups = [ "networkmanager" "wheel" "dialout" "fuse" ];
-  };
-
-  system.stateVersion = "24.05";
-
-}

hosts/vnix-ctr/home.nix

@@ -1,20 +0,0 @@
-{ pkgs, ... }:
-
-{
-  imports = [
-    # GUI
-    ../../modules/home/gui/theming.nix
-  
-    # CLI
-    ../../modules/home/cli/common
-  ];
-
-  guiTheming.enable = false;  
-
-  home = {
-    username = "xeovalyte";
-    homeDirectory = "/home/xeovalyte";
-  };
-
-  home.stateVersion = "24.05";
-}

justfile

@@ -0,0 +1,39 @@
+set unstable
+
+default:
+  @just --list
+
+update:
+  git pull
+  sudo nixos-rebuild switch --flake .
+  home-manager switch --flake .
+  
+clean:
+  sudo nix-collect-garbage -d
+  nix-collect-garbage -d
+
+fmt:
+  nix fmt
+
+alias s := switch
+
+switch:
+  sudo nixos-rebuild switch --flake .
+  home-manager switch --flake .
+
+alias sw := switch-system
+
+switch-system:
+  sudo nixos-rebuild switch --flake .
+
+alias sh := switch-home-manager
+
+switch-home-manager:
+  home-manager switch --flake .
+
+alias gc := collect-garbage
+
+collect-garbage:
+  sudo nix-collect-garbage -d
+  nix-collect-garbage -d
+  

modules/containers/adguard.nix

@@ -1,23 +0,0 @@
-{ pkgs, ... }:
-
-{
-  virtualisation.oci-containers.containers = {
-    adguardhome = {
-      image = "docker.io/adguard/adguardhome";
-      autoStart = true;
-      ports = [
-        "192.168.100.107:53:53/udp"
-        "81:3000/tcp"
-      ];
-      volumes = [
-        "workdir:/opt/adguardhome/work"
-        "confdir:/opt/adguardhome/conf"
-      ];
-    };
-  };
-
-  networking.firewall = {
-    allowedTCPPorts = [ 81 53 ];
-    allowedUDPPorts = [ 53 ];
-  };
-}

modules/containers/caddy.nix

@@ -1,16 +0,0 @@
-{ pkgs, ... }:
-
-pkgs.dockerTools.buildImage {
-  name = "caddy-custom";
-  tag = "latest";
-
-  fromImage = "docker.io/caddy";
-  fromImageName = null;
-  fromImageTag = "2.8.4-builder";
-
-  runAsRoot = ''
-    #!${pkgs.runtimeShell}
-
-    xcaddy build --with github.com/caddy-dns/cloudflare
-  '';
-}

modules/home/applications/alacritty.nix

@@ -0,0 +1,62 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.applications.alacritty;
+in {
+  options = {
+    settings.applications.alacritty.enable = lib.mkOption {
+      type = lib.types.bool;
+      description = ''
+        Enable alacritty terimnal
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    programs.alacritty = {
+      enable = true;
+      settings = {
+        # font = {
+        #   normal = { family = "DejaVuSansM Nerd Font"; style = "Regular"; };
+        # };
+        # window = {
+        #   opacity = 0.8;
+        #   padding = { x = 10; y = 10; };
+        # };
+        # colors = {
+        #   draw_bold_text_with_bright_colors = false;
+        #   primary = {
+        #     background = "0x${config.colorScheme.palette.base00}";
+        #     foreground = "0x${config.colorScheme.palette.base05}";
+        #   };
+        #   cursor = {
+        #     text = "0x${config.colorScheme.palette.base00}";
+        #     cursor = "0x${config.colorScheme.palette.base05}";
+        #   };
+        #   normal = {
+        #     black = "0x${config.colorScheme.palette.base00}";
+        #     red = "0x${config.colorScheme.palette.base08}";
+        #     green = "0x${config.colorScheme.palette.base0B}";
+        #     yellow = "0x${config.colorScheme.palette.base0A}";
+        #     blue = "0x${config.colorScheme.palette.base0D}";
+        #     magenta = "0x${config.colorScheme.palette.base0E}";
+        #     cyan = "0x${config.colorScheme.palette.base0C}";
+        #     white = "0x${config.colorScheme.palette.base05}";
+        #   };
+        #   bright = {
+        #     black = "0x${config.colorScheme.palette.base03}";
+        #     red = "0x${config.colorScheme.palette.base09}";
+        #     green = "0x${config.colorScheme.palette.base01}";
+        #     yellow = "0x${config.colorScheme.palette.base02}";
+        #     blue = "0x${config.colorScheme.palette.base04}";
+        #     magenta = "0x${config.colorScheme.palette.base06}";
+        #     cyan = "0x${config.colorScheme.palette.base0F}";
+        #     white = "0x${config.colorScheme.palette.base07}";
+        #   };
+        # };
+      };
+    };
+  };
+}

modules/home/applications/common.nix

@@ -0,0 +1,24 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.applications.common;
+in {
+  options = {
+    settings.applications.common.enable = lib.mkOption {
+      type = lib.types.bool;
+      description = ''
+        Enable common applications
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      vlc
+      unstable.bitwarden
+      pavucontrol
+    ];
+  };
+}

modules/home/applications/devenv.nix

@@ -0,0 +1,29 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.applications.devenv;
+in {
+  options = {
+    settings.applications.devenv.enable = lib.mkOption {
+      type = lib.types.bool;
+      description = ''
+        Enable common applications
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      unstable.devenv
+      cloc
+    ];
+
+    programs.direnv = {
+      enable = true;
+      enableBashIntegration = true;
+    };
+  };
+}
+

modules/home/applications/firefox.nix

@@ -0,0 +1,182 @@
+{ config, lib, pkgs, ... }:
+
+# about:policies
+# Check about:support for extension/add-on ID strings.
+# Check about:config for options.
+
+with lib;
+
+let
+  cfg = config.settings.applications.firefox;
+in {
+  options = {
+    settings.applications.firefox.enable = lib.mkOption {
+      type = lib.types.bool;
+      description = ''
+        Enable firefox
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      unstable.firefoxpwa
+    ];
+
+    stylix.targets.firefox.profileNames = [ "${config.home.username}" ];
+    
+    programs.firefox = lib.mkMerge [
+      {
+        enable = true;
+      }
+      (lib.mkIf (config.home.username == "xeovalyte") {
+        nativeMessagingHosts = [ pkgs.unstable.firefoxpwa ];
+        policies = {
+          DisableTelemetry = true;
+          DisableFirefoxStudies = true;
+          EnableTrackingProtection = {
+            Value = true;
+            Locked = true;
+            Cryptomining = true;
+            Fingerprinting = true;
+          };
+          DisablePocket = true;
+          DisableFirefoxAccounts = true;
+          DisableAccounts = true;
+          DontCheckDefaultBrowser = true;
+          DisplayBookmarksToolbar = "newpage";
+          ExtensionSettings = {
+            "nl-NL@dictionaries.addons.mozilla.org" = {
+              install_url = "https://addons.mozilla.org/firefox/downloads/latest/woordenboek-nederlands/latest.xpi";
+              installation_mode = "force_installed";
+            };
+            "uBlock0@raymondhill.net" = {
+              install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
+              installation_mode = "force_installed";
+            };
+            "{446900e4-71c2-419f-a6a7-df9c091e268b}" = {
+              install_url = "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi";
+              installation_mode = "force_installed";
+            };
+            "firefoxpwa@filips.si" = {
+              install_url = "https://addons.mozilla.org/firefox/downloads/latest/pwas-for-firefox/latest.xpi";
+              installation_mode = "force_installed";
+            };
+            "markdown-viewer@outofindex.com" = {
+              install_url = "https://addons.mozilla.org/firefox/downloads/latest/markdown-viewer-chrome/latest.xpi";
+              installation_mode = "force_installed";
+            };
+          };
+        };
+        profiles.${config.home.username} = {
+          bookmarks.force = true;
+          bookmarks.settings = [
+            {
+              name = "Toolbar";
+              toolbar = true;
+              bookmarks = [
+                {
+                  name = "Brightspace";
+                  bookmarks = [
+                    {
+                      name = "Books";
+                      url = "https://drive.google.com/drive/folders/1L5OTbn5p3i7_Nc80hc5PztiEGHKwi-I4";
+                    }
+                    {
+                      name = "Linear algebra and Differential equations";
+                      url = "https://brightspace.tudelft.nl/d2l/le/content/681028/Home";
+                    }
+                    {
+                      name = "Electrical Energy Fundamentals";
+                      url = "https://brightspace.tudelft.nl/d2l/le/content/681016/Home";
+                    }
+                    {
+                      name = "IP 2";
+                      url = "https://brightspace.tudelft.nl/d2l/le/content/681022/Home";
+                    }
+                  ];
+                }
+              ];
+            }
+          ];
+          search.engines = {
+            "Nix" = {
+              urls = [{
+                template = "https://mynixos.com/search";
+                params = [
+                  { name = "q"; value = "{searchTerms}"; }
+                ];
+              }];
+
+              icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+              definedAliases = [ "@nix" ];
+            };
+
+            "SearXNG" = {
+              urls = [{
+                template = "https:/search.xeovalyte.dev/search";
+                params = [
+                  { name = "q"; value = "{searchTerms}"; }
+                ];
+              }];
+
+              definedAliases = [ "@searxng" ];
+            };
+
+            "Startpage" = {
+              urls = [{
+                template = "https:/startpage.com/sp/search";
+                params = [
+                  { name = "q"; value = "{searchTerms}"; }
+                ];
+              }];
+
+              definedAliases = [ "@sp" ];
+            };
+
+            "bing".metaData.hidden = true;
+            "google".metaData.hidden = true;
+            "ebay".metaData.hidden = true;
+          };
+          search.force = true;
+          search.default = "ddg";
+
+          settings = {
+            "browser.disableResetPrompt" = true;
+            "browser.download.panel.shown" = true;
+            "browser.download.useDownloadDir" = false;
+            "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
+            "browser.shell.checkDefaultBrowser" = false;
+            "browser.shell.defaultBrowserCheckCount" = 1;
+            "dom.security.https_only_mode" = true;
+            "privacy.trackingProtection.enabled" = true;
+            "browser.toolbars.bookmarks.visibility" = "newtab";
+            "browser.translations.neverTranslateLanguages" = "nl";
+            "browser.newtabpage.pinned" = [
+              {
+                label = "Server";
+                url = "https://home.xeovalyte.dev";
+              }
+              {
+                label = "Youtube";
+                url = "https://youtube.com";
+              }
+              {
+                label = "My TU Delft";
+                url = "https://my.tudelft.nl/";
+              }
+              {
+                label = "Vikunja";
+                url = "https://vikunja.xeovalyte.dev/";
+              }
+            ];
+            "signon.rememberSignons" = false;
+          };
+        };
+      })
+    ];
+  };
+}
+
+  
+

modules/home/applications/git.nix

@@ -0,0 +1,46 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.applications.git;
+in {
+  options = {
+    settings.applications.git.enable = lib.mkOption {
+      type = lib.types.bool;
+      description = ''
+        Enable git version control
+      '';
+    };
+
+    settings.applications.git.lazygit.enable = lib.mkOption {
+      type = lib.types.bool;
+      description = ''
+        Enable lazygit
+      '';
+      default = true;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    programs.lazygit =  {
+      enable = true;
+      settings = {
+        services = {
+          "gitea.xeovalyte.dev" = "gitea:gitea.xeovalyte.dev";
+        };
+      };
+    };
+
+    programs.git = mkIf cfg.lazygit.enable {
+      enable = true;
+      userEmail = "me+gitea@xeovalyte.dev";
+      userName = "Timo Boomers";
+      extraConfig = {
+        commit.gpgsign = true;
+        gpg.format = "ssh";
+        user.signingkey = "~/.ssh/gitea.pub";
+      };
+    };
+  };
+}

modules/home/applications/helix.nix

@@ -0,0 +1,204 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.applications.helix;
+in {
+  options = {
+    settings.applications.helix.enable = lib.mkOption {
+      type = lib.types.bool;
+      description = ''
+        Enable helix text editor
+      '';
+    };
+
+    settings.applications.helix.markdown = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Enable markdown language support
+      '';
+    };
+
+    settings.applications.helix.systemverilog = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Enable systemverilog language support
+      '';
+    };
+
+    settings.applications.helix.nix = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+      description = ''
+        Enable nix language support
+      '';
+    };
+
+    settings.applications.helix.latex = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+      description = ''
+        Enable latex language support
+      '';
+    };
+
+    settings.applications.helix.vue = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+      description = ''
+        Enable vue/nuxt language support
+      '';
+    };
+
+    settings.applications.helix.rust = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Enable rust language support
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; lib.concatLists [
+      (lib.optionals cfg.markdown [ unstable.marksman unstable.markdown-oxide dprint ])
+      (lib.optionals cfg.systemverilog [ unstable.svls ])
+      (lib.optionals cfg.nix [ unstable.nix unstable.nixpkgs-fmt ])
+      (lib.optionals cfg.latex [ tectonic unstable.texlab ])
+      (lib.optionals cfg.vue [ unstable.vue-language-server unstable.typescript unstable.typescript-language-server ])
+    ];
+
+    # Markdown
+    home.file.".config/.dprint.json" = lib.mkIf cfg.markdown {
+      text = ''
+        {
+          "markdown": {
+            "lineWidth":120,
+          },
+          "excludes": [],
+          "plugins": [
+            "https://plugins.dprint.dev/markdown-0.16.1.wasm"
+          ]
+        }
+      '';
+    };
+
+    programs.helix = {
+      enable = true;
+      package = pkgs.unstable.helix;
+      defaultEditor = true;
+      settings = {
+        editor.cursor-shape = {
+          insert = "bar";
+        };
+        editor.end-of-line-diagnostics = "hint";
+      };
+      languages = {
+        # Rust
+        language-server.rust-analyzer.config = lib.mkIf cfg.rust {
+          cargo = {
+            features = "all";
+          };
+        };
+
+        # Systemverilog
+        language-server.svls = lib.mkIf cfg.systemverilog {
+          command = "svls";
+        };
+
+        # Latex
+        language-server.texlab = lib.mkIf cfg.latex {
+          config = {
+            texlab.chktex = {
+              onOpenAndSave = true;
+              onEdit = true;
+            };
+            texlab.forwardSearch = {
+              executable = "zathura";
+              args = [
+                "--synctex-forward"
+                "%l:%c:%f"
+                "%p"
+              ];
+            };
+            texlab.build = {
+              auxDirectory = "build";
+              logDirectory = "build";
+              pdfDirectory = "build";
+              forwardSearchAfter = true;
+              onSave = true;
+              executable = "tectonic";
+              args = [
+                "-X"
+                "compile"
+                "--synctex"
+                "--keep-logs"
+                "--keep-intermediates"
+                "--outdir=build"
+                "%f"
+              ];
+            };
+          };
+        };
+
+        language-server.typescript-language-server.config = lib.mkIf cfg.vue {
+          # tsserver = {
+          #   path = "${pkgs.unstable.typescript}/bin/tsserver";
+          # };
+          plugins = [
+            {
+              name = "@vue/typescript-plugin";
+              location = "${pkgs.unstable.vue-language-server}/bin/vue-language-server}";
+              languages = ["vue"];
+            }
+          ];
+
+          vue.inlayHints = {
+            includeInlayEnumMemberValueHints = true;
+            includeInlayFunctionLikeReturnTypeHints = true;
+            includeInlayFunctionParameterTypeHints = true;
+            includeInlayParameterNameHints = "all";
+            includeInlayParameterNameHintsWhenArgumentMatchesName = true;
+            includeInlayPropertyDeclarationTypeHints = true;
+            includeInlayVariableTypeHints = true;
+          };
+        };
+          # language-server.vue-language-server = {
+          #   command = "${pkgs.vue-language-server}/bin/vue-language-server";
+          #   args = [ "--stdio" ];
+          #   config = {
+          #     typescript = {
+          #       tsdk = "${pkgs.typescript}/bin/";
+          #     };
+          #   };
+          # };
+
+        language = lib.concatLists [
+          (lib.optionals cfg.systemverilog [{
+            name = "verilog";
+            language-servers = [ "svls" ];
+          }])
+          (lib.optionals cfg.markdown [{
+            name = "markdown";
+            auto-format = true;
+            language-servers = [ "markdown-oxide" ];
+            formatter.command = "dprint";
+            formatter.args = ["fmt" "--stdin" "md" "--config" "/home/xeovalyte/.config/.dprint.json"];
+          }
+          {
+            name = "typst";
+            auto-format = false;
+            formatter.command = "${pkgs.typstfmt}/bin/typstfmt";
+          }])
+          (lib.optionals cfg.vue [{
+            name = "vue";
+            language-servers = ["vuels" "typescript-language-server"];
+          }])
+        ];
+      };
+    };
+  };
+}

modules/home/applications/nushell.nix

@@ -0,0 +1,37 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.applications.nushell;
+in {
+  options = {
+    settings.applications.nushell.enable = lib.mkOption {
+      type = lib.types.bool;
+      description = ''
+        Enable nushell shell
+      '';
+      default = false;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      eza    
+      bat
+    ];
+
+    programs.bash = {
+      enable = false;
+    };
+
+    programs.nushell = {
+      enable = true;
+    };
+
+    programs.starship = {
+      enable = true;
+      enableNushellIntegration = true;
+    };
+  };
+}

modules/home/applications/obs-studio.nix

@@ -0,0 +1,27 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.applications.obs-studio;
+in {
+  options = {
+    settings.applications.obs-studio.enable = lib.mkOption {
+      type = lib.types.bool;
+      description = ''
+        Enable obs studio with optional plugins
+      '';
+      default = false;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    programs.obs-studio = {
+      enable = true;
+      plugins = with pkgs.obs-studio-plugins; [
+        wlrobs
+        obs-vaapi #optional AMD hardware acceleration
+      ];
+    };
+  };
+}

modules/home/applications/ssh.nix

@@ -0,0 +1,43 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.applications.ssh;
+in {
+  options = {
+    settings.applications.ssh.enable = lib.mkOption {
+      type = lib.types.bool;
+      description = ''
+        Enable ssh and configure some endpoints
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    programs.ssh = {
+      enable = true;
+      matchBlocks = {
+        archserver = {
+          hostname = "192.168.1.20";
+          user = "xeovalyte";
+          identityFile = "~/.ssh/archserver";
+        };
+
+        "gitea.xeovalyte.dev" = {
+          hostname = "gitea.xeovalyte.dev";
+          port = 2222;
+          user = "git";
+          identityFile = "~/.ssh/gitea";
+        };
+
+        "gitlab.ewi.tudelft.nl" = {
+          hostname = "gitlab.ewi.tudelft.nl";
+          user = "tboomers";
+          identityFile = "~/.ssh/gitlab_tudelft";
+        };
+      };
+      addKeysToAgent = "yes";
+    };
+  };
+}

modules/home/applications/thunderbird.nix

@@ -0,0 +1,101 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.applications.thunderbird;
+in {
+  options = {
+    settings.applications.thunderbird.enable = lib.mkOption {
+      type = lib.types.bool;
+      description = ''
+        Enable thunderbird mail
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+   	programs.thunderbird = {
+      enable = true;
+      package = pkgs.unstable.thunderbird;
+      profiles = {
+        default = {
+          isDefault = true;  
+        };
+      };
+    };
+
+    accounts.email.accounts = {
+      ziggo = {
+        imap = {
+          host = "imap.ziggo.nl";
+          port = 993;
+          tls = {
+            enable = true;
+          };
+        };
+        smtp =  {
+          host = "smtp.ziggo.nl";
+          port = 587;
+          tls = {
+            enable = true;
+            useStartTls = true;
+          };
+        };
+        address = "timo.boomers@ziggo.nl";
+        realName = "Timo Boomers";
+        userName = "timo.boomers@ziggo.nl";
+        primary = true;
+        thunderbird.enable = true;
+        thunderbird.profiles = [ "default" ];
+      };
+      tudelft = {
+        imap = {
+          host = "outlook.office365.com";
+          port = 993;
+          tls = {
+            enable = true;
+          };
+        };
+        smtp =  {
+          host = "smtp.office365.com";
+          port = 587;
+          tls = {
+            enable = true;
+            useStartTls = false;
+          };
+        };
+        address = "tboomers@tudelft.nl";
+        realName = "Timo Boomers";
+        userName = "tboomers@tudelft.nl";
+        primary = false;
+        thunderbird.enable = true;
+        thunderbird.profiles = [ "default" ];
+      };
+      xeovalyte = {
+        imap = {
+          host = "mail.xeovalyte.dev";
+          port = 993;
+          tls = {
+            enable = true;
+          };
+        };
+        smtp =  {
+          host = "mail.xeovalyte.dev";
+          port = 587;
+          tls = {
+            enable = true;
+            useStartTls = true;
+          };
+        };
+        address = "timo@xeovalyte.dev";
+        aliases = [ "me@xeovalyte.dev" "contact@xeovalyte.dev" ];
+        realName = "Timo Boomers";
+        userName = "me@xeovalyte.dev";
+        primary = false;
+        thunderbird.enable = true;
+        thunderbird.profiles = [ "default" ];
+      };
+    };
+  };
+}

modules/home/applications/typst.nix

@@ -0,0 +1,24 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.applications.typst;
+in {
+  options = {
+    settings.applications.typst.enable = lib.mkOption {
+      type = lib.types.bool;
+      description = ''
+        Enable typst
+      '';
+      default = false;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      unstable.typst
+      unstable.typst-live
+    ];
+  };
+}

modules/home/applications/wezterm.nix

@@ -0,0 +1,107 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.applications.wezterm;
+in {
+  options = {
+    settings.applications.wezterm.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Enable wezterm terminal
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    programs.wezterm = {
+      enable = true;
+      enableZshIntegration = true;
+        package = pkgs.unstable.wezterm;
+      extraConfig = /* lua */ ''
+        -- Pull in the wezterm API
+        local wezterm = require 'wezterm'
+
+        -- This will hold the configuration.
+        local config = wezterm.config_builder()
+        local act = wezterm.action
+
+        -- This is where you actually apply your config choices
+
+        -- For example, changing the color scheme:
+        config.enable_tab_bar = true
+        config.use_fancy_tab_bar = false
+        config.window_decorations = "NONE"
+        config.tab_bar_at_bottom = true
+
+        config.keys = {
+          -- Pane controls
+          {
+            key = 'h',
+            mods = 'CTRL',
+            action = act.ActivatePaneDirection 'Left',
+          },
+          {
+            key = 'l',
+            mods = 'CTRL',
+            action = act.ActivatePaneDirection 'Right',
+          },
+          {
+            key = 'k',
+            mods = 'CTRL',
+            action = act.ActivatePaneDirection 'Up',
+          },
+          {
+            key = 'j',
+            mods = 'CTRL',
+            action = act.ActivatePaneDirection 'Down',
+          },
+
+          -- Pane resizing
+          {
+            key = 'H',
+            mods = 'CTRL',
+            action = act.AdjustPaneSize { 'Left', 5 },
+          },
+          {
+            key = 'L',
+            mods = 'CTRL',
+            action = act.AdjustPaneSize { 'Right', 5 },
+          },
+          {
+            key = 'K',
+            mods = 'CTRL',
+            action = act.AdjustPaneSize { 'Up', 5 },
+          },
+          {
+            key = 'J',
+            mods = 'CTRL',
+            action = act.AdjustPaneSize { 'Down', 5 },
+          },
+          {
+            key = 'q',
+            mods = 'CTRL',
+            action = act.CloseCurrentPane { confirm = false },
+          },
+
+          -- Tab management
+          { key = '1', mods = 'ALT', action = act.ActivateTab(0) },
+          { key = '2', mods = 'ALT', action = act.ActivateTab(1) },
+          { key = '3', mods = 'ALT', action = act.ActivateTab(2) },
+          { key = '4', mods = 'ALT', action = act.ActivateTab(3) },
+          { key = '5', mods = 'ALT', action = act.ActivateTab(4) },
+          {
+            key = 'q',
+            mods = 'ALT',
+            action = act.CloseCurrentTab { confirm = false },
+          },
+        }
+
+        -- and finally, return the configuration to wezterm
+        return config
+      '';
+    };
+  };
+}

modules/home/applications/yazi.nix

@@ -0,0 +1,35 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.applications.yazi;
+in {
+  options = {
+    settings.applications.yazi.enable = lib.mkOption {
+      type = lib.types.bool;
+      description = ''
+        Enable yazi terminal file manager
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    programs.yazi = {
+      enable = true;
+      enableZshIntegration = true;
+      settings = {
+        opener = {
+          open = [
+            { run = "xdg-open $@"; desc = "xdg"; orphan = true; }
+          ];
+        };
+        open = {
+          prepend_rules = [
+            { name = "*.rnote"; use = "open"; }
+          ];
+        };
+      };
+    };
+  };
+}

modules/home/applications/zellij.nix

@@ -0,0 +1,99 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.applications.zellij;
+  sesh = pkgs.writeScriptBin "sesh" ''
+    #! /usr/bin/env sh
+  
+    # Taken from https://github.com/zellij-org/zellij/issues/884#issuecomment-1851136980
+    # select a directory using zoxide
+    ZOXIDE_RESULT=$(${pkgs.zoxide}/bin/zoxide query --interactive)
+
+    # checks whether a directory has been selected
+    if [[ -z "$ZOXIDE_RESULT" ]]; then
+    	# if there was no directory, select returns without executing
+    	exit 0
+    fi
+    # extracts the directory name from the absolute path
+    SESSION_TITLE=$(echo "$ZOXIDE_RESULT" | sed 's#.*/##')
+
+    # get the list of sessions
+    SESSION_LIST=$(zellij list-sessions -n | awk '{print $1}')
+
+    # checks if SESSION_TITLE is in the session list
+    if echo "$SESSION_LIST" | grep -q "^$SESSION_TITLE$"; then
+    	# if so, attach to existing session
+    	zellij attach "$SESSION_TITLE"
+    else
+    	# if not, create a new session
+    	echo "Creating new session $SESSION_TITLE and CD $ZOXIDE_RESULT"
+    	cd $ZOXIDE_RESULT
+    	zellij attach -c "$SESSION_TITLE"
+    fi
+  '';
+in {
+  options = {
+    settings.applications.zellij.enable = lib.mkOption {
+      type = lib.types.bool;
+      description = ''
+        Enable zellij tool
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    programs.zellij = {
+      enable = true;
+    };
+
+    programs.zoxide = {
+      enable = true;
+      enableZshIntegration = true;
+    };
+
+    home.packages = [
+      sesh
+    ];
+
+    home.file.zellij = {
+      target = ".config/zellij/config.kdl";
+      text = ''
+        pane_frames true
+        keybinds {
+          normal {
+            bind "Ctrl e" { ToggleFloatingPanes; SwitchToMode "normal"; }
+            bind "Ctrl d" { Detach; }
+            bind "Alt 1" { GoToTab 1; }
+            bind "Alt 2" { GoToTab 2; }
+            bind "Alt 3" { GoToTab 3; }
+            bind "Alt 4" { GoToTab 4; }
+            bind "Alt 5" { GoToTab 5; }
+          }
+        }
+      '';
+    };
+
+    home.file.zellij-layout-default = {
+      target = ".config/zellij/layouts/default.kdl";
+      text = ''
+        layout {
+          pane borderless=true {}
+          floating_panes {
+            pane {
+              width "80%"
+              height "80%"
+              x "10%"
+              y "10%"
+            }
+          }
+          pane size=1 borderless=true {
+            plugin location="zellij:tab-bar"
+          }
+        }
+      '';
+    };
+  };
+}
+

modules/home/applications/zsh.nix

@@ -0,0 +1,49 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.applications.zsh;
+in {
+  options = {
+    settings.applications.zsh.enable = lib.mkOption {
+      type = lib.types.bool;
+      description = ''
+        Enable zsh shell
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      eza    
+      bat
+    ];
+
+    home.shellAliases = {
+      ls = "eza";   
+    };
+
+    programs.bash = {
+      enable = false;
+    };
+
+    programs.zsh = {
+      enable = true;
+      enableCompletion = true;
+      autosuggestion.enable = true;
+      syntaxHighlighting.enable = true;
+    };
+
+    programs.starship = {
+      enable = true;
+      enableBashIntegration = true;
+      enableZshIntegration = true;
+    };
+
+    programs.skim = {
+      enable = true;
+      enableZshIntegration = true;
+    };
+  };
+}

modules/home/cli/common/default.nix

@@ -1,9 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./git.nix
-    ./shell.nix
-    ./helix.nix
-  ];
-}

modules/home/cli/common/git.nix

@@ -1,23 +0,0 @@
-{ pkgs, ... }:
-
-{
-  programs.lazygit = {
-    enable = true;
-    settings = {
-      services = {
-        "gitea.xeovalyte.dev" = "gitea:gitea.xeovalyte.dev";
-      };
-    };
-  };
-
-  programs.git = {
-    enable = true;
-    userEmail = "me+gitea@xeovalyte.dev";
-    userName = "xeovalyte";
-    extraConfig = {
-      commit.gpgsign = true;
-      gpg.format = "ssh";
-      user.signingkey = "~/.ssh/gitea.pub";
-    };
-  };
-}

modules/home/cli/common/helix.nix

@@ -1,117 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    unstable.marksman
-  ];
-
-  programs.helix = {
-    enable = true;
-    package = pkgs.unstable.helix;
-    defaultEditor = true;
-    settings = {
-      theme = "base16";
-      editor.cursor-shape = {
-        insert = "bar";
-      };
-    };
-    languages = {
-      language-server.rust-analyzer.config = {
-        cargo = {
-          features = "all";
-        };
-      };
-    };
-    themes = {
-      base16 = let
-        base00 = "#${config.colorScheme.palette.base00}";
-        base01 = "#${config.colorScheme.palette.base01}";
-        base02 = "#${config.colorScheme.palette.base02}";
-        base03 = "#${config.colorScheme.palette.base03}";
-        base04 = "#${config.colorScheme.palette.base04}";
-        base05 = "#${config.colorScheme.palette.base05}";
-        base06 = "#${config.colorScheme.palette.base06}";
-        base07 = "#${config.colorScheme.palette.base07}";
-        base08 = "#${config.colorScheme.palette.base08}";
-        base09 = "#${config.colorScheme.palette.base09}";
-        base0A = "#${config.colorScheme.palette.base0A}";
-        base0B = "#${config.colorScheme.palette.base0B}";
-        base0C = "#${config.colorScheme.palette.base0C}";
-        base0D = "#${config.colorScheme.palette.base0D}";
-        base0E = "#${config.colorScheme.palette.base0E}";
-        base0F = "#${config.colorScheme.palette.base0F}";
-      in  {
-        "attributes" = base09;
-        "comment" = { fg = base03; modifiers = ["italic"]; };
-        "constant" = base09;
-        "constant.character.escape" = base0C;
-        "constant.numeric" = base09;
-        "constructor" = base0D;
-        "debug" = base03;
-        "diagnostic" = { modifiers = ["underlined"]; };
-        "diff.delta" = base09;
-        "diff.minus" = base08;
-        "diff.plus" = base0B;
-        "error" = base08;
-        "function" = base0D;
-        "hint" = base03;
-        "info" = base0D;
-        "keyword" = base0E;
-        "label" = base0E;
-        "namespace" = base0E;
-        "operator" = base05;
-        "special" = base0D;
-        "string"  = base0B;
-        "type" = base0A;
-        "variable" = base08;
-        "variable.other.member" = base0B;
-        "warning" = base09;
-
-        "markup.bold" = { fg = base0A; modifiers = ["bold"]; };
-        "markup.heading" = base0D;
-        "markup.italic" = { fg = base0E; modifiers = ["italic"]; };
-        "markup.link.text" = base08;
-        "markup.link.url" = { fg = base09; modifiers = ["underlined"]; };
-        "markup.list" = base08;
-        "markup.quote" = base0C;
-        "markup.raw" = base0B;
-        "markup.strikethrough" = { modifiers = ["crossed_out"]; };
-
-        "diagnostic.hint" = { underline = { style = "curl"; }; };
-        "diagnostic.info" = { underline = { style = "curl"; }; };
-        "diagnostic.warning" = { underline = { style = "curl"; }; };
-        "diagnostic.error" = { underline = { style = "curl"; }; };
-
-#        "ui.background" = { bg = base00; };
-        "ui.bufferline.active" = { fg = base00; bg = base03; modifiers = ["bold"]; };
-        "ui.bufferline" = { fg = base04; bg = base00; };
-        "ui.cursor" = { fg = base0A; modifiers = ["reversed"]; };
-        "ui.cursor.insert" = { fg = base0A; modifiers = ["reversed"]; };
-        "ui.cursorline.primary" = { fg = base05; bg = base01; };
-        "ui.cursor.match" = { fg = base0A; modifiers = ["reversed"]; };
-        "ui.cursor.select" = { fg = base0A; modifiers = ["reversed"]; };
-        "ui.gutter" = { bg = base00; };
-        "ui.help" = { fg = base06; bg = base01; };
-        "ui.linenr" = { fg = base03; bg = base00; };
-        "ui.linenr.selected" = { fg = base04; bg = base01; modifiers = ["bold"]; };
-        "ui.menu" = { fg = base05; bg = base01; };
-        "ui.menu.scroll" = { fg = base03; bg = base01; };
-        "ui.menu.selected" = { fg = base01; bg = base04; };
-        "ui.popup" = { bg = base01; };
-        "ui.selection" = { bg = base02; };
-        "ui.selection.primary" = { bg = base02; };
-        "ui.statusline" = { fg = base04; bg = base01; };
-        "ui.statusline.inactive" = { bg = base01; fg = base03; };
-        "ui.statusline.insert" = { fg = base00; bg = base0B; };
-        "ui.statusline.normal" = { fg = base00; bg = base03; };
-        "ui.statusline.select" = { fg = base00; bg = base0F; };
-        "ui.text" = base05;
-        "ui.text.focus" = base05;
-        "ui.virtual.indent-guide" = { fg = base03; };
-        "ui.virtual.inlay-hint" = { fg = base01; };
-        "ui.virtual.ruler" = { bg = base01; };
-        "ui.window" = { bg = base01; };
-      };
-    };
-  };
-}

modules/home/cli/common/shell.nix

@@ -1,29 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    eza    
-    bat
-  ];
-
-  home.shellAliases = {
-    ls = "eza";   
-  };
-
-  programs.bash = {
-    enable = false;
-  };
-
-  programs.zsh = {
-    enable = true;
-    enableCompletion = true;
-    autosuggestion.enable = true;
-    syntaxHighlighting.enable = true;
-  };
-
-  programs.starship = {
-    enable = true;
-    enableBashIntegration = true;
-    enableZshIntegration = true;
-  };
-}

modules/home/cli/develop.nix

@@ -1,47 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    unstable.devenv
-    cloc
-  ];
-
-  programs.direnv = {
-    enable = true;
-    enableBashIntegration = true;
-  };
-
-  programs.zellij = {
-    enable = true;
-    # enableBashIntegration = true;
-  };
-
-  home.file.zellij = {
-    target = ".config/zellij/config.kdl";
-    text = ''
-      pane_frames false
-      keybinds {
-        normal {
-          bind "Ctrl e" { ToggleFloatingPanes; SwitchToMode "normal"; }
-        }
-      }
-    '';
-  };
-
-  home.file.zellij-layout-default = {
-    target = ".config/zellij/layouts/default.kdl";
-    text = ''
-      layout {
-        pane 
-        floating_panes {
-          pane {
-            width "80%"
-            height "80%"
-            x "10%"
-            y "10%"
-          }
-        }
-      }
-    '';
-  };
-}

modules/home/cli/neovim/autocmd.lua

@@ -1,24 +0,0 @@
-local api = vim.api
-
-api.nvim_create_autocmd(
-  "FileType",
-  { pattern = "markdown", command = "setlocal spell" }
-)
-
-api.nvim_create_autocmd(
-  "FileType",
-  { pattern = "markdown", command = "setlocal complete+=kspell" }
-)
-
-api.nvim_create_autocmd({
-    "BufNewFile", "BufRead"
-  },
-  { pattern = "*.mcfunction", command = "set filetype=mcfunction" }
-)
-
-api.nvim_create_autocmd({
-
-  "VimEnter"
-  },
-  { callback = require('lualine').setup }
-)

modules/home/cli/neovim/colorscheme.lua

@@ -1,4 +0,0 @@
-require('onedark').setup {
-    style = 'deep'
-}
-require('onedark').load()

modules/home/cli/neovim/default.nix

@@ -1,132 +0,0 @@
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
-  home.packages = with pkgs; [
-    ripgrep
-    marksman
-    wl-clipboard
-    nodejs_20
-  ];
-
-  programs.neovim =
-  let
-    toLua = str: "lua << EOF\n${str}\nEOF\n";
-    toLuaFile = file: "lua << EOF\n${builtins.readFile file}\nEOF\n";
-  in
-  {
-    enable = true;
-    coc = {
-      enable = false;
-      settings = {
-        languageserver = {
-          arduino = { 
-            command = ["steam-run" "arduino-language-server"];
-            rootPatterns = ["*.ino"];
-            filetypes = ["arduino"];
-            args = ["-cli" "steam-run" "arduino-cli" "-clangd" "steam-run" "clangd" "-cli-config" "/home/xeovalyte/.arduino15/arduino-cli.yaml"];
-          };
-        };
-      };
-    };
-
-    viAlias = true;
-    vimAlias = true;
-    vimdiffAlias = true;
-
-    extraLuaConfig = ''
-      ${builtins.readFile ./options.lua}
-      ${builtins.readFile ./keymaps.lua}
-      ${builtins.readFile ./autocmd.lua}
-    '';
-
-    plugins = with pkgs.vimPlugins; [
-      nvim-web-devicons
-
-      {
-        plugin = nvim-autopairs;
-        config = toLua "require(\"nvim-autopairs\").setup{}";
-      }
-
-      {
-        plugin = telescope-nvim;
-      }
-      plenary-nvim
-
-      {
-        plugin = nvim-lspconfig;
-        config = toLuaFile ./plugins/lsp.lua;
-      }
-      neodev-nvim
-      mason-nvim
-      mason-lspconfig-nvim
-      which-key-nvim
-      rustaceanvim
-      lsp-inlayhints-nvim
-      nvim-dap
-
-      {
-        plugin = markdown-preview-nvim;
-        config = toLuaFile ./plugins/markdown-preview.lua;
-      }
-
-      {
-        plugin = nvim-cmp;
-        config = toLuaFile ./plugins/cmp.lua;
-      }
-      cmp_luasnip
-      cmp-nvim-lsp
-      luasnip
-      friendly-snippets
-
-      {
-        plugin = nvim-tree-lua;
-        config = toLuaFile ./plugins/nvim-tree.lua;
-      }
-
-      {
-        plugin = toggleterm-nvim;
-        config = toLuaFile ./plugins/toggleterm.lua;
-      }
-
-      {
-        plugin = (nvim-treesitter.withPlugins (p: [
-          p.tree-sitter-nix
-          p.tree-sitter-bash
-          p.tree-sitter-json
-          p.tree-sitter-rust
-          p.tree-sitter-vue
-          p.tree-sitter-arduino
-          p.tree-sitter-html
-          p.tree-sitter-css
-          p.tree-sitter-javascript
-        ]));
-        config = toLuaFile ./plugins/treesitter.lua;
-      }
-
-      {
-        plugin = onedark-nvim;
-        config = toLuaFile ./colorscheme.lua;
-      }
-
-      {
-        plugin = presence-nvim;
-        config = toLua "require(\"presence\").setup()";
-      }
-
-      {
-        plugin = lualine-nvim;
-        config = toLuaFile ./plugins/lualine.lua;
-      }
-
-      {
-        plugin =harpoon;
-        config = toLuaFile ./plugins/harpoon.lua;
-      }
-    ];
-  };
-}

modules/home/cli/neovim/keymaps.lua

@@ -1,90 +0,0 @@
-local function map(mode, lhs, rhs, opts)
-	opts = opts or {}
-	opts.silent = opts.silent ~= false
-	if opts.remap and not vim.g.vscode then
-		opts.remap = nil
-	end
-	vim.keymap.set(mode, lhs, rhs, opts)
-end
-
--- better up/down
-map({ "n", "x" }, "j", "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
-map({ "n", "x" }, "k", "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
-
--- Move to window using the <ctrl> hjkl keys
-map("n", "<C-h>", "<C-w>h", { desc = "Go to left window", remap = true })
-map("n", "<C-j>", "<C-w>j", { desc = "Go to lower window", remap = true })
-map("n", "<C-k>", "<C-w>k", { desc = "Go to upper window", remap = true })
-map("n", "<C-l>", "<C-w>l", { desc = "Go to right window", remap = true })
-
--- Resize window using <ctrl> arrow keys
-map("n", "<C-Up>", "<cmd>resize +2<cr>", { desc = "Increase window height" })
-map("n", "<C-Down>", "<cmd>resize -2<cr>", { desc = "Decrease window height" })
-map("n", "<C-Left>", "<cmd>vertical resize -2<cr>", { desc = "Decrease window width" })
-map("n", "<C-Right>", "<cmd>vertical resize +2<cr>", { desc = "Increase window width" })
-
--- Move Lines
-map("n", "<A-j>", "<cmd>m .+1<cr>==", { desc = "Move down" })
-map("n", "<A-k>", "<cmd>m .-2<cr>==", { desc = "Move up" })
-map("i", "<A-j>", "<esc><cmd>m .+1<cr>==gi", { desc = "Move down" })
-map("i", "<A-k>", "<esc><cmd>m .-2<cr>==gi", { desc = "Move up" })
-map("v", "<A-j>", ":m '>+1<cr>gv=gv", { desc = "Move down" })
-map("v", "<A-k>", ":m '<-2<cr>gv=gv", { desc = "Move up" })
-
--- Clear search with <esc>
-map({ "i", "n" }, "<esc>", "<cmd>noh<cr><esc>", { desc = "Escape and clear hlsearch" })
-
--- Clear search, diff update and redraw
--- taken from runtime/lua/_editor.lua
-map(
-  "n",
-  "<leader>ur",
-  "<Cmd>nohlsearch<Bar>diffupdate<Bar>normal! <C-L><CR>",
-  { desc = "Redraw / clear hlsearch / diff update" }
-)
-
--- https://github.com/mhinz/vim-galore#saner-behavior-of-n-and-n
-map("n", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" })
-map("x", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" })
-map("o", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" })
-map("n", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev search result" })
-map("x", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev search result" })
-map("o", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev search result" })
-
--- Add undo break-points
-map("i", ",", ",<c-g>u")
-map("i", ".", ".<c-g>u")
-map("i", ";", ";<c-g>u")
-
--- save file
-map({ "i", "x", "n", "s" }, "<C-s>", "<cmd>w<cr><esc>", { desc = "Save file" })
-
---keywordprg
-map("n", "<leader>K", "<cmd>norm! K<cr>", { desc = "Keywordprg" })
-
--- better indenting
-map("v", "<", "<gv")
-map("v", ">", ">gv")
-
--- new file
-map("n", "<leader>fn", "<cmd>enew<cr>", { desc = "New File" })
-
--- Toggle NeoTree
-map("n", "<leader>e", "<cmd>NvimTreeToggle<cr>", { desc = "Toggle file explorer" })
-
--- Telescope
-map("n", "<leader>ff", "<cmd>Telescope find_files<cr>", { desc = "Telescope find files" })
-map("n", "<leader>fg", "<cmd>Telescope live_grep<cr>", { desc = "Telescope find files" })
-map("n", "<leader>fb", "<cmd>Telescope buffers<cr>", { desc = "Telescope find files" })
-
--- LSP
-map("n", "gl", "<cmd>lua vim.diagnostic.open_float()<cr>", { desc = "Show diagnostics" })
-map("n", "gd", "<cmd>lua vim.lsp.buf.definition()<cr>", { desc = "Show diagnostics" })
-map("n", "gD", "<cmd>lua vim.lsp.buf.declaration()<cr>", { desc = "Show diagnostics" })
-map("n", "K", "<cmd>lua vim.lsp.buf.hover()<cr>", { desc = "Show diagnostics" })
-
--- Buffers
-map("n", "<Tab>", "<cmd>bn<cr>", { desc = "Cycle to next buffer" })
-map("n", "<S-Tab>", "<cmd>bp<cr>", { desc = "Cycle to previous buffer" })
-map("n", "bq", "<cmd>b#|bd#<cr>", { desc = "Close current buffer" })
-map("n", "<leader>bq", "<cmd>BufferLineCloseOthers<cr>", { desc = "Close all other buffers" })

modules/home/cli/neovim/options.lua

@@ -1,57 +0,0 @@
-vim.g.mapleader = " "
-vim.g.maplocalleader = "\\"
-
-local opt = vim.opt
-
-opt.autowrite = true -- Enable auto write
-opt.clipboard = "unnamedplus" -- Sync with system clipboard
-opt.completeopt = "menu,menuone,noselect"
-opt.conceallevel = 3 -- Hide * markup for bold and italic
-opt.confirm = true -- Confirm to save changes before exiting modified buffer
-opt.cursorline = true -- Enable highlighting of the current line
-opt.expandtab = true -- Use spaces instead of tabs
-opt.formatoptions = "jcroqlnt" -- tcqj
-opt.grepformat = "%f:%l:%c:%m"
-opt.grepprg = "rg --vimgrep"
-opt.ignorecase = true -- Ignore case
-opt.inccommand = "nosplit" -- preview incremental substitute
-opt.laststatus = 0
-opt.list = true -- Show some invisible characters (tabs...
-opt.mouse = "a" -- Enable mouse mode
-opt.number = true -- Print line number
-opt.pumblend = 10 -- Popup blend
-opt.pumheight = 10 -- Maximum number of entries in a popup
-opt.relativenumber = true -- Relative line numbers
-opt.scrolloff = 4 -- Lines of context
-opt.sessionoptions = { "buffers", "curdir", "tabpages", "winsize" }
-opt.shiftround = true -- Round indent
-opt.shiftwidth = 2 -- Size of an indent
-opt.shortmess:append({ W = true, I = true, c = true })
-opt.showmode = true -- Dont show mode since we have a statusline
-opt.sidescrolloff = 8 -- Columns of context
-opt.signcolumn = "yes" -- Always show the signcolumn, otherwise it would shift the text each time
-opt.smartcase = true -- Don't ignore case with capitals
-opt.smartindent = true -- Insert indents automatically
-opt.spelllang = { "en", "nl" }
-opt.spell = false -- Enable spell
-opt.splitbelow = true -- Put new windows below current
-opt.splitright = true -- Put new windows right of current
-opt.tabstop = 2 -- Number of spaces tabs count for
-opt.termguicolors = true -- True color support
-opt.timeoutlen = 300
-opt.undofile = true
-opt.undolevels = 10000
-opt.updatetime = 200 -- Save swap file and trigger CursorHold
-opt.wildmode = "longest:full,full" -- Command-line completion mode
-opt.winminwidth = 5 -- Minimum window width
-opt.wrap = false -- Disable line wrap
-
-if vim.fn.has("nvim-0.9.0") == 1 then
-  opt.splitkeep = "screen"
-  opt.shortmess:append({ C = true })
-end
-
--- Fix markdown indentation settings
-vim.g.markdown_recommended_style = 0
-
-vim.cmd [[autocmd BufWritePre * lua vim.lsp.buf.format()]]

modules/home/cli/neovim/plugins/bufferline.lua

@@ -1,12 +0,0 @@
-require('bufferline').setup{
-  options = {
-    offsets = {
-      {
-        filetype = "NvimTree",
-        text = "File Explorer",
-        highlight = "Directory",
-        separator = true -- use a "true" to enable the default, or set your own character
-      }
-    }
-  }
-}

modules/home/cli/neovim/plugins/cmp.lua

@@ -1,46 +0,0 @@
-local cmp = require('cmp')
-local luasnip = require('luasnip')
-
-require('luasnip.loaders.from_vscode').lazy_load()
-luasnip.config.setup {}
-
-cmp.setup {
-    snippet = {
-        expand = function(args)
-            luasnip.lsp_expand(args.body)
-        end,
-    },
-    mapping = cmp.mapping.preset.insert {
-        ['<C-n>'] = cmp.mapping.select_next_item(),
-        ['<C-p>'] = cmp.mapping.select_prev_item(),
-        ['<C-d>'] = cmp.mapping.scroll_docs(-4),
-        ['<C-f>'] = cmp.mapping.scroll_docs(4),
-        ['<C-Space>'] = cmp.mapping.complete {},
-        ['<CR>'] = cmp.mapping.confirm {
-            behavior = cmp.ConfirmBehavior.Replace,
-            select = true,
-        },
-        ['<Tab>'] = cmp.mapping(function(fallback)
-            if cmp.visible() then
-                cmp.select_next_item()
-            elseif luasnip.expand_or_locally_jumpable() then
-                luasnip.expand_or_jump()
-            else
-                fallback()
-            end
-        end, { 'i', 's' }),
-        ['<S-Tab>'] = cmp.mapping(function(fallback)
-            if cmp.visible() then
-                cmp.select_prev_item()
-            elseif luasnip.locally_jumpable(-1) then
-                luasnip.jump(-1)
-            else
-                fallback()
-            end
-        end, { 'i', 's' }),
-    },
-    sources = {
-        { name = 'nvim_lsp' },
-        { name = 'luasnip' },
-    },
-}

modules/home/cli/neovim/plugins/harpoon.lua

@@ -1,10 +0,0 @@
-local mark = require('harpoon.mark')
-local ui = require('harpoon.ui')
-
-vim.keymap.set("n", "<leader>q", mark.add_file)
-vim.keymap.set("n", "<C-e>", ui.toggle_quick_menu)
-
-vim.keymap.set("n", "<C-h>", function() ui.nav_file(1) end)
-vim.keymap.set("n", "<C-t>", function() ui.nav_file(2) end)
-vim.keymap.set("n", "<C-n>", function() ui.nav_file(3) end)
-vim.keymap.set("n", "<C-s>", function() ui.nav_file(4) end)

modules/home/cli/neovim/plugins/lsp.lua

@@ -1,57 +0,0 @@
-require("mason").setup{
-  PATH = "append",
-}
-require("mason-lspconfig").setup()
-require('neodev').setup()
-require('lsp-inlayhints').setup()
-
-local lspconfig = require('lspconfig')
-
-vim.g.rustaceanvim = {
-  tools = {
-    hover_actions = {
-      auto_focus = true,
-    },
-  },
-  server = {
-    on_attach = function(client, bufnr)
-      require("lsp-inlayhints").on_attach(client, bufnr)
-      require("lsp-inlayhints").show()
-    end,
-    default_settings = {
-      ['rust-analyzer'] = {
-        cargo = {
-          features = "all"
-        },
-      },
-    },
-  },
-}
-
-lspconfig.tsserver.setup{}
-
-lspconfig.spyglassmc_language_server.setup{
-  cmd = {
-    "/home/xeovalyte/.npm-global/bin/spyglassmc-language-server", "--stdio"
-  }
-}
-
-lspconfig.arduino_language_server.setup{
-  cmd = {
-      "steam-run","arduino-language-server",
-      "-cli-config", "/home/xeovalyte/.arduino15/arduino-cli.yaml",
-      "-cli", "/usr/bin/arduino-cli",
-      "-clangd", "steam-run clangd"
-  }
-}
-
-lspconfig.tailwindcss.setup{
-  filetypes = {
-    "rust",
-    "css",
-  }
-}
-
-lspconfig.volar.setup{}
-
-lspconfig.marksman.setup{}

modules/home/cli/neovim/plugins/lualine.lua

@@ -1,40 +0,0 @@
-require('lualine').setup {
-  options = {
-    icons_enabled = true,
-    theme = 'auto',
-    component_separators = { left = '', right = ''},
-    section_separators = { left = '', right = ''},
-    disabled_filetypes = {
-      statusline = {},
-      winbar = {},
-    },
-    ignore_focus = {},
-    always_divide_middle = true,
-    globalstatus = true,
-    refresh = {
-      statusline = 1000,
-      tabline = 1000,
-      winbar = 1000,
-    }
-  },
-  sections = {
-    lualine_a = {'mode'},
-    lualine_b = {'branch', 'diff', 'diagnostics'},
-    lualine_c = {'filename'},
-    lualine_x = {'encoding', 'fileformat', 'filetype'},
-    lualine_y = {'progress'},
-    lualine_z = {'location'}
-  },
-  inactive_sections = {
-    lualine_a = {},
-    lualine_b = {},
-    lualine_c = {'filename'},
-    lualine_x = {'location'},
-    lualine_y = {},
-    lualine_z = {}
-  },
-  tabline = {},
-  winbar = {},
-  inactive_winbar = {},
-  extensions = {}
-}

modules/home/cli/neovim/plugins/markdown-preview.lua

@@ -1,2 +0,0 @@
-vim.g.mkdp_auto_start = 0
-vim.g.mkdp_auto_close = 0

modules/home/cli/neovim/plugins/nvim-tree.lua

@@ -1,20 +0,0 @@
-local function my_on_attach(bufnr)
-  local api = require "nvim-tree.api"
-
-  local function opts(desc)
-    return { desc = "nvim-tree: " .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true }
-  end
-
-  -- default mappings
-  api.config.mappings.default_on_attach(bufnr)
-
-  -- custom mappings
-  vim.keymap.set('n', '<C-t>', api.tree.change_root_to_parent,        opts('Up'))
-  vim.keymap.set('n', '?',     api.tree.toggle_help,                  opts('Help'))
-  vim.keymap.set('n', '.',     api.tree.change_root_to_node,                  opts('CD'))
-end
-
--- pass to setup along with your other options
-require("nvim-tree").setup {
-  on_attach = my_on_attach,
-}

modules/home/cli/neovim/plugins/toggleterm.lua

@@ -1,7 +0,0 @@
-require("toggleterm").setup{
-  open_mapping = [[<c-\>]],
-  direction = 'float',
-  float_opts = {
-    border = 'curved'
-  }
-}

modules/home/cli/neovim/plugins/treesitter.lua

@@ -1,9 +0,0 @@
-require("nvim-treesitter.configs").setup{
-  ensure_installed = {},
-
-  auto_install = false,
-
-  highlight = { enable = true },
-
-  indent = { enable = true },
-}

modules/home/cli/ssh.nix

@@ -1,22 +0,0 @@
-{ pkgs, ... }:
-
-{
-  programs.ssh = {
-    enable = true;
-    matchBlocks = {
-      archserver = {
-        hostname = "192.168.1.20";
-        user = "xeovalyte";
-        identityFile = "~/.ssh/archserver";
-      };
-
-      "gitea.xeovalyte.dev" = {
-        hostname = "gitea.xeovalyte.dev";
-        port = 2222;
-        user = "git";
-        identityFile = "~/.ssh/gitea";
-      };
-    };
-    addKeysToAgent = "yes";
-  };
-}

modules/home/containers/beszel.nix

@@ -0,0 +1,61 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.containers.beszel;
+in {
+  options = {
+    settings.containers.beszel.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Enable Beszel container
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    settings.services.sops.enable = true;
+
+    services.podman.containers.beszel = {
+      image = "henrygd/beszel:latest";
+      network = "proxy";
+      volumes = [
+        "%h/containers/beszel/data:/beszel_data" 
+        "%h/containers/beszel/socket:/beszel_socket" 
+      ];
+      environment = {
+        DISABLE_PASSWORD_AUTH = false;
+        USER_CREATION = true;
+      };
+    };
+
+    services.podman.containers.beszel-agent = {
+      image = "henrygd/beszel-agent:latest";
+      network = "proxy";
+      volumes = [
+        "%h/containers/beszel/socket:/beszel_socket" 
+        "/run/user/1000/podman/podman.sock:/var/run/podman.sock:ro"
+
+        "${config.sops.secrets."containers/beszel/key".path}:/run/secrets/key" 
+      ];
+      user = 1000;
+      userNS = "keep-id";
+      environment = {
+        LISTEN = "/beszel_socket/beszel.sock";
+        KEY_FILE = "/run/secrets/key";
+        DOCKER_HOST = "unix:///var/run/podman.sock";
+      };
+    };
+
+    settings.containers.caddy.routes.tbmrs-local.routes.beszel = {
+      host = "monitor";
+      url = "beszel:8090"; 
+    };
+
+    sops.secrets = {
+      "containers/beszel/key" = { };
+    };
+  };
+}

modules/home/containers/caddy.nix

@@ -0,0 +1,98 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.containers.caddy;
+
+  toInternal = name: routesDef: {
+    name = name;
+    host = routesDef.host;
+    url = routesDef.url;
+  };
+
+  generateRoutes = domain: entries: lib.concatMapStrings (route: ''
+    @${route.name} host ${route.host}.${domain}
+    handle @${route.name} {
+      reverse_proxy ${route.url}
+    }
+  '') entries;
+
+  routesOption = lib.mkOption {
+    type = types.attrsOf (types.submodule {
+      options = {
+        url = mkOption {
+          type = types.str;
+        };
+        host = mkOption {
+          type = types.str;
+        };
+      };
+    });
+  };
+in {
+  options = {
+    settings.containers.caddy.enable = mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Enable caddy container
+      '';
+    };
+
+    settings.containers.caddy.routes = mkOption {
+      type = lib.types.attrsOf (types.submodule {
+        options = {
+          routes = routesOption;
+          domain = mkOption {
+            type = types.str;
+          };
+        };       
+      });
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.podman.containers.caddy = {
+      image = "localhost/tboomers/caddy-custom:latest";
+      network = "proxy";
+      networkAlias = [
+        "mail.tbmrs.nl"
+      ];
+      ports = [
+        "1080:80"
+        "1443:443"
+      ];
+      volumes = [
+        "%h/containers/caddy/Caddyfile:/etc/caddy/Caddyfile"
+        "%h/containers/caddy/acme_key:/etc/caddy/acme_key"
+        "%h/containers/caddy/data:/data"
+      ];
+    };
+
+    settings.containers.caddy.routes = {
+      tbmrs.domain = "tbmrs.nl"; 
+      tbmrs-local.domain = "local.tbmrs.nl"; 
+    };
+
+    home.file."containers/caddy/Caddyfile".text = ''
+      *.tbmrs.nl, tbmrs.nl {
+        tls {
+          dns transip xeovalyte /etc/caddy/acme_key
+          resolvers 1.1.1.1
+        }
+
+        ${generateRoutes cfg.routes.tbmrs.domain (mapAttrsToList toInternal cfg.routes.tbmrs.routes)}
+      }
+
+      *.local.tbmrs.nl {
+        tls {
+          dns transip xeovalyte /etc/caddy/acme_key
+          resolvers 1.1.1.1
+        }
+
+        ${generateRoutes cfg.routes.tbmrs-local.domain (mapAttrsToList toInternal cfg.routes.tbmrs-local.routes)}
+      }
+    '';
+  };
+}

modules/home/containers/forgejo.nix

@@ -0,0 +1,37 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.containers.forgejo;
+in {
+  options = {
+    settings.containers.forgejo.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Enable forgejo container
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.podman.containers.forgejo = {
+      image = "codeberg.org/forgejo/forgejo:11";
+      network = "proxy";
+      volumes = [
+        "%h/containers/forgejo/data:/data" 
+      ];
+      environment = {
+        FORGEJO__service__ALLOW_ONLY_EXTERNAL_REGISTRATION = true;
+        FORGEJO__service__SHOW_REGISTRATION_BUTTON = false;
+        FORGEJO__service__ENABLE_PASSWORD_SIGNIN_FORM = false;
+      };
+    };
+
+    settings.containers.caddy.routes.tbmrs.routes.forgejo = {
+      host = "git";
+      url = "forgejo:3000"; 
+    };
+  };
+}

modules/home/containers/homeassistant.nix

@@ -0,0 +1,36 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.containers.homeassistant;
+in {
+  options = {
+    settings.containers.homeassistant.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Enable storage configuration
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.podman.containers.homeassistant = {
+      image = "ghcr.io/home-assistant/home-assistant:stable";
+      network = "proxy";
+      volumes = [
+        "%h/containers/homeassistant/config:/config" 
+      ];
+      userNS = "keep-id";
+      environment = {
+        TZ = "Europe/Amsterdam";
+      };
+    };
+
+    settings.containers.caddy.routes.tbmrs-local.routes.home-assistant = {
+      host = "home-assistant";
+      url = "homeassistant:8123"; 
+    };
+  };
+}

modules/home/containers/homepage.nix

@@ -0,0 +1,191 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.containers.homepage;
+in {
+  options = {
+    settings.containers.homepage.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Enable homepage container
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.podman.containers.homepage = {
+      image = "ghcr.io/gethomepage/homepage:latest";
+      network = "proxy";
+      volumes = [
+        "%h/containers/homepage/config:/app/config" 
+        "%h/containers/homepage/config/settings.yaml:/app/config/settings.yaml"
+        "%h/containers/homepage/config/services.yaml:/app/config/services.yaml"
+        "%h/containers/homepage/config/docker.yaml:/app/config/docker.yaml"
+        "/run/user/1000/podman/podman.sock:/var/run/podman.sock:ro"
+      ];
+      userNS = "keep-id";
+      environment = {
+        HOMEPAGE_ALLOWED_HOSTS = "home.tbmrs.nl";
+      };
+    };
+
+    settings.containers.caddy.routes.tbmrs.routes.homepage = {
+      host = "home";
+      url = "homepage:3000"; 
+    };
+
+    home.file."containers/homepage/config/settings.yaml".source = (pkgs.formats.yaml { }).generate "settings" {
+      title = "Timo's Server";
+      description = "server from Timo";
+      theme = "dark";
+      color = "slate";
+      layout = {
+        Services = {
+          style = "row";
+          columns = "4";
+        };
+        Infra = {
+          style = "row";
+          columns = "4";
+        };
+      };
+    };
+
+    home.file."containers/homepage/config/services.yaml".source = (pkgs.formats.yaml { }).generate "services" [
+      {
+        "Services" = [
+          {
+            "Forgejo" = {
+              href = "https://git.tbmrs.nl";
+              description = "Git server";
+              icon = "forgejo";
+              server = "podman";
+              container = "forgejo";
+            };    
+          }
+          {
+            "Immich" = {
+              href = "https://photos.tbmrs.nl";
+              description = "Photo's and videos";
+              icon = "immich";
+              server = "podman";
+              container = "immich-server";
+            };    
+          }
+          {
+            "Pingvin" = {
+              href = "https://share.tbmrs.nl";
+              description = "File sharing";
+              icon = "pingvin-share";
+              server = "podman";
+              container = "pingvin-share";
+            };    
+          }
+          {
+            "Vaultwarden" = {
+              href = "https://vault.local.tbmrs.nl";
+              description = "Password management";
+              icon = "vaultwarden";
+              server = "podman";
+              container = "vaultwarden";
+            };    
+          }
+          {
+            "Paperless" = {
+              href = "https://paperless.local.tbmrs.nl";
+              description = "Documents management";
+              icon = "paperless-ngx";
+              server = "podman";
+              container = "paperless-ngx";
+            };    
+          }
+          {
+            "Home Assistant" = {
+              href = "https://home-assistant.local.tbmrs.nl";
+              description = "Home automation";
+              icon = "home-assistant";
+              server = "podman";
+              container = "homeassistant";
+            };    
+          }
+          {
+            "Syncthing" = {
+              href = "https://syncthing.local.tbmrs.nl";
+              description = "File syncronisation";
+              icon = "syncthing";
+              server = "podman";
+              container = "syncthing";
+            };    
+          }
+          {
+            "Dufs" = {
+              href = "https://files.tbmrs.nl";
+              description = "File management";
+              icon = "dufs";
+              server = "podman";
+              container = "dufs";
+            };    
+          }
+          {
+            "Linkding" = {
+              href = "https://links.local.tbmrs.nl";
+              description = "Bookmarks";
+              icon = "linkding";
+              server = "podman";
+              container = "linkding";
+            };    
+          }
+          {
+            "Stalwart" = {
+              href = "https://mail.tbmrs.nl";
+              description = "Mailserver";
+              icon = "stalwart";
+              server = "podman";
+              container = "stalwart";
+            };    
+          }
+        ];
+      }
+      {
+        "Infra" = [
+          {
+            "Kanidm" = {
+              href = "https://auth.tbmrs.nl";
+              description = "Oauth2 and ldap provider";
+              icon = "kanidm";
+              server = "podman";
+              container = "kanidm";
+            };    
+          }
+          {
+            "Uptime Kuma" = {
+              href = "https://uptime.tbmrs.nl";
+              description = "Uptime and status";
+              icon = "uptime-kuma";
+              server = "podman";
+              container = "uptime-kuma";
+            };    
+          }
+          {
+            "Beszel" = {
+              href = "https://monitor.local.tbmrs.nl";
+              description = "Server monitoring";
+              icon = "beszel";
+              server = "podman";
+              container = "beszel";
+            };    
+          }
+        ];
+      }
+    ];
+
+    home.file."containers/homepage/config/docker.yaml".source = (pkgs.formats.yaml {}).generate "docker" {
+      podman = {
+        socket = "/var/run/podman.sock";  
+      };
+    };
+  };
+}

modules/home/containers/immich.nix

@@ -0,0 +1,80 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.containers.immich;
+in {
+  options = {
+    settings.containers.immich.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Enable immich container
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.podman.containers.immich-server = {
+      image = "ghcr.io/immich-app/immich-server:release";
+      network = "proxy";
+      volumes = [
+        "%h/containers/immich/upload:/usr/src/app/upload"
+        "/etc/localtime:/etc/localtime:ro" 
+      ];
+      extraConfig = {
+        Unit = {
+          After = [
+            "podman-immich-redis.service"
+            "podman-immich-database.service"
+          ];
+          Requires = [
+            "podman-immich-redis.service"
+            "podman-immich-database.service"
+          ];
+        };
+      };
+      environment = {
+        DB_PASSWORD = "changeme";
+        DB_USERNAME = "postgres";
+        DB_DATABASE_NAME = "immich";
+        DB_HOSTNAME = "immich-database";
+        REDIS_HOSTNAME = "immich-redis";
+      };
+    };
+
+    services.podman.containers.immich-machine-learning = {
+      image = "ghcr.io/immich-app/immich-machine-learning:release";
+      network = "proxy";
+      volumes = [
+        "%h/containers/immich/model-cache:/cache"
+      ];
+    };
+
+    services.podman.containers.immich-redis = {
+      image = "docker.io/valkey/valkey:8-bookworm@sha256:42cba146593a5ea9a622002c1b7cba5da7be248650cbb64ecb9c6c33d29794b1";
+      network = "proxy";
+    };
+
+    services.podman.containers.immich-database = {
+      image = "docker.io/tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:739cdd626151ff1f796dc95a6591b55a714f341c737e27f045019ceabf8e8c52";
+      network = "proxy";
+      volumes = [
+        "%h/containers/immich/database-data:/var/lib/postgresql/data"
+      ];
+      environment = {
+        POSTGRES_PASSWORD = "changeme";
+        POSTGRES_USER = "postgres";
+        POSTGRES_DB = "immich";
+        POSTGRES_INITDB_ARGS = "--data-checksums";
+      };
+      exec = ''postgres -c shared_preload_libraries=vectors.so -c 'search_path="$$user", public, vectors' -c logging_collector=on -c max_wal_size=2GB -c shared_buffers=512MB -c wal_compression=on'';
+    };
+
+    settings.containers.caddy.routes.tbmrs.routes.immich = {
+      host = "photos";
+      url = "immich-server:2283"; 
+    };
+  };
+}

modules/home/containers/jellyfin.nix

@@ -0,0 +1,35 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.containers.jellyfin;
+in {
+  options = {
+    settings.containers.jellyfin.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Enable jellyfin container
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.podman.containers.jellyfin = {
+      image = "jellyfin/jellyfin";
+      network = "proxy";
+      volumes = [
+        "%h/containers/jellyfin/config:/config" 
+        "%h/containers/jellyfin/cache:/cache" 
+        "%h/media:/media"
+      ];
+      userNS = "keep-id";
+    };
+
+    settings.containers.caddy.routes.tbmrs-local.routes.jellyfin = {
+      host = "stream";
+      url = "jellyfin:8096";
+    };
+  };
+}

modules/home/containers/kanidm.nix

@@ -0,0 +1,45 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.containers.nginx;
+in {
+  options = {
+    settings.containers.kanidm.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Enable kanidm container
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.podman.containers.kanidm = {
+      image = "kanidm/server:latest";
+      network = "proxy";
+      networkAlias = [
+        "auth.tbmrs.nl"
+      ];
+      volumes = [
+        "%h/containers/kanidm/data:/data"
+        "%h/containers/caddy/data/caddy/certificates/acme-v02.api.letsencrypt.org-directory/wildcard_.tbmrs.nl:/data/keys"
+      ];
+      environment = {
+        KANIDM_VERSION = "2";
+        KANIDM_BINDADDRESS = "[::]:443";
+        KANIDM_DB_PATH = "/data/kanidm.db";
+        KANIDM_TLS_CHAIN = "/data/keys/wildcard_.tbmrs.nl.crt";
+        KANIDM_TLS_KEY = "/data/keys/wildcard_.tbmrs.nl.key";
+        KANIDM_DOMAIN = "auth.tbmrs.nl";
+        KANIDM_ORIGIN = "https://auth.tbmrs.nl";
+      };
+    };
+
+    settings.containers.caddy.routes.tbmrs.routes.kanidm = {
+      host = "auth";
+      url = "https://auth.tbmrs.nl"; 
+    };
+  };
+}

modules/home/containers/karakeep.nix

@@ -0,0 +1,82 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.containers.karakeep;
+in {
+  options = {
+    settings.containers.karakeep.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Enable karakeep container
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.podman.containers.karakeep = {
+      image = "ghcr.io/karakeep-app/karakeep:release";
+      network = "proxy";
+      volumes = [
+        "%h/containers/karakeep/data:/data" 
+      ];
+      environment = {
+        MEILI_ADDR = "http://karakeep-meilisearch:7700";
+        BROWSER_WEB_URL = "http://karakeep-chrome:9222";
+        DATA_DIR = "/data";
+      };
+      environmentFile = [
+        "${config.sops.templates."container-karakeep.env".path}"
+      ];
+      extraConfig = {
+        Unit = {
+          After = [
+            "podman-karakeep-chrome.service"
+            "podman-karakeep-meilisearch.service"
+          ];
+          Requires = [
+            "podman-karakeep-chrome.service"
+            "podman-karakeep-meilisearch.service"
+          ];
+        };
+      };
+    };
+
+    services.podman.containers.karakeep-chrome = {
+      image = "gcr.io/zenika-hub/alpine-chrome:123";
+      network = "proxy";
+      exec = "--no-sandbox --disable-gpu --disable-dev-shm-usage --remote-debugging-address=0.0.0.0 --remote-debugging-port=9222 --hide-scrollbars";
+    };
+
+    services.podman.containers.karakeep-meilisearch = {
+      image = "getmeili/meilisearch:v1.13.3";
+      network = "proxy";
+      environment = {
+        MEILI_NO_ANALYTICS = "true";
+      };
+      volumes = [
+        "%h/containers/karakeep/meilisearch:/meili_data" 
+      ];
+    };
+
+    settings.services.sops.enable = true;
+
+    sops.secrets = {
+      "containers/karakeep/nextauth-secret" = { };
+      "containers/karakeep/meili-key" = { };
+    };
+
+    sops.templates = {
+      "container-karakeep.env" = {
+        content = ''
+          KARAKEEP_VERSION=release
+          NEXTAUTH_SECRET=${config.sops.placeholder."containers/karakeep/nextauth-secret"}
+          MEILI_MASTER_KEY=${config.sops.placeholder."containers/karakeep/meili-key"}
+          NEXTAUTH_URL=https://karakeep.local.tbmrs.nl
+        '';
+      };
+    };
+  };
+}

modules/home/containers/linkding.nix

@@ -0,0 +1,58 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.containers.linkding;
+in {
+  options = {
+    settings.containers.linkding.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Enable linkding container
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.podman.containers.linkding = {
+      image = "ghcr.io/sissbruecker/linkding:latest";
+      network = "proxy";
+      volumes = [
+        "%h/containers/linkding/data:/etc/linkding/data" 
+      ];
+      environment = {
+        LD_ENABLE_OIDC = "True";
+        OIDC_RP_CLIENT_ID = "linkding";
+        OIDC_OP_AUTHORIZATION_ENDPOINT = "https://auth.tbmrs.nl/ui/oauth2";
+        OIDC_OP_TOKEN_ENDPOINT = "https://auth.tbmrs.nl/oauth2/token";
+        OIDC_OP_USER_ENDPOINT = "https://auth.tbmrs.nl/oauth2/openid/linkding/userinfo";
+        OIDC_OP_JWKS_ENDPOINT = "https://auth.tbmrs.nl/oauth2/openid/linkding/public_key.jwk";
+        OIDC_RP_SIGN_ALGO = "ES256";
+      };
+      environmentFile = [
+        "${config.sops.templates."container-linkding.env".path}"
+      ];
+    };
+
+    settings.containers.caddy.routes.tbmrs-local.routes.linkding = {
+      host = "links";
+      url = "linkding:9090"; 
+    };
+
+    settings.services.sops.enable = true;
+
+    sops.templates = {
+      "container-linkding.env" = {
+        content = /*bash*/ ''
+          OIDC_RP_CLIENT_SECRET=${config.sops.placeholder."containers/linkding/oidc-secret"}
+        '';
+      };
+    };
+
+    sops.secrets = {
+      "containers/linkding/oidc-secret" = { };
+    };
+  };
+}

modules/home/containers/network.nix

@@ -0,0 +1,25 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.containers.network;
+in {
+  options = {
+    settings.containers.network.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Enable network
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.podman.networks.proxy = {
+      description = "Container network for the proxy";
+      driver = "bridge";
+      autoStart = true;
+    };
+  };
+}

modules/home/containers/nginx.nix

@@ -0,0 +1,26 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.containers.nginx;
+in {
+  options = {
+    settings.containers.nginx.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Enable nginx container
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.podman.containers.nginx = {
+      image = "nginx";
+      ports = [
+        "8080:80"
+      ];
+    };
+  };
+}

modules/home/containers/paperless-ngx.nix

@@ -0,0 +1,102 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.containers.paperless-ngx;
+in {
+  options = {
+    settings.containers.paperless-ngx.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Enable Paperless NGX container
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    settings.services.sops.enable = true;
+  
+    services.podman.containers.paperless-ngx = {
+      image = "ghcr.io/paperless-ngx/paperless-ngx:latest";
+      network = "proxy";
+      volumes = [
+        "%h/containers/paperless-ngx/data:/usr/src/paperless/data" 
+        "%h/containers/paperless-ngx/media:/usr/src/paperless/media" 
+        "%h/containers/paperless-ngx/export:/usr/src/paperless/export" 
+        "%h/containers/paperless-ngx/consume:/usr/src/paperless/consume" 
+
+        "${config.sops.secrets."containers/paperless-ngx/db-password".path}:/run/secrets/db-password" 
+        "${config.sops.secrets."containers/paperless-ngx/secret".path}:/run/secrets/secret" 
+        "${config.sops.secrets."containers/paperless-ngx/openid-providers".path}:/run/secrets/openid-providers" 
+      ];
+      environment = {
+        PAPERLESS_REDIS = "redis://paperless-ngx-broker:6379";
+        PAPERLESS_DBHOST = "paperless-ngx-db";
+        PAPERLESS_URL = "https://paperless.local.tbmrs.nl";
+        PAPERLESS_DBPASS_FILE = "/run/secrets/db-password";
+        PAPERLESS_SECRET_KEY_FILE = "/run/secrets/secret";
+
+        PAPERLESS_DISABLE_REGULAR_LOGIN = false;
+        PAPERLESS_APPS = "allauth.socialaccount.providers.openid_connect";
+        PAPERLESS_SOCIALACCOUNT_PROVIDERS_FILE = "/run/secrets/openid-providers";
+        PAPERLESS_SOCIAL_ACCOUNT_SYNC_GROUPS = true;
+      };
+      extraConfig = {
+        Unit = {
+          After = [
+            "sops-nix.service"
+            "podman-paperless-ngx-db.service"
+            "podman-paperless-ngx-broker.service"
+          ];
+          Requires = [
+            "podman-paperless-ngx-db.service"
+            "podman-paperless-ngx-broker.service"
+          ];
+        };
+      };
+    };
+
+    services.podman.containers.paperless-ngx-db = {
+      image = "docker.io/library/postgres:17";
+      network = "proxy";
+      volumes = [
+        "%h/containers/paperless-ngx/db-data:/var/lib/postgresql/data" 
+
+        "${config.sops.secrets."containers/paperless-ngx/db-password".path}:/run/secrets/db-password" 
+      ];
+      environment = {
+        POSTGRES_DB = "paperless";
+        POSTGRES_USER = "paperless";
+        POSTGRES_PASSWORD_FILE = "/run/secrets/db-password";
+      };
+      extraConfig = {
+        Unit = {
+          After = [
+            "sops-nix.service"
+          ];
+        };
+      };
+    };
+
+    services.podman.containers.paperless-ngx-broker = {
+      image = "docker.io/library/redis:7";
+      network = "proxy";
+      volumes = [
+        "%h/containers/paperless-ngx/redis-data:/data" 
+      ];
+    };
+
+    settings.containers.caddy.routes.tbmrs-local.routes.paperless-ngx = {
+      host = "paperless";
+      url = "paperless-ngx:8000"; 
+    };
+
+    sops.secrets = {
+      "containers/paperless-ngx/db-password" = { };
+      "containers/paperless-ngx/secret" = { };
+      "containers/paperless-ngx/openid-providers" = { };
+    };
+  };
+}

modules/home/containers/pingvin-share.nix

@@ -0,0 +1,78 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.containers.pingvin-share;
+in {
+  options = {
+    settings.containers.pingvin-share.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Enable Pingvin share container
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    settings.services.sops.enable = true;
+  
+    services.podman.containers.pingvin-share = {
+      image = "ghcr.io/stonith404/pingvin-share";
+      network = "proxy";
+      volumes = [
+        "%h/containers/pingvin-share/data:/opt/app/backend/data" 
+        # "%h/containers/pingvin-share/config.yaml:/opt/app/config.yaml" 
+        "${config.sops.templates."container-pingvin.yaml".path}:/opt/app/config.yaml" 
+      ];
+      environment = {
+        TRUST_PROXY = true;
+      };
+      userNS = "keep-id";
+      extraConfig = {
+        Unit = {
+          After = [
+            "sops-nix.service"
+          ];
+        };
+      };
+    };
+
+    settings.containers.caddy.routes.tbmrs.routes.pingvin = {
+      host = "share";
+      url = "pingvin-share:3000"; 
+    };
+
+    sops.templates = {
+      "container-pingvin.yaml" = {
+        content = /*yaml*/ ''
+          general:
+            secureCookies: "true"
+            appUrl: https://share.tbmrs.nl
+            showHomePage: "false"
+          share:
+            allowRegistration: "true"
+            maxSize: "10000000000"
+          oauth:
+            disablePassword: "false"
+            oidc-enabled: "true"
+            oidc-discoveryUri: "https://auth.tbmrs.nl/oauth2/openid/pingvin/.well-known/openid-configuration"
+            oidc-clientId: pingvin
+            oidc-clientSecret: "${config.sops.placeholder."containers/pingvin-share/oidc-secret"}"
+          initUser:
+            enabled: "true"
+            username: "admin"
+            email: "admin@example.com"
+            password: "my-secure-password"
+            isAdmin: true
+            ldapDN: ""
+        '';
+      };
+    };
+
+    sops.secrets = {
+      "containers/pingvin-share/oidc-secret" = { };
+    };
+  };
+}

modules/home/containers/stalwart.nix

@@ -0,0 +1,42 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.containers.stalwart;
+in {
+  options = {
+    settings.containers.stalwart.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Enable stalwart mailserver container
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.podman.containers.stalwart = {
+      image = "stalwartlabs/mail-server:latest";
+      network = "proxy";
+      ports = [
+        "1025:25"
+        "1587:587"
+        "1465:465"
+        "1143:143"
+        "1993:993"
+        "14190:4190"
+        "1110:110"
+        "1995:995"
+      ];
+      volumes = [
+        "%h/containers/stalwart/data:/opt/stalwart-mail" 
+      ];
+    };
+
+    settings.containers.caddy.routes.tbmrs.routes.stalwart = {
+      host = "mail";
+      url = "stalwart:8080"; 
+    };
+  };
+}

modules/home/containers/static.nix

@@ -0,0 +1,60 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.containers.static;
+in {
+  options = {
+    settings.containers.static.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Enable static pages containers
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    settings.services.sops.enable = true;
+
+    services.podman.containers.wrbapp = {
+      image = "gitea.xeovalyte.dev/xeovalyte/wrbapp:latest-arm";
+      network = "proxy";
+      environmentFile = [
+        "${config.sops.templates."container-wrbapp.env".path}"
+      ];
+    };
+
+    services.podman.containers.hunshin = {
+      image = "gitea.xeovalyte.dev/xeovalyte/hunshin:latest-arm";
+      network = "proxy";
+    };
+
+    services.podman.containers.bijlobke = {
+      image = "gitea.xeovalyte.dev/xeovalyte/bijlobke:latest-arm";
+      network = "proxy";
+    };
+
+    services.podman.containers.ardsite = {
+      image = "gitea.xeovalyte.dev/ardsite/ardsite:latest-arm";
+      network = "proxy";
+    };
+
+    sops.templates = {
+      "container-wrbapp.env" = {
+        content = ''
+          NUXT_PRIVATE_KEY_ID: "${config.sops.placeholder."containers/wrbapp/private-key-id"}"
+          NUXT_PRIVATE_KEY: "${config.sops.placeholder."containers/wrbapp/private-key"}"
+          NUXT_CLIENT_ID: "${config.sops.placeholder."containers/wrbapp/client-id"}"
+        '';
+      };
+    };
+
+    sops.secrets = {
+      "containers/wrbapp/private-key-id" = { };
+      "containers/wrbapp/private-key" = { };
+      "containers/wrbapp/client-id" = { };
+    };
+  };
+}

modules/home/containers/storage.nix

@@ -0,0 +1,57 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.containers.storage;
+in {
+  options = {
+    settings.containers.storage.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Enable storage configuration
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.podman.containers.dufs = {
+      image = "sigoden/dufs";
+      network = "proxy";
+      volumes = [
+        "%h/storage:/data" 
+      ];
+      userNS = "keep-id";
+      environment = {
+        DUFS_SERVE_PATH = "data";
+        DUFS_AUTH = "@/tboomers/public:ro|tboomers:password@/tboomers:rw";
+        DUFS_ALLOW_ALL = true;
+      };
+    };
+
+    services.podman.containers.syncthing = {
+      image = "syncthing/syncthing";
+      network = "proxy";
+      volumes = [
+        "%h/storage:/storage"
+        "%h/containers/syncthing/data:/var/syncthing"   
+      ];
+      userNS = "keep-id";
+      ports = [
+        "22000:22000/tcp"
+        "22000:22000/udp"
+      ];
+    };
+
+    settings.containers.caddy.routes.tbmrs-local.routes.sycnthing = {
+      host = "syncthing";
+      url = "syncthing:8384"; 
+    };
+
+    settings.containers.caddy.routes.tbmrs.routes.dufs = {
+      host = "files";
+      url = "dufs:5000"; 
+    };
+  };
+}

modules/home/containers/uptime-kuma.nix

@@ -0,0 +1,32 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.containers.uptime-kuma;
+in {
+  options = {
+    settings.containers.uptime-kuma.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Enable uptime kuma container
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.podman.containers.uptime-kuma = {
+      image = "louislam/uptime-kuma:beta";
+      network = "proxy";
+      volumes = [
+        "%h/containers/uptime-kuma/data:/app/data" 
+      ];
+    };
+
+    settings.containers.caddy.routes.tbmrs.routes.uptime-kuma = {
+      host = "uptime";
+      url = "uptime-kuma:3001"; 
+    };
+  };
+}

modules/home/containers/vaultwarden.nix

@@ -0,0 +1,37 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.containers.vaultwarden;
+in {
+  options = {
+    settings.containers.vaultwarden.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Enable Vaultwarden container
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.podman.containers.vaultwarden = {
+      image = "ghcr.io/dani-garcia/vaultwarden:latest";
+      network = "proxy";
+      volumes = [
+        "%h/containers/vaultwarden/data:/data" 
+      ];
+      environment = {
+        DOMAIN = "https://vault.local.tbmrs.nl";
+        SIGNUPS_ALLOWED = true;
+      };
+    };
+
+    settings.containers.caddy.routes.tbmrs-local.routes.vaultwarden = {
+      host = "vault";
+      url = "vaultwarden:80"; 
+    };
+
+  };
+}

modules/home/containers/vikunja.nix

@@ -0,0 +1,34 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.containers.vikunja;
+in {
+  options = {
+    settings.containers.vikunja.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Enable vikunja container
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.podman.containers.vikunja = {
+      image = "vikunja/vikunja";
+      network = "proxy";
+      userNS = "keep-id";
+      volumes = [
+        "%h/containers/vikunja/files:/app/vikunja/files" 
+        "%h/containers/vikunja/db:/db" 
+      ];
+    };
+
+    settings.containers.caddy.routes.tbmrs-local.routes.vikunja = {
+      host = "tasks";
+      url = "vikunja:3456"; 
+    };
+  };
+}

modules/home/default.nix

@@ -0,0 +1,70 @@
+{ inputs, outputs, config, lib, ... }:
+
+{
+  options = {
+    settings.host = lib.mkOption {
+      type = lib.types.str;
+      description = "Hostname";
+    };
+  };
+
+  imports = [
+    ./applications/alacritty.nix
+    ./applications/common.nix
+    ./applications/devenv.nix
+    ./applications/firefox.nix
+    ./applications/git.nix
+    ./applications/helix.nix
+    ./applications/zsh.nix
+    ./applications/ssh.nix
+    ./applications/thunderbird.nix
+    ./applications/yazi.nix
+    ./applications/zellij.nix
+    ./applications/wezterm.nix
+    ./applications/nushell.nix
+    ./applications/typst.nix
+    ./applications/obs-studio.nix
+
+    ./services/nextcloud.nix
+    ./services/podman.nix
+    ./services/sops.nix
+
+    ./theming/fonts.nix
+    ./theming/stylix.nix
+
+    ./desktop-environments/hyprland/default.nix
+    ./desktop-environments/niri/default.nix
+
+    ./containers/network.nix
+
+    ./containers/caddy.nix
+    ./containers/kanidm.nix
+    ./containers/nginx.nix
+    ./containers/forgejo.nix
+    ./containers/immich.nix
+    ./containers/homepage.nix
+    ./containers/uptime-kuma.nix
+    ./containers/pingvin-share.nix
+    ./containers/vaultwarden.nix
+    ./containers/paperless-ngx.nix
+    ./containers/beszel.nix
+    ./containers/storage.nix
+    ./containers/homeassistant.nix
+    ./containers/karakeep.nix
+    ./containers/vikunja.nix
+    ./containers/stalwart.nix
+    ./containers/static.nix
+    ./containers/linkding.nix
+    ./containers/jellyfin.nix
+  ];
+
+  config = {
+  	nixpkgs = {
+  		overlays = [
+  			outputs.overlays.unstable-packages
+  			outputs.overlays.additions
+  			outputs.overlays.modifications
+  		];
+  	};
+  };
+}

modules/home/desktop-environments/hyprland/default.nix

@@ -0,0 +1,214 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.desktop-environments.hyprland;
+in {
+  options = {
+    settings.desktop-environments.hyprland.enable = lib.mkOption {
+      type = lib.types.bool;
+      description = ''
+        Enable hyprland window manager configuration
+      '';
+    };
+  };
+
+  imports = [
+    # ./waybar.nix
+    ./fixes.nix
+    ./dunst.nix
+    ./rofi.nix
+  ];
+
+  config = mkIf cfg.enable {
+
+    home.packages = with pkgs; [
+      alacritty
+      wev
+      brightnessctl
+      playerctl
+      wl-clipboard
+      grimblast
+      nwg-bar
+      powertop
+      lxqt.lxqt-policykit
+
+      networkmanagerapplet
+    ];
+
+    wayland.windowManager.hyprland = {
+      enable = true;
+      settings = {
+        monitor = lib.mkIf (config.host == "xv-laptop") [
+          "eDP-1,preferred,3840x0,1.333"
+          "DP-10,preferred,0x0,1"
+          "DP-9,preferred,1920x0,1"
+        ];
+
+        exec-once = [
+          "waybar"
+          "lxqt-policykit-agent"
+          "nm-applet"
+          "blueman-applet"
+        ];
+
+        env = lib.mkIf (config.host == "xv-desktop") [
+          "LIBVA_DRIVER_NAME,nvidia"
+          "XDG_SESSION_TYPE,wayland"
+          "GBM_BACKEND,nvidia-drm"
+          "__GLX_VENDOR_LIBRARY_NAME,nvidia"
+        ];
+
+        "$mod" = "SUPER";
+
+        input = {
+          follow_mouse = 2;
+          touchpad = {
+            natural_scroll = true;
+            scroll_factor = 0.5;
+            clickfinger_behavior = true;
+          };
+        };
+
+        general = {
+          gaps_in = "5";
+          gaps_out = "10";
+          border_size = "2";
+
+          "col.active_border" = "rgba(00bfffee) rgba(36b7e2ee) 45deg";
+          "col.inactive_border" = "rgba(0a3543aa)";
+
+          layout = "dwindle";
+        };
+
+        decoration = {
+          rounding = "5";
+          blur.enabled = "false";
+        };
+
+        gestures = {
+          workspace_swipe = "on";
+          workspace_swipe_distance = "200";
+        };
+
+        misc = {
+          vfr = "true";
+          vrr = 2;
+          force_default_wallpaper = "0";
+        };
+
+        xwayland = {
+          force_zero_scaling = true;
+        };
+
+        workspace = lib.mkMerge [[
+        
+        ]
+        (lib.mkIf (config.host == "xv-desktop") [
+          "1, monitor:DP-1"
+          "2, monitor:DP-1"
+          "3, monitor:DP-1"
+          "4, monitor:DP-1"
+          "5, monitor:DP-1"
+          "6, monitor:HDMI-A-1"
+          "7, monitor:HDMI-A-1"
+          "8, monitor:HDMI-A-1"
+          "9, monitor:HDMI-A-1"
+          "10, monitor:HDMI-A-1"
+        ])
+        (lib.mkIf (config.host == "xv-laptop") [
+          "1, monitor:DP-10"
+          "2, monitor:DP-10"
+          "3, monitor:DP-10"
+          "4, monitor:DP-10"
+          "5, monitor:DP-9"
+          "6, monitor:DP-9"
+          "7, monitor:DP-9"
+          "8, monitor:eDP-1"
+          "9, monitor:eDP-1"
+          "10, monitor:eDP-1"
+        ])];
+
+        bind = [
+          "$mod, Q, exec, alacritty"
+          "$mod, SPACE, exec, rofi -show drun"
+          ",Print, exec, grimblast copy area"
+          "$mod,ESCAPE, exec, nwg-bar"
+          "$mod, P, exit"
+
+          "$mod, C, killactive"
+          "$mod SHIFT, C, exec, hyprctl kill"
+          "$mod, V, togglefloating"
+          "$mod, F, fullscreen, 0"
+          "$mod, M, fullscreen, 1"
+          "$mod SHIFT, L, exec, hyprlock" 
+          "$mod, S, exec, systemctl suspend" 
+
+          "$mod, h, movefocus, l"
+          "$mod, l, movefocus, r"
+          "$mod, k, movefocus, u"
+          "$mod, j, movefocus, d"
+
+          "$mod SHIFT, h, movewindow, l"
+          "$mod SHIFT, l, movewindow, r"
+          "$mod SHIFT, k, movewindow, u"
+          "$mod SHIFT, j, movewindow, d"
+
+          "$mod ALT, h, resizeactive, -20 0"
+          "$mod ALT, l, resizeactive, 20 0"
+          "$mod ALT, k, resizeactive, 0 -20"
+          "$mod ALT, j, resizeactive, 0 20"
+
+          "$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"
+
+          "$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"
+        ];
+
+        bindle = [
+          # Volume control
+          ",XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
+          ",XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
+
+          # Brightness control
+          ",XF86MonBrightnessUp, exec, brightnessctl set 5%+"
+          ",XF86MonBrightnessDown, exec, brightnessctl set 5%-"
+        ];
+
+        bindl= [
+          # Toggle audio mute
+          ",XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
+
+          # Media control
+          ",XF86AudioPlay, exec, playerctl play-pause"
+          ",XF86AudioNext, exec, playerctl next"
+          ",XF86AudioPrev, exec, playerctl previous"
+        ];
+
+        bindm = [
+          "$mod, mouse:272, movewindow"
+          "$mod, mouse:273, resizewindow"
+        ];
+      };
+    };
+  };
+}
+

modules/home/desktop-environments/hyprland/dunst.nix

@@ -0,0 +1,7 @@
+{ config, ... }:
+
+{
+  services.dunst = {
+    enable = config.settings.desktop-environments.hyprland.enable;
+  };
+}

modules/home/desktop-environments/hyprland/kanshi.nix

@@ -0,0 +1,24 @@
+{ pkgs, ... }:
+
+{
+  services.kanshi = {
+    enable = true;
+    systemdTarget = "hyprland-session.target";
+    profiles = {
+      undocked = {
+        outputs = [
+          {
+            criteria = "eDP-1";
+          }
+        ];
+      };
+      docked = {
+        outputs = [
+          {
+            criteria = "eDP-9";
+          }
+        ];
+      };
+    };
+  };
+}

modules/home/desktop-environments/hyprland/rofi.nix

@@ -0,0 +1,117 @@
+{ config, pkgs, ... }:
+{
+  programs.rofi = {
+    enable = config.settings.desktop-environments.hyprland.enable;
+    package = pkgs.rofi-wayland;
+    # theme = let
+    #   inherit (config.lib.formats.rasi) mkLiteral;
+    # in {
+    #   "*" = {
+    #     background-color = mkLiteral "#${config.colorScheme.palette.base00}";
+    #     foreground-color = mkLiteral "#${config.colorScheme.palette.base05}";
+    #     text-color = mkLiteral "#${config.colorScheme.palette.base07}";
+    #     border-color = mkLiteral "#${config.colorScheme.palette.base04}";
+    #   };
+    #   # Holds the entire window
+    #   "#window" = {
+    #     transparency = "real";
+    #     background-color = mkLiteral "#${config.colorScheme.palette.base00}";
+    #     text-color = mkLiteral "#${config.colorScheme.palette.base07}";
+    #     border = mkLiteral "0px";
+    #     border-color = mkLiteral "#${config.colorScheme.palette.base04}";
+    #     border-radius = mkLiteral "4px";
+    #     width = mkLiteral "850px";
+    #     padding = mkLiteral "8px";
+    #   };
+
+    #   # Wrapper around bar and results
+    #   "#mainbox" = {
+    #     background-color = mkLiteral "#${config.colorScheme.palette.base00}";
+    #     border = mkLiteral "0px";
+    #     border-radius = mkLiteral "0px";
+    #     border-color = mkLiteral "#${config.colorScheme.palette.base04}";
+    #     children = map mkLiteral [ "inputbar" "message" "listview" ];
+    #     spacing = mkLiteral "10px";
+    #     padding = mkLiteral "10px";
+    #   };
+
+    #   # Unknown
+    #   "#textbox-prompt-colon" = {
+    #     expand = false;
+    #     str = ":";
+    #     margin = mkLiteral "0px 0.3em 0em 0em";
+    #     text-color = mkLiteral "#${config.colorScheme.palette.base07}";
+    #   };
+
+    #   # Command prompt left of the input
+    #   "#prompt" = { enabled = false; };
+
+    #   # Actual text box
+    #   "#entry" = {
+    #     placeholder-color = mkLiteral "#${config.colorScheme.palette.base03}";
+    #     expand = true;
+    #     horizontal-align = "0";
+    #     placeholder = "";
+    #     padding = mkLiteral "0px 0px 0px 5px";
+    #     blink = true;
+    #   };
+
+    #   # Top bar
+    #   "#inputbar" = {
+    #     children = map mkLiteral [ "prompt" "entry" ];
+    #     border = mkLiteral "1px";
+    #     border-radius = mkLiteral "4px";
+    #     padding = mkLiteral "6px";
+    #   };
+
+    #   # Results
+    #   "#listview" = {
+    #     background-color = mkLiteral "#${config.colorScheme.palette.base00}";
+    #     padding = mkLiteral "0px";
+    #     columns = 1;
+    #     lines = 12;
+    #     spacing = "5px";
+    #     cycle = true;
+    #     dynamic = true;
+    #     layout = "vertical";
+    #   };
+
+    #   # Each result
+    #   "#element" = {
+    #     orientation = "vertical";
+    #     border-radius = mkLiteral "0px";
+    #     padding = mkLiteral "5px 0px 5px 5px";
+    #   };
+    #   "#element.selected" = {
+    #     border = mkLiteral "1px";
+    #     border-radius = mkLiteral "4px";
+    #     border-color = mkLiteral "#${config.colorScheme.palette.base07}";
+    #     background-color = mkLiteral "#${config.colorScheme.palette.base04}";
+    #     text-color = mkLiteral "#${config.colorScheme.palette.base00}";
+    #   };
+
+    #   "#element-text" = {
+    #     expand = true;
+    #     # horizontal-align = mkLiteral "0.5";
+    #     vertical-align = mkLiteral "0.5";
+    #     margin = mkLiteral "0px 2.5px 0px 2.5px";
+    #   };
+    #   "#element-text.selected" = {
+    #     background-color = mkLiteral "#${config.colorScheme.palette.base04}";
+    #     text-color = mkLiteral "#${config.colorScheme.palette.base00}";
+    #   };
+
+    #   # Not sure how to get icons
+    #   "#element-icon" = {
+    #     size = mkLiteral "18px";
+    #     border = mkLiteral "0px";
+    #     padding = mkLiteral "2px 5px 2px 2px";
+    #     background-color = mkLiteral "#${config.colorScheme.palette.base00}";
+    #   };
+    #   "#element-icon.selected" = {
+    #     background-color = mkLiteral "#${config.colorScheme.palette.base04}";
+    #     text-color = mkLiteral "#${config.colorScheme.palette.base00}";
+    #   };
+    # };
+  };
+}

modules/home/desktop-environments/hyprland/waybar.nix

@@ -2,7 +2,7 @@
 
 {
   programs.waybar = {
-    enable = true;
+    enable = config.settings.desktop-environments.hyprland.enable;
     settings = {
       mainBar = {
         layer = "top";

modules/home/desktop-environments/niri/default.nix

@@ -0,0 +1,216 @@
+{ config, pkgs, lib, inputs, ... }:
+
+with lib;
+
+let
+  cfg = config.settings.desktop-environments.niri;
+in {
+  options = {
+    settings.desktop-environments.niri.enable = lib.mkOption {
+      type = lib.types.bool;
+      description = ''
+        Enable niri window manager configuration
+      '';
+      default = false;
+    };
+  };
+
+  imports = [
+    inputs.niri.homeModules.niri
+    ./waybar.nix
+    ./mako.nix
+    ./swww.nix
+  ];
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      fuzzel
+      brightnessctl
+    ];
+
+    programs.alacritty = {
+      enable = true;
+      settings = {
+        window.decorations = "None";
+      };
+    };
+
+
+    # Configure default applications
+    xdg.mimeApps = {
+      enable = true;
+      defaultApplications = {
+        "text/html" = "firefox.desktop";
+        "x-scheme-handler/http" = "firefox.desktop";
+        "x-scheme-handler/https" = "firefox.desktop";
+        "x-scheme-handler/about" = "firefox.desktop";
+        "x-scheme-handler/unknown" = "firefox.desktop";
+        "application/pdf" = "firefox.desktop";
+      };
+    };
+
+    programs.niri.enable = true;
+    programs.niri.package = pkgs.unstable.niri;
+
+    programs.niri.settings.outputs = lib.mkIf (config.settings.host == "ti-clt-dsk01") {
+      "HDMI-A-1".position = {
+        x = 1920;
+        y = 0;
+      };
+      "DP-1".position = {
+        x = 0;
+        y = 0;
+      };
+    };
+
+    programs.niri.settings.layout = {
+      gaps = 8;
+      focus-ring = {
+        width = 2;
+      };
+      preset-column-widths = [
+        { proportion = 1. / 3.; }   
+        { proportion = 1. / 2.; }   
+        { proportion = 2. / 3.; }   
+      ];
+    };
+
+    programs.niri.settings.workspaces = {
+      "00-app" = { name = "app"; open-on-output = "DP-1"; };
+      "01-term" = { name = "term"; open-on-output = "DP-1"; };
+      "10-web" = { name = "web"; open-on-output = "HDMI-A-1"; };
+      "11-mus" = { name = "mus"; open-on-output = "HDMI-A-1"; };
+      "12-com" = { name = "com"; open-on-output = "HDMI-A-1"; };
+    };
+
+    # Default startup applications
+    programs.niri.settings.spawn-at-startup = [
+      { command = ["vesktop"]; }
+      { command = ["thunderbird"]; }
+      { command = ["xwayland-satellite" ":10"]; }
+    ];
+
+    programs.niri.settings.environment.DISPLAY = ":10";
+    
+    programs.niri.settings.window-rules = [
+      {
+        matches = [
+          { at-startup = true; app-id = "vesktop"; }
+          { at-startup = true; app-id = "thunderbird"; }
+        ];
+        open-on-workspace = "com";
+      }
+    ];
+
+    # Configure overview
+    programs.niri.settings.layer-rules = [
+      {
+        matches = [
+          { namespace = "wallpaper"; }
+        ];
+        place-within-backdrop = true;
+      }
+    ];
+
+    programs.niri.settings.binds = with config.lib.niri.actions; {
+      "Mod+Shift+Slash".action = show-hotkey-overlay;
+
+      # Spawn applications
+      "Mod+Space".action = spawn "fuzzel"; 
+      "Mod+T".action = spawn "alacritty";
+      "Mod+B".action = spawn "firefox";
+
+      # Volume controls
+      "XF86AudioRaiseVolume".action = spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1+";
+      "XF86AudioLowerVolume".action = spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-";
+      "XF86AudioMute".action = spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK" "toggle";
+
+      # Media controls
+      "XF86AudioPlay".action = spawn "playerctl" "play-pause";
+      "XF86AudioNext".action = spawn "playerctl" "next";
+      "XF86AudioPrev".action = spawn "playerctl" "previous";
+
+      # Brightness controls
+      "XF86MonBrightnessUp".action = spawn "brightnessctl" "set" "5%+";
+      "XF86MonBrightnessDown".action = spawn "brightnessctl" "set" "5%-";
+      
+
+      "Mod+O".action = toggle-overview;
+      "Mod+Q".action = close-window;
+      "Mod+C".action = center-column;
+      "Mod+R".action = switch-preset-column-width;
+      "Mod+Escape".action = quit;
+
+      # Sizing
+      "Mod+Minus".action = set-column-width "-10%";
+      "Mod+Equal".action = set-column-width "+10%";
+
+      # Full screen
+      "Mod+F".action = maximize-column;
+      "Mod+Shift+F".action = fullscreen-window;
+      "Mod+Ctrl+F".action = expand-column-to-available-width;
+
+      # Toggle floating
+      "Mod+V".action = toggle-window-floating;
+      "Mod+Shift+V".action = switch-focus-between-floating-and-tiling;
+
+      # Print screen
+      "Print".action = screenshot { show-pointer=false; };
+
+      # Window focus
+      "Mod+H".action = focus-column-left;
+      "Mod+J".action = focus-window-down;
+      "Mod+K".action = focus-window-up;
+      "Mod+L".action = focus-column-right;
+
+      # Window moving
+      "Mod+Ctrl+H".action = move-column-left;
+      "Mod+Ctrl+J".action = move-window-down;
+      "Mod+Ctrl+K".action = move-window-up;
+      "Mod+Ctrl+L".action = move-column-right;
+
+      # Focus to different monitor
+      "Mod+Shift+H".action = focus-monitor-left;
+      "Mod+Shift+J".action = focus-monitor-down;
+      "Mod+Shift+K".action = focus-monitor-up;
+      "Mod+Shift+L".action = focus-monitor-right;
+
+      # Move to different monitor
+      "Mod+Ctrl+Shift+H".action = move-column-to-monitor-left;
+      "Mod+Ctrl+Shift+J".action = move-column-to-monitor-down;
+      "Mod+Ctrl+Shift+K".action = move-column-to-monitor-up;
+      "Mod+Ctrl+Shift+L".action = move-column-to-monitor-right;
+
+      # Switch workspaces
+      "Mod+Page_Down".action = focus-workspace-down;
+      "Mod+Page_Up".action = focus-workspace-up;
+      "Mod+U".action = focus-workspace-down;
+      "Mod+I".action = focus-workspace-up;
+
+      # Move workspaces
+      "Mod+Ctrl+Page_Down".action = move-column-to-workspace-down;
+      "Mod+Ctrl+Page_Up".action = move-column-to-workspace-up;
+      "Mod+Ctrl+U".action = move-column-to-workspace-down;
+      "Mod+Ctrl+I".action = move-column-to-workspace-up;
+
+      # Workspace scrolling
+      "Mod+WheelScrollDown" = {
+        action = focus-workspace-down;
+        cooldown-ms = 150;
+      };
+      "Mod+WheelScrollUp" = {
+        action = focus-workspace-up;
+        cooldown-ms = 150;
+      };
+      "Mod+Shift+WheelScrollDown" = {
+        action = focus-column-left;
+        cooldown-ms = 150;
+      };
+      "Mod+Shift+WheelScrollUp" = {
+        action = focus-column-right;
+        cooldown-ms = 150;
+      };
+    };
+  };
+}
+