flake update

flake.lock

@@ -8,11 +8,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1736955230,
+        "lastModified": 1754433428,
-        "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
+        "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
+        "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
         "type": "github"
       },
       "original": {
@@ -21,47 +21,41 @@
         "type": "github"
       }
     },
-    "ags": {
+    "base16-schemes": {
-      "inputs": {
+      "flake": false,
-        "astal": "astal",
-        "nixpkgs": [
-          "hyprpanel",
-          "nixpkgs"
-        ]
-      },
       "locked": {
-        "lastModified": 1736090999,
+        "lastModified": 1696158499,
-        "narHash": "sha256-B5CJuHqfJrzPa7tObK0H9669/EClSHpa/P7B9EuvElU=",
+        "narHash": "sha256-5yIHgDTPjoX/3oDEfLSQ0eJZdFL1SaCfb9d6M0RmOTM=",
-        "owner": "aylur",
+        "owner": "tinted-theming",
-        "repo": "ags",
+        "repo": "base16-schemes",
-        "rev": "5527c3c07d92c11e04e7fd99d58429493dba7e3c",
+        "rev": "a9112eaae86d9dd8ee6bb9445b664fba2f94037a",
         "type": "github"
       },
       "original": {
-        "owner": "aylur",
+        "owner": "tinted-theming",
-        "repo": "ags",
+        "repo": "base16-schemes",
         "type": "github"
       }
     },
-    "astal": {
+    "blueprint": {
       "inputs": {
         "nixpkgs": [
-          "hyprpanel",
+          "nix-ai-tools",
-          "ags",
           "nixpkgs"
-        ]
+        ],
+        "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1735172721,
+        "lastModified": 1758687491,
-        "narHash": "sha256-rtEAwGsHSppnkR3Qg3eRJ6Xh/F84IY9CrBBLzYabalY=",
+        "narHash": "sha256-sy8Q+MfBe+MZzYj4MJwBDe4lkLnmhy1POO86hWZgqO8=",
-        "owner": "aylur",
+        "owner": "numtide",
-        "repo": "astal",
+        "repo": "blueprint",
-        "rev": "6c84b64efc736e039a8a10774a4a1bf772c37aa2",
+        "rev": "7ecaeb70f63d14a397c73b38f57177894bb795c8",
         "type": "github"
       },
       "original": {
-        "owner": "aylur",
+        "owner": "numtide",
-        "repo": "astal",
+        "repo": "blueprint",
         "type": "github"
       }
     },
@@ -73,11 +67,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700795494,
+        "lastModified": 1744478979,
-        "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
+        "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
+        "rev": "43975d782b418ebf4969e9ccba82466728c2851b",
         "type": "github"
       },
       "original": {
@@ -94,11 +88,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739518853,
+        "lastModified": 1758287904,
-        "narHash": "sha256-3dZpC0Kq9qvaTKcfC9Am+PXd73mWo2Whi2yM6gnvOpA=",
+        "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "85942f35d345daf4d402c05a8ee0c52f414a2168",
+        "rev": "67ff9807dd148e704baadbd4fd783b54282ca627",
         "type": "github"
       },
       "original": {
@@ -107,20 +101,43 @@
         "type": "github"
       }
     },
-    "dotfiles": {
+    "flake-parts": {
-      "flake": false,
+      "inputs": {
+        "nixpkgs-lib": [
+          "nur",
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1728910889,
+        "lastModified": 1733312601,
-        "narHash": "sha256-B/fb+7SKVxK9j851SgR4Nljd6EtE1DzqwLh6yOvkQOY=",
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
-        "ref": "refs/heads/master",
+        "owner": "hercules-ci",
-        "rev": "360c75b2cbce800ebaf9445266e2fe345bf582bf",
+        "repo": "flake-parts",
-        "revCount": 53,
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
-        "type": "git",
+        "type": "github"
-        "url": "https://code.m3tam3re.com/m3tam3re/dotfiles.git"
       },
       "original": {
-        "type": "git",
+        "owner": "hercules-ci",
-        "url": "https://code.m3tam3re.com/m3tam3re/dotfiles.git"
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
       }
     },
     "home-manager": {
@@ -131,11 +148,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1703113217,
+        "lastModified": 1745494811,
-        "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
+        "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
+        "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
         "type": "github"
       },
       "original": {
@@ -151,11 +168,32 @@
         ]
       },
       "locked": {
-        "lastModified": 1739470101,
+        "lastModified": 1759573136,
-        "narHash": "sha256-NxNe32VB4XI/xIXrsKmIfrcgtEx5r/5s52pL3CpEcA4=",
+        "narHash": "sha256-ILSPD0Dm8p0w0fCVzOx98ZH8yFDrR75GmwmH3fS2VnE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5031c6d2978109336637977c165f82aa49fa16a7",
+        "rev": "5f06ceafc6c9b773a776b9195c3f47bbe1defa43",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "home-manager_3": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprpanel",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1750798083,
+        "narHash": "sha256-DTCCcp6WCFaYXWKFRA6fiI2zlvOLCf5Vwx8+/0R8Wc4=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "ff31a4677c1a8ae506aa7e003a3dba08cb203f82",
         "type": "github"
       },
       "original": {
@@ -170,7 +208,7 @@
           "rose-pine-hyprcursor",
           "nixpkgs"
         ],
-        "systems": "systems_2"
+        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1709914708,
@@ -188,15 +226,16 @@
     },
     "hyprpanel": {
       "inputs": {
-        "ags": "ags",
+        "flake-utils": "flake-utils",
+        "home-manager": "home-manager_3",
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1739002652,
+        "lastModified": 1757563845,
-        "narHash": "sha256-W83O9ASWUFaDAFY7H9vvW/Gm9PN5Lkh0McYW3bA/6aU=",
+        "narHash": "sha256-pz69vejsrB+7N+jyKxZcckTjJtzw9BCAIRzHNbFUIp0=",
         "owner": "Jas-SinghFSU",
         "repo": "HyprPanel",
-        "rev": "0d5f80ff5cd525b8f27adfb84cef67d90e3d7f10",
+        "rev": "0a961ce8a959c521f41546af7f355e04adee5503",
         "type": "github"
       },
       "original": {
@@ -205,45 +244,183 @@
         "type": "github"
       }
     },
+    "m3ta-nixpkgs": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1759661061,
+        "narHash": "sha256-LAd1fNNIL19HrOm1cVeoKP5v8si932HsX1ZDwJh9O8o=",
+        "ref": "refs/heads/master",
+        "rev": "27d92a238ba9b9df117680c2080e082a2732bfc5",
+        "revCount": 7,
+        "type": "git",
+        "url": "https://code.m3ta.dev/m3tam3re/nixpkgs"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://code.m3ta.dev/m3tam3re/nixpkgs"
+      }
+    },
+    "nix-ai-tools": {
+      "inputs": {
+        "blueprint": "blueprint",
+        "nixpkgs": "nixpkgs_4",
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1759662326,
+        "narHash": "sha256-DlLJ95u+Y+dQUgYXK9w4+oXEN1tAoBTuOBbROkJFw5Y=",
+        "owner": "numtide",
+        "repo": "nix-ai-tools",
+        "rev": "f9b693bea48cea1dbe1f1b4471f546fe1e7a0c29",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "nix-ai-tools",
+        "type": "github"
+      }
+    },
+    "nix-colors": {
+      "inputs": {
+        "base16-schemes": "base16-schemes",
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1707825078,
+        "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=",
+        "owner": "misterio77",
+        "repo": "nix-colors",
+        "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "misterio77",
+        "repo": "nix-colors",
+        "type": "github"
+      }
+    },
+    "nixlib": {
+      "locked": {
+        "lastModified": 1736643958,
+        "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixos-generators": {
+      "inputs": {
+        "nixlib": "nixlib",
+        "nixpkgs": "nixpkgs_5"
+      },
+      "locked": {
+        "lastModified": 1751903740,
+        "narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=",
+        "owner": "nix-community",
+        "repo": "nixos-generators",
+        "rev": "032decf9db65efed428afd2fa39d80f7089085eb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixos-generators",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1703013332,
+        "lastModified": 1754028485,
-        "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
+        "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
+        "rev": "59e69648d345d6e8fef86158c555730fa12af9de",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs-d016996": {
+    "nixpkgs-45570c2": {
       "locked": {
-        "lastModified": 1737074211,
+        "lastModified": 1750950224,
-        "narHash": "sha256-BdTeiNTc1DUiEcKhmjjuJ54KRv+8UzyTqRl7QS64AMI=",
+        "narHash": "sha256-vMCk6wKJVgR7H2pVrQV4/qygzTtvpnS/9jCT3cjzXVM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d0169965cf1ce1cd68e50a63eabff7c8b8959743",
+        "rev": "45570c299dc2b63c8c574c4cd77f0b92f7e2766e",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d0169965cf1ce1cd68e50a63eabff7c8b8959743",
+        "rev": "45570c299dc2b63c8c574c4cd77f0b92f7e2766e",
+        "type": "github"
+      }
+    },
+    "nixpkgs-9e58ed7": {
+      "locked": {
+        "lastModified": 1746823729,
+        "narHash": "sha256-6E3jRDNK9w1gwDsreG6ZS8Ec0Dv35DkDqKzxZATEUts=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "9e58ed7ba759d81c98f033b7f5eba21ca68f53b0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "9e58ed7ba759d81c98f033b7f5eba21ca68f53b0",
+        "type": "github"
+      }
+    },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1697935651,
+        "narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs-locked": {
+      "locked": {
+        "lastModified": 1739661218,
+        "narHash": "sha256-hEGW0SKD0ORTEmoTuEEONxgENP5kMqe+NCtJug0U6R0=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "2744d988fa116fc6d46cdfa3d1c936d0abd7d121",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "2744d988fa116fc6d46cdfa3d1c936d0abd7d121",
         "type": "github"
       }
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1739521149,
+        "lastModified": 1759661032,
-        "narHash": "sha256-9CYhycBZDYkxD1uu6HMeJzRkSuDYZ86RJzEbFopO/CQ=",
+        "narHash": "sha256-cqZAN2FmnUX/M42m1T9/glzcp8C+66bV/25xUB7TbAw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "49f1c6e940b67fa522c45c14603a0584aa90ebd2",
+        "rev": "b7ffd1a8c2550781d74d6a2b48dc6bcd9da29996",
         "type": "github"
       },
       "original": {
@@ -255,27 +432,27 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1739357830,
+        "lastModified": 1759580034,
-        "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=",
+        "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a",
+        "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1736344531,
+        "lastModified": 1750776420,
-        "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
+        "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
+        "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf",
         "type": "github"
       },
       "original": {
@@ -287,11 +464,59 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1739446958,
+        "lastModified": 1759381078,
-        "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
+        "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1759381078,
+        "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1736657626,
+        "narHash": "sha256-FWlPMUzp0lkQBdhKlPqtQdqmp+/C+1MBiEytaYfrCTY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2f9e2f85cb14a46410a1399aa9ea7ecf433e422e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1759381078,
+        "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
+        "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
         "type": "github"
       },
       "original": {
@@ -301,7 +526,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1710272261,
         "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
@@ -317,32 +542,59 @@
         "type": "github"
       }
     },
+    "nur": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1759659817,
+        "narHash": "sha256-S26D4k/9He1tLCn5ARx+3BNzK7IKBLBJWUqx9GF8X7s=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "df8713776e7e236129f7c260017e770393b4f278",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "NUR",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
         "disko": "disko",
-        "dotfiles": "dotfiles",
         "home-manager": "home-manager_2",
         "hyprpanel": "hyprpanel",
-        "nixpkgs": "nixpkgs_3",
+        "m3ta-nixpkgs": "m3ta-nixpkgs",
-        "nixpkgs-d016996": "nixpkgs-d016996",
+        "nix-ai-tools": "nix-ai-tools",
+        "nix-colors": "nix-colors",
+        "nixos-generators": "nixos-generators",
+        "nixpkgs": "nixpkgs_6",
+        "nixpkgs-45570c2": "nixpkgs-45570c2",
+        "nixpkgs-9e58ed7": "nixpkgs-9e58ed7",
+        "nixpkgs-locked": "nixpkgs-locked",
         "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-stable": "nixpkgs-stable",
+        "nur": "nur",
         "rose-pine-hyprcursor": "rose-pine-hyprcursor"
       }
     },
     "rose-pine-hyprcursor": {
       "inputs": {
         "hyprlang": "hyprlang",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_7",
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1733265112,
+        "lastModified": 1748096947,
-        "narHash": "sha256-FdO+2X7TeIAW73hiyFKZbCjlAskb4xMmYYPX97mo9RE=",
+        "narHash": "sha256-ouuA8LVBXzrbYwPW2vNjh7fC9H2UBud/1tUiIM5vPvM=",
         "owner": "ndom91",
         "repo": "rose-pine-hyprcursor",
-        "rev": "89dc9e347ce8da26766ad421b0899536f9f87639",
+        "rev": "4b02963d0baf0bee18725cf7c5762b3b3c1392f1",
         "type": "github"
       },
       "original": {
@@ -368,16 +620,16 @@
     },
     "systems_2": {
       "locked": {
-        "lastModified": 1689347949,
+        "lastModified": 1681028828,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
         "owner": "nix-systems",
-        "repo": "default-linux",
+        "repo": "default",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
-        "repo": "default-linux",
+        "repo": "default",
         "type": "github"
       }
     },
@@ -396,9 +648,60 @@
         "type": "github"
       }
     },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
+    "systems_5": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-ai-tools",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1758728421,
+        "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
     "utils": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1710146030,

flake.nix

@@ -16,10 +16,19 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05";
-    nixpkgs-d016996.url = "github:nixos/nixpkgs/d0169965cf1ce1cd68e50a63eabff7c8b8959743";
+    nixpkgs-45570c2.url = "github:nixos/nixpkgs/45570c299dc2b63c8c574c4cd77f0b92f7e2766e";
+    nixpkgs-locked.url = "github:nixos/nixpkgs/2744d988fa116fc6d46cdfa3d1c936d0abd7d121";
+    nixpkgs-9e58ed7.url = "github:nixos/nixpkgs/9e58ed7ba759d81c98f033b7f5eba21ca68f53b0";
     nixpkgs-master.url = "github:nixos/nixpkgs/master";
 
+    m3ta-nixpkgs.url = "git+https://code.m3ta.dev/m3tam3re/nixpkgs";
+    # m3ta-nixpkgs.url = "path:/home/m3tam3re/p/nix/nixpkgs";
+    #
+    nur = {
+      url = "github:nix-community/NUR";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     agenix.url = "github:ryantm/agenix";
 
     disko = {
@@ -27,21 +36,23 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    nixos-generators = {
+      url = "github:nix-community/nixos-generators";
+    };
+
     hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
     rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor";
-
+    nix-colors.url = "github:misterio77/nix-colors";
-    dotfiles = {
+    nix-ai-tools.url = "github:numtide/nix-ai-tools";
-      url = "git+https://code.m3tam3re.com/m3tam3re/dotfiles.git";
-      flake = false;
-    };
   };
 
   outputs = {
     self,
     agenix,
-    dotfiles,
     home-manager,
     nixpkgs,
+    m3ta-nixpkgs,
+    nur,
     ...
   } @ inputs: let
     inherit (self) outputs;
@@ -58,6 +69,7 @@
       forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});
     overlays = import ./overlays {inherit inputs outputs;};
     homeManagerModules = import ./modules/home-manager;
+
     nixosConfigurations = {
       m3-ares = nixpkgs.lib.nixosSystem {
         specialArgs = {
@@ -67,6 +79,7 @@
         modules = [
           ./hosts/m3-ares
           agenix.nixosModules.default
+          m3ta-nixpkgs.nixosModules.default
         ];
       };
       m3-atlas = nixpkgs.lib.nixosSystem {
@@ -76,6 +89,7 @@
           ./hosts/m3-atlas
           inputs.disko.nixosModules.disko
           agenix.nixosModules.default
+          m3ta-nixpkgs.nixosModules.default
         ];
       };
       m3-kratos = nixpkgs.lib.nixosSystem {
@@ -86,6 +100,8 @@
         modules = [
           ./hosts/m3-kratos
           agenix.nixosModules.default
+          nur.modules.nixos.default
+          m3ta-nixpkgs.nixosModules.default
         ];
       };
       m3-helios = nixpkgs.lib.nixosSystem {
@@ -95,18 +111,35 @@
           ./hosts/m3-helios
           inputs.disko.nixosModules.disko
           agenix.nixosModules.default
+          m3ta-nixpkgs.nixosModules.default
         ];
       };
     };
     homeConfigurations = {
-      "m3tam3re@m3-ares" = home-manager.lib.homeManagerConfiguration {
+      "m3tam3re@m3-daedalus" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages."x86_64-linux";
         extraSpecialArgs = {
           inherit inputs outputs;
-          hostname = "m3-ares";
+          hostname = "m3-daedalus";
         };
-        modules = [./home/m3tam3re/m3tam3re-ares.nix];
+        modules = [./home/m3tam3re/m3-daedalus.nix];
       };
     };
+    devShells.x86_64-linux.infraShell = let
+      pkgs = nixpkgs.legacyPackages.x86_64-linux;
+    in
+      pkgs.mkShell {
+        buildInputs = with pkgs; [
+          opentofu
+          nixos-anywhere
+        ];
+        shellHook = ''
+          echo "Infrastructure Management Shell"
+          echo "Commands:"
+          echo "  - cd infra/proxmox && tofu init"
+          echo "  - tofu plan"
+          echo "  - tofu apply"
+        '';
+      };
   };
 }

home/common/default.nix

@@ -1,23 +1,30 @@
 {
+  inputs,
   lib,
   outputs,
   pkgs,
   ...
 }: {
   imports = [
-    (import
+    inputs.nix-colors.homeManagerModules.default
-      ../../modules/home-manager/zellij-ps.nix)
+    inputs.m3ta-nixpkgs.homeManagerModules.default
   ]; #imports = builtins.attrValues outputs.homeManagerModules;
   nixpkgs = {
     # You can add overlays here
     overlays = [
       # Add overlays your own flake exports (from overlays and pkgs dir):
-      outputs.overlays.additions
+      #outputs.overlays.additions
-      outputs.overlays.modifications
+      #outputs.overlays.modifications
+      outputs.overlays.temp-packages
       outputs.overlays.stable-packages
+      outputs.overlays.locked-packages
       outputs.overlays.pinned-packages
       outputs.overlays.master-packages
 
+      inputs.nur.overlays.default
+      inputs.m3ta-nixpkgs.overlays.default
+      inputs.m3ta-nixpkgs.overlays.modifications
+
       # You can also add overlays exported from other flakes:
       # neovim-nightly-overlay.overlays.default
 
@@ -44,4 +51,5 @@
       warn-dirty = false;
     };
   };
+  colorScheme = inputs.nix-colors.colorSchemes.dracula;
 }

home/features/cli/default.nix

@@ -1,32 +1,165 @@
-{pkgs, ...}: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
     ./fish.nix
     ./fzf.nix
-    ./neofetch.nix
+    ./nitch.nix
+    ./nushell.nix
     ./secrets.nix
     ./starship.nix
     ./zellij.nix
   ];
 
+  programs.carapace = {
+    enable = true;
+    enableFishIntegration = true;
+    enableNushellIntegration = true;
+    enableBashIntegration = true;
+  };
+
   programs.zoxide = {
     enable = true;
     enableFishIntegration = true;
+    enableNushellIntegration = true;
   };
 
-  programs.neovim = {
+  programs.bat = {
     enable = true;
-    defaultEditor = true;
+    config = {
-    viAlias = true;
+      theme = "universal";
-    vimAlias = true;
+    };
-    vimdiffAlias = true;
+    themes = {
-    withNodeJs = true;
+      universal = {
-    withPython3 = true;
+        src = pkgs.writeText "universal.tmTheme" ''
+          <?xml version="1.0" encoding="UTF-8"?>
+          <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+          <plist version="1.0">
+          <dict>
+            <key>name</key>
+            <string>Universal (nix-colors)</string>
+            <key>settings</key>
+            <array>
+              <dict>
+                <key>settings</key>
+                <dict>
+                  <key>background</key>
+                  <string>#${config.colorScheme.palette.base00}</string>
+                  <key>foreground</key>
+                  <string>#${config.colorScheme.palette.base05}</string>
+                  <key>caret</key>
+                  <string>#${config.colorScheme.palette.base05}</string>
+                  <key>selection</key>
+                  <string>#${config.colorScheme.palette.base02}</string>
+                  <key>selectionForeground</key>
+                  <string>#${config.colorScheme.palette.base05}</string>
+                  <key>lineHighlight</key>
+                  <string>#${config.colorScheme.palette.base01}</string>
+                </dict>
+              </dict>
+              <dict>
+                <key>name</key>
+                <string>Comment</string>
+                <key>scope</key>
+                <string>comment</string>
+                <key>settings</key>
+                <dict>
+                  <key>foreground</key>
+                  <string>#${config.colorScheme.palette.base03}</string>
+                  <key>fontStyle</key>
+                  <string>italic</string>
+                </dict>
+              </dict>
+              <dict>
+                <key>name</key>
+                <string>String</string>
+                <key>scope</key>
+                <string>string</string>
+                <key>settings</key>
+                <dict>
+                  <key>foreground</key>
+                  <string>#${config.colorScheme.palette.base0A}</string>
+                </dict>
+              </dict>
+              <dict>
+                <key>name</key>
+                <string>Number</string>
+                <key>scope</key>
+                <string>constant.numeric</string>
+                <key>settings</key>
+                <dict>
+                  <key>foreground</key>
+                  <string>#${config.colorScheme.palette.base0E}</string>
+                </dict>
+              </dict>
+              <dict>
+                <key>name</key>
+                <string>Keyword</string>
+                <key>scope</key>
+                <string>keyword</string>
+                <key>settings</key>
+                <dict>
+                  <key>foreground</key>
+                  <string>#${config.colorScheme.palette.base08}</string>
+                </dict>
+              </dict>
+              <dict>
+                <key>name</key>
+                <string>Function</string>
+                <key>scope</key>
+                <string>entity.name.function</string>
+                <key>settings</key>
+                <dict>
+                  <key>foreground</key>
+                  <string>#${config.colorScheme.palette.base0B}</string>
+                </dict>
+              </dict>
+              <dict>
+                <key>name</key>
+                <string>Type</string>
+                <key>scope</key>
+                <string>entity.name.type, storage.type</string>
+                <key>settings</key>
+                <dict>
+                  <key>foreground</key>
+                  <string>#${config.colorScheme.palette.base0D}</string>
+                </dict>
+              </dict>
+              <dict>
+                <key>name</key>
+                <string>Variable</string>
+                <key>scope</key>
+                <string>variable</string>
+                <key>settings</key>
+                <dict>
+                  <key>foreground</key>
+                  <string>#${config.colorScheme.palette.base05}</string>
+                </dict>
+              </dict>
+              <dict>
+                <key>name</key>
+                <string>Constant</string>
+                <key>scope</key>
+                <string>constant</string>
+                <key>settings</key>
+                <dict>
+                  <key>foreground</key>
+                  <string>#${config.colorScheme.palette.base0E}</string>
+                </dict>
+              </dict>
+            </array>
+          </dict>
+          </plist>
+        '';
+      };
+    };
   };
 
-  programs.bat = {enable = true;};
-
   programs.direnv = {
     enable = true;
+    enableNushellIntegration = true;
     nix-direnv.enable =
       true;
   };
@@ -50,31 +183,39 @@
     };
   };
 
+  cli.zellij-ps = {
+    enable = true;
+    projectFolders = ["/home/m3tam3re/p"];
+  };
+
   home.packages = with pkgs; [
+    agenix-cli
     alejandra
     bc
+    claude-code
     comma
     coreutils
     devenv
-    fabric-ai
     fd
     gcc
     go
     htop
     httpie
+    hyprpaper-random
     jq
     just
     lazygit
     llm
     lf
     nix-index
-    procs
+    nushellPlugins.skim
     progress
     ripgrep
     rocmPackages.rocm-smi
     rocmPackages.rocminfo
     rocmPackages.rocm-runtime
     tldr
+    pomodoro-timer
     trash-cli
     unimatrix
     unzip

home/features/cli/fish.nix

@@ -11,6 +11,43 @@ in {
   config = mkIf cfg.enable {
     programs.fish = {
       enable = true;
+      interactiveShellInit = ''
+        # Fish colors using universal nix-colors palette
+        # Text colors
+        set -g fish_color_normal ${config.colorScheme.palette.base05}      # text
+        set -g fish_color_param ${config.colorScheme.palette.base05}       # text
+        set -g fish_color_comment ${config.colorScheme.palette.base03}     # muted
+        set -g fish_color_autosuggestion ${config.colorScheme.palette.base03} # muted
+
+        # Command colors
+        set -g fish_color_command ${config.colorScheme.palette.base0D}     # accent6 (blue)
+        set -g fish_color_quote ${config.colorScheme.palette.base0A}       # accent3 (yellow)
+        set -g fish_color_redirection ${config.colorScheme.palette.base0E} # accent7 (purple)
+        set -g fish_color_end ${config.colorScheme.palette.base08}         # accent1 (red)
+        set -g fish_color_error ${config.colorScheme.palette.base08}       # accent1 (red)
+        set -g fish_color_operator ${config.colorScheme.palette.base0C}    # accent5 (cyan)
+        set -g fish_color_escape ${config.colorScheme.palette.base09}      # accent2 (orange)
+
+        # Path colors
+        set -g fish_color_cwd ${config.colorScheme.palette.base0B}         # accent4 (green)
+        set -g fish_color_cwd_root ${config.colorScheme.palette.base08}    # accent1 (red)
+        set -g fish_color_valid_path --underline
+
+        # Interactive colors
+        set -g fish_color_match ${config.colorScheme.palette.base0B}       # accent4 (green)
+        set -g fish_color_selection --background=${config.colorScheme.palette.base02} # overlay
+        set -g fish_color_search_match --background=${config.colorScheme.palette.base02} # overlay
+        set -g fish_color_history_current --bold
+        set -g fish_color_user ${config.colorScheme.palette.base0B}        # accent4 (green)
+        set -g fish_color_host ${config.colorScheme.palette.base0D}        # accent6 (blue)
+        set -g fish_color_cancel -r
+
+        # Pager colors
+        set -g fish_pager_color_completion normal
+        set -g fish_pager_color_description ${config.colorScheme.palette.base03} # muted
+        set -g fish_pager_color_prefix ${config.colorScheme.palette.base0E}      # accent7 (purple)
+        set -g fish_pager_color_progress ${config.colorScheme.palette.base0B}    # accent4 (green)
+      '';
       loginShellInit = ''
         set -x NIX_PATH nixpkgs=channel:nixos-unstable
         set -x NIX_LOG info
@@ -29,6 +66,7 @@ in {
         set -x FZF_DEFAULT_COMMAND fd --type f --exclude .git --follow --hidden
         set -x FZF_CTRL_T_COMMAND "$FZF_DEFAULT_COMMAND"
         set -x FLAKE $HOME/p/nixos/nixos-config
+        source /run/agenix/${config.home.username}-secrets
 
         if test (tty) = "/dev/tty1"
           exec uwsm start -S -F /run/current-system/sw/bin/Hyprland

home/features/cli/fzf.nix

@@ -13,22 +13,25 @@ in {
       enable = true;
       enableFishIntegration = true;
       colors = {
-        "fg" = "#f8f8f2";
+        "fg" = "#${config.colorScheme.palette.base05}";
-        "bg" = "#282a36";
+        "bg" = "#${config.colorScheme.palette.base00}";
-        "hl" = "#bd93f9";
+        "hl" = "#${config.colorScheme.palette.base0E}";
-        "fg+" = "#f8f8f2";
+        "fg+" = "#${config.colorScheme.palette.base05}";
-        "bg+" = "#44475a";
+        "bg+" = "#${config.colorScheme.palette.base02}";
-        "hl+" = "#bd93f9";
+        "hl+" = "#${config.colorScheme.palette.base0E}";
-        "info" = "#ffb86c";
+        "info" = "#${config.colorScheme.palette.base09}";
-        "prompt" = "#50fa7b";
+        "prompt" = "#${config.colorScheme.palette.base0B}";
-        "pointer" = "#ff79c6";
+        "pointer" = "#${config.colorScheme.palette.base08}";
-        "marker" = "#ff79c6";
+        "marker" = "#${config.colorScheme.palette.base08}";
-        "spinner" = "#ffb86c";
+        "spinner" = "#${config.colorScheme.palette.base09}";
-        "header" = "#6272a4";
+        "header" = "#${config.colorScheme.palette.base03}";
       };
       defaultOptions = [
         "--preview='bat --color=always -n {}'"
         "--bind 'ctrl-/:toggle-preview'"
+        "--header 'Press CTRL-Y to copy command into clipboard'"
+        "--bind 'ctrl-/:toggle-preview'"
+        "--bind 'ctrl-y:execute-silent(echo -n {2..} | wl-copy)+abort'"
       ];
       defaultCommand = "fd --type f --exclude .git --follow --hidden";
       changeDirWidgetCommand = "fd --type d --exclude .git --follow --hidden";

home/features/cli/neofetch.nix

@@ -1,15 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.features.cli.neofetch;
-in {
-  options.features.cli.neofetch.enable = mkEnableOption "enable neofetch";
-
-  config = mkIf cfg.enable {
-    home.packages = with pkgs; [neofetch];
-  };
-}

home/features/cli/nitch.nix

@@ -0,0 +1,15 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.features.cli.nitch;
+in {
+  options.features.cli.nitch.enable = mkEnableOption "enable nitch";
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [nitch];
+  };
+}

home/features/cli/nushell.nix

@@ -0,0 +1,185 @@
+{
+  config,
+  lib,
+  ...
+}:
+with lib; let
+  cfg = config.features.cli.nushell;
+in {
+  options.features.cli.nushell.enable = mkEnableOption "enable nushell";
+
+  config = mkIf cfg.enable {
+    programs.nushell = {
+      enable = true;
+      envFile.text = ''
+        $env.config.show_banner = false
+        $env.NIX_PATH = "nixpkgs=channel:nixos-unstable"
+        $env.NIX_LOG = "iunfo"
+        $env.WEBKIT_DISABLE_COMPOSITING_MODE = "1"
+        $env.TERMINAL = "kitty"
+        $env.EDITOR = "nvim"
+        $env.VISUAL = "zed"
+        $env.FZF_DEFAULT_COMMAND = "fd --type f --exclude .git --follow --hidden"
+        $env.FZF_DEFAULT_OPTS = "--preview='bat --color=always --style=numbers --line-range=:500 {}' --bind 'ctrl-/:toggle-preview' --header 'Press CTRL-Y to copy to clipboard' --bind 'ctrl-y:execute-silent(echo {} | wl-copy)' --color bg:#${config.colorScheme.palette.base00},bg+:#${config.colorScheme.palette.base02},fg:#${config.colorScheme.palette.base05},fg+:#${config.colorScheme.palette.base05},header:#${config.colorScheme.palette.base03},hl:#${config.colorScheme.palette.base0E},hl+:#${config.colorScheme.palette.base0E},info:#${config.colorScheme.palette.base09},marker:#${config.colorScheme.palette.base08},pointer:#${config.colorScheme.palette.base08},prompt:#${config.colorScheme.palette.base0B},spinner:#${config.colorScheme.palette.base09}"
+        $env.XDG_DATA_HOME = $"($env.HOME)/.local/share"
+        $env.FZF_DEFAULT_COMMAND = "fd --type f --exclude .git --follow --hidden"
+        $env.SSH_AUTH_SOCK = "/run/user/1000/gnupg/S.gpg-agent.ssh"
+        $env.FLAKE = $"($env.HOME)/p/nixos/nixos-config"
+        source /run/agenix/${config.home.username}-secrets
+      '';
+      configFile.text = ''
+        # FZF integration functions for nushell
+        def fzf-file [] {
+          fd --type f --exclude .git --follow --hidden | fzf --preview 'bat --color=always --style=numbers --line-range=:500 {}' --bind 'ctrl-y:execute-silent(echo {} | wl-copy)'
+        }
+
+        def fzf-dir [] {
+          fd --type d --exclude .git --follow --hidden | fzf --preview 'ls -la {}'
+        }
+
+        def fzf-history [] {
+          history | get command | reverse | fzf --bind 'ctrl-y:execute-silent(echo {} | wl-copy)'
+        }
+
+        # Key bindings for FZF
+        $env.config = {
+          keybindings: [
+            {
+              name: fzf_file
+              modifier: control
+              keycode: char_t
+              mode: [emacs, vi_normal, vi_insert]
+              event: {
+                send: executehostcommand
+                cmd: "commandline edit --insert (fzf-file)"
+              }
+            }
+            {
+              name: fzf_history
+              modifier: control
+              keycode: char_r
+              mode: [emacs, vi_normal, vi_insert]
+              event: {
+                send: executehostcommand
+                cmd: "commandline edit --replace (fzf-history)"
+              }
+            }
+          ]
+        }
+
+        if (tty) == "/dev/tty1" {
+          exec uwsm start -S -F /run/current-system/sw/bin/Hyprland
+        }
+        if (tty) == "/dev/tty2" {
+          exec gamescope -O HDMI-A-1 -W 1920 -H 1080 --adaptive-sync --hdr-enabled --rt --steam -- steam -pipewire-dmabuf -tenfoot
+        }
+
+        alias .. = cd ..
+        alias ... = cd ...
+        alias h = cd $env.HOME
+        alias b = yazi
+        alias lt = eza --tree --level=2 --long --icons --git
+        alias grep = rg
+        alias just = just --unstable
+
+        alias n = nix
+        alias nd = nix develop -c $nu.current-shell
+        alias ns = nix shell
+        alias nsn = nix shell nixpkgs#
+        alias nb = nix build
+        alias nbn = nix build nixpkgs#
+        alias nf = nix flake
+
+        alias nr = sudo nixos-rebuild --flake .
+        alias nrs = sudo nixos-rebuild switch --flake .#(sys host | get hostname)
+        alias snr = sudo nixos-rebuild --flake .
+        alias snrs = sudo nixos-rebuild --flake . switch
+        alias hm = home-manager --flake .
+        alias hms = home-manager --flake . switch
+        alias hmr = do { cd ~/projects/nix-configurations; nix flake lock --update-input dotfiles; home-manager --flake .#(whoami)@(hostname) switch }
+
+        alias tsu = sudo tailscale up
+        alias tsd = sudo tailscale down
+
+        alias vi = nvim
+        alias vim = nvim
+
+        def history_fuzzy [] {
+            let selected = (
+                history
+                | reverse
+                | get command
+                | uniq
+                | to text
+                | ^fzf
+            )
+            if ($selected | is-not-empty) {
+                commandline edit ($selected)
+            } else {
+                null
+            }
+        }
+        def --env dir_fuzzy [] {
+            let selected = (
+                fd --type directory
+                | ^fzf
+            )
+            cd $selected
+        }
+        def find_fuzzy [] {
+            # Find non-hidden text files with matches for any content and select one via fuzzy search
+            let selected = (
+                ^fd --type file --no-hidden -X rg -l --files-with-matches .
+                | lines
+                | to text
+                | ^fzf
+            )
+            if ($selected | is-not-empty) {
+                ^$env.EDITOR $selected
+            }
+        }
+
+        $env.config = {
+          keybindings: [
+            {
+              name: history_fuzzy
+              modifier: control
+              keycode: char_r
+              mode: [emacs, vi_insert, vi_normal]
+              event: [
+                {
+                  send: executehostcommand
+                  cmd: "history_fuzzy"
+                }
+              ]
+            }
+            {
+              name: dir_fuzzy
+              modifier: alt
+              keycode: char_c
+              mode: [emacs, vi_insert, vi_normal]
+              event: [
+                {
+                  send: executehostcommand
+                  cmd: "dir_fuzzy"
+                }
+              ]
+            }
+            {
+              name: history_fuzzy
+              modifier: control
+              keycode: char_t
+              mode: [emacs, vi_insert, vi_normal]
+              event: [
+                {
+                  send: executehostcommand
+                  cmd: "find_fuzzy"
+                }
+              ]
+            }
+          ]
+        }
+      '';
+    };
+  };
+}

home/features/cli/starship.nix

@@ -12,6 +12,57 @@ in {
     programs.starship = {
       enable = true;
       enableFishIntegration = true;
+      enableNushellIntegration = true;
+      settings = {
+        format = "$all$character";
+        palette = "universal";
+
+        palettes.universal = {
+          background = "#${config.colorScheme.palette.base00}";
+          surface = "#${config.colorScheme.palette.base01}";
+          muted = "#${config.colorScheme.palette.base03}";
+          text = "#${config.colorScheme.palette.base05}";
+          bright = "#${config.colorScheme.palette.base07}";
+          accent1 = "#${config.colorScheme.palette.base08}";
+          accent2 = "#${config.colorScheme.palette.base09}";
+          accent3 = "#${config.colorScheme.palette.base0A}";
+          accent4 = "#${config.colorScheme.palette.base0B}";
+          accent5 = "#${config.colorScheme.palette.base0C}";
+          accent6 = "#${config.colorScheme.palette.base0D}";
+          accent7 = "#${config.colorScheme.palette.base0E}";
+        };
+
+        character = {
+          success_symbol = "[❯](accent7)";
+          error_symbol = "[❯](accent1)";
+        };
+
+        directory = {
+          style = "accent6";
+          truncation_length = 3;
+          truncate_to_repo = false;
+        };
+
+        git_branch = {
+          style = "accent7";
+        };
+
+        git_status = {
+          style = "accent5";
+        };
+
+        cmd_duration = {
+          style = "accent3";
+        };
+
+        hostname = {
+          style = "accent4";
+        };
+
+        username = {
+          style_user = "accent2";
+        };
+      };
     };
   };
 }

home/features/cli/zellij.nix

@@ -11,6 +11,22 @@ in {
   config = mkIf cfg.enable {
     programs.zellij = {
       enable = true;
+      settings = {
+        theme = "universal";
+        themes.universal = {
+          bg = "#${config.colorScheme.palette.base00}";
+          fg = "#${config.colorScheme.palette.base05}";
+          black = "#${config.colorScheme.palette.base01}";
+          red = "#${config.colorScheme.palette.base08}";
+          green = "#${config.colorScheme.palette.base0B}";
+          yellow = "#${config.colorScheme.palette.base0A}";
+          blue = "#${config.colorScheme.palette.base0D}";
+          magenta = "#${config.colorScheme.palette.base0E}";
+          cyan = "#${config.colorScheme.palette.base0C}";
+          white = "#${config.colorScheme.palette.base07}";
+          orange = "#${config.colorScheme.palette.base09}";
+        };
+      };
     };
   };
 }

home/features/coding/default.nix

@@ -1,16 +1,19 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
     devpod
-    devpod-desktop
+    #devpod-desktop
+    code2prompt
+    nur.repos.charmbracelet.crush
     (python3.withPackages (ps:
       with ps; [
+        pip
         # Scientific packages
         numba
         numpy
-        openai-whisper
         torch
         srt
       ]))
+    pyrefly
     nixd
     alejandra
     tailwindcss

home/features/desktop/coding.nix

@@ -5,7 +5,7 @@
   ...
 }:
 with lib; let
-  cfg = config.features.desktop.office;
+  cfg = config.features.desktop.coding;
 in {
   options.features.desktop.coding.enable =
     mkEnableOption "install coding related stuff";
@@ -15,73 +15,9 @@ in {
       bruno
       insomnia
     ];
-
+    coding.editors = {
-    programs.zed-editor = {
+      neovim.enable = true;
-      enable = true;
+      zed.enable = true;
-      userSettings = {
-        features = {
-          edit_prediction_provider = "zed";
-          inline_completion_provider = "zed";
-          copilot = false;
-        };
-        telemetry = {
-          metrics = false;
-        };
-        lsp = {
-          rust_analyzer = {
-            binary = {path_lookup = true;};
-          };
-        };
-        languages = {
-          Nix = {
-            language_servers = ["nixd"];
-            formatter = {
-              external = {
-                command = "alejandra";
-                arguments = ["-q" "-"];
-              };
-            };
-          };
-          Python = {
-            language_servers = ["pyright"];
-            formatter = {
-              external = {
-                command = "black";
-                arguments = ["-"];
-              };
-            };
-          };
-        };
-        assistant = {
-          version = "2";
-          default_model = {
-            provider = "zed.dev";
-            model = "claude-3-5-sonnet-latest";
-          };
-        };
-        language_models = {
-          anthropic = {
-            version = "1";
-            api_url = "https://api.anthropic.com";
-          };
-          openai = {
-            version = "1";
-            api_url = "https://api.openai.com/v1";
-          };
-          ollama = {
-            api_url = "http://localhost:11434";
-          };
-        };
-        auto_update = false;
-        format_on_save = "on";
-        vim_mode = true;
-        load_direnv = "shell_hook";
-        theme = "Dracula";
-        buffer_font_family = "FiraCode Nerd Font";
-        ui_font_size = 16;
-        buffer_font_size = 16;
-        show_edit_predictions = true;
-      };
     };
   };
 }

home/features/desktop/crypto.nix

@@ -0,0 +1,15 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.features.desktop.crypto;
+in {
+  options.features.desktop.crypto.enable = mkEnableOption "Enable Crypto";
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [bisq2 monero-gui trezor-suite];
+  };
+}

home/features/desktop/default.nix

@@ -1,6 +1,11 @@
-{pkgs, ...}: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
     ./coding.nix
+    ./crypto.nix
     ./fonts.nix
     ./gaming.nix
     ./hyprland.nix
@@ -9,7 +14,6 @@
     ./rofi.nix
     ./theme.nix
     ./wayland.nix
-    ./wofi.nix
   ];
 
   xdg = {
@@ -43,24 +47,14 @@
     NIXOS_OZONE_WL = "1";
     TERMINAL = "kitty";
     QT_QPA_PLATFORM = "wayland";
+    XDG_CURRENT_DESKTOP = "Hyprland";
+    XDG_SESSION_TYPE = "wayland";
+    XDG_SESSION_DESKTOP = "Hyprland";
   };
   home.sessionPath = ["\${XDG_BIN_HOME}" "\${HOME}/.cargo/bin" "$HOME/.npm-global/bin"];
 
   fonts.fontconfig.enable = true;
 
-  services.mako = {
-    enable = true;
-    backgroundColor = "#282a36";
-    textColor = "#80FFEA";
-    borderColor = "#9742b5";
-    width = 400;
-    height = 150;
-    padding = "10,20";
-    borderRadius = 8;
-    borderSize = 1;
-    margin = "20,20";
-  };
-
   programs.kitty = {
     enable = true;
     shellIntegration = {
@@ -68,8 +62,58 @@
       enableBashIntegration = true;
     };
     font = {name = "Fira Code";};
-    themeFile = "Dracula";
+
-    settings = {copy_on_select = "yes";};
+    settings = {
+      copy_on_select = "yes";
+
+      # Base colors
+      foreground = "#${config.colorScheme.palette.base05}";
+      background = "#${config.colorScheme.palette.base00}";
+      selection_foreground = "#${config.colorScheme.palette.base07}";
+      selection_background = "#${config.colorScheme.palette.base02}";
+
+      # URL color
+      url_color = "#${config.colorScheme.palette.base08}";
+
+      # Cursor
+      cursor = "#${config.colorScheme.palette.base05}";
+      cursor_text_color = "#${config.colorScheme.palette.base00}";
+
+      # Colors 0-15
+      color0 = "#${config.colorScheme.palette.base01}";
+      color8 = "#${config.colorScheme.palette.base03}";
+
+      color1 = "#${config.colorScheme.palette.base08}";
+      color9 = "#${config.colorScheme.palette.base08}";
+
+      color2 = "#${config.colorScheme.palette.base0B}";
+      color10 = "#${config.colorScheme.palette.base0B}";
+
+      color3 = "#${config.colorScheme.palette.base0A}";
+      color11 = "#${config.colorScheme.palette.base0A}";
+
+      color4 = "#${config.colorScheme.palette.base0D}";
+      color12 = "#${config.colorScheme.palette.base0D}";
+
+      color5 = "#${config.colorScheme.palette.base0E}";
+      color13 = "#${config.colorScheme.palette.base0E}";
+
+      color6 = "#${config.colorScheme.palette.base0C}";
+      color14 = "#${config.colorScheme.palette.base0C}";
+
+      color7 = "#${config.colorScheme.palette.base05}";
+      color15 = "#${config.colorScheme.palette.base07}";
+
+      # Tab colors
+      active_tab_foreground = "#${config.colorScheme.palette.base00}";
+      active_tab_background = "#${config.colorScheme.palette.base05}";
+      inactive_tab_foreground = "#${config.colorScheme.palette.base05}";
+      inactive_tab_background = "#${config.colorScheme.palette.base01}";
+
+      # Mark colors
+      mark1_foreground = "#${config.colorScheme.palette.base00}";
+      mark1_background = "#${config.colorScheme.palette.base08}";
+    };
   };
 
   home.pointerCursor = {
@@ -83,6 +127,7 @@
     appimage-run
     anytype
     # blueberry
+    bemoji
     brave
     # brightnessctl
     # clipman
@@ -98,13 +143,13 @@
     # gsettings-desktop-schemas
     # graphviz
     # ksnip
+    msty-studio
     nwg-look
     # pamixer
     # pavucontrol
     # libsForQt5.qtstyleplugins
     # stable.nyxt
     # pcmanfm
-    protonmail-desktop
     rose-pine-hyprcursor
     # qt5ct
     # qt6.qtwayland
@@ -117,7 +162,9 @@
     remmina
     slack
     telegram-desktop
-    ungoogled-chromium
+    vivaldi
+    vivaldi-ffmpeg-codecs
+    warp-terminal
     # wl-clipboard
     # wlogout
     # wtype

home/features/desktop/gaming.nix

@@ -13,9 +13,10 @@ in {
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
       gamescope
+      gamemode
       goverlay
       mangohud
-      protonup-ng
+      protonplus
     ];
   };
 }

home/features/desktop/hyprland.nix

@@ -1,184 +1,216 @@
 {
-  wayland.windowManager.hyprland = {
+  config,
-    settings = {
+  lib,
-      xwayland = {
+  ...
-        force_zero_scaling = true;
+}:
-      };
+with lib; let
+  cfg = config.features.desktop.hyprland;
+in {
+  options.features.desktop.hyprland.enable =
+    mkEnableOption "Hyprland related stuff";
 
-      exec-once = [
+  config = mkIf cfg.enable {
-        "hyprpanel"
+    wayland.windowManager.hyprland = {
-        "hyprpaper"
+      settings = {
-        "hypridle"
+        xwayland = {
-        "wl-paste -p -t text --watch clipman store -P --histpath=\"~/.local/share/clipman-primary.json\""
+          force_zero_scaling = true;
-      ];
-
-      env = [
-        "XCURSOR_SIZE,32"
-        "HYPRCURSOR_THEME,Bibata-Modern-Ice"
-        "WLR_NO_HARDWARE_CURSORS,1"
-        "GTK_THEME,Dracula"
-      ];
-
-      input = {
-        kb_layout = "de,us";
-        kb_variant = "";
-        kb_model = "";
-        kb_rules = "";
-        kb_options = "ctrl:nocaps";
-        follow_mouse = 1;
-      };
-
-      general = {
-        gaps_in = 5;
-        gaps_out = 5;
-        border_size = 1;
-        "col.active_border" = "rgba(9742b5ee) rgba(9742b5ee) 45deg";
-        "col.inactive_border" = "rgba(595959aa)";
-        layout = "dwindle";
-      };
-
-      decoration = {
-        shadow = {
-          enabled = true;
-          range = 60;
-          render_power = 3;
-          color = "rgba(1E202966)";
-          offset = "1 2";
-          scale = 0.97;
         };
-        rounding = 8;
-        blur = {
-          enabled = true;
-          size = 3;
-          passes = 3;
-        };
-        active_opacity = 0.9;
-        inactive_opacity = 0.5;
-      };
 
-      animations = {
+        exec-once = [
-        enabled = true;
+          "hyprpanel"
-        bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
+          "hyprpaper"
-        animation = [
+          "hyprpaper-random"
-          "windows, 1, 7, myBezier"
+          "hypridle"
-          "windowsOut, 1, 7, default, popin 80%"
+          "wl-paste --type text --watch cliphist store" # Stores only text data
-          "border, 1, 10, default"
+          "wl-paste --type image --watch cliphist store" # Stores only image data "wl-paste -p -t text --watch clipman store -P --histpath=\"~/.local/share/clipman-primary.json\""
-          "borderangle, 1, 8, default"
+          "xwaylandvideobridge"
-          "fade, 1, 7, default"
+        ];
-          "workspaces, 1, 6, default"
+
+        env = [
+          "XCURSOR_SIZE,32"
+          "HYPRCURSOR_THEME,Bibata-Modern-Ice"
+          "WLR_NO_HARDWARE_CURSORS,1"
+          "GTK_THEME,Dracula"
+        ];
+
+        input = {
+          kb_layout = "de,us";
+          kb_variant = "";
+          kb_model = "";
+          kb_rules = "";
+          kb_options = "ctrl:nocaps";
+          follow_mouse = 1;
+        };
+
+        general = {
+          gaps_in = 5;
+          gaps_out = 5;
+          border_size = 1;
+          # Keeping the existing active border as requested
+          "col.active_border" = "rgba(9742b5ee) rgba(9742b5ee) 45deg";
+          "col.inactive_border" = "rgba(${config.colorScheme.palette.base03}aa)";
+          layout = "dwindle";
+        };
+
+        decoration = {
+          shadow = {
+            enabled = true;
+            range = 60;
+            render_power = 3;
+            color = "rgba(${config.colorScheme.palette.base00}66)";
+            offset = "1 2";
+            scale = 0.97;
+          };
+          rounding = 8;
+          blur = {
+            enabled = true;
+            size = 3;
+            passes = 3;
+          };
+          active_opacity = 0.9;
+          inactive_opacity = 0.5;
+        };
+
+        animations = {
+          enabled = true;
+          bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
+          animation = [
+            "windows, 1, 7, myBezier"
+            "windowsOut, 1, 7, default, popin 80%"
+            "border, 1, 10, default"
+            "borderangle, 1, 8, default"
+            "fade, 1, 7, default"
+            "workspaces, 1, 6, default"
+          ];
+        };
+
+        dwindle = {
+          pseudotile = true;
+          preserve_split = true;
+        };
+
+        master = {
+          new_status = "master";
+        };
+
+        device = [
+          {
+            name = "epic-mouse-v1";
+            sensitivity = -0.5;
+          }
+          {
+            name = "zsa-technology-labs-moonlander-mark-i";
+            kb_layout = "us";
+          }
+          {
+            name = "keychron-keychron-k7";
+            kb_layout = "us";
+          }
+        ];
+        windowrule = [
+          "float, class:file_progress"
+          "float, class:confirm"
+          "float, class:dialog"
+          "float, class:download"
+          "float, class:notification"
+          "float, class:error"
+          "float, class:splash"
+          "float, class:confirmreset"
+          "float, title:Open File"
+          "float, title:branchdialog"
+          "float, class:pavucontrol-qt"
+          "float, class:pavucontrol"
+          "fullscreen, class:wlogout"
+          "float, title:wlogout"
+          "fullscreen, title:wlogout"
+          "float, class:mpv"
+          "idleinhibit focus, class:mpv"
+          "opacity 1.0 override, class:mpv"
+          "float, title:^(Media viewer)$"
+          "float, title:^(Volume Control)$"
+          "float, title:^(Picture-in-Picture)$"
+          "float,title:^(floating-pomodoro)$"
+          "size 250 50, title:^(floating-pomodoro)$"
+          "move 12 100%-150,title:^(floating-pomodoro)$"
+          "pin,title:^(floating-pomodoro)$"
+          "float, initialTitle:.*streamlabs.com.*"
+          "pin, initialTitle:.*streamlabs.com.*"
+          "size 800 400, initialTitle:.*streamlabs.com.*"
+          "move 100%-820 102, initialTitle:.*alert-box.*"
+          "move 100%-820 512, initialTitle:.*chat-box.*"
+          "opacity 0.5 override, initialTitle:.*streamlabs.com.*"
+          "idleinhibit focus, initialTitle:.*streamlabs.com.*"
+          "noanim, initialTitle:.*streamlabs.com.*"
+          "noborder, initialTitle:.*streamlabs.com.*"
+          "noshadow, initialTitle:.*streamlabs.com.*"
+          "noblur, initialTitle:.*streamlabs.com.*"
+          "opacity 0.0 override, class:^(xwaylandvideobridge)$"
+          "noanim, class:^(xwaylandvideobridge)$"
+          "noinitialfocus, class:^(xwaylandvideobridge)$"
+          "maxsize 1 1, class:^(xwaylandvideobridge)$"
+          "noblur, class:^(xwaylandvideobridge)$"
+          "nofocus, class:^(xwaylandvideobridge)$"
+        ];
+        "$mainMod" = "SUPER";
+        "$terminal" = "kitty";
+
+        bind = [
+          "$mainMod, return, exec, $terminal nu -c zellij-ps"
+          # "$mainMod, t, exec, warp-terminal"
+          "$mainMod, t, exec, $terminal -e nu -c 'nitch; exec nu'"
+          "$mainMod SHIFT, t, exec, launch-timer"
+          "$mainMod, n, exec, $terminal -e nvim"
+          "$mainMod, z, exec, uwsm app -- zeditor"
+          "$mainMod, o, exec, hyprctl setprop activewindow opaque toggle"
+          "$mainMod, r, exec, hyprctl dispatch focuswindow \"initialtitle:.*alert-box.*\" && hyprctl dispatch moveactive exact 4300 102 && hyprctl dispatch focuswindow \"initialtitle:.*chat-box.*\" && hyprctl dispatch moveactive exact 4300 512"
+          "$mainMod, b, exec, uwsm app -- thunar"
+          "$mainMod SHIFT, B, exec, uwsm app -- vivaldi"
+          "$mainMod, Escape, exec, uwsm app -- wlogout -p layer-shell"
+          "$mainMod, Space, togglefloating"
+          "$mainMod, q, killactive"
+          "$mainMod, M, exit"
+          "$mainMod, F, fullscreen"
+          "$mainMod SHIFT, V, togglefloating"
+          "$mainMod, D, exec, uwsm app -- rofi -show drun -run-command \"uwsm app -- {cmd}\""
+          "$mainMod, V, exec, uwsm app -- cliphist list | rofi -dmenu | cliphist decode | wl-copy"
+          "$mainMod SHIFT, S, exec, uwsm app -- rofi -show emoji"
+          "$mainMod, P, exec, uwsm app -- rofi-pass"
+          "$mainMod SHIFT, P, pseudo"
+          "$mainMod, J, togglesplit"
+          "$mainMod, h, movefocus, l"
+          "$mainMod, l, movefocus, r"
+          "$mainMod, k, movefocus, u"
+          "$mainMod, j, movefocus, d"
+          "$mainMod, 1, workspace, 1"
+
+          "$mainMod, 2, workspace, 2"
+          "$mainMod, 3, workspace, 3"
+          "$mainMod, 4, workspace, 4"
+          "$mainMod, 5, workspace, 5"
+          "$mainMod, 6, workspace, 6"
+          "$mainMod, 7, workspace, 7"
+          "$mainMod, 8, workspace, 8"
+          "$mainMod, 9, workspace, 9"
+          "$mainMod, 0, workspace, 10"
+          "$mainMod SHIFT, 1, movetoworkspace, 1"
+          "$mainMod SHIFT, 2, movetoworkspace, 2"
+          "$mainMod SHIFT, 3, movetoworkspace, 3"
+          "$mainMod SHIFT, 4, movetoworkspace, 4"
+          "$mainMod SHIFT, 5, movetoworkspace, 5"
+          "$mainMod SHIFT, 6, movetoworkspace, 6"
+          "$mainMod SHIFT, 7, movetoworkspace, 7"
+          "$mainMod SHIFT, 8, movetoworkspace, 8"
+          "$mainMod SHIFT, 9, movetoworkspace, 9"
+          "$mainMod SHIFT, 0, movetoworkspace, 10"
+          "$mainMod, mouse_down, workspace, e+1"
+          "$mainMod, mouse_up, workspace, e-1"
+        ];
+
+        bindm = [
+          "$mainMod, mouse:272, movewindow"
+          "$mainMod, mouse:273, resizewindow"
         ];
       };
-
-      dwindle = {
-        pseudotile = true;
-        preserve_split = true;
-      };
-
-      master = {
-        new_status = "master";
-      };
-
-      gestures = {
-        workspace_swipe = false;
-      };
-
-      device = [
-        {
-          name = "epic-mouse-v1";
-          sensitivity = -0.5;
-        }
-        {
-          name = "zsa-technology-labs-moonlander-mark-i";
-          kb_layout = "us";
-        }
-        {
-          name = "keychron-keychron-k7";
-          kb_layout = "us";
-        }
-      ];
-      windowrule = [
-        "float, file_progress"
-        "float, confirm"
-        "float, dialog"
-        "float, download"
-        "float, notification"
-        "float, error"
-        "float, splash"
-        "float, confirmreset"
-        "float, title:Open File"
-        "float, title:branchdialog"
-        "float, Lxappearance"
-        "float, Wofi"
-        "float, dunst"
-        "animation none,Wofi"
-        "float,viewnior"
-        "float,feh"
-        "float, pavucontrol-qt"
-        "float, pavucontrol"
-        "float, file-roller"
-        "fullscreen, wlogout"
-        "float, title:wlogout"
-        "fullscreen, title:wlogout"
-        "idleinhibit focus, mpv"
-        "idleinhibit fullscreen, firefox"
-        "float, title:^(Media viewer)$"
-        "float, title:^(Volume Control)$"
-        "float, title:^(Picture-in-Picture)$"
-        "size 800 600, title:^(Volume Control)$"
-        "move 75 44%, title:^(Volume Control)$"
-      ];
-
-      "$mainMod" = "SUPER";
-
-      bind = [
-        "$mainMod, return, exec, kitty -e zellij-ps"
-        "$mainMod, t, exec, kitty -e fish -c 'neofetch; exec fish'"
-        "$mainMod SHIFT, e, exec, kitty -e zellij_nvim"
-        "$mainMod, o, exec, hyprctl setprop activewindow opaque toggle"
-        "$mainMod, b, exec, thunar"
-        "$mainMod, Escape, exec, wlogout -p layer-shell"
-        "$mainMod, Space, togglefloating"
-        "$mainMod, q, killactive"
-        "$mainMod, M, exit"
-        "$mainMod, F, fullscreen"
-        "$mainMod, V, togglefloating"
-        "$mainMod, D, exec, rofi -show"
-        "$mainMod SHIFT, S, exec, bemoji"
-        "$mainMod, P, exec, rofi-pass"
-        "$mainMod SHIFT, P, pseudo"
-        "$mainMod, J, togglesplit"
-        "$mainMod, h, movefocus, l"
-        "$mainMod, l, movefocus, r"
-        "$mainMod, k, movefocus, u"
-        "$mainMod, j, movefocus, d"
-        "$mainMod, 1, workspace, 1"
-        "$mainMod, 2, workspace, 2"
-        "$mainMod, 3, workspace, 3"
-        "$mainMod, 4, workspace, 4"
-        "$mainMod, 5, workspace, 5"
-        "$mainMod, 6, workspace, 6"
-        "$mainMod, 7, workspace, 7"
-        "$mainMod, 8, workspace, 8"
-        "$mainMod, 9, workspace, 9"
-        "$mainMod, 0, workspace, 10"
-        "$mainMod SHIFT, 1, movetoworkspace, 1"
-        "$mainMod SHIFT, 2, movetoworkspace, 2"
-        "$mainMod SHIFT, 3, movetoworkspace, 3"
-        "$mainMod SHIFT, 4, movetoworkspace, 4"
-        "$mainMod SHIFT, 5, movetoworkspace, 5"
-        "$mainMod SHIFT, 6, movetoworkspace, 6"
-        "$mainMod SHIFT, 7, movetoworkspace, 7"
-        "$mainMod SHIFT, 8, movetoworkspace, 8"
-        "$mainMod SHIFT, 9, movetoworkspace, 9"
-        "$mainMod SHIFT, 0, movetoworkspace, 10"
-        "$mainMod, mouse_down, workspace, e+1"
-        "$mainMod, mouse_up, workspace, e-1"
-      ];
-
-      bindm = [
-        "$mainMod, mouse:272, movewindow"
-        "$mainMod, mouse:273, resizewindow"
-      ];
     };
   };
 }

home/features/desktop/media.nix

@@ -25,8 +25,8 @@ in {
       inkscape
       kdePackages.kdenlive
       krita
-      makemkv
+      libation
-      mpv
+      #makemkv
       pamixer
       pavucontrol
       qpwgraph
@@ -40,16 +40,18 @@ in {
       unimatrix
     ];
 
-    programs.obs-studio = {
+    programs = {
-      enable = true;
+      mpv = {
-      plugins = with pkgs.obs-studio-plugins; [
+        enable = true;
-        input-overlay
+        bindings = {
-        obs-gstreamer
+          WHEEL_UP = "seek 10";
-        obs-vaapi
+          WHEEL_DOWN = "seek -10";
-        obs-vertical-canvas
+        };
-        obs-vkcapture
+        config = {
-        wlrobs
+          profile = "gpu-hq";
-      ];
+          ytdl-format = "bestvideo+bestaudio";
+        };
+      };
     };
   };
 }

home/features/desktop/rofi.nix

@@ -32,7 +32,152 @@ in {
         kb-primary-paste = "Control+V,Shift+Insert";
         kb-secondary-paste = "Control+v,Insert";
       };
-      theme = "dracula";
+      theme = let
+        inherit (config.colorScheme) palette;
+      in
+        builtins.toString (pkgs.writeText "rofi-universal-theme.rasi" ''
+          * {
+            /* Universal theme colors from nix-colors */
+            background:  #${palette.base00};
+            surface:     #${palette.base01};
+            overlay:     #${palette.base02};
+            muted:       #${palette.base03};
+            subtle:      #${palette.base04};
+            text:        #${palette.base05};
+            bright-text: #${palette.base06};
+            highlight:   #${palette.base07};
+            accent1:     #${palette.base08};
+            accent2:     #${palette.base09};
+            accent3:     #${palette.base0A};
+            accent4:     #${palette.base0B};
+            accent5:     #${palette.base0C};
+            accent6:     #${palette.base0D};
+            accent7:     #${palette.base0E};
+            accent8:     #${palette.base0F};
+
+            /* Global properties */
+            background-color: @background;
+            text-color: @text;
+            font: "Fira Code 12";
+            border: 0;
+            margin: 0;
+            padding: 0;
+            spacing: 0;
+          }
+
+          window {
+            background-color: @background;
+            border: 1px;
+            border-color: @accent7;
+            border-radius: 6px;
+            width: 40%;
+            padding: 16px;
+          }
+
+          inputbar {
+            children: [ prompt, entry ];
+            spacing: 12px;
+            padding: 8px;
+            border-radius: 4px;
+            background-color: @surface;
+          }
+
+          prompt {
+            text-color: @accent7;
+            background-color: transparent;
+          }
+
+          entry {
+            placeholder: "Search...";
+            placeholder-color: @subtle;
+            text-color: @text;
+            background-color: transparent;
+            cursor-color: @accent7;
+          }
+
+          message {
+            background-color: @surface;
+            border-radius: 4px;
+            padding: 8px;
+            margin: 8px 0;
+          }
+
+          textbox {
+            text-color: @text;
+            background-color: transparent;
+          }
+
+          listview {
+            background-color: transparent;
+            margin: 8px 0 0;
+            lines: 10;
+            columns: 1;
+            fixed-height: true;
+            scrollbar: false;
+          }
+
+          element {
+            background-color: transparent;
+            text-color: @text;
+            padding: 8px;
+            border-radius: 4px;
+            spacing: 8px;
+          }
+
+          element normal.normal {
+            background-color: transparent;
+            text-color: @text;
+          }
+
+          element selected.normal {
+            background-color: @accent7;
+            text-color: @background;
+          }
+
+          element alternate.normal {
+            background-color: transparent;
+            text-color: @text;
+          }
+
+          element-icon {
+            background-color: transparent;
+            size: 24px;
+          }
+
+          element-text {
+            background-color: transparent;
+            text-color: inherit;
+            vertical-align: 0.5;
+          }
+
+          mode-switcher {
+            spacing: 0;
+            background-color: @surface;
+            border-radius: 4px;
+            margin: 8px 0 0;
+          }
+
+          button {
+            padding: 8px 16px;
+            background-color: transparent;
+            text-color: @text;
+            border-radius: 4px;
+          }
+
+          button selected {
+            background-color: @accent7;
+            text-color: @background;
+          }
+
+          /* Scrollbar */
+          scrollbar {
+            width: 4px;
+            border: 0;
+            handle-color: @accent7;
+            handle-width: 4px;
+            padding: 0;
+          }
+        '');
     };
   };
 }

home/features/desktop/theme.nix

@@ -1,4 +1,7 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  ...
+}: {
   qt = {
     enable = true;
     platformTheme.name = "gtk";

home/features/desktop/wayland.nix

@@ -10,264 +10,9 @@ in {
   options.features.desktop.wayland.enable = mkEnableOption "wayland extra tools and config";
 
   config = mkIf cfg.enable {
-    programs.waybar = {
-      enable = true;
-      style = ''
-        @define-color background-darker rgba(30, 31, 41, 230);
-        @define-color background #282a36;
-        @define-color selection #44475a;
-        @define-color foreground #f8f8f2;
-        @define-color comment #6272a4;
-        @define-color cyan #8be9fd;
-        @define-color green #50fa7b;
-        @define-color orange #ffb86c;
-        @define-color pink #ff79c6;
-        @define-color purple #bd93f9;
-        @define-color red #ff5555;
-        @define-color yellow #f1fa8c;
-
-        * {
-            border: none;
-            border-radius: 0;
-            font-family: FiraCode Nerd Font;
-            font-weight: bold;
-            font-size: 14px;
-            min-height: 0;
-        }
-
-        window#waybar {
-            background: rgba(21, 18, 27, 0);
-            color: #cdd6f4;
-        }
-
-        tooltip {
-            background: #1e1e2e;
-            border-radius: 10px;
-            border-width: 2px;
-            border-style: solid;
-            border-color: #11111b;
-        }
-
-        #workspaces button {
-            padding: 5px;
-            color: #313244;
-            margin-right: 5px;
-        }
-
-        #workspaces button.active {
-            color: #11111b;
-            background: #a6e3a1;
-            border-radius: 10px;
-        }
-
-        #workspaces button.focused {
-            color: #a6adc8;
-            background: #eba0ac;
-            border-radius: 10px;
-        }
-
-        #workspaces button.urgent {
-            color: #11111b;
-            background: #a6e3a1;
-            border-radius: 10px;
-        }
-
-        #workspaces button:hover {
-            background: #11111b;
-            color: #cdd6f4;
-            border-radius: 10px;
-        }
-
-        #custom-language,
-        #custom-updates,
-        #custom-caffeine,
-        #custom-weather,
-        #window,
-        #clock,
-        #battery,
-        #pulseaudio,
-        #network,
-        #workspaces,
-        #tray,
-        #backlight {
-            background: #1e1e2e;
-            padding: 0px 10px;
-            margin: 3px 0px;
-            margin-top: 10px;
-            border: 1px solid #181825;
-        }
-
-        #tray {
-            border-radius: 10px;
-            margin-right: 10px;
-        }
-
-        #workspaces {
-            background: #1e1e2e;
-            border-radius: 10px;
-            margin-left: 10px;
-            padding-right: 0px;
-            padding-left: 5px;
-        }
-
-        #custom-caffeine {
-            color: #89dceb;
-            border-radius: 10px 0px 0px 10px;
-            border-right: 0px;
-            margin-left: 10px;
-        }
-
-        #custom-language {
-            color: #f38ba8;
-            border-left: 0px;
-            border-right: 0px;
-        }
-
-        #custom-updates {
-            color: #f5c2e7;
-            border-left: 0px;
-            border-right: 0px;
-        }
-
-        #window {
-            border-radius: 10px;
-            margin-left: 60px;
-            margin-right: 60px;
-        }
-
-        #clock {
-            color: #fab387;
-            border-radius: 10px 0px 0px 10px;
-            margin-left: 0px;
-            border-right: 0px;
-        }
-
-        #network {
-            color: #f9e2af;
-            border-left: 0px;
-            border-right: 0px;
-        }
-
-        #pulseaudio {
-            color: #89b4fa;
-            border-left: 0px;
-            border-right: 0px;
-        }
-
-        #pulseaudio.microphone {
-            color: #cba6f7;
-            border-left: 0px;
-            border-right: 0px;
-        }
-
-        #battery {
-            color: #a6e3a1;
-            border-radius: 0 10px 10px 0;
-            margin-right: 10px;
-            border-left: 0px;
-        }
-
-        #custom-weather {
-            border-radius: 0px 10px 10px 0px;
-            border-right: 0px;
-            margin-left: 0px;
-        }
-      '';
-      settings = {
-        mainbar = {
-          layer = "top";
-          position = "top";
-          mod = "dock";
-          exclusive = true;
-          passthrough = false;
-          gtk-layer-shell = true;
-          height = 0;
-          modules-left = ["clock" "custom/weather" "hyprland/workspaces"];
-          modules-center = ["hyprland/window"];
-          modules-right = [
-            "tray"
-            "custom/language"
-            "battery"
-            "backlight"
-            "pulseaudio"
-            "pulseaudio#microphone"
-          ];
-
-          "hyprland/window" = {
-            format = "👉 {}";
-            seperate-outputs = true;
-          };
-          "hyprland/workspaces" = {
-            disable-scroll = true;
-            all-outputs = true;
-            on-click = "activate";
-            format = " {name} {icon} ";
-            on-scroll-up = "hyprctl dispatch workspace e+1";
-            on-scroll-down = "hyprctl dispatch workspace e-1";
-            format-icons = {
-              "1" = "";
-              "2" = "";
-              "3" = "";
-              "4" = "";
-              "5" = "";
-              "6" = "";
-              "7" = "";
-            };
-            persistent_workspaces = {
-              "1" = [];
-              "2" = [];
-              "3" = [];
-              "4" = [];
-            };
-          };
-          "custom/weather" = {
-            format = "{}°C";
-            tooltip = true;
-            interval = 3600;
-            exec = "wttrbar --location Pockau-Lengefeld";
-            return-type = "json";
-          };
-          tray = {
-            icon-size = 13;
-            spacing = 10;
-          };
-          clock = {
-            format = " {:%R   %d/%m}";
-            tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
-          };
-          pulseaudio = {
-            format = "{icon} {volume}%";
-            tooltip = false;
-            format-muted = " Muted";
-            on-click = "pamixer -t";
-            on-scroll-up = "pamixer -i 5";
-            on-scroll-down = "pamixer -d 5";
-            scroll-step = 5;
-            format-icons = {
-              headphone = "";
-              hands-free = "";
-              headset = "";
-              phone = "";
-              portable = "";
-              car = "";
-              default = ["" "" ""];
-            };
-          };
-          "pulseaudio#microphone" = {
-            format = "{format_source}";
-            format-source = " {volume}%";
-            format-source-muted = " Muted";
-            on-click = "pamixer --default-source -t";
-            on-scroll-up = "pamixer --default-source -i 5";
-            on-scroll-down = "pamixer --default-source -d 5";
-            scroll-step = 5;
-          };
-        };
-      };
-    };
-
     home.packages = with pkgs; [
       grim
+      kdePackages.xwaylandvideobridge
       hyprcursor
       hyprlock
       hyprpaper
@@ -277,7 +22,6 @@ in {
       wl-clipboard
       wf-recorder
       wl-mirror
-      wl-clipboard
       wlogout
       wtype
       ydotool

home/features/desktop/wofi.nix

@@ -1,6 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    wofi
-    bemoji
-  ];
-}

home/m3tam3re/dotfiles/default.nix

@@ -1,26 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
-  home.file.".config/bat" = {
-    source = "${inputs.dotfiles}/bat";
-    recursive = true;
-  };
-  home.file.".config/nyxt" = {
-    source = "${inputs.dotfiles}/nyxt";
-    recursive = true;
-  };
-  # home.file.".config/hypr" = {
-  #   source = "${inputs.dotfiles}/hypr";
-  #   recursive = true;
-  # };
-  home.file.".config/nvim" = {
-    source = "${inputs.dotfiles}/nvim";
-    recursive = true;
-  };
-  home.file.".config/zellij" = {
-    source = "${inputs.dotfiles}/zellij";
-    recursive = true;
-  };
-}

home/m3tam3re/home-server.nix

@@ -89,27 +89,27 @@
       init.defaultBranch = "master";
     };
   };
-  programs.zellij-ps = {
+  # programs.zellij-ps = {
-    enable = true;
+  #   enable = true;
-    projectFolders = [
+  #   projectFolders = [
-      "${config.home.homeDirectory}/p/c"
+  #     "${config.home.homeDirectory}/p/c"
-      "${config.home.homeDirectory}/p"
+  #     "${config.home.homeDirectory}/p"
-      "${config.home.homeDirectory}/.config"
+  #     "${config.home.homeDirectory}/.config"
-    ];
+  #   ];
-    layout = ''
+  #   layout = ''
-      layout {
+  #     layout {
-          pane size=1 borderless=true {
+  #         pane size=1 borderless=true {
-              plugin location="zellij:tab-bar"
+  #             plugin location="zellij:tab-bar"
-          }
+  #         }
-          pane size="70%" command="nvim"
+  #         pane size="70%" command="nvim"
-          pane split_direction="vertical" {
+  #         pane split_direction="vertical" {
-              pane
+  #             pane
-              pane command="unimatrix"
+  #             pane command="unimatrix"
-          }
+  #         }
-          pane size=1 borderless=true {
+  #         pane size=1 borderless=true {
-              plugin location="zellij:status-bar"
+  #             plugin location="zellij:status-bar"
-          }
+  #         }
-      }
+  #     }
-    '';
+  #   '';
-  };
+  # };
 }

home/m3tam3re/home.nix

@@ -24,7 +24,6 @@
   # The home.packages option allows you to install Nix packages into your
   # environment.
   home.packages = with pkgs; [
-    aider-chat-env
     libgtop
     # # Adds the 'hello' command to your environment. It prints a friendly
     # # "Hello, world!" when run.
@@ -81,6 +80,11 @@
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 
+  services.cliphist = {
+    enable = true;
+    allowImages = true;
+  };
+
   programs.git = {
     enable = true;
     difftastic.enable = true;
@@ -95,27 +99,149 @@
       init.defaultBranch = "master";
     };
   };
-  programs.zellij-ps = {
+
+  programs.jujutsu = {
     enable = true;
-    projectFolders = [
+    settings = {
-      "${config.home.homeDirectory}/p/c"
+      user = {
-      "${config.home.homeDirectory}/p"
+        email = "m@m3tam3re.com";
-      "${config.home.homeDirectory}/.config"
+        name = "Sascha Koenig";
-    ];
+      };
-    layout = ''
+    };
-      layout {
-          pane size=1 borderless=true {
-              plugin location="zellij:tab-bar"
-          }
-          pane size="70%" command="nvim"
-          pane split_direction="vertical" {
-              pane
-              pane command="unimatrix"
-          }
-          pane size=1 borderless=true {
-              plugin location="zellij:status-bar"
-          }
-      }
-    '';
   };
+
+  programs.ssh = {
+    enable = true;
+    enableDefaultConfig = false;
+    matchBlocks = {
+      "AZ-CLD-1" = {
+        hostname = "152.53.186.119";
+        user = "sascha.koenig";
+        port = 2022;
+        identityFile = "~/.ssh/sascha.koenig";
+      };
+      "github.com" = {
+        hostname = "github.com";
+        user = "m3tam3re";
+        port = 22;
+        identityFile = "~/.ssh/github";
+      };
+      "nikhil" = {
+        hostname = "91.99.176.80";
+        user = "nikhilmaddirala";
+        identityFile = "~/.ssh/m3tam3re";
+      };
+      "code.m3ta.dev" = {
+        hostname = "code.m3ta.dev";
+        user = "m3tam3re";
+        identityFile = "~/.ssh/gitea";
+      };
+      "git.az-gruppe.com" = {
+        hostname = "git.az-gruppe.com";
+        port = 2022;
+        user = "sascha.koenig";
+        identityFile = "~/.ssh/sascha.koenig";
+      };
+      "lkk-nix-1" = {
+        hostname = "89.58.10.189";
+        user = "lkk-admin";
+        identityFile = "~/.ssh/lkk-admin";
+      };
+      "m3-r1" = {
+        hostname = "202.61.226.110";
+        user = "m3tam3re";
+        identityFile = "~/.ssh/m3tam3re";
+      };
+      "lkk-prod-test" = {
+        hostname = "192.168.122.215";
+        user = "root";
+        identityFile = "~/.ssh/m3tam3re";
+      };
+      "lkk-prod-1" = {
+        hostname = "192.168.0.24";
+        user = "root";
+        identityFile = "~/.ssh/m3tam3re";
+      };
+      "lkk-prod-2" = {
+        hostname = "192.168.0.20";
+        user = "root";
+        identityFile = "~/.ssh/m3tam3re";
+      };
+      "m3-deck" = {
+        hostname = "192.168.178.193";
+        user = "m3tam3re";
+        identityFile = "~/.ssh/m3tam3re";
+      };
+      "m3-kratos-vm" = {
+        hostname = "192.168.122.43";
+        user = "m3tam3re";
+        identityFile = "~/.ssh/m3tam3re";
+      };
+      "m3-helios" = {
+        hostname = "192.168.178.210";
+        user = "m3tam3re";
+        identityFile = "~/.ssh/m3tam3re";
+      };
+      "m3-ares" = {
+        hostname = "192.168.1.30";
+        user = "m3tam3re";
+        identityFile = "~/.ssh/m3tam3re";
+      };
+      "m3-atlas" = {
+        hostname = "152.53.85.162";
+        user = "m3tam3re";
+        identityFile = "~/.ssh/m3tam3re";
+      };
+      "m3-zelda" = {
+        hostname = "95.217.189.186";
+        user = "m3tam3re";
+        identityFile = "~/.ssh/m3tam3re";
+      };
+      "m3-skynet" = {
+        hostname = "m3-skynet";
+        user = "admin";
+        identityFile = "~/.ssh/m3tam3re";
+      };
+      "m3-prox-1" = {
+        hostname = "192.168.1.110";
+        user = "root";
+        identityFile = "~/.ssh/m3tam3re";
+      };
+      "shp-old" = {
+        hostname = "95.217.3.250";
+        port = 2222;
+        user = "m3tam3re";
+        identityFile = "~/.ssh/self-host-playbook";
+      };
+      "shp-1" = {
+        hostname = "95.217.189.186";
+        port = 2222;
+        user = "m3tam3re";
+        identityFile = "~/.ssh/self-host-playbook";
+      };
+    };
+  };
+  # programs.zellij-ps = {
+  #   enable = true;
+  #   projectFolders = [
+  #     "${config.home.homeDirectory}/p/c"
+  #     "${config.home.homeDirectory}/p"
+  #     "${config.home.homeDirectory}/.config"
+  #   ];
+  #   layout = ''
+  #     layout {
+  #         pane size=1 borderless=true {
+  #             plugin location="zellij:tab-bar"
+  #         }
+  #         pane size="70%" command="nvim"
+  #         pane split_direction="vertical" {
+  #             pane
+  #             pane command="unimatrix"
+  #         }
+  #         pane size=1 borderless=true {
+  #             plugin location="zellij:status-bar"
+  #         }
+  #     }
+  #   '';
+  # };
 }

home/m3tam3re/m3-aether.nix

@@ -0,0 +1,17 @@
+{
+  imports = [
+    ../common
+    ../features/cli
+    ./home-server.nix
+  ];
+
+  features = {
+    cli = {
+      fish.enable = true;
+      fzf.enable = true;
+      nitch.enable = true;
+      secrets.enable = false;
+      starship.enable = true;
+    };
+  };
+}

home/m3tam3re/m3-ares.nix

@@ -3,24 +3,16 @@
   lib,
   ...
 }:
-with lib; let
+with lib; {
-  cfg = config.features.desktop.hyprland;
-in {
   imports = [
     ../common
-    ./dotfiles
     ./home.nix
     ../features/cli
     ../features/coding
     ../features/desktop
-    #./services/librechat.nix
   ];
 
-  options.features.desktop.hyprland.enable =
-    mkEnableOption "enable Hyprland";
-
   config = mkMerge [
-    # Base configuration
     {
       xdg = {
         # TODO: better structure
@@ -31,31 +23,33 @@ in {
           associations.added = {
             "application/zip" = ["org.gnome.FileRoller.desktop"];
             "application/csv" = ["calc.desktop"];
-            "application/pdf" = ["io.github.zen_browser.zen.desktop"];
+            "application/pdf" = ["vivaldi-stable.desktop"];
-            "x-scheme-handler/http" = ["io.github.zen_browser.zen.desktop"];
+            "x-scheme-handler/http" = ["vivaldi-stable.desktop"];
-            "x-scheme-handler/https" = ["io.github.zen_browser.zen.desktop"];
+            "x-scheme-handler/https" = ["vivaldi-stable.desktop"];
           };
           defaultApplications = {
             "application/zip" = ["org.gnome.FileRoller.desktop"];
             "application/csv" = ["calc.desktop"];
-            "application/pdf" = ["io.github.zen_browser.zen.desktop"];
+            "application/pdf" = ["vivaldi-stable.desktop"];
             "application/md" = ["dev.zed.Zed.desktop"];
             "application/text" = ["dev.zed.Zed.desktop"];
-            "x-scheme-handler/http" = ["io.github.zen_browser.zen.desktop"];
+            "x-scheme-handler/http" = ["vivaldi-stable.desktop"];
-            "x-scheme-handler/https" = ["io.github.zen_browser.zen.desktop"];
+            "x-scheme-handler/https" = ["vivaldi-stable.desktop"];
           };
         };
       };
       features = {
         cli = {
           fish.enable = true;
+          nushell.enable = true;
           fzf.enable = true;
-          neofetch.enable = true;
+          nitch.enable = true;
           secrets.enable = true;
           starship.enable = true;
         };
         desktop = {
           coding.enable = true;
+          crypto.enable = true;
           gaming.enable = true;
           hyprland.enable = true;
           media.enable = true;
@@ -67,29 +61,32 @@ in {
       };
     }
 
-    (mkIf cfg.enable {
+    (mkIf config.features.desktop.hyprland.enable {
       wayland.windowManager.hyprland = {
         enable = true;
         settings = {
+          exec-once = ["tuxedo-backlight"];
           monitor = [
             "eDP-1,preferred,0x0,1.25"
-            "HDMI-A-1,preferred,2560x0,1"
+            "HDMI-A-1,1920x1080@120,2560x0,1"
           ];
           workspace = [
             "1, monitor:eDP-1, default:true"
             "2, monitor:eDP-1"
             "3, monitor:eDP-1"
-            "4, monitor:HDMI-A-1"
+            "4, monitor:HDMI-A-1,"
             "5, monitor:HDMI-A-1,border:false,rounding:false"
             "6, monitor:HDMI-A-1"
           ];
-          windowrulev2 = [
+          windowrule = [
             "workspace 1,class:dev.zed.Zed"
+            "workspace 1,class:Msty"
             "workspace 2,class:(com.obsproject.Studio)"
-            "workspace 4,opacity 1.0, class:(chromium-browser)"
+            "workspace 4,opacity 1.0, class:(brave-browser)"
-            "workspace 4,opacity 1.0, class:(zen)"
+            "workspace 4,opacity 1.0, class:(vivaldi-stable)"
             "fullscreen,class:^steam_app_\\d+$"
             "workspace 5,class:^steam_app_\\d+$"
+            "idleinhibit focus, class:^steam_app_\\d+$"
           ];
         };
       };

home/m3tam3re/m3-atlas.nix

@@ -7,9 +7,9 @@
 
   features = {
     cli = {
-      fish.enable = true;
+      nushell.enable = true;
       fzf.enable = true;
-      neofetch.enable = true;
+      nitch.enable = true;
       secrets.enable = false;
       starship.enable = true;
     };

home/m3tam3re/m3-daedalus.nix

@@ -0,0 +1,101 @@
+{
+  config,
+  lib,
+  ...
+}:
+with lib; let
+  cfg = config.features.desktop.hyprland;
+in {
+  imports = [
+    ../common
+    ./home.nix
+    ../features/cli
+    ../features/coding
+    ../features/desktop
+    #./services/librechat.nix
+  ];
+
+  options.features.desktop.hyprland.enable =
+    mkEnableOption "enable Hyprland";
+
+  config = mkMerge [
+    # Base configuration
+    {
+      xdg = {
+        # TODO: better structure
+        enable = true;
+        configFile."mimeapps.list".force = true;
+        mimeApps = {
+          enable = true;
+          associations.added = {
+            "application/zip" = ["org.gnome.FileRoller.desktop"];
+            "application/csv" = ["calc.desktop"];
+            "application/pdf" = ["vivaldi-stable.desktop"];
+            "x-scheme-handler/http" = ["vivaldi-stable.desktop"];
+            "x-scheme-handler/https" = ["vivaldi-stable.desktop"];
+          };
+          defaultApplications = {
+            "application/zip" = ["org.gnome.FileRoller.desktop"];
+            "application/csv" = ["calc.desktop"];
+            "application/pdf" = ["vivaldi-stable.desktop"];
+            "application/md" = ["dev.zed.Zed.desktop"];
+            "application/text" = ["dev.zed.Zed.desktop"];
+            "x-scheme-handler/http" = ["vivaldi-stable.desktop"];
+            "x-scheme-handler/https" = ["vivaldi-stable.desktop"];
+          };
+        };
+      };
+      features = {
+        cli = {
+          fish.enable = true;
+          nushell.enable = true;
+          fzf.enable = true;
+          nitch.enable = true;
+          secrets.enable = true;
+          starship.enable = true;
+        };
+        desktop = {
+          coding.enable = true;
+          crypto.enable = false;
+          gaming.enable = false;
+          hyprland.enable = false;
+          media.enable = true;
+          office.enable = false;
+          rofi.enable = true;
+          fonts.enable = true;
+          wayland.enable = false;
+        };
+      };
+    }
+
+    (mkIf cfg.enable {
+      wayland.windowManager.hyprland = {
+        enable = true;
+        settings = {
+          monitor = [
+            "eDP-1,preferred,0x0,1.25"
+            "HDMI-A-1,preferred,2560x0,1"
+          ];
+          workspace = [
+            "1, monitor:eDP-1, default:true"
+            "2, monitor:eDP-1"
+            "3, monitor:eDP-1"
+            "4, monitor:HDMI-A-1"
+            "5, monitor:HDMI-A-1,border:false,rounding:false"
+            "6, monitor:HDMI-A-1"
+          ];
+          windowrule = [
+            "workspace 1,class:dev.zed.Zed"
+            "workspace 1,class:Msty"
+            "workspace 2,class:(com.obsproject.Studio)"
+            "workspace 4,opacity 1.0, class:(brave-browser)"
+            "workspace 4,opacity 1.0, class:(vivaldi-stable)"
+            "fullscreen,class:^steam_app_\\d+$"
+            "workspace 5,class:^steam_app_\\d+$"
+            "idleinhibit focus, class:^steam_app_\\d+$"
+          ];
+        };
+      };
+    })
+  ];
+}

home/m3tam3re/m3-helios.nix

@@ -9,7 +9,7 @@
     cli = {
       fish.enable = true;
       fzf.enable = true;
-      neofetch.enable = true;
+      nitch.enable = true;
       secrets.enable = false;
       starship.enable = true;
     };

home/m3tam3re/m3-kratos.nix

@@ -3,24 +3,16 @@
   lib,
   ...
 }:
-with lib; let
+with lib; {
-  cfg = config.features.desktop.hyprland;
-in {
   imports = [
     ../common
-    ./dotfiles
     ./home.nix
     ../features/cli
     ../features/coding
     ../features/desktop
-    ./services/librechat.nix
   ];
 
-  options.features.desktop.hyprland.enable =
-    mkEnableOption "enable Hyprland";
-
   config = mkMerge [
-    # Base configuration
     {
       xdg = {
         # TODO: better structure
@@ -31,30 +23,31 @@ in {
           associations.added = {
             "application/zip" = ["org.gnome.FileRoller.desktop"];
             "application/csv" = ["calc.desktop"];
-            "application/pdf" = ["io.github.zen_browser.zen.desktop"];
+            "application/pdf" = ["vivaldi-stable.desktop"];
-            "x-scheme-handler/http" = ["io.github.zen_browser.zen.desktop"];
+            "x-scheme-handler/http" = ["vivaldi-stable.desktop"];
-            "x-scheme-handler/https" = ["io.github.zen_browser.zen.desktop"];
+            "x-scheme-handler/https" = ["vivaldi-stable.desktop"];
           };
           defaultApplications = {
             "application/zip" = ["org.gnome.FileRoller.desktop"];
             "application/csv" = ["calc.desktop"];
-            "application/pdf" = ["io.github.zen_browser.zen.desktop"];
+            "application/pdf" = ["vivaldi-stable.desktop"];
             "application/md" = ["dev.zed.Zed.desktop"];
             "application/text" = ["dev.zed.Zed.desktop"];
-            "x-scheme-handler/http" = ["io.github.zen_browser.zen.desktop"];
+            "x-scheme-handler/http" = ["vivaldi-stable.desktop"];
-            "x-scheme-handler/https" = ["io.github.zen_browser.zen.desktop"];
+            "x-scheme-handler/https" = ["vivaldi-stable.desktop"];
           };
         };
       };
       features = {
         cli = {
-          fish.enable = true;
+          nushell.enable = true;
           fzf.enable = true;
-          neofetch.enable = true;
+          nitch.enable = true;
           secrets.enable = true;
           starship.enable = true;
         };
         desktop = {
+          crypto.enable = true;
           coding.enable = true;
           gaming.enable = true;
           hyprland.enable = true;
@@ -67,7 +60,7 @@ in {
       };
     }
 
-    (mkIf cfg.enable {
+    (mkIf config.features.desktop.hyprland.enable {
       wayland.windowManager.hyprland = {
         enable = true;
         settings = {
@@ -85,11 +78,13 @@ in {
             "7, monitor:DP-2"
           ];
 
-          windowrulev2 = [
+          windowrule = [
             "workspace 1,class:dev.zed.Zed"
+            "workspace 1,class:Msty"
             "workspace 2,class:(com.obsproject.Studio)"
-            "workspace 4,opacity 1.0, class:(chromium-browser)"
+            "workspace 4,opacity 1.0, class:(brave-browser)"
-            "workspace 4,opacity 1.0, class:(zen)"
+            "workspace 4,opacity 1.0, class:(vivaldi-stable)"
+            "idleinhibit focus, class:^steam_app_\\d+$"
           ];
         };
       };

home/m3tam3re/services/librechat.nix

@@ -1,18 +0,0 @@
-{
-  systemd.user.services.librechat = {
-    Unit = {
-      Description = "LibreChat Start";
-      After = ["network-online.target"];
-      Wants = ["network-online.target"];
-    };
-    Install = {WantedBy = ["default.target"];};
-    Service = {
-      Type = "oneshot";
-      RemainAfterExit = "yes";
-      WorkingDirectory = "/home/m3tam3re/p/r/ai/LibreChat";
-      ExecStart = "/run/current-system/sw/bin/podman-compose up -d";
-      ExecStop = "/run/current-system/sw/bin/podman-compose down";
-      Restart = "on-failure";
-    };
-  };
-}

hosts/common/default.nix

@@ -8,6 +8,7 @@
 }: {
   imports = [
     ./extraServices
+    ./ports.nix
     ./users
     inputs.home-manager.nixosModules.home-manager
   ];
@@ -25,12 +26,16 @@
     # You can add overlays here
     overlays = [
       # Add overlays your own flake exports (from overlays and pkgs dir):
-      outputs.overlays.additions
+      #outputs.overlays.additions
-      outputs.overlays.modifications
+      #outputs.overlays.modifications
       outputs.overlays.stable-packages
+      outputs.overlays.locked-packages
       outputs.overlays.pinned-packages
       outputs.overlays.master-packages
 
+      inputs.m3ta-nixpkgs.overlays.default
+      inputs.m3ta-nixpkgs.overlays.modifications
+
       # You can also add overlays exported from other flakes:
       # neovim-nightly-overlay.overlays.default
 
@@ -69,5 +74,5 @@
       ((lib.filterAttrs (_: lib.isType "flake")) inputs);
     nixPath = ["/etc/nix/path"];
   };
-  users.defaultUserShell = pkgs.fish;
+  users.defaultUserShell = pkgs.nushell;
 }

hosts/common/extraServices/flatpak.nix

@@ -16,8 +16,7 @@ in {
       enable = true;
       wlr.enable = true;
       extraPortals = with pkgs; [
-        xdg-desktop-portal-gtk
+        xdg-desktop-portal-hyprland
-        xdg-desktop-portal-wlr
       ];
       config.common.default = "*";
     };

hosts/common/extraServices/ollama.nix

@@ -12,10 +12,6 @@ in {
   config = mkIf cfg.enable {
     services.ollama = {
       enable = true;
-      package =
-        if config.services.xserver.videoDrivers == ["amdgpu"] # rocblas-6.0.2 broken
-        then pkgs.pinned.ollama
-        else pkgs.ollama;
       acceleration =
         if config.services.xserver.videoDrivers == ["amdgpu"]
         then "rocm"
@@ -24,6 +20,10 @@ in {
         else null;
       host = "[::]";
       openFirewall = true;
+      environmentVariables = {
+        OLLAMA_ORIGINS = "https://msty.studio";
+        OLLAMA_HOST = "0.0.0.0";
+      };
     };
     nixpkgs.config = {
       rocmSupport = config.services.xserver.videoDrivers == ["amdgpu"];

hosts/common/extraServices/virtualisation.nix

@@ -20,7 +20,7 @@ in {
           ovmf = {
             enable = true;
             packages = [
-              (pkgs.OVMF.override {
+              (pkgs.locked.OVMF.override {
                 secureBoot = true;
                 tpmSupport = true;
               })
@@ -31,8 +31,8 @@ in {
       };
     };
     programs.virt-manager.enable = true;
-    environment.systemPackages = with pkgs; [
+    environment = {
-      OVMFFull
+      systemPackages = [pkgs.qemu];
-    ];
+    };
   };
 }

hosts/common/ports.nix

@@ -0,0 +1,72 @@
+{config, ...}: {
+  m3ta.ports = {
+    enable = true;
+    definitions = {
+      # System services
+      ssh = 22;
+
+      # Web & proxy services
+      traefik = 80;
+      traefik-ssl = 443;
+
+      # Databases
+      postgres = 5432;
+      mysql = 3306;
+      redis = 6379;
+
+      # VPN & networking
+      wireguard = 51820;
+      tailscale = 41641;
+      headscale = 3009;
+
+      # Containers & web apps
+      gitea = 3030;
+      baserow = 3001;
+      ghost = 3002;
+      wastebin = 3003;
+      littlelink = 3004;
+      searx = 3005;
+      restreamer = 3006;
+      paperless = 3012;
+      vaultwarden = 3013;
+      slash = 3010;
+      slash-nemoti = 3016;
+      kestra = 3018;
+      outline = 3019;
+      pangolin = 3020;
+      pangolin-api = 3021;
+      pangolin-ws = 3022;
+
+      # Home automation
+      homarr = 7575;
+
+      # DNS
+      adguardhome = 53;
+    };
+
+    hostOverrides = {
+      # Host-specific overrides
+      m3-ares = {
+        # Any custom port overrides for m3-ares
+      };
+
+      m3-atlas = {
+        # Any custom port overrides for m3-atlas
+      };
+
+      m3-helios = {
+        # Any custom port overrides for m3-helios
+      };
+
+      m3-kratos = {
+        # Any custom port overrides for m3-kratos
+      };
+    };
+  };
+  environment.etc."info/all-ports.json" = {
+    text = builtins.toJSON {
+      hostname = config.networking.hostName;
+      ports = config.m3ta.ports.all; # TODO should only return actually used ports
+    };
+  };
+}

hosts/common/users/m3tam3re.nix

@@ -20,6 +20,7 @@
       "input"
       "kvm"
       "qemu-libvirtd"
+      "adbusers"
     ];
     openssh.authorizedKeys.keys = [
       "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC3YEmpYbM+cpmyD10tzNRHEn526Z3LJOzYpWEKdJg8DaYyPbDn9iyVX30Nja2SrW4Wadws0Y8DW+Urs25/wVB6mKl7jgPJVkMi5hfobu3XAz8gwSdjDzRSWJrhjynuaXiTtRYED2INbvjLuxx3X8coNwMw58OuUuw5kNJp5aS2qFmHEYQErQsGT4MNqESe3jvTP27Z5pSneBj45LmGK+RcaSnJe7hG+KRtjuhjI7RdzMeDCX73SfUsal+rHeuEw/mmjYmiIItXhFTDn8ZvVwpBKv7xsJG90DkaX2vaTk0wgJdMnpVIuIRBa4EkmMWOQ3bMLGkLQeK/4FUkNcvQ/4+zcZsg4cY9Q7Fj55DD41hAUdF6SYODtn5qMPsTCnJz44glHt/oseKXMSd556NIw2HOvihbJW7Rwl4OEjGaO/dF4nUw4c9tHWmMn9dLslAVpUuZOb7ykgP0jk79ldT3Dv+2Hj0CdAWT2cJAdFX58KQ9jUPT3tBnObSF1lGMI7t77VU= m3tam3re@m3-nix"

hosts/m3-aether/configuration.nix

@@ -0,0 +1,111 @@
+# Edit this configuration file to define what should be installed on
+# your system. Help is available in the configuration.nix(5) man page, on
+# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
+{pkgs, ...}: {
+  imports = [
+    # Include the results of the hardware scan.
+    ./disko-config.nix
+    ./hardware-configuration.nix
+  ];
+
+  # Bootloader.
+  boot.loader.grub = {
+    efiSupport = true;
+    efiInstallAsRemovable = true;
+  };
+
+  networking.hostName = "m3-helios"; # Define your hostname.
+  networking.hostId = "3ebf1cd3";
+  # Pick only one of the below networking options.
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+  networking.networkmanager.enable =
+    true; # Easiest to use and most distros use this by default.
+  # Set your time zone.
+  time.timeZone = "Europe/Berlin";
+
+  # Configure network proxy if necessary
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_US.UTF-8";
+  # console = {
+  #   font = "Lat2-Terminus16";
+  #   keyMap = "us";
+  #   useXkbConfig = true; # use xkb.options in tty.
+  # };
+
+  # Enable the X11 windowing system.
+  # services.xserver.enable = true;
+
+  # Enable the GNOME Desktop Environment.
+  # services.xserver.displayManager.gdm.enable = true;
+  # services.xserver.desktopManager.gnome.enable = true;
+
+  # Configure keymap in X11
+  # services.xserver.xkb.layout = "us";
+  # services.xserver.xkb.options = "eurosign:e,caps:escape";
+
+  # Enable CUPS to print documents.
+  # services.printing.enable = true;
+
+  # Enable sound.
+  # hardware.pulseaudio.enable = true;
+  # OR
+
+  # Enable touchpad support (enabled default in most desktopManager).
+  # services.libinput.enable = true;
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = with pkgs; [neovim git];
+
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.mtr.enable = true;
+  # programs.gnupg.agent = {
+  #   enable = true;
+  #   enableSSHSupport = true;
+  # };
+
+  # List services that you want to enable:
+
+  # Enable the OpenSSH daemon.
+  services.openssh.enable = true;
+  services.fstrim = {
+    enable = true; # For SSD/thin-provisioned storage
+    interval = "weekly";
+  };
+
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
+  # Copy the NixOS configuration file and link it from the resulting system
+  # (/run/current-system/configuration.nix). This is useful in case you
+  # accidentally delete configuration.nix.
+  # system.copySystemConfiguration = true;
+
+  # This option defines the first version of NixOS you have installed on this particular machine,
+  # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
+  #
+  # Most users should NEVER change this value after the initial install, for any reason,
+  # even if you've upgraded your system to a new NixOS release.
+  #
+  # This value does NOT affect the Nixpkgs version your packages and OS are pulled from,
+  # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how
+  # to actually do that.
+  #
+  # This value being lower than the current NixOS release does NOT mean your system is
+  # out of date, out of support, or vulnerable.
+  #
+  # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
+  # and migrated your data accordingly.
+  #
+  # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
+  system.stateVersion = "24.11"; # Did you read the comment?
+}

hosts/m3-aether/default.nix

@@ -0,0 +1,50 @@
+# A staring point is the basic NIXOS configuration generated by the ISO installer.
+# On an existing NIXOS install you can use the following command in your flakes basedir:
+# sudo nixos-generate-config --dir ./hosts/m3tam3re
+#
+# Please make sure to change the first couple of lines in your configuration.nix:
+# { config, inputs, ouputs, lib, pkgs, ... }:
+#
+# {
+#   imports = [ # Include the results of the hardware scan.
+#     ./hardware-configuration.nix
+#     inputs.home-manager.nixosModules.home-manager
+#   ];
+#   ...
+#
+# Moreover please update the packages option in your user configuration and add the home-manager options:
+# users.users = {
+#   m3tam3re = {
+#     isNormalUser = true;
+#     initialPassword = "12345";
+#     extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
+#     packages = [ inputs.home-manager.packages.${pkgs.system}.default ];
+#   };
+# };
+#
+# home-manager = {
+#   useUserPackages = true;
+#   extraSpecialArgs = { inherit inputs outputs; };
+#   users.m3tam3re =
+#     import ../../home/m3tam3re/${config.networking.hostName}.nix;
+# };
+#
+# Please also change your hostname accordingly:
+#:w
+# networking.hostName = "nixos"; # Define your hostname.
+{
+  imports = [
+    ../common
+    ./configuration.nix
+    ./programs.nix
+    ./secrets.nix
+    ./services
+  ];
+
+  extraServices = {
+    flatpak.enable = true;
+    ollama.enable = false;
+    podman.enable = true;
+    virtualisation.enable = false;
+  };
+}

hosts/m3-aether/disko-config.nix

@@ -0,0 +1,39 @@
+{
+  disko.devices = {
+    disk = {
+      main = {
+        type = "disk";
+        device = "/dev/sda";
+        content = {
+          type = "gpt";
+          partitions = {
+            boot = {
+              size = "1M";
+              type = "EF02"; # for GRUB MBR
+              priority = 1;
+            };
+            esp = {
+              size = "512M";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = ["defaults" "umask=0077"];
+              };
+            };
+            root = {
+              size = "100%";
+              content = {
+                type = "filesystem";
+                format = "ext4";
+                mountpoint = "/";
+                mountOptions = ["noatime" "nodiratime" "discard"];
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+}

hosts/m3-aether/hardware-configuration.nix

@@ -0,0 +1,24 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/profiles/qemu-guest.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+
+  # 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.ens18.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+}

hosts/m3-aether/programs.nix

@@ -0,0 +1,14 @@
+{pkgs, ...}: {
+  programs.nix-ld.enable = true;
+  programs.nix-ld.libraries = with pkgs; [
+    # Add any missing dynamic libraries for unpackaged programs
+    # here, NOT in environment.systemPackages
+  ];
+  programs.fish.enable = true;
+  programs.nh = {
+    enable = true;
+    clean.enable = true;
+    clean.extraArgs = "--keep-since 4d --keep 3";
+    flake = "/home/m3tam3re/p/nixos/nixos-config";
+  };
+}

hosts/m3-aether/secrets.nix

@@ -0,0 +1,15 @@
+{
+  age = {
+    secrets = {
+      traefik = {
+        file = ../../secrets/traefik.age;
+        mode = "770";
+        owner = "traefik";
+      };
+      m3tam3re-secrets = {
+        file = ../../secrets/m3tam3re-secrets.age;
+        owner = "m3tam3re";
+      };
+    };
+  };
+}

hosts/m3-aether/services/cloud-init.nix

@@ -0,0 +1,7 @@
+{
+  services.cloud-init = {
+    enable = true;
+    ext4.enable = true;
+    network.enable = true;
+  };
+}

hosts/m3-aether/services/default.nix

@@ -0,0 +1,11 @@
+{
+  imports = [
+    ./cloud-init.nix
+  ];
+  systemd.sleep.extraConfig = ''
+    AllowSuspend=no
+    AllowHibernation=no
+    AllowHybridSleep=no
+    AllowSuspendThenHibernate=no
+  '';
+}

hosts/m3-ares/configuration.nix

@@ -24,17 +24,20 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.systemd-boot.memtest86.enable = true;
   boot.initrd.services.lvm.enable = false;
-  boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback];
+  # boot.kernelModules = [];
-  boot.kernelModules = ["v4l2loopback"];
+  boot.kernelPackages = pkgs.linuxPackages_latest;
-
   boot.extraModprobeConfig = ''
     options kvm_intel nested=1
     options kvm_intel emulate_invalid_guest_state=0
     options kvm ignore_msrs=1
-    options v4l2loopback exclusive_caps=1 max_buffers=2
   '';
 
   networking.hostName = "m3-ares"; # Define your hostname.
+  # warp-terminal update fix
+  # networking.extraHosts = ''
+  #   127.0.0.1 releases.warp.dev
+  #   127.0.0.1 app.warp.dev
+  # '';
   # Pick only one of the below networking options.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
   networking.networkmanager.enable =
@@ -92,7 +95,13 @@
   # List services that you want to enable:
 
   # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
+  services.openssh = {
+    enable = true;
+    settings.PermitRootLogin = "no";
+    settings = {
+      PasswordAuthentication = false;
+    };
+  };
   services.fstrim.enable = true;
 
   # Open ports in the firewall.

hosts/m3-ares/hardware-configuration.nix

@@ -53,6 +53,7 @@
   fileSystems."/mnt/skynet" = {
     device = "192.168.1.100:/volume3/m3-skynet";
     fsType = "nfs";
+    options = ["noauto" "x-systemd.automount"];
   };
 
   swapDevices = [];

hosts/m3-ares/hardware.nix

@@ -1,4 +1,4 @@
-{
+{pkgs, ...}: {
   hardware.nvidia = {
     prime = {
       offload.enable = false;
@@ -16,11 +16,33 @@
     dynamicBoost.enable = true;
     nvidiaSettings = true;
   };
+  hardware.tuxedo-drivers.enable = true;
   hardware.bluetooth.enable = true;
   hardware.keyboard.zsa.enable = true;
   hardware.graphics.enable = true;
 
   services.hardware.bolt.enable = true;
   services.auto-cpufreq.enable = true;
-  services.tlp.enable = true;
+  services.tlp = {
+    enable = true;
+    settings = {
+      START_CHARGE_THRESH_BAT0 = 75;
+      STOP_CHARGE_THRESH_BAT0 = 80;
+    };
+  };
+
+  environment.systemPackages = with pkgs; [
+    tuxedo-backlight
+  ];
+  security.sudo.extraRules = [
+    {
+      users = ["@wheel"];
+      commands = [
+        {
+          command = "/run/current-system/sw/bin/set-backlight";
+          options = ["NOPASSWD"];
+        }
+      ];
+    }
+  ];
 }

hosts/m3-ares/services/default.nix

@@ -5,8 +5,9 @@
     ./postgres.nix
     ./restic.nix
     ./sound.nix
+    ./tailscale.nix
     ./udev.nix
-    #./wireguard.nix
+    ./wireguard.nix
   ];
   services = {
     hypridle.enable = true;
@@ -14,7 +15,14 @@
     gvfs.enable = true;
     trezord.enable = true;
     gnome.gnome-keyring.enable = true;
-    qdrant.enable = true;
+    qdrant = {
+      enable = true;
+      settings = {
+        service = {
+          host = "0.0.0.0";
+        };
+      };
+    };
     upower.enable = true;
     avahi = {
       enable = true;

hosts/m3-ares/services/postgres.nix

@@ -1,4 +1,7 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  ...
+}: {
   services.postgresql = {
     enable = true;
     package = pkgs.postgresql_17;

hosts/m3-ares/services/sound.nix

@@ -1,7 +1,4 @@
-{pkgs, ...}: {
+{
-  environment.systemPackages = with pkgs; [
-    speechd
-  ];
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;

hosts/m3-ares/services/tailscale.nix

@@ -1,40 +1,11 @@
-{
+{config, ...}: {
-  config,
-  pkgs,
-  ...
-}: {
   services.tailscale = {
-    enable = true;
+    enable = false;
-    useRoutingFeatures = "client";
+    authKeyFile = config.age.secrets.tailscale-key.path;
-  };
+    useRoutingFeatures = "both";
-
+    extraUpFlags = [
-  systemd.services.tailscale-autoconnect = {
+      "--login-server=https://va.m3tam3re.com"
-    description = "Automatic connection to Tailscale";
+      "--accept-routes"
-
+    ];
-    # make sure tailscale is running before trying to connect to tailscale
-    after = ["network-pre.target" "tailscale.service"];
-    wants = ["network-pre.target" "tailscale.service"];
-    wantedBy = ["multi-user.target"];
-
-    # set this service as a oneshot job
-    serviceConfig = {
-      Type = "oneshot";
-      EnvironmentFile = "${config.age.secrets.tailscale-key.path}";
-    };
-
-    # have the job run this shell script
-    script = with pkgs; ''
-      # wait for tailscaled to settle
-      sleep 2
-
-      # check if we are already authenticated to tailscale
-      status="$(${tailscale}/bin/tailscale status -json | ${jq}/bin/jq -r .BackendState)"
-      if [ $status = "Running" ]; then # if so, then do nothing
-        exit 0
-      fi
-
-      # otherwise authenticate with tailscale
-      ${tailscale}/bin/tailscale up --exit-node 100.88.96.77 --authkey $TAILSCALE_KEY
-    '';
   };
 }

hosts/m3-ares/services/udev.nix

@@ -1,6 +1,7 @@
 {pkgs, ...}: {
   services.udev.extraRules = ''
-    SUBSYSTEM=="usb", MODE="0666
+    SUBSYSTEM=="usb", MODE="0666"
+    SUBSYSTEM=="leds", KERNEL=="rgb:kbd_backlight*", ACTION=="add", RUN+="${pkgs.coreutils}/bin/chmod a+w /sys/class/leds/%k/multi_intensity"
   '';
   environment.systemPackages = with pkgs; [
     zsa-udev-rules

hosts/m3-ares/services/wireguard.nix

@@ -10,7 +10,7 @@
     };
     NO = {
       configFile = config.age.secrets.wg-NO.path;
-      autostart = true;
+      autostart = false;
     };
     US = {
       configFile = config.age.secrets.wg-US.path;

hosts/m3-atlas/secrets.nix

@@ -7,22 +7,41 @@
       ghost-env = {
         file = ../../secrets/ghost-env.age;
       };
+      kestra-config = {
+        file = ../../secrets/kestra-config.age;
+        mode = "644";
+      };
+      kestra-env = {
+        file = ../../secrets/kestra-env.age;
+      };
       littlelink-m3tam3re = {
         file = ../../secrets/littlelink-m3tam3re.age;
       };
       minio-root-cred = {
         file = ../../secrets/minio-root-cred.age;
       };
+      n8n-env = {
+        file = ../../secrets/n8n-env.age;
+      };
+      paperless-key = {
+        file = ../../secrets/paperless-key.age;
+      };
       restreamer-env = {
         file = ../../secrets/restreamer-env.age;
       };
       searx = {
         file = ../../secrets/searx.age;
       };
+      tailscale-key = {
+        file = ../../secrets/tailscale-key.age;
+      };
       traefik = {
         file = ../../secrets/traefik.age;
         owner = "traefik";
       };
+      vaultwarden-env = {
+        file = ../../secrets/vaultwarden-env.age;
+      };
       m3tam3re-secrets = {
         file = ../../secrets/m3tam3re-secrets.age;
         owner = "m3tam3re";

hosts/m3-atlas/services/containers/baserow.nix

@@ -1,8 +1,8 @@
 {config, ...}: {
   virtualisation.oci-containers.containers."baserow" = {
-    image = "docker.io/baserow/baserow:1.30.1";
+    image = "docker.io/baserow/baserow:1.34.2";
     environmentFiles = [config.age.secrets.baserow-env.path];
-    ports = ["127.0.0.1:3001:80"];
+    ports = ["127.0.0.1:${toString (config.m3ta.ports.get "baserow")}:80"];
     volumes = ["baserow_data:/baserow/data"];
     extraOptions = ["--add-host=postgres:10.89.0.1" "--ip=10.89.0.10" "--network=web"];
   };
@@ -10,17 +10,26 @@
   services.traefik.dynamicConfigOptions.http = {
     services.baserow.loadBalancer.servers = [
       {
-        url = "http://localhost:3001/";
+        url = "http://localhost:${toString (config.m3ta.ports.get "baserow")}/";
       }
     ];
 
     routers.baserow = {
-      rule = "Host(`br.m3tam3re.com`)";
+      rule = "Host(`br.m3ta.dev`)";
       tls = {
         certResolver = "godaddy";
       };
       service = "baserow";
       entrypoints = "websecure";
     };
+    routers.baserow-old = {
+      rule = "Host(`br.m3tam3re.com`)";
+      tls = {
+        certResolver = "godaddy";
+      };
+      service = "baserow";
+      entrypoints = "websecure";
+      middlewares = ["subdomain-redirect"];
+    };
   };
 }

hosts/m3-atlas/services/containers/default.nix

@@ -2,8 +2,14 @@
   imports = [
     ./baserow.nix
     ./ghost.nix
+    ./kestra.nix
     ./littlelink.nix
+    ./matomo.nix
+    # ./n8n.nix
+    # ./pangolin.nix
     ./restreamer.nix
+    ./slash.nix
+    ./slash-nemoti.nix
   ];
   system.activationScripts.createPodmanNetworkWeb = lib.mkAfter ''
     if ! /run/current-system/sw/bin/podman network exists web; then

hosts/m3-atlas/services/containers/ghost.nix

@@ -1,6 +1,6 @@
 {config, ...}: {
   virtualisation.oci-containers.containers."ghost" = {
-    image = "docker.io/ghost:5.106.1";
+    image = "docker.io/ghost:latest";
     environmentFiles = [config.age.secrets.ghost-env.path];
     ports = ["127.0.0.1:3002:2368"];
     volumes = ["ghost_data:/var/lib/ghost/content"];
@@ -13,14 +13,25 @@
         url = "http://localhost:3002/";
       }
     ];
-
+    routers = {
-    routers.ghost = {
+      ghost = {
-      rule = "Host(`www.m3tam3re.com`)";
+        rule = "Host(`m3ta.dev`) || Host(`www.m3ta.dev`)";
-      tls = {
+        tls = {
-        certResolver = "godaddy";
+          certResolver = "godaddy";
+        };
+        service = "ghost";
+        entrypoints = "websecure";
+        middlewares = ["strip-www"];
+      };
+      ghost-old = {
+        rule = "Host(`www.m3tam3re.com`)";
+        tls = {
+          certResolver = "godaddy";
+        };
+        service = "ghost";
+        entrypoints = "websecure";
+        middlewares = ["domain-redirect"];
       };
-      service = "ghost";
-      entrypoints = "websecure";
     };
   };
 }

hosts/m3-atlas/services/containers/kestra.nix

@@ -0,0 +1,34 @@
+{ config, ... }: {
+  virtualisation.oci-containers.containers."kestra" = {
+    image = "docker.io/kestra/kestra:latest";
+    environmentFiles = [ config.age.secrets.kestra-env.path ];
+    cmd = [ "server" "standalone" "--config" "/etc/config/application.yaml"];
+    ports = [ "127.0.0.1:3018:8080" ];
+    user = "root";
+    volumes = [
+      "/var/run/docker.sock:/var/run/docker.sock"
+      "${config.age.secrets.kestra-config.path}:/etc/config/application.yaml"
+      "kestra_data:/app/storage"
+      "/tmp/kestra-wd:/tmp/kestra-wd"
+    ];
+    extraOptions =
+      [ "--add-host=postgres:10.89.0.1" "--ip=10.89.0.18" "--network=web" ];
+  };
+
+  systemd.tmpfiles.rules = [
+    "d /tmp/kestra-wd 0750 1000 1000 - -"
+  ];
+
+  # Traefik configuration specific to littlelink
+  services.traefik.dynamicConfigOptions.http = {
+    services.kestra.loadBalancer.servers =
+      [{ url = "http://localhost:3018/"; }];
+
+    routers.kestra = {
+      rule = "Host(`k.m3ta.dev`)";
+      tls = { certResolver = "godaddy"; };
+      service = "kestra";
+      entrypoints = "websecure";
+    };
+  };
+}

hosts/m3-atlas/services/containers/littlelink.nix

@@ -3,7 +3,7 @@
     image = "ghcr.io/techno-tim/littlelink-server";
     environmentFiles = [config.age.secrets.littlelink-m3tam3re.path];
     ports = ["127.0.0.1:3004:3000"];
-    extraOptions = ["--ip=10.89.0.12" "--network=web"];
+    extraOptions = ["--ip=10.89.0.4" "--network=web"];
   };
   # Traefik configuration specific to littlelink
   services.traefik.dynamicConfigOptions.http = {

hosts/m3-atlas/services/containers/matomo.nix

@@ -0,0 +1,43 @@
+{
+  virtualisation.oci-containers.containers."matomo" = {
+    image = "docker.io/matomo:latest";
+    ports = ["127.0.0.1:3011:80"];
+    volumes = ["matomo_data:/var/www/html"];
+    environment = {
+      MATOMO_DATABASE_HOST = "mysql";
+      MATOMO_DATABASE_USERNAME = "matomo";
+      MATOMO_DATABASE_PASSWORD = "matomo";
+      MATOMO_DATABASE_DBNAME = "matomo";
+      MYSQL_DATABASE = "matomo";
+      PHP_MEMORY_LIMIT = "2048M";
+    };
+    extraOptions = ["--add-host=mysql:10.89.0.1" "--ip=10.89.0.16" "--network=web"];
+  };
+  # Traefik configuration specific to ghost
+  services.traefik.dynamicConfigOptions.http = {
+    services.matomo.loadBalancer.servers = [
+      {
+        url = "http://localhost:3011/";
+      }
+    ];
+
+    routers = {
+      matomo-nemoti = {
+        rule = "Host(`stats.nemoti.com`)";
+        tls = {
+          certResolver = "godaddy";
+        };
+        service = "matomo";
+        entrypoints = "websecure";
+      };
+      matomo-m3tam3re = {
+        rule = "Host(`stats.m3tam3re.com`)";
+        tls = {
+          certResolver = "godaddy";
+        };
+        service = "matomo";
+        entrypoints = "websecure";
+      };
+    };
+  };
+}

hosts/m3-atlas/services/containers/n8n.nix

@@ -0,0 +1,27 @@
+{config, ...}: {
+  virtualisation.oci-containers.containers."n8n" = {
+    image = "docker.n8n.io/n8nio/n8n";
+    environmentFiles = [config.age.secrets.n8n-env.path];
+    ports = ["127.0.0.1:5678:5678"];
+    volumes = ["n8n_data:/home/node/.n8n"];
+    extraOptions = ["--add-host=postgres:10.89.0.1" "--ip=10.89.0.14" "--network=web"];
+  };
+
+  # Traefik configuration specific to n8n
+  services.traefik.dynamicConfigOptions.http = {
+    services.n8n.loadBalancer.servers = [
+      {
+        url = "http://localhost:5678/";
+      }
+    ];
+
+    routers.n8n = {
+      rule = "Host(`wf.m3tam3re.com`)";
+      tls = {
+        certResolver = "godaddy";
+      };
+      service = "n8n";
+      entrypoints = "websecure";
+    };
+  };
+}

hosts/m3-atlas/services/containers/pangolin.nix

@@ -0,0 +1,211 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  # Define the Pangolin configuration as a Nix attribute set
+  pangolinConfig = {
+    app = {
+      dashboard_url = "https://vpn.m3tam3re.com";
+      log_level = "info";
+      save_logs = false;
+    };
+
+    domains = {
+      vpn = {
+        base_domain = "m3tam3re.com";
+        cert_resolver = "godaddy";
+        prefer_wildcard_cert = false;
+      };
+    };
+
+    server = {
+      external_port = 3000;
+      internal_port = 3001;
+      next_port = 3002;
+      internal_hostname = "pangolin";
+      session_cookie_name = "p_session_token";
+      resource_access_token_param = "p_token";
+      resource_session_request_param = "p_session_request";
+    };
+
+    traefik = {
+      cert_resolver = "godaddy";
+      http_entrypoint = "web";
+      https_entrypoint = "websecure";
+    };
+
+    gerbil = {
+      start_port = 51820;
+      base_endpoint = "vpn.m3tam3re.com";
+      use_subdomain = false;
+      block_size = 24;
+      site_block_size = 30;
+      subnet_group = "100.89.137.0/20";
+    };
+
+    rate_limits = {
+      global = {
+        window_minutes = 1;
+        max_requests = 100;
+      };
+    };
+
+    email = {
+      smtp_host = config.age.secrets.smtp-host.path;
+      smtp_port = 587;
+      smtp_user = config.age.secrets.smtp-user.path;
+      smtp_pass = config.age.secrets.smtp-pass.path;
+      no_reply = config.age.secrets.smtp-user.path;
+    };
+
+    users = {
+      server_admin = {
+        email = "admin@m3tam3re.com";
+        password = config.age.secrets.pangolin-admin-password.path;
+      };
+    };
+
+    flags = {
+      require_email_verification = true;
+      disable_signup_without_invite = true;
+      disable_user_create_org = true;
+      allow_raw_resources = true;
+      allow_base_domain_resources = true;
+    };
+  };
+
+  # Convert Nix attribute set to YAML using a simpler approach
+  pangolinConfigYaml = pkgs.writeTextFile {
+    name = "config.yml";
+    text = lib.generators.toYAML {} pangolinConfig;
+  };
+in {
+  # Define the containers
+  virtualisation.oci-containers.containers = {
+    "pangolin" = {
+      image = "fosrl/pangolin:1.1.0";
+      autoStart = true;
+      volumes = [
+        "${pangolinConfigYaml}:/app/config/config.yml:ro" # Mount the config file directly
+        "pangolin_config:/app/config/data" # Volume for persistent data
+      ];
+      ports = [
+        "127.0.0.1:3020:3001" # API server
+        "127.0.0.1:3021:3002" # Next.js server
+        "127.0.0.1:3022:3000" # API/WebSocket server
+      ];
+      extraOptions = ["--ip=10.89.0.20" "--network=web"];
+    };
+
+    "gerbil" = {
+      image = "fosrl/gerbil:1.0.0";
+      autoStart = true;
+      volumes = [
+        "pangolin_config:/var/config" # Share the volume for persistent data
+      ];
+      cmd = [
+        "--reachableAt=http://gerbil:3003"
+        "--generateAndSaveKeyTo=/var/config/key"
+        "--remoteConfig=http://pangolin:3001/api/v1/gerbil/get-config"
+        "--reportBandwidthTo=http://pangolin:3001/api/v1/gerbil/receive-bandwidth"
+      ];
+      ports = [
+        "51820:51820/udp" # WireGuard port
+      ];
+      extraOptions = [
+        "--ip=10.89.0.21"
+        "--network=web"
+        "--cap-add=NET_ADMIN"
+        "--cap-add=SYS_MODULE"
+      ];
+    };
+  };
+
+  # Secrets for Pangolin
+  # age.secrets = {
+  #   "smtp-host" = {
+  #     file = ../secrets/smtp-host.age;
+  #     owner = "root";
+  #     group = "root";
+  #     mode = "0400";
+  #   };
+  #   "smtp-user" = {
+  #     file = ../secrets/smtp-user.age;
+  #     owner = "root";
+  #     group = "root";
+  #     mode = "0400";
+  #   };
+  #   "smtp-pass" = {
+  #     file = ../secrets/smtp-pass.age;
+  #     owner = "root";
+  #     group = "root";
+  #     mode = "0400";
+  #   };
+  #   "pangolin-admin-password" = {
+  #     file = ../secrets/pangolin-admin-password.age;
+  #     owner = "root";
+  #     group = "root";
+  #     mode = "0400";
+  #   };
+  # };
+
+  # Traefik configuration for Pangolin
+  services.traefik.dynamicConfigOptions = {
+    http = {
+      # Next.js service (front-end)
+      services.pangolin-next-service.loadBalancer.servers = [
+        {url = "http://localhost:3021";}
+      ];
+
+      # API service
+      services.pangolin-api-service.loadBalancer.servers = [
+        {url = "http://localhost:3022";}
+      ];
+
+      # Routers
+      routers = {
+        # Next.js router (handles everything except API paths)
+        "pangolin-next" = {
+          rule = "Host(`vpn.m3tam3re.com`) && !PathPrefix(`/api/v1`)";
+          service = "pangolin-next-service";
+          entrypoints = ["websecure"];
+          tls = {
+            certResolver = "godaddy";
+          };
+        };
+
+        # API router
+        "pangolin-api" = {
+          rule = "Host(`vpn.m3tam3re.com`) && PathPrefix(`/api/v1`)";
+          service = "pangolin-api-service";
+          entrypoints = ["websecure"];
+          tls = {
+            certResolver = "godaddy";
+          };
+        };
+      };
+    };
+  };
+
+  # Add HTTP provider to Traefik for dynamic configuration from Pangolin
+  services.traefik.staticConfigOptions.providers.http = {
+    endpoint = "http://localhost:3020/api/v1/traefik-config";
+    pollInterval = "5s";
+  };
+
+  # Add experimental section for Badger plugin
+  services.traefik.staticConfigOptions.experimental = {
+    plugins = {
+      #TODO create an overlay for the plugin
+      badger = {
+        moduleName = "github.com/fosrl/badger";
+        version = "v1.0.0";
+      };
+    };
+  };
+
+  # Firewall configuration for WireGuard
+  networking.firewall.allowedUDPPorts = [51820]; # WireGuard port
+}

hosts/m3-atlas/services/containers/restreamer.nix

@@ -2,25 +2,74 @@
   virtualisation.oci-containers.containers."restreamer" = {
     image = "docker.io/datarhei/restreamer:latest";
     environmentFiles = [config.age.secrets.restreamer-env.path];
-    ports = ["127.0.0.1:3006:8080" "1935:1935" "1936:1936"];
+    # Modified ports to include RTMPS
-    volumes = ["restreamer_data:/restreamer/db"];
+    ports = [
+      "127.0.0.1:${toString (config.m3ta.ports.get "restreamer")}:8080" # Web UI
+      "127.0.0.1:1936:1935" # RTMP
+    ];
+    volumes = [
+      "restreamer_data:/core/data"
+      "restreamer_config:/core/config"
+    ];
     extraOptions = ["--add-host=postgres:10.89.0.1" "--ip=10.89.0.13" "--network=web"];
   };
-  # Traefik configuration specific to baserow
-  services.traefik.dynamicConfigOptions.http = {
-    services.restreamer.loadBalancer.servers = [
-      {
-        url = "http://localhost:3006/";
-      }
-    ];
 
-    routers.restreamer = {
+  # Traefik configuration
-      rule = "Host(`stream.m3tam3re.com`)";
+  services.traefik = {
-      tls = {
+    dynamicConfigOptions = {
-        certResolver = "godaddy";
+      http = {
+        services.restreamer.loadBalancer.servers = [
+          {
+            url = "http://localhost:${toString (config.m3ta.ports.get "restreamer")}/";
+          }
+        ];
+
+        routers.restreamer = {
+          rule = "Host(`stream.m3ta.dev`)";
+          tls = {
+            certResolver = "godaddy";
+          };
+          service = "restreamer";
+          entrypoints = ["websecure"];
+        };
+      };
+
+      tcp = {
+        services = {
+          rtmp-service.loadBalancer.servers = [
+            {
+              address = "localhost:1936";
+            }
+          ];
+          rtmps-service.loadBalancer.servers = [
+            {
+              address = "localhost:1936";
+            }
+          ];
+        };
+
+        routers = {
+          rtmp = {
+            rule = "HostSNI(`*`)"; # Changed to accept all SNI
+            service = "rtmp-service";
+            entryPoints = ["rtmp"];
+          };
+          rtmps = {
+            rule = "HostSNI(`stream.m3tam3re.com`)";
+            service = "rtmps-service";
+            entryPoints = ["rtmps"];
+            tls = {
+              certResolver = "godaddy";
+              passthrough = false;
+            };
+          };
+        };
       };
-      service = "restreamer";
-      entrypoints = "websecure";
     };
   };
+
+  # Firewall configuration
+  networking.firewall = {
+    allowedTCPPorts = [1935 1945];
+  };
 }

hosts/m3-atlas/services/containers/slash-nemoti.nix

@@ -0,0 +1,27 @@
+{
+  virtualisation.oci-containers.containers."slash-nemoti" = {
+    image = "docker.io/yourselfhosted/slash:latest";
+    ports = ["127.0.0.1:3016:5231"];
+    volumes = [
+      "slash-nemoti_data:/var/opt/slash"
+    ];
+    extraOptions = ["--ip=10.89.0.17" "--network=web"];
+  };
+  # Traefik configuration specific to littlelink
+  services.traefik.dynamicConfigOptions.http = {
+    services.slash-nemoti.loadBalancer.servers = [
+      {
+        url = "http://localhost:3016/";
+      }
+    ];
+
+    routers.slash-nemoti = {
+      rule = "Host(`l.nemoti.art`)";
+      tls = {
+        certResolver = "godaddy";
+      };
+      service = "slash-nemoti";
+      entrypoints = "websecure";
+    };
+  };
+}

hosts/m3-atlas/services/containers/slash.nix

@@ -0,0 +1,27 @@
+{
+  virtualisation.oci-containers.containers."slash" = {
+    image = "docker.io/yourselfhosted/slash:latest";
+    ports = ["127.0.0.1:3010:5231"];
+    volumes = [
+      "slash_data:/var/opt/slash"
+    ];
+    extraOptions = ["--ip=10.89.0.15" "--network=web"];
+  };
+  # Traefik configuration specific to littlelink
+  services.traefik.dynamicConfigOptions.http = {
+    services.slash.loadBalancer.servers = [
+      {
+        url = "http://localhost:3010/";
+      }
+    ];
+
+    routers.slash = {
+      rule = "Host(`l.m3ta.dev`)";
+      tls = {
+        certResolver = "godaddy";
+      };
+      service = "slash";
+      entrypoints = "websecure";
+    };
+  };
+}

hosts/m3-atlas/services/default.nix

@@ -2,12 +2,17 @@
   imports = [
     ./containers
     ./gitea.nix
+    ./headscale.nix
     ./minio.nix
     ./mysql.nix
     ./n8n.nix
+    ./outline.nix
+    ./paperless.nix
     ./postgres.nix
     ./searx.nix
+    ./tailscale.nix
     ./traefik.nix
+    ./vaultwarden.nix
     ./wastebin.nix
   ];
 }

hosts/m3-atlas/services/gitea.nix

@@ -1,8 +1,12 @@
-{
+{config, ...}: {
   services.gitea = {
     enable = true;
     settings = {
-      server.ROOT_URL = "https://code.m3tam3re.com";
+      server = {
+        ROOT_URL = "https://code.m3ta.dev";
+        HTTP_PORT = config.m3ta.ports.get "gitea";
+      };
+      mailer.SENDMAIL_PATH = "/run/wrappers/bin/sendmail";
       service.DISABLE_REGISTRATION = true;
     };
     lfs.enable = true;
@@ -17,17 +21,26 @@
   services.traefik.dynamicConfigOptions.http = {
     services.gitea.loadBalancer.servers = [
       {
-        url = "http://localhost:3000/";
+        url = "http://localhost:${toString (config.m3ta.ports.get "gitea")}/";
       }
     ];
 
     routers.gitea = {
-      rule = "Host(`code.m3tam3re.com`)";
+      rule = "Host(`code.m3ta.dev`)";
       tls = {
         certResolver = "godaddy";
       };
       service = "gitea";
       entrypoints = "websecure";
     };
+    routers.gitea-old = {
+      rule = "Host(`code.m3tam3re.com`)";
+      tls = {
+        certResolver = "godaddy";
+      };
+      service = "gitea";
+      entrypoints = "websecure";
+      middlewares = ["subdomain-redirect"];
+    };
   };
 }

hosts/m3-atlas/services/headscale.nix

@@ -0,0 +1,119 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
+  # Define a new option for the admin user
+  options.services.headscale = {
+    adminUser = lib.mkOption {
+      type = lib.types.str;
+      default = "m3tam3re";
+      description = "Username for the headscale admin user";
+    };
+  };
+
+  config = let
+    adminUser = config.services.headscale.adminUser;
+
+    aclConfig = {
+      # Groups definition
+      groups = {
+        "group:admins" = ["${adminUser}"];
+      };
+
+      acls = [
+        # Allow all connections within the tailnet
+        {
+          action = "accept";
+          src = ["*"];
+          dst = ["*:*"];
+        }
+        # Allow admin to connect to their own services
+        {
+          action = "accept";
+          src = ["${adminUser}"];
+          dst = ["${adminUser}:*"];
+        }
+      ];
+
+      # Auto-approvers section for routes
+      autoApprovers = {
+        routes = {
+          "0.0.0.0/0" = ["${adminUser}"];
+          "10.0.0.0/8" = ["${adminUser}"];
+          "192.168.0.0/16" = ["${adminUser}"];
+        };
+
+        exitNode = ["${adminUser}"];
+      };
+    };
+    # Convert to HuJSON format with comments
+    aclHuJson = ''
+      // Headscale ACL Policy - Generated by NixOS
+      // Admin user: ${adminUser}
+
+      ${builtins.toJSON aclConfig}
+    '';
+    aclFile = pkgs.writeText "acl-policy.hujson" aclHuJson;
+  in {
+    services = {
+      headscale = {
+        enable = true;
+        adminUser = "m3tam3re@m3ta.loc";
+        port = 3009;
+        settings = {
+          server_url = "https://va.m3tam3re.com";
+          dns = {
+            base_domain = "m3ta.loc";
+            nameservers.global = ["8.8.8.8"];
+          };
+          logtail.enabled = false;
+          policy.path = "${aclFile}";
+        };
+      };
+    };
+
+    # Create a systemd service to ensure the admin user exists
+    systemd.services.headscale-ensure-admin = lib.mkIf config.services.headscale.enable {
+      description = "Ensure Headscale admin user exists";
+      after = ["headscale.service"];
+      requires = ["headscale.service"];
+      wantedBy = ["multi-user.target"];
+      serviceConfig = {
+        Type = "oneshot";
+        RemainAfterExit = true;
+        User = "headscale";
+        Group = "headscale";
+      };
+
+      script = ''
+        # Check if user exists and create if needed
+        if ! ${pkgs.headscale}/bin/headscale users list | grep -q "${adminUser}"; then
+          echo "Creating headscale admin user: ${adminUser}"
+          ${pkgs.headscale}/bin/headscale users create "${adminUser}"
+        else
+          echo "Headscale admin user ${adminUser} already exists"
+        fi
+      '';
+    };
+
+    # Traefik configuration for headscale
+    services.traefik.dynamicConfigOptions.http = {
+      services.headscale.loadBalancer.servers = [
+        {
+          url = "http://localhost:3009/";
+        }
+      ];
+
+      routers.headscale = {
+        rule = "Host(`va.m3tam3re.com`)";
+        tls = {
+          certResolver = "godaddy";
+        };
+        service = "headscale";
+        entrypoints = "websecure";
+      };
+    };
+  };
+}

hosts/m3-atlas/services/mysql.nix

@@ -10,14 +10,18 @@
       CREATE USER 'ghost'@'10.89.%' IDENTIFIED BY 'ghost';
       GRANT ALL PRIVILEGES ON ghost.* TO 'ghost'@'10.89.%';
 
-      CREATE USER 'matomo'@'10.89.%' IDENTIFIED BY 'password';
+      CREATE USER 'matomo'@'10.89.%' IDENTIFIED BY 'matomo';
-      GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'10.89.%';
+      GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'10.89.%'; '';
-    '';
   };
   services.mysqlBackup = {
     enable = true;
     calendar = "03:00:00";
     databases = ["ghost" "matomo"];
   };
-  networking.firewall.allowedTCPPorts = [3306];
+  networking.firewall = {
+    extraCommands = ''
+      iptables -A INPUT -p tcp -s 127.0.0.1 --dport 3306 -j ACCEPT
+      iptables -A INPUT -p tcp -s 10.89.0.0/24 --dport 3306 -j ACCEPT
+    '';
+  };
 }

hosts/m3-atlas/services/n8n.nix

@@ -1,9 +1,11 @@
-{
+{config, ...}: {
   services.n8n = {
     enable = true;
     webhookUrl = "https://wf.m3tam3re.com";
   };
-
+  systemd.services.n8n.serviceConfig = {
+    EnvironmentFile = ["${config.age.secrets.n8n-env.path}"];
+  };
   # Traefik configuration specific to n8n
   services.traefik.dynamicConfigOptions.http = {
     services.n8n.loadBalancer.servers = [
@@ -13,7 +15,7 @@
     ];
 
     routers.n8n = {
-      rule = "Host(`wf.m3tam3re.com`)";
+      rule = "Host(`wf.m3ta.dev`)";
       tls = {
         certResolver = "godaddy";
       };

hosts/m3-atlas/services/outline.nix

@@ -0,0 +1,33 @@
+{
+  services.outline = {
+    enable = true;
+    port = 3019;
+    publicUrl = "https://ol.m3ta.dev";
+    databaseUrl = "postgresql://outline:outline@127.0.0.1:5432/outline";
+    storage = {
+      storageType = "local";
+    };
+  };
+  systemd.services.outline.serviceConfig = {
+    Environment = [
+      "PGSSLMODE=disable"
+    ];
+  };
+  # Traefik configuration specific to littlelink
+  services.traefik.dynamicConfigOptions.http = {
+    services.outline.loadBalancer.servers = [
+      {
+        url = "http://localhost:3019/";
+      }
+    ];
+
+    routers.outline = {
+      rule = "Host(`ol.m3ta.dev`)";
+      tls = {
+        certResolver = "godaddy";
+      };
+      service = "outline";
+      entrypoints = "websecure";
+    };
+  };
+}

hosts/m3-atlas/services/paperless.nix

@@ -0,0 +1,40 @@
+{config, ...}: {
+  services.paperless = {
+    enable = true;
+    port = config.m3ta.ports.get "paperless";
+    database.createLocally = true;
+    passwordFile = config.age.secrets.paperless-key.path;
+    configureTika = true;
+    settings = {
+      PAPERLESS_URL = "https://pl.m3ta.dev";
+      DATABASE_URL = "postgresql://paperless:paperless@127.0.0.1:${toString (config.m3ta.ports.get "postgres")}/paperless";
+      PAPERLESS_CONSUMER_IGNORE_PATTERN = [
+        ".DS_STORE/*"
+        "desktop.ini"
+        ".env"
+      ];
+      PAPERLESS_OCR_LANGUAGE = "deu+eng";
+      PAPERLESS_OCR_USER_ARGS = {
+        optimize = 1;
+        pdfa_image_compression = "lossless";
+      };
+    };
+  };
+
+  # Traefik configuration for headscale
+  services.traefik.dynamicConfigOptions.http = {
+    services.paperless.loadBalancer.servers = [
+      {
+        url = "http://localhost:${toString (config.m3ta.ports.get "paperless")}/";
+      }
+    ];
+    routers.paperless = {
+      rule = "Host(`pl.m3ta.dev`)";
+      tls = {
+        certResolver = "godaddy";
+      };
+      service = "paperless";
+      entrypoints = "websecure";
+    };
+  };
+}

hosts/m3-atlas/services/postgres.nix

@@ -1,24 +1,47 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  config,
+  ...
+}: {
   services.postgresql = {
     enable = true;
     enableTCPIP = true;
-    package = pkgs.postgresql_15;
+    package = pkgs.postgresql_17;
+    extensions = with pkgs.postgresql17Packages; [
+      pgvector
+    ];
     authentication = pkgs.lib.mkOverride 10 ''
-      local all all trust
+      # Local connections (Unix socket)
-      host all all 127.0.0.1/32 trust
+      local   all         postgres    peer
-      host all all ::1/128 trust
+      local   paperless   paperless   scram-sha-256
-      host all all 10.89.0.0/16 trust
+
-    '';
+      # Localhost connections (IPv4 and IPv6)
-    initialScript = pkgs.writeText "backend-initScript" ''
+      host    all          postgres     127.0.0.1/32    scram-sha-256
-      CREATE USER baserow WITH ENCRYPTED PASSWORD 'baserow';
+      host    all          postgres     ::1/128         scram-sha-256
-      CREATE DATABASE baserow;
+      host    outline      outline      127.0.0.1/32    scram-sha-256
-      ALTER DATABASE baserow OWNER to baserow;
+      host    outline      outline      ::1/128         scram-sha-256
+      host    paperless    paperless    127.0.0.1/32    scram-sha-256
+      host    paperless    paperless    ::1/128         scram-sha-256
+
+      # Podman network connections for Baserow
+      host    baserow      baserow      10.89.0.0/24    scram-sha-256
+      host    kestra       kestra       10.89.0.0/24    scram-sha-256
+
+      # Deny all other connections
+      local   all       all       reject
+      host    all       all       0.0.0.0/0      reject
+      host    all       all       ::/0           reject
     '';
   };
   services.postgresqlBackup = {
     enable = true;
     startAt = "03:10:00";
-    databases = ["baserow"];
+    databases = ["baserow" "paperless" "kestra"];
+  };
+  networking.firewall = {
+    extraCommands = ''
+      iptables -A INPUT -p tcp -s 127.0.0.1 --dport ${toString (config.m3ta.ports.get "postgres")} -j ACCEPT
+      iptables -A INPUT -p tcp -s 10.89.0.0/24 --dport ${toString (config.m3ta.ports.get "postgres")} -j ACCEPT
+    '';
   };
-  networking.firewall.allowedTCPPorts = [5432];
 }

hosts/m3-atlas/services/searx.nix

@@ -17,12 +17,21 @@
     ];
 
     routers.searx = {
-      rule = "Host(`search.m3tam3re.com`)";
+      rule = "Host(`search.m3ta.dev`)";
       tls = {
         certResolver = "godaddy";
       };
       service = "searx";
       entrypoints = "websecure";
     };
+    routers.searx-old = {
+      rule = "Host(`search.m3tam3re.com`)";
+      tls = {
+        certResolver = "godaddy";
+      };
+      service = "searx";
+      entrypoints = "websecure";
+      middlewares = ["subdomain-redirect"];
+    };
   };
 }

hosts/m3-atlas/services/tailscale.nix

@@ -0,0 +1,27 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
+  services.tailscale = {
+    enable = true;
+    authKeyFile = config.age.secrets.tailscale-key.path;
+    useRoutingFeatures = "both";
+    extraUpFlags = [
+      "--login-server=${config.services.headscale.settings.server_url}"
+      "--advertise-exit-node"
+      "--accept-routes"
+    ];
+  };
+  services.networkd-dispatcher = lib.mkIf config.services.tailscale.enable {
+    enable = true;
+    rules."50-tailscale" = {
+      onState = ["routable"];
+      script = ''
+        NETDEV=$(ip -o route get 8.8.8.8 | cut -f 5 -d " ")
+        ${pkgs.ethtool}/bin/ethtool -K "$NETDEV" rx-udp-gro-forwarding on rx-gro-list off
+      '';
+    };
+  };
+}

hosts/m3-atlas/services/traefik.nix

@@ -11,6 +11,11 @@
             caserver = "https://acme-v02.api.letsencrypt.org/directory";
             dnsChallenge = {
               provider = "godaddy";
+              resolvers = ["1.1.1.1:53" "8.8.8.8:53"];
+              propagation = {
+                delayBeforeChecks = 60;
+                disableChecks = true;
+              };
             };
           };
         };
@@ -24,12 +29,48 @@
             scheme = "https";
           };
         };
-        websecure = {address = ":443";};
+        rtmp = {
+          address = ":1935";
+        };
+        rtmps = {
+          address = ":1945";
+        };
+        websecure = {
+          address = ":443";
+        };
       };
     };
     dynamicConfigOptions = {
       http = {
+        services = {
+          dummy = {
+            loadBalancer.servers = [
+              {url = "http://192.168.0.1";} # Diese URL wird nie verwendet
+            ];
+          };
+        };
         middlewares = {
+          domain-redirect = {
+            redirectRegex = {
+              regex = "^https://www\\.m3tam3re\\.com(.*)";
+              replacement = "https://m3ta.dev$1";
+              permanent = true;
+            };
+          };
+          strip-www = {
+            redirectRegex = {
+              regex = "^https://www\\.(.+)";
+              replacement = "https://$1";
+              permanent = true;
+            };
+          };
+          subdomain-redirect = {
+            redirectRegex = {
+              regex = "^https://([a-zA-Z0-9-]+)\\.m3tam3re\\.com(.*)";
+              replacement = "https://$1.m3ta.dev$2";
+              permanent = true;
+            };
+          };
           auth = {
             basicAuth = {
               users = ["m3tam3re:$apr1$1xqdta2b$DIVNvvp5iTUGNccJjguKh."];

hosts/m3-atlas/services/vaultwarden.nix

@@ -0,0 +1,29 @@
+{config, ...}: {
+  services.vaultwarden = {
+    enable = true;
+    backupDir = "/var/backup/vaultwarden";
+    config = {
+      ROCKET_ADDRESS = "127.0.0.1";
+      ROCKET_PORT = 3013;
+    };
+    environmentFile = "${config.age.secrets.vaultwarden-env.path}";
+  };
+
+  # Traefik configuration for headscale
+  services.traefik.dynamicConfigOptions.http = {
+    services.vaultwarden.loadBalancer.servers = [
+      {
+        url = "http://localhost:3013/";
+      }
+    ];
+
+    routers.vaultwarden = {
+      rule = "Host(`vw.m3ta.dev`)";
+      tls = {
+        certResolver = "godaddy";
+      };
+      service = "vaultwarden";
+      entrypoints = "websecure";
+    };
+  };
+}

hosts/m3-atlas/services/wastebin.nix

@@ -3,8 +3,9 @@
     enable = true;
     settings = {
       WASTEBIN_TITLE = "m3tam3re's wastebin";
-      WASTEBIN_BASE_URL = "https://bin.m3tam3re.com";
+      WASTEBIN_BASE_URL = "https://bin.m3ta.dev";
       WASTEBIN_ADDRESS_PORT = "0.0.0.0:3003";
+      WASTEBIN_MAX_BODY_SIZE = 1048576;
     };
   };
   # Traefik configuration specific to wastebin
@@ -16,12 +17,21 @@
     ];
 
     routers.wastebin = {
-      rule = "Host(`bin.m3tam3re.com`)";
+      rule = "Host(`bin.m3ta.dev`)";
       tls = {
         certResolver = "godaddy";
       };
       service = "wastebin";
       entrypoints = "websecure";
     };
+    routers.wastebin-old = {
+      rule = "Host(`bin.m3tam3re.com`)";
+      tls = {
+        certResolver = "godaddy";
+      };
+      service = "wastebin";
+      entrypoints = "websecure";
+      middlewares = ["subdomain-redirect"];
+    };
   };
 }

hosts/m3-helios/services/adguard.nix

@@ -1,10 +1,10 @@
-{
+{config, ...}: {
   services.adguardhome = {
     enable = true;
     openFirewall = true;
     settings = {
       dns = {
-        port = 53;
+        port = config.m3ta.ports.get "adguardhome";
         upstream_dns = [
           "1.1.1.1"
           "8.8.8.8"
@@ -20,6 +20,6 @@
       };
     };
   };
-  networking.firewall.allowedTCPPorts = [53];
+  networking.firewall.allowedTCPPorts = [(config.m3ta.ports.get "adguardhome")];
-  networking.firewall.allowedUDPPorts = [53];
+  networking.firewall.allowedUDPPorts = [(config.m3ta.ports.get "adguardhome")];
 }

hosts/m3-kratos/configuration.nix

@@ -14,11 +14,16 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
   boot.initrd.kernelModules = ["amdgpu"];
-
+  boot.kernelPackages = pkgs.linuxPackages_6_16;
   services.xserver.videoDrivers = ["amdgpu"];
   security.polkit.enable = true;
+  security.pam.services.gdm.enableGnomeKeyring = true;
   networking.hostName = "m3-kratos"; # Define your hostname.
   networking.hostId = "458bd616";
+  # networking.extraHosts = ''
+  #   127.0.0.1 releases.warp.dev
+  #   127.0.0.1 app.warp.dev
+  # '';
   # Pick only one of the below networking options.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
   networking.networkmanager.enable =
@@ -63,7 +68,7 @@
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
-  environment.systemPackages = with pkgs; [neovim git];
+  environment.systemPackages = with pkgs; [neovim git n8n];
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
@@ -76,7 +81,13 @@
   # List services that you want to enable:
 
   # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
+  services.openssh = {
+    enable = true;
+    settings.PermitRootLogin = "no";
+    settings = {
+      PasswordAuthentication = false;
+    };
+  };
   services.fstrim.enable = true;
 
   services.zfs.autoSnapshot.enable = true;

hosts/m3-kratos/programs.nix

@@ -4,6 +4,7 @@
     # Add any missing dynamic libraries for unpackaged programs
     # here, NOT in environment.systemPackages
   ];
+  programs.adb.enable = true;
   programs.hyprland = {
     enable = true;
     xwayland.enable = true;
@@ -19,6 +20,17 @@
     dedicatedServer.openFirewall = true;
     gamescopeSession.enable = true;
   };
+  programs.obs-studio = {
+    enable = true;
+    enableVirtualCamera = true;
+    plugins = with pkgs.obs-studio-plugins; [
+      obs-composite-blur
+      obs-vaapi
+      # obs-vertical-canvas
+      obs-vkcapture
+      wlrobs
+    ];
+  };
   programs.fish.enable = true;
   programs.thunar = {
     enable = true;

hosts/m3-kratos/secrets.nix

@@ -1,6 +1,9 @@
 {
   age = {
     secrets = {
+      tailscale-key = {
+        file = ../../secrets/tailscale-key.age;
+      };
       wg-DE = {
         file = ../../secrets/wg-DE.age;
         path = "/etc/wireguard/DE.conf";
@@ -21,7 +24,6 @@
         file = ../../secrets/wg-BR.age;
         path = "/etc/wireguard/BR.conf";
       };
-      tailscale-key.file = ../../secrets/tailscale-key.age;
       m3tam3re-secrets = {
         file = ../../secrets/m3tam3re-secrets.age;
         owner = "m3tam3re";

hosts/m3-kratos/services/default.nix

@@ -4,6 +4,7 @@
     ./n8n.nix
     ./postgres.nix
     ./sound.nix
+    ./tailscale.nix
     ./udev.nix
     ./wireguard.nix
   ];
@@ -14,6 +15,7 @@
     trezord.enable = true;
     gnome.gnome-keyring.enable = true;
     qdrant.enable = true;
+    stirling-pdf.enable = true;
     avahi = {
       enable = true;
       nssmdns4 = true;

hosts/m3-kratos/services/n8n.nix

@@ -6,6 +6,7 @@
   systemd.services.n8n = {
     environment = {
       N8N_SECURE_COOKIE = "false";
+      N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = "false";
     };
   };
 }

hosts/m3-kratos/services/tailscale.nix

@@ -0,0 +1,12 @@
+{config, ...}: {
+  services.tailscale = {
+    enable = true;
+    authKeyFile = config.age.secrets.tailscale-key.path;
+    useRoutingFeatures = "both";
+    extraUpFlags = [
+      "--login-server=https://va.m3tam3re.com"
+      "--accept-routes"
+      "--exit-node-allow-lan-access"
+    ];
+  };
+}

hosts/m3-kratos/services/udev.nix

@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   services.udev.extraRules = ''
-    SUBSYSTEM=="usb", MODE="0666
+    SUBSYSTEM=="usb", MODE="0666"
   '';
   environment.systemPackages = with pkgs; [
     zsa-udev-rules

hosts/m3-kratos/services/wireguard.nix

@@ -10,7 +10,7 @@
     };
     NO = {
       configFile = config.age.secrets.wg-NO.path;
-      autostart = true;
+      autostart = false;
     };
     US = {
       configFile = config.age.secrets.wg-US.path;

modules/home-manager/default.nix

@@ -1,3 +1,3 @@
 {
-  zellij-ps = import ./zellij-ps.nix;
+  #module = import ./module.nix;
 }

modules/home-manager/zellij-ps.nix

@@ -1,44 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.programs.zellij-ps;
-in {
-  options = {
-    programs.zellij-ps = {
-      enable = mkEnableOption "Zellij Project Selector";
-      projectFolders = lib.mkOption {
-        type = lib.types.listOf lib.types.path;
-        description = "List of project folders for zellij-ps.";
-        default = ["${config.home.homeDirectory}/projects"];
-      };
-      layout = lib.mkOption {
-        type = lib.types.str;
-        description = "Layout for zellij";
-        default = ''
-          layout {
-                      pane size=1 borderless=true {
-                          plugin location="zellij:tab-bar"
-                      }
-                      pane
-                      pane split_direction="vertical" {
-                          pane
-                          pane command="htop"
-                      }
-                      pane size=2 borderless=true {
-                          plugin location="zellij:status-bar"
-                      }
-                  }
-        '';
-      };
-    };
-  };
-  config = mkIf cfg.enable {
-    home.packages = [pkgs.zellij-ps];
-    home.sessionVariables.PROJECT_FOLDERS = lib.concatStringsSep ":" cfg.projectFolders;
-    home.file.".config/zellij/layouts/zellij-ps.kdl".text = cfg.layout;
-  };
-}

modules/nixos/default.nix

@@ -0,0 +1,3 @@
+{
+  #module = import ./module.nix;
+}

overlays/default.nix

@@ -1,24 +1,36 @@
 {inputs, ...}: {
   # This one brings our custom packages from the 'pkgs' directory
-  additions = final: prev:
+  # additions = final: prev:
-    (import ../pkgs {pkgs = final;})
+  #   (import ../pkgs {pkgs = final;})
-    // (inputs.hyprpanel.overlay final prev)
+  #   // {rose-pine-hyprcursor = inputs.rose-pine-hyprcursor.packages.${prev.system}.default;};
-    // {rose-pine-hyprcursor = inputs.rose-pine-hyprcursor.packages.${prev.system}.default;};
+
   # This one contains whatever you want to overlay
   # You can change versions, add patches, set compilation flags, anything really.
   # https://nixos.wiki/wiki/Overlays
-  modifications = final: prev: {
+
-    n8n = import ./mods/n8n.nix {inherit prev;};
+  # modifications = final: prev: {
-    # hyprpanel = inputs.hyprpanel.packages.${prev.system}.default.overrideAttrs (prev: {
+  #   n8n = import ./mods/n8n.nix {inherit prev;};
-    #   version = "latest"; # or whatever version you want
+
-    #   src = final.fetchFromGitHub {
+  #   brave = prev.brave.override {
-    #     owner = "Jas-SinghFSU";
+  #     commandLineArgs = "--password-store=gnome-libsecret";
-    #     repo = "HyprPanel";
+  #   };
-    #     rev = "master"; # or a specific commit hash
+
-    #     hash = "sha256-l623fIVhVCU/ylbBmohAtQNbK0YrWlEny0sC/vBJ+dU=";
+  # hyprpanel = inputs.hyprpanel.packages.${prev.system}.default.overrideAttrs (prev: {
-    #   };
+  #   version = "latest"; # or whatever version you want
-    # });
+  #   src = final.fetchFromGitHub {
-    #ffmpeg = inputs.nixpkgs-stable.legacyPackages.${prev.system}.ffmpeg;
+  #     owner = "Jas-SinghFSU";
+  #     repo = "HyprPanel";
+  #     rev = "master"; # or a specific commit hash
+  #     hash = "sha256-l623fIVhVCU/ylbBmohAtQNbK0YrWlEny0sC/vBJ+dU=";
+  #   };
+  # });
+  # };
+
+  temp-packages = final: _prev: {
+    temp = import inputs.nixpkgs-9e9486b {
+      system = final.system;
+      config.allowUnfree = true;
+    };
   };
 
   stable-packages = final: _prev: {
@@ -29,7 +41,14 @@
   };
 
   pinned-packages = final: _prev: {
-    pinned = import inputs.nixpkgs-d016996 {
+    pinned = import inputs.nixpkgs-9472de4 {
+      system = final.system;
+      config.allowUnfree = true;
+    };
+  };
+
+  locked-packages = final: _prev: {
+    locked = import inputs.nixpkgs-locked {
       system = final.system;
       config.allowUnfree = true;
     };

overlays/mods/n8n.nix

@@ -1,17 +0,0 @@
-{prev}:
-prev.n8n.overrideAttrs (oldAttrs: rec {
-  pname = oldAttrs.pname;
-  version = "1.78.0";
-
-  src = prev.fetchFromGitHub {
-    owner = "n8n-io";
-    repo = "n8n";
-    rev = "n8n@${version}";
-    hash = "sha256-ebMuhbUyak13wQ7qWvpNCcmL52J24QPsGmEvIifnzVo=";
-  };
-
-  pnpmDeps = prev.pnpm_9.fetchDeps {
-    inherit pname version src;
-    hash = "sha256-1vheGCTGacrQMVJjYrEuv4NC4ImSb+WAbYLXpEithnM=";
-  };
-})

pkgs/aider-chat-env/default.nix

@@ -1,50 +0,0 @@
-{
-  lib,
-  stdenv,
-  python3,
-  zlib,
-  libffi,
-  makeWrapper,
-}: let
-  pythonEnv = python3.withPackages (ps:
-    with ps; [
-      # Add any Python packages you want available globally here
-      virtualenv
-    ]);
-in
-  stdenv.mkDerivation rec {
-    pname = "aider-chat-env";
-    version = "0.1.0";
-
-    src = ./.;
-
-    nativeBuildInputs = [makeWrapper];
-    buildInputs = [pythonEnv zlib libffi];
-
-    installPhase = ''
-      mkdir -p $out/bin
-      cat > $out/bin/aider-chat-env <<EOF
-      #!/bin/sh
-      VENV_DIR="\$HOME/.aider-chat-venv"
-      if [ ! -d "\$VENV_DIR" ]; then
-        ${pythonEnv}/bin/python -m venv "\$VENV_DIR"
-      fi
-      source "\$VENV_DIR/bin/activate"
-      python -m pip install -U aider-chat
-      exec "\$SHELL"
-      EOF
-      chmod +x $out/bin/aider-chat-env
-    '';
-
-    postFixup = ''
-      wrapProgram $out/bin/aider-chat-env \
-        --prefix PATH : ${lib.makeBinPath buildInputs} \
-        --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [stdenv.cc.cc.lib zlib libffi]}
-    '';
-
-    meta = with lib; {
-      description = "Python environment with aider-chat";
-      license = licenses.mit;
-      platforms = platforms.all;
-    };
-  }

pkgs/default.nix

@@ -1,5 +1,3 @@
 {pkgs, ...}: {
-  # Define your custom packages here
+  #  package = pkgs.callPackage ./package {};
-  zellij-ps = pkgs.callPackage ./zellij-ps {};
-  aider-chat-env = pkgs.callPackage ./aider-chat-env {};
 }

pkgs/zellij-ps/default.nix

@@ -1,41 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitea,
-  fish,
-  fd,
-  fzf,
-  makeWrapper,
-  zellij,
-}:
-with lib;
-  stdenv.mkDerivation {
-    pname = "zellij-ps";
-    version = "0.1.0";
-
-    src = fetchFromGitea {
-      domain = "code.m3tam3re.com";
-      owner = "m3tam3re";
-      repo = "helper-scripts";
-      rev = "08a3217b83391c1110545c1ee3161eecd5dbe5e9";
-      sha256 = "1sc4i58mwcg3qsq0wwl5rvk08ykbxc497bq7mrxiirndsarskby7";
-    };
-
-    buildInputs = [];
-
-    nativeBuildInputs = [makeWrapper];
-    installPhase = ''
-      mkdir -p $out/bin
-      cp zellij-ps.fish $out/bin/zellij-ps
-      wrapProgram $out/bin/zellij-ps \
-        --prefix PATH : ${lib.makeBinPath [fish fd fzf zellij]}
-    '';
-
-    meta = with lib; {
-      description = "A small project script for zellij";
-      homepage = "https://code.m3tam3re.com/m3tam3re/helper-scripts";
-      license = licenses.mit;
-      maintainers = with maintainers; [m3tam3re];
-      platforms = platforms.unix;
-    };
-  }

secrets.nix

@@ -22,11 +22,16 @@ in {
   "secrets/ghost-env.age".publicKeys = systems ++ users;
   "secrets/littlelink-m3tam3re.age".publicKeys = systems ++ users;
   "secrets/m3tam3re-secrets.age".publicKeys = systems ++ users;
+  "secrets/kestra-config.age".publicKeys = systems ++ users;
+  "secrets/kestra-env.age".publicKeys = systems ++ users;
   "secrets/minio-root-cred.age".publicKeys = systems ++ users;
+  "secrets/n8n-env.age".publicKeys = systems ++ users;
+  "secrets/paperless-key.age".publicKeys = systems ++ users;
   "secrets/restreamer-env.age".publicKeys = systems ++ users;
   "secrets/searx.age".publicKeys = systems ++ users;
   "secrets/tailscale-key.age".publicKeys = systems ++ users;
   "secrets/traefik.age".publicKeys = systems ++ users;
+  "secrets/vaultwarden-env.age".publicKeys = systems ++ users;
   "secrets/wg-DE.age".publicKeys = systems ++ users;
   "secrets/wg-NL.age".publicKeys = systems ++ users;
   "secrets/wg-NO.age".publicKeys = systems ++ users;