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

@@ -1,7 +1,7 @@
 FROM caddy:2.8-builder AS builder
 
 RUN xcaddy build \
-  --with github.com/caddy-dns/cloudflare
+  --with github.com/caddy-dns/transip
 
 FROM caddy:2.8
 

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": 1726989464,
+        "lastModified": 1751810233,
-        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
+        "narHash": "sha256-kllkNbIqQi3VplgTMeGzuh1t8Gk8TauvkTRt93Km+tQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
+        "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": 1728067476,
+        "lastModified": 1752048960,
-        "narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=",
+        "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=",
         "owner": "NixOS",
-        "repo": "nixpkgs",
+        "repo": "nixos-hardware",
-        "rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030",
+        "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,13 +316,29 @@
         "type": "github"
       }
     },
-    "nixpkgs-unstable": {
+    "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1728018373,
+        "lastModified": 1751943650,
-        "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
+        "narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
+        "rev": "88983d4b665fb491861005137ce2b11a9f89f203",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1751792365,
+        "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb",
         "type": "github"
       },
       "original": {
@@ -101,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,99 +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} );
-    nixosConfigurations = {
+    overlays = import ./overlays { inherit inputs; };
-      xv-laptop = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = { inherit inputs; };
-        modules = [
-          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
   
-          ./hosts/laptop
+    nixosConfigurations = {
+      ti-clt-lpt01 = nixpkgs.lib.nixosSystem {
+        specialArgs = { inherit inputs outputs; };
+        modules = [
+          inputs.nixos-hardware.nixosModules.framework-13-7040-amd
+
+          ./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 {
-        system = "x86_64-linux";
-        specialArgs = { inherit inputs; };
-        modules = [
-          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
-
-          ./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 ];
-          }
-        ];
-      };
-    };
-
-    # pm01vm01 Configuration
-    nixosConfigurations = {
-      pm01vm01 = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = { inherit inputs; };
-        modules = [
-          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
-
-          ./hosts/pm01vm01
-        ];
-      };
-    };
-
-    homeConfigurations = {
-      "xeovalyte@pm01vm01" = 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-tbl01/home.nix
+        ];
+      };
 
-          ./hosts/pm01vm01/home.nix
+      "xeovalyte@ti-clt-dsk01" = home-manager.lib.homeManagerConfiguration {
+        pkgs = nixpkgs.legacyPackages.x86_64-linux;
+        extraSpecialArgs = { inherit inputs outputs; };
+        modules = [
+          ./hosts/ti-clt-dsk01/home.nix
+        ];
+      };
+
+      # Christa
+      "kiiwy@ch-clt-dsk01" = home-manager.lib.homeManagerConfiguration {
+        pkgs = nixpkgs.legacyPackages.x86_64-linux;
+        extraSpecialArgs = { inherit inputs outputs; };
+        modules = [
+          ./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/.gitignore

@@ -1,2 +0,0 @@
-secrets/
-.env

homelab/README.md

@@ -1,13 +0,0 @@
-# Create proxy network
-`docker network create proxy`
-
-# Configure caddy cloudflare
-Find instructions on [caddy-dns cloudflare](https://github.com/caddy-dns/cloudflare)
-
-# Services
-| Name | Use | Domain | Auth |
-| --- | --- | --- | --- |
-| Adguard | DNS | https://adguard.timo.bmrs.nl/ | local | 
-| Caddy | Reverse proxy | - | - |
-| Forgejo | Git | https://git.timo.bmrs.nl/ | Openid |
-| Ldap | User directory | https://ldap.timo.bmrs.nl/ | - |

homelab/adguard/docker-compose.yml

@@ -1,21 +0,0 @@
-services:
-  adguardhome:
-    image: adguard/adguardhome:latest
-    container_name: adguardhome
-    restart: unless-stopped
-    ports:
-      - 53:53/tcp
-      - 53:53/udp
-      # - 80:3000 # Only use during setup
-    volumes:
-      - work:/opt/adguardhome/work
-      - conf:/opt/adguardhome/conf
-
-volumes:
-  work:
-  conf:
-
-networks:
-  default:
-    name: proxy
-    external: true

homelab/authelia/.gitignore

@@ -1 +0,0 @@
-keys/

homelab/authelia/README.md

@@ -1,2 +0,0 @@
-- Follow [This](https://www.authelia.com/configuration/identity-providers/openid-connect/provider/) guide for generating keys
-- Store the keys in the /keys directory

homelab/authelia/docker-compose.yml

@@ -1,44 +0,0 @@
-services:
-  authelia:
-    image: authelia/authelia:latest
-    container_name: authelia
-    restart: unless-stopped
-    depends_on:
-      - lldap
-    volumes:
-      - ./config/configuration.yml:/config/configuration.yml
-      - ./config/keys:/keys
-      - data_authelia:/config
-    environment:
-      X_AUTHELIA_CONFIG_FILTERS: template
-      JWT_SECRET: ${AUTHELIA_JWT_SECRET}
-      SESSION_SECRET: ${AUTHELIA_SESSION_SECRET}
-      STORAGE_ENCRYPTION_KEY: ${AUTHELIA_STORAGE_ENCRYPTION_KEY}
-      AUTHELIA_AUTHENTICATION_BACKEND_LDAP_PASSWORD: ${LLDAP_ADMIN_PASSWORD}
-      HMAC_SECRET: ${AUTHELIA_HMAC_SECRET}
-      CLIENT_SECRET_FORGEJO: ${AUTHELIA_CLIENT_SECRET_FORGEJO}
-      CLIENT_ID_FORGEJO: ${AUTHELIA_CLIENT_ID_FORGEJO}
-      CLIENT_SECRET_PAPERLESS: ${AUTHELIA_CLIENT_SECRET_PAPERLESS}
-      CLIENT_ID_PAPERLESS: ${AUTHELIA_CLIENT_ID_PAPERLESS}
-
-  lldap:
-    image: lldap/lldap:latest
-    container_name: lldap
-    restart: unless-stopped
-    volumes:
-      - data_lldap:/data
-    environment:
-      LLDAP_JWT_SECRET: ${LLDAP_JWT_SECRET}
-      LLDAP_KEY_SEED: ${LLDAP_KEY_SEED}
-      LLDAP_LDAP_BASE_DN: dc=bmrs,dc=nl
-      LLDAP_LDAP_USER_PASS: ${LLDAP_ADMIN_PASSWORD}
-
-volumes:
-  data_lldap:
-  data_authelia:
-
-networks:
-  default:
-    name: proxy
-    external: true
-

homelab/caddy/README.md

@@ -1,2 +0,0 @@
-# Caddy reverse proxy
-Follow [this](https://github.com/caddy-dns/cloudflare) to obtain secrets

homelab/caddy/caddyfiles/Caddyfile

@@ -1,21 +0,0 @@
-localhost {
-	respond "Hello world!"
-}
-
-
-*.timo.bmrs.nl timo.bmrs.nl {
-	tls {
-		dns cloudflare {
-			zone_token {env.CF_ZONE_TOKEN}
-			api_token {env.CF_API_TOKEN}
-		}
-		resolvers 1.1.1.1
-	}
-
-	forward_auth authelia:9091 {
-		uri /api/authz/forward-auth
-		copy_headers Remote-User Remote-Groups Remote-Email Remote-Name		
-	}
-
-	import routes/*
-}

homelab/caddy/caddyfiles/routes/adguard

@@ -1,4 +0,0 @@
-@adguard host adguard.timo.bmrs.nl
-handle @adguard {
-	reverse_proxy adguardhome:3000
-}

homelab/caddy/caddyfiles/routes/authelia

@@ -1,9 +0,0 @@
-@ldap host ldap.timo.bmrs.nl
-handle @ldap {
-	reverse_proxy lldap:17170
-}
-
-@authelia host auth.timo.bmrs.nl
-handle @authelia {
-	reverse_proxy authelia:9091
-}

homelab/caddy/caddyfiles/routes/dozzle

@@ -1,9 +0,0 @@
-@dozzle host dozzle.timo.bmrs.nl
-handle @dozzle {
-	forward_auth authelia:9091 {
-		uri /api/authz/forward-auth
-		copy_headers Remote-User Remote-Groups Remote-Name Remote-Email
-	}
-
-	reverse_proxy dozzle:8080
-}

homelab/caddy/caddyfiles/routes/forgejo

@@ -1,4 +0,0 @@
-@forgejo host git.timo.bmrs.nl
-handle @forgejo {
-	reverse_proxy forgejo:3000
-}

homelab/caddy/caddyfiles/routes/homeassistant

@@ -1,4 +0,0 @@
-@homeassistant host homeassistant.timo.bmrs.nl
-handle @homeassistant {
-	reverse_proxy homeassistant:8123
-}

homelab/caddy/caddyfiles/routes/homepage

@@ -1,4 +0,0 @@
-@homepage host home.timo.bmrs.nl
-handle @homepage {
-	reverse_proxy homepage:3000
-}

homelab/caddy/caddyfiles/routes/immich

@@ -1,4 +0,0 @@
-@immich host immich.timo.bmrs.nl
-handle @immich {
-	reverse_proxy immich:2283
-}

homelab/caddy/caddyfiles/routes/nextcloud

@@ -1,12 +0,0 @@
-@nextcloud host cloud.timo.bmrs.nl
-handle @nextcloud {
-	redir /.well-known/carddav /remote.php/dav/ 301
-    redir /.well-known/caldav /remote.php/dav/ 301
-
-	reverse_proxy nextcloud:80
-}
-
-@office host office.timo.bmrs.nl
-handle @office {
-	reverse_proxy nextcloud-office:9980
-}

homelab/caddy/caddyfiles/routes/paperless-ngx

@@ -1,4 +0,0 @@
-@paperless-ngx host paperless.timo.bmrs.nl
-handle @paperless-ngx {
-	reverse_proxy paperless-ngx:8000
-}

homelab/caddy/caddyfiles/routes/searxng

@@ -1,4 +0,0 @@
-@searxng host search.timo.bmrs.nl
-handle @searxng {
-	reverse_proxy searxng:8080
-}

homelab/caddy/caddyfiles/routes/uptime-kuma

@@ -1,4 +0,0 @@
-@uptime-kuma host uptime.timo.bmrs.nl
-handle @uptime-kuma {
-	reverse_proxy uptime-kuma:3001
-}

homelab/caddy/caddyfiles/routes/vaultwarden

@@ -1,4 +0,0 @@
-@vaultwarden host bitwarden.timo.bmrs.nl
-handle @vaultwarden {
-	reverse_proxy vaultwarden:80
-}

homelab/caddy/docker-compose.yml

@@ -1,33 +0,0 @@
-services:
-  caddy:
-    build: .
-    container_name: caddy
-    restart: unless-stopped
-    cap_add:
-      - NET_ADMIN
-    ports:
-      - 80:80
-      - 443:443
-      - 443:443/udp
-    volumes:
-      - data:/data
-      - config:/config
-      - ./caddyfiles:/etc/caddy/
-    environment:
-      CF_ZONE_TOKEN: ${CF_ZONE_TOKEN}
-      CF_API_TOKEN: ${CF_API_TOKEN}
-    networks:
-      proxy:
-        aliases:
-          - auth.timo.bmrs.nl
-          - cloud.timo.bmrs.nl
-          - office.timo.bmrs.nl
-
-volumes:
-  data:
-  config:
-
-networks:
-  proxy:
-    name: proxy
-    external: true

homelab/dozzle/docker-compose.yml

@@ -1,15 +0,0 @@
-services:
-  dozzle:
-    image: amir20/dozzle:latest
-    container_name: dozzle
-    restart: unless-stopped
-    volumes:
-      - /run/user/1000/docker.sock:/var/run/docker.sock:ro
-    environment:
-      DOZZLE_ENABLE_ACTIONS: true
-      DOZZLE_AUTH_PROVIDER: forward-proxy
-
-networks:
-  default:
-    external: true
-    name: proxy

homelab/forgejo/docker-compose.yml

@@ -1,40 +0,0 @@
-services:
-  forgejo:
-    image: codeberg.org/forgejo/forgejo:9
-    container_name: forgejo
-    restart: unless-stopped
-    depends_on:
-      - db
-    ports:
-      - 222:22
-    volumes:
-      - data:/data
-      - ./config/app.ini:/etc/forgejo/app.ini
-      - /etc/timezone:/etc/timezone:ro
-      - /etc/localtime:/etc/localtime:ro 
-    environment:
-      FORGEJO__database__DB_TYPE: postgres
-      FORGEJO__database__HOST: "forgejo-db"
-      FORGEJO__database__NAME: forgejo
-      FORGEJO__database__USER: forgejo
-      FORGEJO__database__PASSWD: ${DB_PASSWORD}
-  
-  db:
-    image: postgres:14
-    container_name: forgejo-db
-    restart: unless-stopped
-    volumes:
-      - data_db:/var/lib/postgresql/data
-    environment:
-      POSTGRES_USER: forgejo
-      POSTGRES_PASSWORD: ${DB_PASSWORD}
-      POSTGES_DB: forgejo
-
-volumes:
-  data:
-  data_db:
-
-networks:
-  default:
-    name: proxy
-    external: true

homelab/homeassistant/config/configuration.yaml

@@ -1,15 +0,0 @@
-# Loads default set of integrations. Do not remove.
-default_config:
-
-# Load frontend themes from the themes folder
-frontend:
-  themes: !include_dir_merge_named themes
-
-automation: !include automations.yaml
-script: !include scripts.yaml
-scene: !include scenes.yaml
-
-http:
-  use_x_forwarded_for: true
-  trusted_proxies:
-    - 172.18.0.0/24

homelab/homeassistant/docker-compose.yml

@@ -1,17 +0,0 @@
-services:
-  homeassistant:
-    image: ghcr.io/home-assistant/home-assistant:stable
-    container_name: homeassistant
-    restart: unless-stopped
-    volumes:
-      - config:/config
-      - ./config/configuration.yaml:/config/configuration.yaml
-      - /etc/localtime:/etc/localtime:ro
-
-volumes:
-  config:
-
-networks:
-  default:
-    name: proxy
-    external: true

homelab/homepage/config/.gitignore

@@ -1 +0,0 @@
-logs/

homelab/homepage/config/bookmarks.yaml

@@ -1,3 +0,0 @@
----
-# For configuration options and examples, please see:
-# https://gethomepage.dev/configs/bookmarks

homelab/homepage/config/docker.yaml

@@ -1,10 +0,0 @@
----
-# For configuration options and examples, please see:
-# https://gethomepage.dev/configs/docker/
-
-# my-docker:
-#   host: 127.0.0.1
-#   port: 2375
-
-docker:
-  socket: /var/run/docker.sock

homelab/homepage/config/kubernetes.yaml

@@ -1,2 +0,0 @@
----
-# sample kubernetes config

homelab/homepage/config/services.yaml

@@ -1,56 +0,0 @@
----
-# For configuration options and examples, please see:
-# https://gethomepage.dev/configs/services
-
-- Primary Services:
-    - Adguard:
-        href: https://adguard.timo.bmrs.nl/
-        description: DNS
-        icon: adguard-home
-        server: docker
-        container: adguardhome
-        widget:
-            type: adguard
-            url: http://adguardhome:3000
-            username: xeovalyte
-            password: {{HOMEPAGE_VAR_ADGUARD_PASSWORD}}
-
-    - Forgejo:
-        href: https://git.timo.bmrs.nl/
-        description: Git
-        icon: forgejo
-        server: docker
-        container: forgejo
-
-    - Uptime Kuma:
-        href: https://uptime.timo.bmrs.nl/
-        description: Uptime monitoring
-        icon: uptime-kuma
-        server: docker
-        container: uptime-kuma
-
-    - Vaultwarden:
-        href: https://bitwarden.timo.bmrs.nl/
-        description: Password manager
-        icon: bitwarden
-        server: docker
-        container: vaultwarden
-
-- Backend Services:
-    - Authelia:
-        description: SSO
-        icon: authelia
-        server: docker
-        container: authelia
-    
-    - Caddy:
-        description: Reverse proxy
-        icon: caddy
-        server: docker
-        container: caddy
-
-    - LLDAP:
-        description: Active directory
-        href: https://ldap.timo.bmrs.nl/
-        server: docker
-        container: lldap

homelab/homepage/config/settings.yaml

@@ -1,21 +0,0 @@
----
-# For configuration options and examples, please see:
-# https://gethomepage.dev/configs/settings
-
-providers:
-  openweathermap: openweathermapapikey
-  weatherapi: weatherapiapikey
-
-title: Xeovalyte's Dashboard
-color: slate
-
-headerStyle: boxedWidgets
-
-layout:
-  Primary Services:
-    style: row
-    columns: 3
-
-  Backend Services:
-    style: row
-    columns: 4

homelab/homepage/config/widgets.yaml

@@ -1,12 +0,0 @@
----
-# For configuration options and examples, please see:
-# https://gethomepage.dev/configs/service-widgets
-
-- resources:
-    cpu: true
-    memory: true
-    disk: /
-
-- search:
-    provider: duckduckgo
-    target: _blank

homelab/homepage/docker-compose.yml

@@ -1,19 +0,0 @@
-services:
-  homepage:
-    image: ghcr.io/gethomepage/homepage:latest
-    container_name: homepage
-    restart: unless-stopped
-    volumes:
-      - ./config:/app/config
-      - logs:/app/config/logs
-      - /run/user/1000/docker.sock:/var/run/docker.sock
-    environment:
-      HOMEPAGE_VAR_ADGUARD_PASSWORD: $ADGUARD_PASSWORD
-
-volumes:
-  logs:
-
-networks:
-  default:
-    name: proxy
-    external: true

homelab/immich/docker-compose.yml

@@ -1,78 +0,0 @@
-services:
-  immich:
-    image: ghcr.io/immich-app/immich-server:release
-    container_name: immich
-    restart: unless-stopped
-    volumes:
-      - data:/usr/src/app/upload
-      - /etc/localtime:/etc/localtime:ro
-    environment:
-      DB_HOSTNAME: "immich-db"
-    env_file:
-      - .env
-    depends_on:
-      - redis
-      - db
-
-  immich-machine-learning:
-    image: ghcr.io/immich-app/immich-machine-learning:release
-    container_name: immich-machine-learning
-    restart: unless-stopped
-    volumes:
-      - cache:/cache
-    env_file:
-      - .env
-
-  redis:
-    image: docker.io/redis:6.2-alpine@sha256:2ba50e1ac3a0ea17b736ce9db2b0a9f6f8b85d4c27d5f5accc6a416d8f42c6d5
-    container_name: immich-redis
-    restart: unless-stopped
-    healthcheck:
-      test: redis-cli ping || exit 1
-    volumes:
-      - data_redis:/data
-
-  db:
-    image: docker.io/tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:90724186f0a3517cf6914295b5ab410db9ce23190a2d9d0b9dd6463e3fa298f0
-    container_name: immich-db
-    restart: unless-stopped
-    volumes:
-      # Do not edit the next line. If you want to change the database storage location on your system, edit the value of DB_DATA_LOCATION in the .env file
-      - data_db:/var/lib/postgresql/data
-    healthcheck:
-      test: pg_isready --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' --tuples-only --no-align --command='SELECT COALESCE(SUM(checksum_failures), 0) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ "$$Chksum" = '0' ] || exit 1
-      interval: 5m
-      start_interval: 30s
-      start_period: 5m
-    command:
-      [
-        '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',
-      ]
-    environment:
-      POSTGRES_PASSWORD: ${DB_PASSWORD}
-      POSTGRES_USER: ${DB_USERNAME}
-      POSTGRES_DB: ${DB_DATABASE_NAME}
-      POSTGRES_INITDB_ARGS: '--data-checksums'
-
-volumes:
-  data:
-  data_db:
-  data_redis:
-  cache:
-
-networks:
-  default:
-    name: proxy
-    external: true

homelab/nextcloud/docker-compose.yml

@@ -1,54 +0,0 @@
-services:
-  nextcloud:
-    image: nextcloud:apache
-    container_name: nextcloud
-    restart: unless-stopped
-    volumes:
-      - data:/var/www/html
-    environment:
-      POSTGRES_HOST: nextcloud-db
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-      POSTGRES_DB: nextcloud
-      POSTGRES_USER: nextcloud
-      REDIS_HOST: nextcloud-redis
-      TRUSTED_PROXIES: "172.23.0.0/24"
-    depends_on:
-      - db
-      - redis
-
-  db:
-    image: postgres:16
-    container_name: nextcloud-db
-    restart: unless-stopped
-    volumes:
-      - data_db:/var/lib/postgresql/data
-    environment:
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-      POSTGRES_DB: nextcloud
-      POSTGRES_USER: nextcloud
-
-  redis:
-    image: redis:alpine
-    container_name: nextcloud-redis
-    restart: unless-stopped
-    volumes:
-      - data_redis:/data
-
-  office:
-    image: collabora/code
-    container_name: nextcloud-office
-    restart: unless-stopped
-    environment:
-      DOMAIN: "cloud.timo.bmrs.nl"
-      extra_params: "--o:ssl.enable=false --o:ssl.termination=true"
-
-
-volumes:
-  data:
-  data_db:
-  data_redis:
-
-networks:
-  default:
-    name: proxy
-    external: true

homelab/paperless-ngx/README.md

@@ -1,3 +0,0 @@
-# Paperless NGX
-- Create super user: `docker compose exec paperless-ngx python3 manage.py createsuperuser`
-- Follow [Paperless wiki](https://www.authelia.com/integration/openid-connect/paperless/) for configuring oauth

homelab/paperless-ngx/docker-compose.yml

@@ -1,50 +0,0 @@
-services:
-  paperless-ngx:
-    image: ghcr.io/paperless-ngx/paperless-ngx:latest
-    container_name: paperless-ngx
-    restart: unless-stopped
-    depends_on:
-      - broker
-      - db
-    volumes:
-      - data:/usr/src/paperless/data
-      - media:/usr/src/paperless/media
-    environment:
-      PAPERLESS_REDIS: redis://paperless-ngx-broker:6379
-      PAPERLESS_DBHOST: paperless-ngx-db
-      PAPERLESS_DBPASS: ${POSTGRES_PASSWORD}
-      PAPERLESS_URL: https://paperless.timo.bmrs.nl
-
-      PAPERLESS_DISABLE_REGULAR_LOGIN: true
-      PAPERLESS_APPS: allauth.socialaccount.providers.openid_connect
-      PAPERLESS_SOCIALACCOUNT_PROVIDERS: ${PAPERLESS_SOCIALACCOUNT_PROVIDERS}
-
-  broker:
-    image: docker.io/library/redis:7
-    container_name: paperless-ngx-broker
-    restart: unless-stopped
-    volumes:
-      - data_redis:/data
-
-  db:
-    image: docker.io/library/postgres:16
-    container_name: paperless-ngx-db
-    restart: unless-stopped
-    volumes:
-      - data_db:/var/lib/postgresql/data
-    environment:
-      POSTGRES_DB: paperless
-      POSTGRES_USER: paperless
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-
-
-volumes:
-  data:
-  data_db:
-  data_redis:
-  media:
-
-networks:
-  default:
-    name: proxy
-    external: true

homelab/searxng/config/uwsgi.ini

@@ -1,54 +0,0 @@
-[uwsgi]
-# Who will run the code
-uid = searxng
-gid = searxng
-
-# Number of workers (usually CPU count)
-# default value: %k (= number of CPU core, see Dockerfile)
-workers = %k
-
-# Number of threads per worker
-# default value: 4 (see Dockerfile)
-threads = 4
-
-# The right granted on the created socket
-chmod-socket = 666
-
-# Plugin to use and interpreter config
-single-interpreter = true
-master = true
-plugin = python3
-lazy-apps = true
-enable-threads = 4
-
-# Module to import
-module = searx.webapp
-
-# Virtualenv and python path
-pythonpath = /usr/local/searxng/
-chdir = /usr/local/searxng/searx/
-
-# automatically set processes name to something meaningful
-auto-procname = true
-
-# Disable request logging for privacy
-disable-logging = true
-log-5xx = true
-
-# Set the max size of a request (request-body excluded)
-buffer-size = 8192
-
-# No keep alive
-# See https://github.com/searx/searx-docker/issues/24
-add-header = Connection: close
-
-# Follow SIGTERM convention
-# See https://github.com/searxng/searxng/issues/3427
-die-on-term
-
-# uwsgi serves the static files
-static-map = /static=/usr/local/searxng/searx/static
-# expires set to one day
-static-expires = /* 86400
-static-gzip-all = True
-offload-threads = 4

homelab/searxng/docker-compose.yml

@@ -1,15 +0,0 @@
-services:
-  searxng:
-    image: searxng/searxng
-    container_name: searxng
-    restart: unless-stopped
-    volumes:
-      - ./config:/etc/searxng
-    environment:
-      BASE_URL: "https://search.timo.bmrs.nl/"
-      SEARXNG_SECRET: "PO8rO5ZW7K67sroemisMS8wpiq5pXEHecvXzGs4CdAgTQIQvAI09m65vFKGVVkZW"
-
-networks:
-  default:
-    external: true
-    name: proxy

homelab/uptime-kuma/docker-compose.yml

@@ -1,15 +0,0 @@
-services:
-  uptime-kuma:
-    image: louislam/uptime-kuma:1
-    container_name: uptime-kuma
-    restart: unless-stopped
-    volumes:
-      - data:/app/data
-
-volumes:
-  data:
-
-networks:
-  default:
-    name: proxy
-    external: true

homelab/vaultwarden/docker-compose.yml

@@ -1,17 +0,0 @@
-services:
-  vaultwarden:
-    image: vaultwarden/server:latest
-    container_name: vaultwarden
-    restart: unless-stopped
-    volumes:
-      - data:/data
-    environment:
-      SIGNUPS_ALLOWED: "true"
-
-volumes:
-  data:
-
-networks:
-  default:
-    name: proxy
-    external: true

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,52 +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
-
-    # Hardware
-    ../../modules/system/hardware/firewall.nix
-    ../../modules/system/hardware/garbage-collection.nix
-    ../../modules/system/hardware/locale.nix
-    ../../modules/system/hardware/nvidia.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" ];
-  };
-
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
-  system.stateVersion = "24.05";
-
-}

hosts/desktop/home.nix

@@ -1,46 +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
-      '';
-    };
-
-    headless = lib.mkOption {
-      type = with lib.types; bool;
-      description = ''
-        Is this machine headless?
-      '';
-    };
-  };
-
-  config = {
-    home = {
-      username = "xeovalyte";
-      homeDirectory = "/home/xeovalyte";
-    };
-
-    host = "xv-desktop";
-    headless = false;
-
-    home.packages = with pkgs; [
-       unstable.prismlauncher
-    ];
-
-    home.stateVersion = "24.05";
-  };
-}

hosts/laptop/default.nix

@@ -1,66 +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
-    ../../modules/system/hardware/fprint.nix
-    ../../modules/system/hardware/virt.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;
-  services.fwupd.enable = true;
-
-  system.stateVersion = "24.05";
-
-}

hosts/laptop/home.nix

@@ -1,89 +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
-    ../../modules/home/cli/yazi.nix
-  ];
-
-
-  options = {
-    host = lib.mkOption {
-      type = with lib.types; str;
-      description = ''
-        Define the host of the machine
-      '';
-    };
-
-    headless = lib.mkOption {
-      type = with lib.types; bool;
-      description = ''
-        Is this machine headless?
-      '';
-    };
-  };
-
-  config = {
-    home = {
-      username = "xeovalyte";
-      homeDirectory = "/home/xeovalyte";
-    };
-
-    host = "xv-laptop";
-    headless = false;
-
-    home.packages = with pkgs; [
-      # Desktop Applications
-      kdenlive
-      unstable.prismlauncher
-      unstable.joplin-desktop
-      unstable.prusa-slicer
-      signal-desktop
-      unstable.vesktop
-      unstable.blender
-      loupe
-      unstable.rnote
-
-      # Office
-      libreoffice
-      onlyoffice-bin
-      papers
-
-      # Image editing
-      gimp
-      inkscape
-      unstable.obs-studio
-
-      # Development
-      unstable.drawio
-
-      # Scripts
-      (import ../../modules/scripts/save_image.nix { inherit pkgs; })
-    ];
-
-    # Enable home-manager
-    programs.home-manager.enable = true;
-
-    # Enable default applications
-    xdg.mimeApps = {
-      enable = true;
-      defaultApplications = {
-        "application/pdf" = "firefox.desktop";
-        "application/rnote" = "rnote.desktop";
-      };
-    };
-
-    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/pm01vm01/default.nix

@@ -1,48 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  imports = [
-    ./hardware-configuration.nix
-
-    # CLI
-    ../../modules/system/cli/common.nix
-    ../../modules/system/cli/docker.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"
-    ];
-  };
-
-  # Bootloader.
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.systemd-boot.enable = true;
-
-  networking.hostName = "pm01vm01"; # Define your hostname.
-
-  users.users.xeovalyte = {
-    isNormalUser = true;
-    description = "Timo Boomers";
-    extraGroups = [ "networkmanager" "wheel" ];
-  };
-
-  # Enable ssh
-  services.openssh.enable = true;
-
-  # Forward ports
-  networking.firewall = {
-    allowedTCPPorts = [ 80 443 53 ];
-    allowedUDPPorts = [ 53 ];
-  };
-
-  system.stateVersion = "24.05";
-
-}

hosts/pm01vm01/home.nix

@@ -1,48 +0,0 @@
-{ pkgs, lib, config, ... }:
-
-{
-  imports = [
-    # Gui
-    ../../modules/home/gui/theming.nix
-  
-    # CLI
-    ../../modules/home/cli/common
-    ../../modules/home/cli/yazi.nix
-  ];
-
-
-  options = {
-    host = lib.mkOption {
-      type = with lib.types; str;
-      description = ''
-        Define the host of the machine
-      '';
-    };
-
-    headless = lib.mkOption {
-      type = with lib.types; bool;
-      description = ''
-        Is this machine headless?
-      '';
-    };
-  };
-
-  config = {
-    home = {
-      username = "xeovalyte";
-      homeDirectory = "/home/xeovalyte";
-    };
-
-    host = "pm01vm01";
-    headless = true;
-
-    home.packages = with pkgs; [
-    ];
-
-    # 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/hardware-configuration.nix

@@ -8,18 +8,18 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/b4cefbc5-dd3d-4a4b-84d0-031b2ed7655c";
+    { device = "/dev/disk/by-uuid/f8dc500b-2b36-4ca8-940b-1716742d6cf3";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/9A7D-7464";
+    { device = "/dev/disk/by-uuid/029A-9287";
       fsType = "vfat";
       options = [ "fmask=0022" "dmask=0022" ];
     };

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

@@ -5,33 +5,36 @@
 
 {
   imports =
-    [ (modulesPath + "/profiles/qemu-guest.nix")
+    [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ohci_pci" "ehci_pci" "virtio_pci" "ahci" "usbhid" "sr_mod" "virtio_blk" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
+  boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/47301fe6-a7db-4ffd-854a-beddd53b6d99";
+    { device = "/dev/disk/by-uuid/4d44a7fb-9a4f-4d55-8daf-1c93f08485dd";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/6A5B-F811";
+    { device = "/dev/disk/by-uuid/30EC-F045";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
-  swapDevices = [ ];
+  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.enp0s8.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";
+  };
+}

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/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,166 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    unstable.marksman
-    unstable.svls
-    unstable.nil
-    unstable.nixpkgs-fmt
-    unstable.vale-ls
-    unstable.vale
-  ];
-
-  home.file.".config/vale/.vale.ini".text = ''
-    StylesPath = ~/.local/share/vale/styles
-
-    MinAlertLevel = suggestion
-    Packages = Readability
-
-    [*]
-    BasedOnStyles = Vale
-  '';
-
-  programs.helix = {
-    enable = true;
-    package = pkgs.unstable.helix;
-    defaultEditor = true;
-    settings = {
-      theme = "base16";
-      editor.cursor-shape = {
-        insert = "bar";
-      };
-    };
-    languages = {
-      # Rust
-      language-server.rust-analyzer.config = {
-        cargo = {
-          features = "all";
-        };
-      };
-
-      # Systemverilog
-      language-server.svls = {
-        command = "svls";
-      };
-
-      # Vale
-      language-server.vale = {
-        command = "vale-ls";
-      };
-
-      language = [
-        {
-          name = "verilog";
-          language-servers = [ "svls" ];
-        }
-        {
-          name = "nix";
-          language-servers = [ "svls" ];
-        }
-        {
-          name = "html";
-          language-servers = [ "vscode-html-language-server" "tailwindcss-ls" ];
-        }
-        {
-          name = "css";
-          language-servers = [ "vscode-html-language-server" "tailwindcss-ls" ];
-        }
-        {
-          name = "markdown";
-          language-servers = [ "vale" ];
-        }
-      ];
-    };
-    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;
-      }
-    ];
-  };
-}