flake bump

update option name (opengl -> graphics)
nix without llm
2024-12-23 12:59:32 +01:00 · 2024-12-23 12:59:22 +01:00 · 2024-12-23 12:58:31 +01:00 · 2024-12-19 15:19:51 +01:00 · 2024-12-19 15:19:47 +01:00 · 2024-12-19 15:19:31 +01:00
45 changed files with 1583 additions and 1015 deletions
--- a/configuration.nix
+++ b/configuration.nix
@@ -6,6 +6,7 @@
    ./system-modules/auto-mount.nix
    ./system-modules/hardware-configuration.nix
    ./system-modules/fuse.nix
+    ./system-modules/games.nix
    ./system-modules/nvidia.nix 
    ./system-modules/users.nix
    ./system-modules/sound.nix
@@ -41,8 +42,9 @@
    ./system-modules/nx2site.nix
    ./system-modules/postgres.nix
    ./system-modules/nx2site/proxy.nix
-    # ./system-modules/nx2site/gitea.nix
-    # ./system-modules/nx2site/vaultwarden.nix
+    ./system-modules/nx2site/gitea.nix
+    ./system-modules/nx2site/vaultwarden.nix
+    ./system-modules/nx2site/paperless.nix
  ] else []);

  # Set your time zone.
@@ -99,6 +101,7 @@
    blueman
    dmidecode
    file
+    parallel
  # ]) ++ (with pkgs-unstable; [
  # # sendme
  ]);
@@ -115,7 +118,7 @@
    xwayland.enable = true;
  };

-  system.stateVersion = "24.05";
+  system.stateVersion = "24.11";

  nixpkgs.config.allowUnfree = true;

--- a/flake-modules/rice.nix
+++ b/flake-modules/rice.nix
@@ -6,8 +6,7 @@ pkgs: rec {
  rounding = 3;
  gap-size = 5;
  border-width = 2;
-  color =
-    let
+  color = let
    dark = (-0.5);
    bright = (0.5);  
    alter-set = let f = lib.alter-luminace-hex; in color-name: color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; };
@@ -26,7 +25,7 @@ pkgs: rec {
    facolor = builtins.mapAttrs alter-set (builtins.fromJSON (builtins.readFile ./colors.json)).to_alter;
    fbcolor =                             (builtins.fromJSON (builtins.readFile ./colors.json)).base;
    fcolor = facolor // fbcolor;
-      xcolor = with ccolor; with fcolor; rec {
+    xcolor = with ccolor; with fcolor; {
      background = "#000000";
      # foreground = "#dddddd";
      # accent = blue;
@@ -42,8 +41,7 @@ pkgs: rec {
  in ccolor // fcolor // xcolor; 
  font = {
    code = {
-      name = "JetBrainsMono-NF";
-      name2 = "JetBrainsMono Nerd Font";
+      name = "JetBrainsMono Nerd Font";
      package = (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; });
      # name = "CascadiaCove-NF";
      # package = (pkgs.nerdfonts.override { fonts = [ "CascadiaCode" ]; });
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1728710667,
-        "narHash": "sha256-9HR9EePhzweUAUPUccByNYxKQzfFAnxfu2BXTLqOLZQ=",
+        "lastModified": 1734671517,
+        "narHash": "sha256-rTKZlNZP13zIy8eyHiTbCN15rON0FG9S8zxRE7jH+Ak=",
        "owner": "KZDKM",
        "repo": "Hyprspace",
-        "rev": "e8406a7708bceb3b5bedf56b67490dbe3d27e6f8",
+        "rev": "6d49cb495c3b0364fb6c4b50ab4c04a864aa6c43",
        "type": "github"
      },
      "original": {
@@ -41,11 +41,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1728902391,
-        "narHash": "sha256-44bnoY0nAvbBQ/lVjmn511yL39Sv7SknV0BDxn34P3Q=",
+        "lastModified": 1734400729,
+        "narHash": "sha256-Bf+oya0BuleVXYGIWsb0eWnrK6s0aiesOsI7Mpj1pMU=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "9874e08eec85b5542ca22494e127b0cdce46b786",
+        "rev": "a132fa41be7ebe797ad758e84d9df068151a723b",
        "type": "github"
      },
      "original": {
@@ -124,11 +124,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1727826117,
-        "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
+        "lastModified": 1733312601,
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
        "type": "github"
      },
      "original": {
@@ -176,6 +176,28 @@
        "type": "github"
      }
    },
+    "flake-utils-plus": {
+      "inputs": {
+        "flake-utils": [
+          "yazi-plugins",
+          "flake-utils"
+        ]
+      },
+      "locked": {
+        "lastModified": 1696281284,
+        "narHash": "sha256-xcmtTmoiiAOSk4abifbtqVZk0iwBcqJfg47iUbkwhcE=",
+        "owner": "gytis-ivaskevicius",
+        "repo": "flake-utils-plus",
+        "rev": "6cf1e312fb259693c4930d07ca3cbe1d07ef4a48",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gytis-ivaskevicius",
+        "ref": "v1.4.0",
+        "repo": "flake-utils-plus",
+        "type": "github"
+      }
+    },
    "flake-utils_2": {
      "inputs": {
        "systems": "systems_4"
@@ -194,6 +216,27 @@
        "type": "github"
      }
    },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": [
+          "yazi-plugins",
+          "systems"
+        ]
+      },
+      "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"
+      }
+    },
    "gitignore": {
      "inputs": {
        "nixpkgs": [
@@ -238,6 +281,28 @@
        "type": "github"
      }
    },
+    "haumea": {
+      "inputs": {
+        "nixpkgs": [
+          "yazi-plugins",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1685133229,
+        "narHash": "sha256-FePm/Gi9PBSNwiDFq3N+DWdfxFq0UKsVVTJS3cQPn94=",
+        "owner": "nix-community",
+        "repo": "haumea",
+        "rev": "34dd58385092a23018748b50f9b23de6266dffc2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "v0.2.2",
+        "repo": "haumea",
+        "type": "github"
+      }
+    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@@ -245,16 +310,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1726989464,
-        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
+        "lastModified": 1734366194,
+        "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
+        "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-24.05",
+        "ref": "release-24.11",
        "repo": "home-manager",
        "type": "github"
      }
@@ -275,11 +340,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1728669738,
-        "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=",
+        "lastModified": 1734364709,
+        "narHash": "sha256-+2bZJL2u5hva7rSp65OfKJBK+k03T6GB/NCvpoS1OOo=",
        "owner": "hyprwm",
        "repo": "hyprcursor",
-        "rev": "0264e698149fcb857a66a53018157b41f8d97bb0",
+        "rev": "f388aacd22be4a6e4d634fbaf6f75eb0713d239a",
        "type": "github"
      },
      "original": {
@@ -288,11 +353,42 @@
        "type": "github"
      }
    },
+    "hyprgraphics": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733684019,
+        "narHash": "sha256-2kYREgmSmbLsmDpLEq96hxVAU3qz8aCvVhF65yCFZHY=",
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "rev": "fb2c0268645a77403af3b8a4ce8fa7ba5917f15d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "type": "github"
+      }
+    },
    "hyprland": {
      "inputs": {
        "aquamarine": "aquamarine",
        "hyprcursor": "hyprcursor",
+        "hyprgraphics": "hyprgraphics",
        "hyprland-protocols": "hyprland-protocols",
+        "hyprland-qtutils": "hyprland-qtutils",
        "hyprlang": "hyprlang",
        "hyprutils": "hyprutils",
        "hyprwayland-scanner": "hyprwayland-scanner",
@@ -302,11 +398,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1729629261,
-        "narHash": "sha256-IJtor2qFpsZkCm4UMnCHOSosW9GXKZVOm7DILtJJgoM=",
+        "lastModified": 1734822454,
+        "narHash": "sha256-BMSkybR8NTDACUk4swh25qHzKeEF2mN5fMVX1AtOhmc=",
        "ref": "refs/heads/main",
-        "rev": "29997ef4ba8ef0a80390e80199998d1390177454",
-        "revCount": 5366,
+        "rev": "31422ae25dee33dd000798b64a80bd7fd08d2ece",
+        "revCount": 5577,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland"
@@ -334,11 +430,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1729596320,
-        "narHash": "sha256-sBPr6O2Ad916f+L7biAjmJVx4TLDITC4joKgeOT47V8=",
+        "lastModified": 1734813923,
+        "narHash": "sha256-AujPxcqXf+o0fH1GlIhzF8Er/K/y6s5IYHuQ8Bipv6E=",
        "owner": "hyprwm",
        "repo": "hyprland-plugins",
-        "rev": "4d7f0b5d8b952f31f7d2e29af22ab0a55ca5c219",
+        "rev": "067bbc9eaba8f5b95ec69bfe91fe699a854734a5",
        "type": "github"
      },
      "original": {
@@ -372,6 +468,35 @@
        "type": "github"
      }
    },
+    "hyprland-qtutils": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733940128,
+        "narHash": "sha256-hmfXWj2GA9cj1QUkPFYtAAeohhs615zL4E3APy3FnvQ=",
+        "owner": "hyprwm",
+        "repo": "hyprland-qtutils",
+        "rev": "3833097e50473a152dd614d4b468886840b4ea78",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-qtutils",
+        "type": "github"
+      }
+    },
    "hyprlang": {
      "inputs": {
        "hyprutils": [
@@ -388,11 +513,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1728168612,
-        "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=",
+        "lastModified": 1734364628,
+        "narHash": "sha256-ii8fzJfI953n/EmIxVvq64ZAwhvwuuPHWfGd61/mJG8=",
        "owner": "hyprwm",
        "repo": "hyprlang",
-        "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e",
+        "rev": "16e59c1eb13d9fb6de066f54e7555eb5e8a4aba5",
        "type": "github"
      },
      "original": {
@@ -407,11 +532,11 @@
        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1725107917,
-        "narHash": "sha256-6on3nwb3gB4t+P/2IExgGhVLVgAkF6ZiE5x+qcQHEXU=",
+        "lastModified": 1732716575,
+        "narHash": "sha256-OvFJCj52HuXxRrcCXrieIoiOzbeYFvDXNO8SndFiyAE=",
        "owner": "h3rmt",
        "repo": "hyprswitch",
-        "rev": "f478c394ad6db5ba268f80052f1eb2366366b21e",
+        "rev": "2b77dbcb422123dfce9bb82d698649e9757f35e0",
        "type": "github"
      },
      "original": {
@@ -433,11 +558,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1728941256,
-        "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=",
+        "lastModified": 1734384247,
+        "narHash": "sha256-bl3YyJb2CgaeVKYq/l8j27vKdbkTpDNFDsnCl0dnNlY=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85",
+        "rev": "e6cf45cd1845368702e03b8912f4cc44ebba3322",
        "type": "github"
      },
      "original": {
@@ -458,11 +583,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1726874836,
-        "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=",
+        "lastModified": 1734384417,
+        "narHash": "sha256-noYeXcNQ15g1/gIJIYT2zdO66wzY5Z06PYz6BfKUZA8=",
        "owner": "hyprwm",
        "repo": "hyprwayland-scanner",
-        "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e",
+        "rev": "90e87f7fcfcce4862826d60332cbc5e2f87e1f88",
        "type": "github"
      },
      "original": {
@@ -498,11 +623,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1728888510,
-        "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
+        "lastModified": 1734119587,
+        "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
+        "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
        "type": "github"
      },
      "original": {
@@ -514,11 +639,11 @@
    },
    "nixpkgs-latest": {
      "locked": {
-        "lastModified": 1729631290,
-        "narHash": "sha256-zVL79jvDihxcnq9FKkAoILYWxGmxCw1DGdBnpv/B+3s=",
+        "lastModified": 1734868772,
+        "narHash": "sha256-sFcazyy2FEQIkcnHvWavPE7rMyDv3EVNG6QLrYmQF7c=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "1f9d2cf67508efd9b5e81cdf7af556bbbfe02377",
+        "rev": "740c83e328bfb89de169e6c1834601bba1804405",
        "type": "github"
      },
      "original": {
@@ -530,23 +655,23 @@
    },
    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1727825735,
-        "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
+        "lastModified": 1733096140,
+        "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=",
        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
      },
      "original": {
        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
      }
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1720386169,
-        "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
+        "lastModified": 1730741070,
+        "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
+        "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
        "type": "github"
      },
      "original": {
@@ -572,29 +697,13 @@
        "type": "github"
      }
    },
-    "nixpkgs-stable_3": {
-      "locked": {
-        "lastModified": 1729357638,
-        "narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "release-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1729413321,
-        "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=",
+        "lastModified": 1734649271,
+        "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26",
+        "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
        "type": "github"
      },
      "original": {
@@ -636,16 +745,16 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1729449015,
-        "narHash": "sha256-Gf04dXB0n4q0A9G5nTGH3zuMGr6jtJppqdeljxua1fo=",
+        "lastModified": 1734737257,
+        "narHash": "sha256-GIMyMt1pkkoXdCq9un859bX6YQZ/iYtukb9R5luazLM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "89172919243df199fe237ba0f776c3e3e3d72367",
+        "rev": "1c6e20d41d6a9c1d737945962160e8571df55daa",
        "type": "github"
      },
      "original": {
        "id": "nixpkgs",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
        "type": "indirect"
      }
    },
@@ -692,11 +801,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1728778939,
-        "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=",
+        "lastModified": 1734379367,
+        "narHash": "sha256-Keu8z5VgT5gnCF4pmB+g7XZFftHpfl4qOn7nqBcywdE=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "ff68f91754be6f3427e4986d7949e6273659be1d",
+        "rev": "0bb4be58f21ff38fc3cdbd6c778eb67db97f0b99",
        "type": "github"
      },
      "original": {
@@ -749,6 +858,7 @@
        "nixpkgs-unstable": "nixpkgs-unstable",
        "sops-nix": "sops-nix",
        "yazi": "yazi",
+        "yazi-plugins": "yazi-plugins",
        "zen-browser": "zen-browser"
      }
    },
@@ -802,15 +912,14 @@
      "inputs": {
        "nixpkgs": [
          "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable_3"
+        ]
      },
      "locked": {
-        "lastModified": 1729587807,
-        "narHash": "sha256-YOc4033a/j1TbdLfkaSOSX2SrvlmuM+enIFoveNTCz4=",
+        "lastModified": 1734546875,
+        "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "26642e8f193f547e72d38cd4c0c4e45b49236d27",
+        "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d",
        "type": "github"
      },
      "original": {
@@ -879,6 +988,21 @@
        "type": "github"
      }
    },
+    "systems_5": {
+      "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"
+      }
+    },
    "xdph": {
      "inputs": {
        "hyprland-protocols": [
@@ -907,11 +1031,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1728166987,
-        "narHash": "sha256-w6dVTguAn9zJ+7aPOhBQgDz8bn6YZ7b56cY8Kg5HJRI=",
+        "lastModified": 1734422917,
+        "narHash": "sha256-0y7DRaXslhfqVKV8a/talYTYAe2NHOQhMZG7KMNRCtc=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "fb9c8d665af0588bb087f97d0f673ddf0d501787",
+        "rev": "3e884d941ca819c1f2e50df8bdae0debded1ed87",
        "type": "github"
      },
      "original": {
@@ -927,11 +1051,11 @@
        "rust-overlay": "rust-overlay_2"
      },
      "locked": {
-        "lastModified": 1729473414,
-        "narHash": "sha256-ffiEVFCUMnShcSa4hvCbT1EQeu7c2lVOk6OdaxjiUmU=",
+        "lastModified": 1734711448,
+        "narHash": "sha256-jBScI00uIUggrc/LYJoPcFfqradkPTzV5IbbI67JXPc=",
        "owner": "sxyazi",
        "repo": "yazi",
-        "rev": "0e118b5b3a5baacf7fe62971e2bfe2b0ad972bab",
+        "rev": "5bd71bf225487c0af334881f406db5e76c996e9c",
        "type": "github"
      },
      "original": {
@@ -940,6 +1064,30 @@
        "type": "github"
      }
    },
+    "yazi-plugins": {
+      "inputs": {
+        "flake-utils": "flake-utils_3",
+        "flake-utils-plus": "flake-utils-plus",
+        "haumea": "haumea",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": "systems_5"
+      },
+      "locked": {
+        "lastModified": 1734294375,
+        "narHash": "sha256-Q9EyfyeNCVKObybaevMydHzoR3v1gARqVkwFKHKTH84=",
+        "owner": "lordkekz",
+        "repo": "nix-yazi-plugins",
+        "rev": "5c42e2a33030c29801681102e89c8dc813e810aa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lordkekz",
+        "repo": "nix-yazi-plugins",
+        "type": "github"
+      }
+    },
    "zen-browser": {
      "inputs": {
        "nixpkgs": "nixpkgs_6"
--- a/flake.nix
+++ b/flake.nix
@@ -2,10 +2,10 @@
  description = "Multisystem NixOS Flake of Lennart J. Kurzweg";

  inputs = {
-    nixpkgs =          { url = "nixpkgs/nixos-24.05";                                                                        };
+    nixpkgs =          { url = "nixpkgs/nixos-24.11";                                                                        };
    nixpkgs-unstable = { url = "nixpkgs/nixos-unstable";                                                                     };
    nixpkgs-latest =   { url = "github:nixos/nixpkgs?ref=master";                                                            };
-    home-manager =     { url = "github:nix-community/home-manager/release-24.05";      inputs.nixpkgs.follows = "nixpkgs";   };
+    home-manager =     { url = "github:nix-community/home-manager/release-24.11";      inputs.nixpkgs.follows = "nixpkgs";   };
    sops-nix =         { url = "github:Mic92/sops-nix";                                inputs.nixpkgs.follows = "nixpkgs";   };
    lanzaboote =       { url = "github:nix-community/lanzaboote/v0.3.0";                                                     };

@@ -14,8 +14,8 @@
    Hyprspace =        { url = "github:KZDKM/Hyprspace";                               inputs.hyprland.follows = "hyprland"; };
    hyprswitch =       { url = "github:h3rmt/hyprswitch/release";                                                            };

-    # firefox-addons =   { url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixpkgs.follows = "nixpkgs"; };
    yazi.url = "github:sxyazi/yazi";
+    yazi-plugins =     { url = "github:lordkekz/nix-yazi-plugins";                     inputs.nixpkgs.follows = "nixpkgs";   };
    zen-browser.url = "github:MarceColl/zen-browser-flake";
  };

--- a/git-crypt/secrets.nix
+++ b/git-crypt/secrets.nix
--- a/home-modules/chatterino.nix
+++ b/home-modules/chatterino.nix
@@ -1,51 +1,31 @@
 { pkgs, lib, rice, user, secrets, ... }:
 let
  channels = [
-    "Caedrel"
-    "NoWay4u_Sir"
-    "zackrawrr"
-
    "agurin"
    "asmongold"
-    "Broeki"
-    "Broxah"
-    # "Caedrel"
-    "chrissyofficial"
+    "Caedrel"
    "EintrachtSpandau"
    "GamesDoneQuick"
    "gdolphn"
    "GRONKH"
    "handofblood"
    "HisWattson"
-    "imls"
-    "iskall85"
    "Jankos"
-    "Karni"
    "KuruHS"
    "kutcherlol"
-    "LCK"
-    "LCS"
    "LEC"
    "lol_nemesis"
-    "loltyler1"
-    "LPL"
-    "maxim"
    "NASA"
    "NNOPrime"
-    # "NoWay4u_Sir"
+    "NoWay4u_Sir"
    "OfficialMikeShinoda"
-    "ow_esports"
-    "PrimeGaming"
-    "PrimeLeague"
    "Rekkles"
    "riotgames"
-    "Sola"
    "ThePrimeagen"
    "Tolkin"
-    "Trick2g"
    "TSM_ImperialHal"
    "Xisuma"
-    # "zackrawrr"
+    "zackrawrr"
  ];
  tabber = channel-name: {
    highlightsEnabled = true;
--- a/home-modules/color-pallete.nix
+++ b/home-modules/color-pallete.nix
@@ -5,17 +5,18 @@
      <div class="color-container" style="border-color: ${color-set.base}">
        <div class="color-box" style="background: ${color-set.dark}; height: ${builtins.toString size}px;">
          <p style="color: ${color-set.bright}"> ${color-name}.dark </p>
+          <p style="color: ${color-set.bright}"> ${color-set.dark} </p>
        </div>
        <div class="color-box" style="background: ${color-set.base}; height: ${builtins.toString size}px;">
          <p class="dynamic-text"> ${color-name}.base </p>
+          <p class="dynamic-text"> ${color-set.base} </p>
        </div>
        <div class="color-box" style="background: ${color-set.bright}; height: ${builtins.toString size}px;">
          <p style="color: ${color-set.dark}"> ${color-name}.bright </p>
+          <p style="color: ${color-set.dark}"> ${color-set.bright} </p>
        </div>
      </div>
    '';
-  
-  
  in /* html */ ''
    <!DOCTYPE html>
    <head>
@@ -37,7 +38,7 @@
          color: ${foreground};
          width: fit-content;
          margin: 10px auto 10px auto;
-          background: ${background};
+          background: rgba(${rice.lib.hex-to-rgb-comma-string background},${builtins.toString rice.transparency});
          border: ${builtins.toString rice.border-width}px solid ${border}; 
          border-radius: ${builtins.toString rice.rounding}px;
          padding: ${builtins.toString rice.gap-size}px;
@@ -46,7 +47,7 @@
          margin: ${builtins.toString rice.gap-size}px;
        }
        .color-container {
-          font-family: ${rice.font.code.name2};
+          font-family: ${rice.font.code.name};
          display: flex;
          gap: ${builtins.toString rice.gap-size}px;
          margin: ${builtins.toString rice.gap-size}px;
@@ -66,18 +67,20 @@
      ${cb accent "accent" 100}
      ${cb secondary "secondary" 100}
      ${cb tertiary "tertiary" 100}
-      ${cb weird "weird" 75}
-      ${cb special "special" 75}
-      ${cb positive "positive" 30}
-      ${cb negative "negative" 30}
-      ${cb black "black" 25}
-      ${cb white "white" 25}
-      ${cb blue "blue" 25}
-      ${cb cyan "cyan" 25}
-      ${cb green "green" 25}
-      ${cb magenta "magenta" 25}
-      ${cb red "red" 25}
-      ${cb yellow "yellow" 25}
+      ${cb weird "weird" 100}
+      ${cb special "special" 100}
+      <br>
+      ${cb positive "positive" 70}
+      ${cb negative "negative" 70}
+      <br>
+      ${cb black "black" 50}
+      ${cb white "white" 50}
+      ${cb blue "blue" 50}
+      ${cb cyan "cyan" 50}
+      ${cb green "green" 50}
+      ${cb magenta "magenta" 50}
+      ${cb red "red" 50}
+      ${cb yellow "yellow" 50}
    </body>
    <script>
      function getLuminance(color) {
--- a/home-modules/email.nix
+++ b/home-modules/email.nix
@@ -9,14 +9,7 @@ lib.mkIf (host != "NxACE")
  programs.thunderbird = let
    inherit (lib.generators) toJSON;
    extensions = toJSON {} {
-      "default-theme@mozilla.org" = "5787f490-29b8-436e-a111-640da8590790";
-      "google@search.mozilla.org" = "cc340383-7068-4b32-a10f-9f19334bfebc";
-      "ddg@search.mozilla.org" = "0c340210-f7ab-48e8-9778-600ed5d00160";
-      "amazondotcom@search.mozilla.org" = "881d8fdf-5772-4e33-81ff-faac2d1fa92c";
-      "wikipedia@search.mozilla.org" = "7ea3d39d-3eea-430f-9bd7-f902d8124d45";
-      "bing@search.mozilla.org" = "f480cce8-68af-4082-908e-f8996153352b";
      "addon@darkreader.org" = "71d6c69d-55f9-4c56-888c-abdcf6efd73d";
-      "lightningcalendartabs@jlx.84" = "12d48e41-412e-4d09-835a-fa6fb8c180eb";
    };
  in {
    enable = true;
@@ -48,23 +41,20 @@ lib.mkIf (host != "NxACE")
          "mailnews.headers.showUserAgent" = true;
          "toolkit.legacyUserProfileCustomizations.stylesheets" = true;         
        };
-        userChrome = with rice.color; /* css */ ''
-          * {
-            color: ${rice.lib.hex-to-rgb-comma-string foreground} !important;
-            background-color: rgba(${rice.lib.hex-to-rgb-comma-string background}, ${builtins.toString rice.transparency}) !important;
-            border: none !important;
-          }
-          treechildren::-moz-tree-row(odd), treechildren::-moz-tree-row(even) {
-            background-color: rgba(${rice.lib.hex-to-rgb-comma-string background}, ${builtins.toString rice.transparency}) !important;
-          }
-        '';
+        # userChrome = with rice.color; /* css */ ''
+        #   * {
+        #     color: ${foreground} !important;
+        #     background-color: rgba(${rice.lib.hex-to-rgb-comma-string background},${builtins.toString 0.1}) !important;
+        #     border: none !important;
+        #     -moz-appearance: none !important;
+        #   }
+        # '';
      }; 
    }; 
  };


-  accounts.email.accounts = 
-  let
+  accounts.email.accounts =  let
    OAuth2Settings = id: {
      "mail.smtpserver.smtp_${id}.authMethod" = 10;
      "mail.server.server_${id}.authMethod" = 10;
--- a/home-modules/firefox.nix
+++ b/home-modules/firefox.nix
@@ -1,6 +1,7 @@
 # { pkgs-unstable, secrets, user, system, inputs, ...}:
 { rice, user, ... }:
 # browser.tabs.allow_transparent_browser
+# https://www.reddit.com/r/FirefoxCSS/comments/1dqws4b/firefox_128_will_allow_the_main_browser_content/
 {
  home.file = with rice.color;  let
    blur = builtins.toString 20;
@@ -110,9 +111,15 @@

      /* new-tab */ 
      @-moz-document url-prefix(about:home), url-prefix(about:newtab) {
+      	:root{
+	        --newtab-background-color-secondary: ${background} !important;
+      	}
        body, html {
          background: transparent !important;
        }
+      	.tile, .search-handoff-button {
+          border: ${builtins.toString rice.border-width}px solid ${border} !important;
+      	}
      }

      @-moz-document domain(youtube.com) {
@@ -140,7 +147,6 @@
      @-moz-document domain(reddit.com) {
        header {
          background-color: rgba(${rice.lib.hex-to-rgb-comma-string background},${builtins.toString rice.transparency}) !important;
-          backdrop-filter: blur(20px);
        }    
        body, html, reddit-sidebar-nav, shreddit-post, aside, .reddit-search-bar{
          background-color: transparent !important;
@@ -171,6 +177,24 @@
        }
      }

+      @media (prefers-color-scheme: dark) {
+        :root .theme-system {
+          --color-bg: transtparent !important;
+          --color-text: ${rice.color.foreground}
+        }
+      }
+
+      @-moz-document domain(developer.mozilla.org) {
+        html, body {
+          background-color: transparent !important;
+        }
+        .top-navigation, .article-actions-container {
+          background-color: rgba(0,0,0,1) !important; 
+          backdrop-filter: blur(100px);
+          border-radius: ${builtins.toString rice.rounding}px;
+        }
+      }
+
      @-moz-document domain(github.com) {
        body, html, header, #repository-container-header, .bgColor-muted, section {
          background-color: transparent !important;
@@ -182,7 +206,8 @@
          background-color: transparent !important;
        }
        header, footer {
-          background-color: rgba(0,0,0,0.5) !important;
+          background-color: rgba(0,0,0,1) !important; 
+          backdrop-filter: blur(100px);
          border-radius: ${builtins.toString rice.rounding}px;
        }
      }
@@ -203,6 +228,37 @@
          background-size: 2vmin 2vmin !important;
        }
      }
+
+      @-moz-document domain(pw.nx2.site) {
+        html {
+          background: radial-gradient(rgba(255, 255, 255, 0.8) 5%, transparent 5%) !important;
+          background-repeat: repeat !important;
+          background-size: 2vmin 2vmin !important;
+        }
+        body, .tw-bg-background-alt3, main, .card-header, .card-body, .modal-body {
+          background-color: transparent !important;
+        }
+        .modal-open, .modal-header, form.modal-content, .modal-footer {
+          background-color: rgba(0,0,0,0.8) !important;
+          backdrop-filter: blur(5px);
+        } 
+        .cdk-virtual-scroll-content-wrapper, .card, .tw-bg-background, .modal-content {
+          background-color: rgba(0,0,0,0.8) !important;
+          border-radius: 10px !important;
+          border: ${toString rice.border-width}px solid ${border} !important;
+        }
+      }     
+
+      @-moz-document domain(chatgpt.com) {
+        body, html , .bg-token-sidebar-surface-primary {
+          background-color: transparent !important;
+        }
+        .bg-token-main-surface-primary {
+          background-color: rgba(0,0,0,1) !important; 
+          backdrop-filter: blur(100px) !important;
+          border-radius: ${builtins.toString rice.rounding}px !important;
+        }
+      }
    '';
  };
 }
--- a/home-modules/fish.nix
+++ b/home-modules/fish.nix
@@ -27,7 +27,7 @@
        $(echo -e "$logo" | sed -n 7p): fish $(fish --version | rev | cut -f 1 -d' ' | rev)
        $(echo -e "$logo" | sed -n 8p): ''$(uname -r)
        $(echo -e "$logo" | sed -n 9p): $($EDITOR --version | head -n 1 | sed -E 's-(.+?) \(.*-\1-g')
-        $(echo -e "$logo" | sed -n 10p): $(yazi --version | yazi --version | sed -E 's-(.*?) \(.*-\1-g')
+        $(echo -e "$logo" | sed -n 10p): $(yazi --version | sed -E 's-(.*?) \(.*-\1-g')
        $(echo -e "$logo" | sed -n 11p): $(starship --version | head -n 1)
        "
        echo -e "$msg"
@@ -85,20 +85,18 @@
      # ya = "yazi"; # function
      # nxfiglet = "figlet"; 
    };
-    interactiveShellInit = ''
+    interactiveShellInit = /* fish */ ''
      set -g fish_greeting
      if not set -q IN_NIX_SHELL
-        nxfetch
-        # yazi
        if set -q SESSION_FROM_DE
-          set -e SESSION_FROM_DE
          set tmp (mktemp -t "yazi-cwd.XXXXX")
-          yazi $argv --cwd-file="$tmp"
+          yazi --cwd-file="$tmp"
          if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
-            cd -- "$cwd"
+              builtin cd -- "$cwd"
          end
          rm -f -- "$tmp"
        end
+        nxfetch
      end
    '';
    functions = {
--- a/home-modules/games.nix
+++ b/home-modules/games.nix
@@ -1,7 +1,18 @@
-{  pkgs, lib, host, ... }:
-lib.mkIf (host != "NxACE")
+{ pkgs-unstable, pkgs, lib, host, ... }:
+lib.mkIf (host == "NxNORTH" || host == "NxACE")
 {
-  home.packages = with pkgs; [
+  home = {
+    packages = (with pkgs-unstable; [
+      protonup
+      mangohud
+
+      # heroic
+
      mindustry-wayland 
-  ];
+    ]) ++ [ pkgs.heroic ];
+    sessionVariables = {
+      STEAM_EXTRA_COMPAT_TOOLS_PATHS = "\${HOME}/.steam/root/compatibilitytools.d";
+    };
+  };
 }
+
--- a/home-modules/gimp.nix
+++ b/home-modules/gimp.nix
@@ -0,0 +1,9 @@
+{ pkgs, lib, host, ... }:
+{
+  home.packages = with pkgs; [
+    (gimp-with-plugins.override {
+      plugins = with gimpPlugins; [ bimp ];
+    })
+  ];
+}
+
--- a/home-modules/gtk.nix
+++ b/home-modules/gtk.nix
@@ -1,4 +1,5 @@
-{ config, pkgs, lib, rice, user, ... }: let
+{ config, pkgs, rice, ... }:
+let
  # theme-name = "Colloid-Pink-Dark-Compact";
  # theme-package = pkgs.colloid-gtk-theme.override {
  #   themeVariants = [ "pink" ];
@@ -6,18 +7,134 @@
  #   sizeVariants = [ "compact" ]; 
  #   tweaks = [ "black" ]; 
  # };
-  theme-name = "catppuccin-macchiato-pink-compact+rimless,black";
-  theme-package = pkgs.catppuccin-gtk.override {
-    accents = [ "pink" ];
-    size = "compact";
-    tweaks = [ "rimless" "black" ];
-    variant = "macchiato";
-  };
+
+  # theme-name = "catppuccin-macchiato-pink-compact+rimless,black";
+  # theme-package = pkgs.catppuccin-gtk.override {
+  #   accents = [ "pink" ];
+  #   size = "compact";
+  #   tweaks = [ "rimless" "black" ];
+  #   variant = "macchiato";
+  # };
+  theme-name = "Materia-dark-compact";
+  theme-package = pkgs.materia-theme-transparent;
+  # theme-name = "numix";
+  # theme-name = "adw-gtk3-dark";
+  # theme-package = pkgs.adw-gtk3;
+  # theme-package = let
+  #   theme-string = with rice.color; let 
+  #     h = rice.lib.nohash;
+  #     d = rice.lib.float-to-drune;
+  #   in /* ini */ ''
+  #     BG=${h background}
+  #     FG=${h foreground}
+  #     SEL_BG=${h accent.base}
+  #     SEL_FG=${h black.base}
+  #     ACCENT_BG=${h accent.base}
+  #     TXT_BG=${h black.dark}
+  #     TXT_FG=${h foreground}
+  #     HDR_BG=${h background}
+  #     HDR_FG=${h foreground}
+  #     BTN_BG=${h accent.dark}
+  #     BTN_FG=${h foreground}
+  #     HDR_BTN_BG=${h accent.dark}
+  #     HDR_BTN_FG=${h foreground}
+  #     WM_BORDER_FOCUS=${h border}
+  #     WM_BORDER_UNFOCUS=${h accent.dark}
+  #     ROUNDNESS=${builtins.toString rice.rounding}
+  #     ROUNDNESS_GTK2_HIDPI=${builtins.toString rice.rounding}
+  #     OUTLINE_WIDTH=${builtins.toString rice.border-width}
+  #     BTN_OUTLINE_OFFSET=-3
+  #     BTN_OUTLINE_WIDTH=1
+  #     SPACING=${builtins.toString rice.gap-size}
+  #     GRADIENT=0.0
+  #     CINNAMON_OPACITY=${builtins.toString rice.transparency}
+  #     INACTIVE_FG=${h foreground}
+  #     INACTIVE_TXT_FG=${h foreground}
+  #     INACTIVE_HDR_FG=${h foreground}
+  #     ICONS_DARK=${h accent.dark}
+  #     ICONS_MEDIUM=${h accent.base}
+  #     ICONS_LIGHT=${h accent.bright}
+  #     ICONS_LIGHT_FOLDER=${h accent.base}
+  #     ICONS_SYMBOLIC_ACTION=${h accent.base}
+  #     ICONS_SYMBOLIC_PANEL=${h accent.base}
+  #     ICONS_STYLE=icons_papirus
+  #     CARET1_FG=${h white.dark}
+  #     CARET2_FG=${h black.bright}
+  #     CARET_SIZE=0.04
+  #     MENU_BG=${h accent.dark}
+  #     MENU_FG=${h foreground}
+  #     OUTLINE_WIDTH=${builtins.toString rice.border-width}
+  #     SPOTIFY_PROTO_BG=${h accent.dark}
+  #     SPOTIFY_PROTO_FG=${h foreground}
+  #     SPOTIFY_PROTO_SEL=${h blue.base}
+  #     BASE16_GENERATE_DARK=False
+  #     BASE16_INVERT_TERMINAL=False
+  #     BASE16_MILD_TERMINAL=False
+  #     UNITY_DEFAULT_LAUNCHER_STYLE=False
+  #   '';
+  #   # theme-source-pkg = pkgs.materia-theme;
+  #   theme-source-pkg = pkgs.themix-gui;
+  # in pkgs.stdenv.mkDerivation {
+  #   name = "oomox-gtk";
+  #   version = theme-source-pkg.version;
+  #   src = theme-source-pkg.src;
+  #   dontBuild = true;
+  #   nativeBuildInputs = with pkgs; [
+  #     glib
+  #     libxml2
+  #     bc
+  #   ];
+  #   buildInputs = with pkgs; [
+  #     gnome-themes-extra
+  #     gdk-pixbuf
+  #     librsvg
+  #     sassc
+  #     inkscape
+  #     optipng
+  #   ];
+  #   propagatedUserEnvPkgs = with pkgs; [
+  #     gtk-engine-murrine
+  #   ];
+  #   # installPhase = ''
+  #   #   mkdir -p $out/share/themes/materia
+  #   #   patchShebangs .
+  #   #   ./change_color.sh -o materia -t $out/share/themes <(echo -e "${theme-string}")
+  #   # '';
+  #   installPhase = ''
+  #     mkdir -p $out/share/icons/icons_papirus
+  #     mkdir -p $out/share/icons/icons_numix
+  #     mkdir -p $out/share/icons/icons_suruplus
+  #     echo "${theme-string}" > $out/oomox.colors
+  #     pushd plugins/icons_papirus
+  #     patchShebangs .
+  #     ./change_color.sh -o icons_papirus -d $out/share/icons/icons_papirus $out/oomox.colors
+  #     popd
+  #     pushd plugins/icons_numix
+  #     patchShebangs .
+  #     ./change_color.sh -o icons_numix -d $out/share/icons/icons_numix $out/oomox.colors
+  #     popd
+  #     pushd plugins/icons_suruplus
+  #     patchShebangs .
+  #     ./change_color.sh -o icons_suruplus -d $out/share/icons/icons_suruplus $out/oomox.colors
+  #     popd
+  #     mkdir -p $out/share/themes/numix
+  #     pushd plugins/theme_oomox
+  #     patchShebangs .
+  #     HOME=$out ./change_color.sh -o numix -m all -t $out/share/themes $out/oomox.colors
+  #     popd
+  #   '';
+  #   meta = {
+  #     description = "custom theme utility";
+  #     homepage = "https://github.com/themix-project/themix-gui";
+  #     maintainers = [ ];
+  #   };
+  # };
 in {
-  home.packages = with pkgs; [
+  home = {
+    packages = with pkgs; [
      # gnome.gnome-themes-extra
-    # gnome.adwaita-icon-theme
-    gnome.gnome-tweaks
+      adwaita-icon-theme
+      gnome-tweaks
      gtk3
      gtk4
      # catppuccin-gtk
@@ -25,46 +142,57 @@ in {
    ] ++ [
      # pkgs-unstable.themix-gui
    ];
-
-
-  home.sessionVariables.GTK_THEME = theme-name;
-
+    sessionVariables.GTK_THEME = theme-name;
+    pointerCursor = {
+      gtk.enable = true;
+      x11.enable = true;
+    } // rice.cursor;
+  };
  gtk = {
    enable = true;
    theme = {
      name = theme-name;
      package = theme-package;
    };
-      gtk3.extraConfig = {
-        gtk-application-prefer-dark-theme = 1;
+    gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
+    gtk3 = {
+      extraConfig.gtk-application-prefer-dark-theme = 1;
+      # extraCss = with rice.color; /* css */ ''
+      #   wnck-pager {
+      #     color: ${black.bright};
+      #     background-color: ${background};
+      #   }
+
+      #   wnck-pager:selected {
+      #     color: ${background};
+      #     background-color: ${accent.base};
+      #   }
+      # '';
+        # window.background {
+        #   background-color: rgba(${rice.lib.hex-to-rgb-comma-string background},${builtins.toString rice.transparency});
+        # }
+        # .background, .view, .surface, .frame, box, window.decoration, stack {
+        #   background-color: transparent;
+        # }
    };
-      gtk4.extraConfig = {
-        gtk-application-prefer-dark-theme = 1;
+    gtk4 = {
+      extraConfig.gtk-application-prefer-dark-theme = 1;
+      extraCss = config.gtk.gtk3.extraCss;
    };
    cursorTheme = rice.cursor;
  };
-
-    home.pointerCursor = {
-      gtk.enable = true;
-      x11.enable = true;
-    } // rice.cursor;
-
  xdg.configFile = {
-      "gtk-4.0/assets".source = "${theme-package}/share/themes/${theme-name}/gtk-4.0/assets";
-      "gtk-4.0/gtk.css".source = "${theme-package}/share/themes/${theme-name}/gtk-4.0/gtk.css";
-      "gtk-4.0/gtk-dark.css".source = "${theme-package}/share/themes/${theme-name}/gtk-4.0/gtk-dark.css";
+    "gtk-4.0/assets".source = "${theme-package}/share/themes/${theme-name}/gtk-3.20/assets";
+    "gtk-4.0/gtk.css".source = "${theme-package}/share/themes/${theme-name}/gtk-3.20/gtk.css";
+    "gtk-4.0/gtk-dark.css".source = "${theme-package}/share/themes/${theme-name}/gtk-3.20/gtk-dark.css";
  };
-
-
-
-
  dconf = {
    enable = true;
    settings = {
      "org/gnome/desktop/interface" = {
        color-scheme = "prefer-dark";
-          gtk-theme = theme-name;
+        # gtk-theme = theme-name;
      };
    };
  };
-  }
+}
--- a/home-modules/helix.nix
+++ b/home-modules/helix.nix
@@ -1,11 +1,13 @@
-{ pkgs, pkgs-unstable,lib, rice, ... }:
+{ pkgs, pkgs-unstable, lib, rice, ... }:
 {
  home = {
    packages = with pkgs; [
      # nixfmt-classic # nix formater
      # nil # nix language server
      # nixd # specified in nixd.nix
+      gopls
      python311Packages.python-lsp-server
+      jdt-language-server
      ruff
      ruff-lsp
      pyright
@@ -76,7 +78,10 @@
      language = [
        {
          name = "nix";
-          language-servers = [ "nixd" "nil" ]; 
+          language-servers = [
+            "nixd"
+            # "llm"
+          ]; 
        }
        {
          name = "latex";
@@ -122,6 +127,16 @@
            }];
          };
        }
+        {
+          name = "go";
+          language-servers = [ 
+            "gopls"
+            # "llm"
+          ];
+          # formatter = {
+          #   command = "gofmt";
+          # };
+        }
      ];
      language-server = {
        "nixd" = {
@@ -137,20 +152,19 @@
          command = "ruff-lsp";
          config.settings.args = [
            # Set line length
-            # "--line-length"
-            # "79"
-
-            # Enable some ruff rules
-            # "--select"
-            # (
-            #   "F,W,E,I,N,D200,D201,D202,D203,D204,D205,D206,D207,D208,D209,D210,D211,"
-            #   + "D212,D213,D214,D215,D300,D301,D400,D401,D402,D403,D404,D405,D406,"
-            #   + "D407,D408,D409,D410,D411,D412,D413,D414,D415,D416,D417,D418,D419,"
-            #   + "UP,YTT,TRIO,ASYNC,B,A,COM,C4,DTZ,T10,DJ,EXE,FA,ISC,ICN001,G010,"
-            #   + "G101,G201,G202,INP,PIE,Q,RSE,RET,SLOT,SIM,TCH,INT,ARG,PTH,TD001,"
-            #   + "TD004,TD005,TD006,TD007,PD,PL,TRY004,TRY200,TRY201,TRY302,TRY400,"
-            #   + "TRY401,FLY,NPY,AIR,PERF,FURB,LOG,RUF"
-            # )
+            "--line-length"
+            "240"
+            # Enable custom ruff rules
+            # "--select" lib.concatStringsSep [ ]
+          ];
+        };
+        "llm" = {
+          command = lib.getExe pkgs.helix-gpt; 
+          args = [
+            "--handler"
+            "ollama"
+            "--ollamaModel"
+            "codellama:7b"
          ];
        };
      };
@@ -167,7 +181,7 @@
        "constant.numeric" = foreground; 
        "constructor" = weird.base;
        "debug" = yellow.base;
-        "diagnostic.modifiers" = [ "underlined" ];
+        "diagnostic.modifiers" = [ "underline" ];
        "diff.delta" = blue.bright; 
        "diff.minus" = negative.bright; 
        "diff.plus" = positive.bright; 
--- a/home-modules/hyprland.nix
+++ b/home-modules/hyprland.nix
@@ -21,13 +21,13 @@ let
      main = {
        name = "DP-4";
        resolution = "2560x1440";
-        position = "1920x0";
+        position = "1920x150";
        scale = "1.0";
      };
      left = {
        name = "HDMI-A-2";
        resolution = "1920x1080";
-        position = "0x360";
+        position = "0x0";
        scale = "1.0";
      };
      # right = {
@@ -52,6 +52,7 @@ in {
    hyprland-protocols
    hyprlock
    hypridle
+    hyprpicker
    hyprcursor

    grim
@@ -91,15 +92,13 @@ in {
          "${main.name}, ${main.resolution}, ${main.position}, ${main.scale}"
        ]));

-      workspace =
-        let
+      workspace = let
        d1 = if host == "NxXPS" then monitors.xps.main.name else (if host == "NxNORTH" then monitors.north.main.name else monitors.ace.main.name);
        d2 = if host == "NxXPS" then monitors.xps.second.name else (if host == "NxNORTH" then monitors.north.left.name else monitors.ace.main.name);
        d3 = if host == "NxXPS" then monitors.xps.main.name else (if host == "NxNORTH" then monitors.north.main.name else monitors.ace.main.name);
        # d3 = if host == "NxXPS" then monitors.xps.main.name else (if host == "NxNORTH" then monitors.north.right.name else monitors.ace.main.name);
       compact = "gapsin:0, gapsout:0, bordersize:1, rounding:false";
-        in
-        [
+      in [
        "11, monitor:${d1}, default:true"
        "12, monitor:${d1}"
        "13, monitor:${d1}"
@@ -131,6 +130,10 @@ in {
        "38, monitor:${d3}"
        "39, monitor:${d3}"
        "30, monitor:${d3}, ${compact}"
+      ] ++ [
+        # no gaps when only
+        "w[tv1], gapsout:0, gapsin:0"
+        "f[1], gapsout:0, gapsin:0"
      ];

      # "device:logitech-wireless-mouse-mx-master-1" = {
@@ -174,12 +177,12 @@ in {

      decoration = {
        rounding = rice.rounding;
-        drop_shadow = false;
-        shadow_range = "20";
-        shadow_offset = "0 0";
-        shadow_render_power = "4";
-        "col.shadow" = "rgba(${rice.lib.nohash rice.color.red.base}ff)";
-        "col.shadow_inactive" = "rgba(${rice.lib.nohash rice.color.black.base}ff)";
+        # drop_shadow = false;
+        # shadow_range = "20";
+        # shadow_offset = "0 0";
+        # shadow_render_power = "4";
+        # "col.shadow" = "rgba(${rice.lib.nohash rice.color.red.base}ff)";
+        # "col.shadow_inactive" = "rgba(${rice.lib.nohash rice.color.black.base}ff)";

        active_opacity = "1.0";
        inactive_opacity = "1.0";
@@ -228,7 +231,6 @@ in {

      dwindle = {
        preserve_split = true; # you probably want this
-        no_gaps_when_only = true;
      };

      # master = {
@@ -258,6 +260,16 @@ in {
        "opacity ${transparency},class:^(com.chatterino.*)$"
        "opacity ${transparency},class:^(chatterino)$"
        "bordercolor rgba(${rice.lib.nohash rice.color.magenta.bright}ff), pinned:1"
+        "noanim, class:^(presenter)$" # sent
+        "float, class:^(presenter)$" # sent
+        "noanim, class:^(imv)$"
+        "float, class:^(imv)$" 
+        "fullscreen, class:^(imv)$" 
+      ] ++ [
+        "bordersize 0, floating:0, onworkspace:w[tv1]"
+        "rounding 0, floating:0, onworkspace:w[tv1]"
+        "bordersize 0, floating:0, onworkspace:f[1]"
+        "rounding 0, floating:0, onworkspace:f[1]"
      ];

      windowrule = [
@@ -274,12 +286,12 @@ in {
        "opacity ${transparency}, discord"
        "opacity ${transparency}, vesktop"
        "opacity ${transparency}, Element"
-        "opacity ${transparency}, thunderbird"
+        # "opacity ${transparency}, thunderbird"
        "opacity ${transparency}, lutris"
        "opacity ${transparency}, element"
-        "opacity ${transparency}, ^([sS]potify)$"
-        "opacity ${transparency}, virt-manager"
-        "opacity ${transparency}, thunar"
+        # "opacity ${transparency}, ^([sS]potify)$"
+        # "opacity ${transparency}, virt-manager"
+        # "opacity ${transparency}, thunar"
        "opacity ${transparency}, title:^(wlogout)$"
        "opaque, title:^(GNU Image Manipulation Program)$"
        "float, title:^(Picture-in-Picture)$"
@@ -326,15 +338,15 @@ in {
        "SUPER,       F1, workspace,       100"
        "SUPER SHIFT, F1, movetoworkspace, 100"
        # "SUPER,       F2,"
-        "SUPER,       F3, toggleopaque"
+        # "SUPER,       F3, toggleopaque"
        # "SUPER,       F4,"
        "SUPER,       F5, exec, nx_gcal_event force-lookup"
        "SUPER SHIFT, F5, exec, nx_gcal_event reauthenticate"
        "SUPER,       F6, exec, kitty -e 'htop'"
        "SUPER,       F7, exec, kitty -e 'nmtui'"
-        ''SUPER,       F8, exec, find ~/Pictures/wallpapers/* -type f -not -path "~/Pictures/wallpapers/.git/*" | sort -R | head -n 1 | xargs swww img --transition-type wipe --transition-angle 60 --transition-step 120 --transition-fps 120''
-        ''SUPER,       F9, exec, kitty -e sh -c 'change_colors_json $(swww query | sed -n 1p | sed -e "s-.*image: --g") && nh home switch && firefox /home/${user}/.config/color-pallete.html' '' 
-        ''SUPER SHIFT, F9, exec, firefox /home/${user}/.config/color-pallete.html '' 
+        ''SUPER,       F8, exec, find ~/Pictures/wallpapers/* -type f -not -path "~/Pictures/wallpapers/.git/*" | sort -R | head -n 1 | xargs -d '\n' swww img --transition-type wipe --transition-angle 60 --transition-step 120 --transition-fps 120 --transition-duration 2''
+        "SUPER,       F9, execr, waybar_mode set '󰸉 '"
+        "SUPER,       F9, submap, color"
        # "SUPER,       F10, hyprload,update"
        "SUPER,       F11, exec, waybar"
        "SUPER SHIFT, F11, exec, pkill waybar "
@@ -387,7 +399,8 @@ in {
        # "SUPER SHIFT, T, exec, alacritty -e sh -c "ssh nxace""
        "SUPER,       T, exec, SESSION_FROM_DE=TRUE kitty"
        "SUPER SHIFT, T, exec, kitty -e sh -c 'ssh nxace'"
-        # "SUPER,       Z, "
+        "SUPER,       Z, exec, waybar_mode set ' '"
+        "SUPER,       Z, submap, tuda"
        "SUPER,       U, exec, thunderbird "
        "SUPER,       I, exec, kitty -e fish -c 'hx ~/nix-dots/ && fish'"
        "SUPER SHIFT, I, exec, kitty -e fish -c 'nh home switch || read'"
@@ -396,7 +409,8 @@ in {
        "SUPER,       P, pin "
        # "SUPER,       Ü,"
        # "SUPER,       +,"
-        # "SUPER,       Enter,"
+        "SUPER,       Enter, exec, SESSION_FROM_DE=TRUE kitty"
+

        ###########################################################################
        ## ROW 3:
@@ -424,6 +438,7 @@ in {
        "SUPER,       X, exec, pkill wlogout || wlogout --protocol layer-shell -b 3"
        # "SUPER,       C, exec, /home/nx2/scripts/quickconfig/quickconfig.sh "
        "SUPER,       C, exec, chatterino"
+        "SUPER SHIFT, C, exec, hyprpicker -n -a"
        "SUPER,       V, togglefloating, "
        "SUPER,       B, exec, bitwarden"
        "SUPER,       N, togglesplit"
@@ -504,396 +519,91 @@ in {
    #   'Y8b. 88    88 88''Yb. 88    88 8888888 888888P'   'Y8b.
    # db   8D 88.  .88 88   8D 88    88 88' '88 88       db   8D
    # '8888Y' 'Y8888P' Y8888P' YP    YP 88   YP YP       '8888Y'
-    extraConfig = ''
+    extraConfig = let
+      action_simple = { mods ? "", key, cmd }: ''
+        bind=${mods},${key},execr,waybar_mode unset
+        bind=${mods},${key},${cmd}
+        bind=${mods},${key},submap,reset
+      '';
+      extra_workspace = { key, wsnumber }: ''
+        bind=,${key},execr,waybar_mode unset
+        bind=,${key},workspace,${wsnumber}
+        bind=,${key},submap,reset
+        bind=SUPER,${key},execr,waybar_mode unset
+        bind=SUPER,${key},workspace,${wsnumber}
+        bind=SUPER,${key},submap,reset
+        bind=SUPER SHIFT,${key},execr, waybar_mode unset
+        bind=SUPER SHIFT,${key},movetoworkspace,${wsnumber}
+        bind=SUPER SHIFT,${key},submap,reset
+      '';
+    in ''    
      submap = browserSM
-      bind = , W, exec, waybar_mode unset
-      bind = , W, exec, hyprctl dispatch exec firefox 
-      bind = , W, submap, reset
-
-      bind = , Y, exec, waybar_mode unset 
-      bind = , Y, exec, firefox https://youtube.com 
-      bind = , Y, submap, reset
-
-      bind = , T, exec, waybar_mode unset
-      bind = , T, exec,  hyprctl dispatch exec firefox https://twitch.tv
-      bind = , T, submap, reset
-
-      bind = , R, exec, waybar_mode unset
-      bind = , R, exec,  firefox https://reddit.com 
-      bind = , R, submap, reset
-
-      bind = , C, exec, waybar_mode unset
-      bind = , C, exec,  firefox https://calendar.google.com 
-      bind = , C, submap, reset
-
-      bind = , Ü, exec, waybar_mode unset
-      bind = , Ü, exec,  firefox https://translate.google.com 
-      bind = , Ü, submap, reset
-
-      bind = , N, exec, waybar_mode unset
-      bind = , N, exec,  firefox https://Netflix.com 
-      bind = , N, submap, reset
-
-      bind = , A, exec, waybar_mode unset
-      bind = , A, exec,  firefox https://www.amazon.de/b?node=3010075031&ref_=nav_ya_signin 
-      bind = , A, submap, reset
-
-      bind = , D, exec, waybar_mode unset
-      bind = , D, exec,  firefox https://www.disneyplus.com/home 
-      bind = , D, submap, reset
-
-      bind = , H, exec, waybar_mode unset
-      bind = , H, exec,  firefox https://www.hs-mittweida.de 
-      bind = , H, submap, reset
-
-      bind = , X, exec, waybar_mode unset
-      bind = , X, exec,  firefox https://nx2.site 
-      bind = , X, submap, reset
-
-      bind = , L, exec, waybar_mode unset
-      bind = , L, exec,  firefox https://feddit.de
-      bind = , L, submap, reset
-
-      bind = , I, exec, waybar_mode unset
-      bind = , I, exec,  firefox https://www.imdb.com
-      bind = , I, submap, reset
-
-      bind = , M, exec, waybar_mode unset
-      bind = , M, exec,  firefox https://ieji.de/home
-      bind = , M, submap, reset
-
-      bind = , S, exec, waybar_mode unset
-      bind = , S, exec,  firefox 127.0.0.1:8384/
-      bind = , S, submap, reset
-
+      ${action_simple { key = "A"; cmd = "exec,firefox https://www.amazon.de/b?node=3010075031&ref_=nav_ya_signin";}}
+      ${action_simple { key = "C"; cmd = "exec,firefox https://calendar.google.com";}}
+      ${action_simple { key = "D"; cmd = "exec,firefox https://www.disneyplus.com/home";}}
+      ${action_simple { key = "H"; cmd = "exec,firefox https://www.hs-mittweida.de";}}
+      ${action_simple { key = "I"; cmd = "exec,firefox https://www.imdb.com";}}
+      ${action_simple { key = "L"; cmd = "exec,firefox https://feddit.de";}}
+      ${action_simple { key = "M"; cmd = "exec,firefox https://ieji.de/home";}}
+      ${action_simple { key = "N"; cmd = "exec,firefox https://Netflix.com";}}
+      ${action_simple { key = "R"; cmd = "exec,firefox https://reddit.com";}}
+      ${action_simple { key = "S"; cmd = "exec,firefox 127.0.0.1:8384/";}}
+      ${action_simple { key = "T"; cmd = "exec,hyprctl dispatch exec firefox https://twitch.tv";}}
+      ${action_simple { key = "udiaeresis"; cmd = "exec,firefox https://translate.google.com";}}
+      ${action_simple { key = "W"; cmd = "exec,hyprctl dispatch exec firefox";}}
+      ${action_simple { key = "X"; cmd = "exec,firefox https://nx2.site";}}
+      ${action_simple { key = "Y"; cmd = "exec,firefox https://youtube.com";}}
+      ${action_simple { key = "P"; cmd = "exec,firefox https://pw.nx2.site";}}
      bind = , Escape, exec, waybar_mode unset
      bind = , Escape, submap, reset
      submap = reset


      submap = scrL
-      bind =      ,       1, execr, waybar_mode unset
-      bind =      ,       1, workspace,       21
-      bind =      ,       1, submap, reset
-      bind = SUPER,       1, execr, waybar_mode unset
-      bind = SUPER,       1, workspace,       21
-      bind = SUPER,       1, submap, reset
-      bind = SUPER SHIFT, 1, execr, waybar_mode unset
-      bind = SUPER SHIFT, 1, movetoworkspace, 21
-      bind = SUPER SHIFT, 1, submap, reset
-
-      bind =      ,       2, execr, waybar_mode unset
-      bind =      ,       2, workspace,       22
-      bind =      ,       2, submap, reset
-      bind = SUPER,       2, execr, waybar_mode unset
-      bind = SUPER,       2, workspace,       22
-      bind = SUPER,       2, submap, reset
-      bind = SUPER SHIFT, 2, execr, waybar_mode unset
-      bind = SUPER SHIFT, 2, movetoworkspace, 22
-      bind = SUPER SHIFT, 2, submap, reset
-
-      bind =      ,       3, execr, waybar_mode unset
-      bind =      ,       3, workspace,       23
-      bind =      ,       3, submap, reset
-      bind = SUPER,       3, execr, waybar_mode unset
-      bind = SUPER,       3, workspace,       23
-      bind = SUPER,       3, submap, reset
-      bind = SUPER SHIFT, 3, execr, waybar_mode unset
-      bind = SUPER SHIFT, 3, movetoworkspace, 23
-      bind = SUPER SHIFT, 3, submap, reset
-
-      bind =      ,       4, execr, waybar_mode unset
-      bind =      ,       4, workspace,       24
-      bind =      ,       4, submap, reset
-      bind = SUPER,       4, execr, waybar_mode unset
-      bind = SUPER,       4, workspace,       24
-      bind = SUPER,       4, submap, reset
-      bind = SUPER SHIFT, 4, execr, waybar_mode unset
-      bind = SUPER SHIFT, 4, movetoworkspace, 24
-      bind = SUPER SHIFT, 4, submap, reset
-
-      bind =      ,       5, execr, waybar_mode unset
-      bind =      ,       5, workspace,       25
-      bind =      ,       5, submap, reset
-      bind = SUPER,       5, execr, waybar_mode unset
-      bind = SUPER,       5, workspace,       25
-      bind = SUPER,       5, submap, reset
-      bind = SUPER SHIFT, 5, execr, waybar_mode unset
-      bind = SUPER SHIFT, 5, movetoworkspace, 25
-      bind = SUPER SHIFT, 5, submap, reset
-
-      bind =      ,       6, execr, waybar_mode unset
-      bind =      ,       6, workspace,       26
-      bind =      ,       6, submap, reset
-      bind = SUPER,       6, execr, waybar_mode unset
-      bind = SUPER,       6, workspace,       26
-      bind = SUPER,       6, submap, reset
-      bind = SUPER SHIFT, 6, execr, waybar_mode unset
-      bind = SUPER SHIFT, 6, movetoworkspace, 26
-      bind = SUPER SHIFT, 6, submap, reset
-
-      bind =      ,       7, execr, waybar_mode unset
-      bind =      ,       7, workspace,       27
-      bind =      ,       7, submap, reset
-      bind = SUPER,       7, execr, waybar_mode unset
-      bind = SUPER,       7, workspace,       27
-      bind = SUPER,       7, submap, reset
-      bind = SUPER SHIFT, 7, execr, waybar_mode unset
-      bind = SUPER SHIFT, 7, movetoworkspace, 27
-      bind = SUPER SHIFT, 7, submap, reset
-
-      bind =      ,       8, execr, waybar_mode unset
-      bind =      ,       8, workspace,       28
-      bind =      ,       8, submap, reset
-      bind = SUPER,       8, execr, waybar_mode unset
-      bind = SUPER,       8, workspace,       28
-      bind = SUPER,       8, submap, reset
-      bind = SUPER SHIFT, 8, execr, waybar_mode unset
-      bind = SUPER SHIFT, 8, movetoworkspace, 28
-      bind = SUPER SHIFT, 8, submap, reset
-
-      bind =      ,       9, execr, waybar_mode unset
-      bind =      ,       9, workspace,       29
-      bind =      ,       9, submap, reset
-      bind = SUPER,       9, execr, waybar_mode unset
-      bind = SUPER,       9, workspace,       29
-      bind = SUPER,       9, submap, reset
-      bind = SUPER SHIFT, 9, execr, waybar_mode unset
-      bind = SUPER SHIFT, 9, movetoworkspace, 29
-      bind = SUPER SHIFT, 9, submap, reset
-
-      bind =      ,       0, execr, waybar_mode unset
-      bind =      ,       0, workspace,       20
-      bind =      ,       0, submap, reset
-      bind = SUPER,       0, execr, waybar_mode unset
-      bind = SUPER,       0, workspace,       20
-      bind = SUPER,       0, submap, reset
-      bind = SUPER SHIFT, 0, execr, waybar_mode unset
-      bind = SUPER SHIFT, 0, movetoworkspace, 20
-      bind = SUPER SHIFT, 0, submap, reset
-
-
+      ${builtins.concatStringsSep "\n" (builtins.map (num: extra_workspace { key = builtins.toString num; wsnumber = "2" + builtins.toString num;}) [1 2 3 4 5 6 7 8 9 0])}
      bind = , A, execr, waybar_mode unset
      bind = , A, submap, reset
      bind = , Escape, execr, waybar_mode unset
      bind = , Escape, submap, reset
      submap = reset

-
      submap = scrR
-      bind =      ,       1, execr, waybar_mode unset
-      bind =      ,       1, workspace,       31
-      bind =      ,       1, submap, reset
-      bind = SUPER,       1, execr, waybar_mode unset
-      bind = SUPER,       1, workspace,       31
-      bind = SUPER,       1, submap, reset
-      bind = SUPER SHIFT, 1, execr, waybar_mode unset
-      bind = SUPER SHIFT, 1, movetoworkspace, 31
-      bind = SUPER SHIFT, 1, submap, reset
-
-      bind =      ,       2, execr, waybar_mode unset
-      bind =      ,       2, workspace,       32
-      bind =      ,       2, submap, reset
-      bind = SUPER,       2, execr, waybar_mode unset
-      bind = SUPER,       2, workspace,       32
-      bind = SUPER,       2, submap, reset
-      bind = SUPER SHIFT, 2, execr, waybar_mode unset
-      bind = SUPER SHIFT, 2, movetoworkspace, 32
-      bind = SUPER SHIFT, 2, submap, reset
-
-      bind =      ,       3, execr, waybar_mode unset
-      bind =      ,       3, workspace,       33
-      bind =      ,       3, submap, reset
-      bind = SUPER,       3, execr, waybar_mode unset
-      bind = SUPER,       3, workspace,       33
-      bind = SUPER,       3, submap, reset
-      bind = SUPER SHIFT, 3, execr, waybar_mode unset
-      bind = SUPER SHIFT, 3, movetoworkspace, 33
-      bind = SUPER SHIFT, 3, submap, reset
-
-      bind =      ,       4, execr, waybar_mode unset
-      bind =      ,       4, workspace,       34
-      bind =      ,       4, submap, reset
-      bind = SUPER,       4, execr, waybar_mode unset
-      bind = SUPER,       4, workspace,       34
-      bind = SUPER,       4, submap, reset
-      bind = SUPER SHIFT, 4, execr, waybar_mode unset
-      bind = SUPER SHIFT, 4, movetoworkspace, 34
-      bind = SUPER SHIFT, 4, submap, reset
-
-      bind =      ,       5, execr, waybar_mode unset
-      bind =      ,       5, workspace,       35
-      bind =      ,       5, submap, reset
-      bind = SUPER,       5, execr, waybar_mode unset
-      bind = SUPER,       5, workspace,       35
-      bind = SUPER,       5, submap, reset
-      bind = SUPER SHIFT, 5, execr, waybar_mode unset
-      bind = SUPER SHIFT, 5, movetoworkspace, 35
-      bind = SUPER SHIFT, 5, submap, reset
-
-      bind =      ,       6, execr, waybar_mode unset
-      bind =      ,       6, workspace,       36
-      bind =      ,       6, submap, reset
-      bind = SUPER,       6, execr, waybar_mode unset
-      bind = SUPER,       6, workspace,       36
-      bind = SUPER,       6, submap, reset
-      bind = SUPER SHIFT, 6, execr, waybar_mode unset
-      bind = SUPER SHIFT, 6, movetoworkspace, 36
-      bind = SUPER SHIFT, 6, submap, reset
-
-      bind =      ,       7, execr, waybar_mode unset
-      bind =      ,       7, workspace,       37
-      bind =      ,       7, submap, reset
-      bind = SUPER,       7, execr, waybar_mode unset
-      bind = SUPER,       7, workspace,       37
-      bind = SUPER,       7, submap, reset
-      bind = SUPER SHIFT, 7, execr, waybar_mode unset
-      bind = SUPER SHIFT, 7, movetoworkspace, 37
-      bind = SUPER SHIFT, 7, submap, reset
-
-      bind =      ,       8, execr, waybar_mode unset
-      bind =      ,       8, workspace,       38
-      bind =      ,       8, submap, reset
-      bind = SUPER,       8, execr, waybar_mode unset
-      bind = SUPER,       8, workspace,       38
-      bind = SUPER,       8, submap, reset
-      bind = SUPER SHIFT, 8, execr, waybar_mode unset
-      bind = SUPER SHIFT, 8, movetoworkspace, 38
-      bind = SUPER SHIFT, 8, submap, reset
-
-      bind =      ,       9, execr, waybar_mode unset
-      bind =      ,       9, workspace,       39
-      bind =      ,       9, submap, reset
-      bind = SUPER,       9, execr, waybar_mode unset
-      bind = SUPER,       9, workspace,       39
-      bind = SUPER,       9, submap, reset
-      bind = SUPER SHIFT, 9, execr, waybar_mode unset
-      bind = SUPER SHIFT, 9, movetoworkspace, 39
-      bind = SUPER SHIFT, 9, submap, reset
-
-      bind =      ,       0, execr, waybar_mode unset
-      bind =      ,       0, workspace,       30
-      bind =      ,       0, submap, reset
-      bind = SUPER,       0, execr, waybar_mode unset
-      bind = SUPER,       0, workspace,       30
-      bind = SUPER,       0, submap, reset
-      bind = SUPER SHIFT, 0, execr, waybar_mode unset
-      bind = SUPER SHIFT, 0, movetoworkspace, 30
-      bind = SUPER SHIFT, 0, submap, reset
-
+      ${builtins.concatStringsSep "\n" (builtins.map (num: extra_workspace { key = builtins.toString num; wsnumber = "3" + builtins.toString num;}) [1 2 3 4 5 6 7 8 9 0])}
      bind = , Y, execr, waybar_mode unset
      bind = , Y, submap, reset
      bind = , Escape, execr, waybar_mode unset
      bind = , Escape, submap, reset
      submap = reset

-
-
-
-      plugin {
-          hyprexpo {
-              columns = 5
-              gap_size = ${builtins.toString rice.gap-size}
-              bg_col = rgb(${builtins.substring 1 6 rice.color.background})
-              workspace_method = first 10 # [center/first] [workspace] e.g. first 1 or center m+1
-
-              enable_gesture = false # laptop touchpad, 4 fingers
-              gesture_distance = 300 # how far is the "max"
-              gesture_positive = true # positive = swipe down. Negative = swipe up.
-          }
-      }
-
-
-      plugin {
-          overview {
-              panelColor = rgba(00000088)
-              workspaceActiveBackground = rgba(00ff00ff)
-              workspaceInactiveBackground = rgba(0000ffff)
-              # workspaceActiveBorder = 
-              # workspaceInactiveBorder = 
-              dragAlpha = 0.5
-              panelHeight = 200
-              workspaceMargin = 30  
-              workspaceBorderSize = 3 
-              centerAligned = true
-              overrideGaps = false
-              gapsIn = 0
-              gapsOut = 0
-              hideBackgroundLayers = false
-              drawActiveWorkspace = true
-              autoDrag = true
-              autoScroll = true
-              exitOnClick = false
-              switchOnDrop = false
-              exitOnSwitch = trueß
-              showNewWorkspace = true
-              showEmptyWorkspace = false
-          }
-      }
-
-      # allows repeated switching with same keypress that starts the submap
-      binde = SUPER, TAB, exec, hyprswitch --daemon --do-initial-execute
-      bind = SUPER, TAB, submap, switch
-      bind = SUPER, TAB, exec, waybar_mode set "sw" 
-
-      # allows repeated switching with same keypress that starts the submap
-      binde = SUPER SHIFT, TAB, exec, hyprswitch --daemon --do-initial-execute -r
-      bind = SUPER SHIFT, TAB, submap, switch
-      bind = SUPER, TAB, exec, waybar_mode set "swr" 
-
-      submap = switch
-      # allow repeated window switching in submap (same keys as repeating while starting)
-      binde = SUPER, TAB, exec, hyprswitch --daemon
-      binde = SUPER SHIFT, TAB, exec, hyprswitch --daemon -r
-
-      # switch to specific window offset
-      bind = , 1, exec, hyprswitch --daemon --offset=1
-      bind = , 2, exec, hyprswitch --daemon --offset=2
-      bind = , 3, exec, hyprswitch --daemon --offset=3
-      bind = , 4, exec, hyprswitch --daemon --offset=4
-      bind = , 5, exec, hyprswitch --daemon --offset=5
-      bind = , 6, exec, hyprswitch --daemon --offset=6
-      bind = , 7, exec, hyprswitch --daemon --offset=7
-      bind = , 8, exec, hyprswitch --daemon --offset=8
-      bind = , 8, exec, hyprswitch --daemon --offset=8
-      bind = , 9, exec, hyprswitch --daemon --offset=9
-
-      bind = SUPER $reverse, 1, exec, hyprswitch --daemon --offset=1 -r
-      bind = SUPER $reverse, 2, exec, hyprswitch --daemon --offset=2 -r
-      bind = SUPER $reverse, 3, exec, hyprswitch --daemon --offset=3 -r
-      bind = SUPER $reverse, 4, exec, hyprswitch --daemon --offset=4 -r
-      bind = SUPER $reverse, 5, exec, hyprswitch --daemon --offset=5 -r
-      bind = SUPER $reverse, 6, exec, hyprswitch --daemon --offset=6 -r
-      bind = SUPER $reverse, 7, exec, hyprswitch --daemon --offset=7 -r
-      bind = SUPER $reverse, 8, exec, hyprswitch --daemon --offset=8 -r
-      bind = SUPER $reverse, 9, exec, hyprswitch --daemon --offset=9 -r
-      bind = SUPER $reverse, 5, exec, hyprswitch --daemon --offset=5 -r
-
-
-      # exit submap and stop hyprswitch
-      bindrt = SUPER, SUPER_L, exec, hyprswitch --stop-daemon
-      bindrt = SUPER, SUPER_L, submap, reset
-      bindrt = SUPER, SUPER_L, exec, waybar_mode unset
-
-      # if it somehow doesn't close on releasing $switch_release, escape can kill
-      bindr = ,escape, exec, pkill hyprswitch
-      bindr = ,escape, submap, reset
+      submap = color
+      ${action_simple { key = "W"; cmd = ''exec,swww query | sed -n 1p | sed -E 's-.*image: (.*)-"\1"-g' | xargs change_colors_json img && notify-send 'change_colors_json img successfull' ''; }} 
+      ${action_simple { key = "M"; cmd = ''exec,change_colors_json manual && notify-send 'change_colors_json manual successfull'  ''; }} 
+      ${action_simple { key = "D"; cmd = ''exec,firefox /home/${user}/.config/color-pallete.html''; }} 
+      bind = , Escape, execr, waybar_mode unset
+      bind = , Escape, submap, reset
      submap = reset

+      submap = tuda
+      ${action_simple { key = "T"; cmd = ''exec,firefox https://www.tucan.tu-darmstadt.de/''; }} 
+      ${action_simple { key = "M"; cmd = ''exec,firefox https://moodle.tu-darmstadt.de/''; }} 
+      ${action_simple { key = "I"; cmd = ''exec,firefox https://moodle.informatik.tu-darmstadt.de/''; }} 
+      bind = , Escape, execr, waybar_mode unset
+      bind = , Escape, submap, reset
+      submap = reset
+
+      
    '';
  };

-  home.file =
-    let
+  home.file = let
    m = if host == "NxXPS" then monitors.xps.main.name else monitors.north.main.name;
-    in
-    {
+  in {
    ".config/hypr/hyprlock.conf".text = ''
      background {
          monitor = ${m}

          # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
-          path = /home/nx2/Pictures/nix-wall.png
+          path = /home/nx2/Pictures/wallpapers/nix-wall.png
          blur_size = 4
          blur_passes = 3 # 0 disables blurring
          noise = 0.0117
--- a/home-modules/kitty.nix
+++ b/home-modules/kitty.nix
@@ -3,7 +3,7 @@
  programs.kitty = {
    enable = true;
    font = {
-      name = rice.font.code.name2;
+      name = rice.font.code.name;
      package = rice.font.code.package;
    };
    settings = with rice.color; {
--- a/home-modules/mako.nix
+++ b/home-modules/mako.nix
@@ -3,12 +3,12 @@
  home.packages = with pkgs; [ libnotify ];
  services.mako = with rice; {
    enable = true;
-    defaultTimeout = 5000; # in ms
+    defaultTimeout = 10000; # in ms
    backgroundColor = color.background;
    textColor = color.foreground;
    borderColor = color.border;
    borderSize = border-width;
-    font = font.code.name2;
+    font = font.code.name;
    borderRadius = rounding;
    anchor = "top-right";
    margin = builtins.toString (gap-size * 2) ;
--- a/home-modules/programming/go.nix
+++ b/home-modules/programming/go.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+  home = {
+    packages = with pkgs; [
+      go
+    ];
+  };
+}
--- a/home-modules/programming/java.nix
+++ b/home-modules/programming/java.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+  home = {
+    packages = with pkgs; [
+      jdk
+    ];
+  };
+}
--- a/home-modules/programming/node.nix
+++ b/home-modules/programming/node.nix
--- a/home-modules/qt.nix
+++ b/home-modules/qt.nix
@@ -1,6 +1,8 @@
-{ pkgs, lib,  user, ... }: 
+{ ... }: 
 {
  qt = {
-    platformTheme = "gtk";
+    enable = true;
+    platformTheme.name = "qtct";
+    style.name = "adwaita-dark";
  };
 }
--- a/home-modules/rofi.nix
+++ b/home-modules/rofi.nix
@@ -14,7 +14,7 @@
      }

      * {
-        font: "${rice.font.code.name2} 12";
+        font: "${rice.font.code.name} 12";
        foreground: ${foreground};
        background-color: ${background}${trdr};
        padding: 0px;
--- a/home-modules/ssh.nix
+++ b/home-modules/ssh.nix
@@ -21,7 +21,7 @@
      HOST nxgit
          HostName ssh.${domain}
          User git
-          Port 20022
+          Port 50022
    '';
  };
 }
--- a/home-modules/vscode.nix
+++ b/home-modules/vscode.nix
@@ -65,7 +65,7 @@
      ];
      userSettings = {
        workbench.colorTheme = "Just Black";
-        editor.fontFamily = "'${rice.font.code.name2}', 'monospace', monospace";
+        editor.fontFamily = "'${rice.font.code.name}', 'monospace', monospace";
        remote.SSH.useLocalServer = false;
      };
      enableUpdateCheck = false;
--- a/home-modules/wallpaper-to-colors.nix
+++ b/home-modules/wallpaper-to-colors.nix
@@ -5,16 +5,18 @@
      libraries = with python3Packages; [ numpy pillow scikit-learn ];
      flakeIgnore = [ "E302" "E305" "E226" "E501" ];
    } /*python */ ''
-from colorsys import hls_to_rgb, rgb_to_hls
-import json
-import sys
-from typing import Literal, cast
-from numpy.typing import NDArray
-from sklearn.cluster import KMeans
-import numpy as np
-from PIL import Image
+      from colorsys import hls_to_rgb, rgb_to_hls
+      import json
+      import sys
+      import subprocess
+      from time import sleep
+      from typing import Literal, cast
+      from numpy.typing import NDArray
+      from sklearn.cluster import KMeans
+      import numpy as np
+      from PIL import Image

-def fc(c: int) -> str:
+      def fc(c: int) -> str:
          assert c < 256
          s = str(hex(c))[2:]
          if c < 16:
@@ -24,8 +26,8 @@ def fc(c: int) -> str:
          else:
              return s

-class Color(object):
-    def __init__(self, rgb: tuple[int, ...], frequency: float):
+      class Color(object):
+          def __init__(self, rgb: tuple[int, ...], frequency: float = 1):
              assert len(rgb) == 3, "RGB values must be a tuple of length 3"
              self.rgb = cast(tuple[int, int, int], rgb)
              self.freq: float = frequency
@@ -41,7 +43,7 @@ class Color(object):
          def luminance(self) -> float:
              return np.dot(np.array([0.2126, 0.7152, 0.0722]), self.rgb)

-def k_means_extraction(arr: NDArray[float], height: int, width: int, palette_size: int) -> list[Color]:
+      def k_means_extraction(arr: NDArray[float], height: int, width: int, palette_size: int) -> list[Color]:
          arr = np.reshape(arr, (width * height, -1))
          model = KMeans(n_clusters=palette_size, n_init="auto", init="k-means++", random_state=2024)
          labels = model.fit_predict(arr)
@@ -54,7 +56,7 @@ def k_means_extraction(arr: NDArray[float], height: int, width: int, palette_siz
          return colors


-class Palette:
+      class Palette:
          def __init__(self, colors: list[Color]):
              self.colors = colors
              self.frequencies = [c.freq for c in colors]
@@ -65,7 +67,7 @@ class Palette:
          def __len__(self) -> int:
              return self.number_of_colors

-def ensure_color(c: Color, alter_sat: bool) -> list[int]:
+      def ensure_color(c: Color, alter_sat: bool) -> list[int]:
          hue, lum, sat = c.hls
          if alter_sat:
              new_sat = min((sat**0.5) + 0.4, 1)
@@ -75,10 +77,10 @@ def ensure_color(c: Color, alter_sat: bool) -> list[int]:
          r, g, b = hls_to_rgb(h=hue, l=new_lum, s=new_sat)
          return [int(r*255), int(g*255), int(b*255)]

-def list_to_hex(ilist: list[int]) -> str:
+      def list_to_hex(ilist: list[int]) -> str:
          return f"#{fc(ilist[0])}{fc(ilist[1])}{fc(ilist[2])}"

-def alter_hue(ilist: list[int], hue: int) -> list[int]:
+      def alter_hue(ilist: list[int], hue: int) -> list[int]:
          assert hue >= 0 and hue <= 360
          r, g, b = ilist
          h, l, s = rgb_to_hls((r/255), (g/255), (b/255))
@@ -86,19 +88,19 @@ def alter_hue(ilist: list[int], hue: int) -> list[int]:
          r, g, b = hls_to_rgb(h=new_hue, l=l, s=s)
          return [int(r*255), int(g*255), int(b*255)]

-def alter_l(ilist: list[int], l_in_1_0: float) -> list[int]:
+      def alter_l(ilist: list[int], l_in_1_0: float) -> list[int]:
          assert l_in_1_0 >= 0 and l_in_1_0 <= 1
          r, g, b = ilist
          h, _, s = rgb_to_hls((r/255), (g/255), (b/255))
          r, g, b = hls_to_rgb(h=h, l=l_in_1_0, s=s)
          return [int(r*255), int(g*255), int(b*255)]

-def extract_colors(
+      def extract_colors(
          image: str,
          palette_size: int = 5,
          resize: bool = True,
          sort_mode: Literal["luminance", "frequency"] | None = None,
-) -> Palette:
+      ) -> Palette:

          img = Image.open(image).convert("RGB")

@@ -115,14 +117,25 @@ def extract_colors(
              colors.sort(reverse=True)

          return Palette(colors)
-if __name__ == "__main__":
-    img = sys.argv[1]

+      def hyprpicker() -> Color:
+          ret = str(subprocess.run(["${pkgs.hyprpicker}/bin/hyprpicker", "-n", "-f", "rgb"], capture_output=True).stdout)[2:-3]
+          return Color([int(c) for c in ret.split(" ")])
+
+      if __name__ == "__main__":
+          if sys.argv[1] == "img":
+              img = sys.argv[2]
              palette = extract_colors(image=img, palette_size=3)
-
              accent = ensure_color(c=palette[0], alter_sat=False)
              secondary = ensure_color(c=palette[1], alter_sat=True)
              tertiary = ensure_color(c=palette[2], alter_sat=False)
+          elif sys.argv[1] == "manual":
+              accent = ensure_color(c=hyprpicker(), alter_sat=False)
+              sleep(0.1)
+              secondary = ensure_color(c=hyprpicker(), alter_sat=True)
+              sleep(0.1)
+              tertiary = ensure_color(c=hyprpicker(), alter_sat=False)
+
          weird = alter_hue(ilist=accent, hue=80)
          special = alter_hue(ilist=accent, hue=180)
          foreground = alter_l(accent, 0.9)
@@ -144,6 +157,6 @@ if __name__ == "__main__":

          with open("/home/nx2/nix-dots/flake-modules/colors.json", "w") as f:
              f.write(json.dumps(d, indent=4))
-'')
+    '')
  ];
 }
--- a/home-modules/waybar.nix
+++ b/home-modules/waybar.nix
@@ -163,7 +163,7 @@ in {
    };
    style = with rice.color; let f = rice.lib.hex-to-rgb-comma-string; in ''
      * {
-        font-family: ${rice.font.code.name2};
+        font-family: ${rice.font.code.name};
        font-size: 1em;
        min-height: 0px;
        margin: 0px;
@@ -223,7 +223,7 @@ in {
      }

      #window, #custom-ctimeremaining {
-        font-family: ${rice.font.base.name}, ${rice.font.code.name2};
+        font-family: ${rice.font.base.name}, ${rice.font.code.name};
        color: rgb(${f tertiary.bright});
      }

@@ -238,11 +238,14 @@ in {
        color: rgb(${f green.base});;
      }

-      #battery.critical { 
-        color: rgb(${f red.dark});;
-        background: rgb(${f red.bright});
+      #battery.charging {
+        color: rgb(${f green.base});
+      }
+
+      #battery.critical { 
+        background: rgb(${f negative.base});
+        color: rgb(${f foreground});
      }
-      #battery.charging { color: rgb(${f green.base}); }
    '';

      #battery.critical:not(.charging) { 
--- a/home-modules/yazi.nix
+++ b/home-modules/yazi.nix
@@ -3,14 +3,149 @@
 {
  home.packages = with pkgs; [
    # yazi
-    dragon
+    # dragon
    unar
   ];
  
  programs.yazi = {
    enable = true;
+    # package = pkgs.yazi;
    package = inputs.yazi.packages.${system}.default;
    enableFishIntegration = true;
+    shellWrapperName = "ya";
+    plugins = with inputs.yazi-plugins.packages.${system}; {
+      inherit chmod starship;
+    };
+    # initLua = /* lua */  '' '';
+    keymap = {
+      keymap = [
+      	{ on = "<Esc>"; run = "escape"; desc = "Exit visual mode, clear selected, or cancel search"; }
+      	{ on = "q"; run = "quit"; desc = "Exit the process"; }
+      	{ on = "Q"; run = "quit --no-cwd-file"; desc = "Exit the process without writing cwd-file"; }
+      	{ on = "<C-w>"; run = "close"; desc = "Close the current tab, or quit if it is last tab"; }
+      	{ on = "<C-z>"; run = "suspend"; desc = "Suspend the process"; }
+      	# Hopping
+      	{ on = "k";               run = "arrow -1";         desc = "Move cursor up"; }
+      	{ on = "j";               run = "arrow 1";          desc = "Move cursor down"; }
+      	{ on = "<Up>";            run = "arrow -1";         desc = "Move cursor up"; }
+      	{ on = "<Down>";          run = "arrow 1";          desc = "Move cursor down"; }
+      	{ on = "<C-u>";           run = "arrow -50%";       desc = "Move cursor up half page"; }
+      	{ on = "<C-d>";           run = "arrow 50%";        desc = "Move cursor down half page"; }
+      	{ on = "<C-b>";           run = "arrow -100%";      desc = "Move cursor up one page"; }
+      	{ on = "<C-f>";           run = "arrow 100%";       desc = "Move cursor down one page"; }
+      	{ on = "<PageUp>";        run = "arrow -100%";      desc = "Move cursor up one page"; }
+      	{ on = "<PageDown>";      run = "arrow 100%";       desc = "Move cursor down one page"; }
+      	{ on = [ "g" "g" ];       run = "arrow -99999999";  desc = "Move cursor to the top"; }
+      	{ on = [ "g" "e" ];       run = "arrow 99999999";   desc = "Move cursor to the end"; }
+      	{ on = [ "g" "h" ];       run = "cd ~";             desc = "Go to the home directory"; }
+      	{ on = [ "g" "n" ];       run = "cd ~/nix-dots";    desc = "Go to the Nix-Dotfiles directory"; }
+      	{ on = [ "g" "n" ];       run = "cd /nix/store";    desc = "Go to the Nix-Store"; }
+      	{ on = [ "g" "c" ];       run = "cd ~/.config";     desc = "Go to the config directory"; }
+      	{ on = [ "g" "l" ];       run = "cd ~/.locale";     desc = "Go to the .locale directory"; }
+      	{ on = [ "g" "C" ];       run = "cd ~/.cache";      desc = "Go to the .cache directory"; }
+      	{ on = [ "g" "m" ];       run = "cd ~/media";       desc = "Go to the media (udiskie mount) directory"; }
+      	{ on = [ "g" "v" ];       run = "cd ~/Videos";      desc = "Go to the Videos directory"; }
+      	{ on = [ "g" "d" ];       run = "cd ~/Downloads";   desc = "Go to the downloads directory"; }
+      	{ on = [ "g" "D" ];       run = "cd ~/Documents";   desc = "Go to the Documents directory"; }
+      	{ on = [ "g" "r" ];       run = "cd /";             desc = "Go to the root (/) directory"; }
+      	{ on = [ "g" "/" ];       run = "cd /";             desc = "Go to the root (/) directory"; }
+      	{ on = [ "g" "<Space>" ]; run = "cd --interactive"; desc = "Go to a directory interactively"; }
+      	# Navigation
+      	{ on = "h";       run = "leave";   desc = "Go back to the parent directory"; }
+      	{ on = "l";       run = "enter";   desc = "Enter the child directory"; }
+      	{ on = "<Left>";  run = "leave";   desc = "Go back to the parent directory"; }
+      	{ on = "<Right>"; run = "enter";   desc = "Enter the child directory"; }
+      	{ on = "H";       run = "back";    desc = "Go back to the previous directory"; }
+      	{ on = "L";       run = "forward"; desc = "Go forward to the next directory"; }
+      	# Seeking
+      	{ on = "K"; run = "seek -5"; desc = "Seek up 5 units in the preview"; }
+      	{ on = "J"; run = "seek 5"; desc = "Seek down 5 units in the preview"; }
+      	# Selection
+      	{ on = "<Space>"; run = [ "select --state=none" "arrow 1" ]; desc = "Toggle the current selection state"; }
+      	{ on = "v";       run = "visual_mode";                        desc = "Enter visual mode (selection mode)"; }
+      	{ on = "V";       run = "visual_mode --unset";                desc = "Enter visual mode (unset mode)"; }
+      	{ on = "<C-a>";   run = "select_all --state=true";            desc = "Select all files"; }
+      	{ on = "<C-r>";   run = "select_all --state=none";            desc = "Inverse selection of all files"; }
+      	# Operation
+      	{ on = "o";         run = "open";                        desc = "Open selected files"; }
+      	{ on = "O";         run = "open --interactive";          desc = "Open selected files interactively"; }
+      	{ on = "<Enter>";   run = "open";                        desc = "Open selected files"; }
+      	{ on = "<S-Enter>"; run = "open --interactive";          desc = "Open selected files interactively"; }
+      	{ on = "y";         run = "yank";                        desc = "Yank selected files (copy)"; }
+      	{ on = "x";         run = "yank --cut";                  desc = "Yank selected files (cut)"; }
+      	{ on = "p";         run = "paste";                       desc = "Paste yanked "; }
+      	{ on = "P";         run = "paste --force";               desc = "Paste yanked (overwrite if exists)"; }
+      	{ on = "-";         run = "link";                        desc = "Symlink the absolute path of yanked files"; }
+      	{ on = "_";         run = "link --relative";             desc = "Symlink the relative path of yanked files"; }
+      	{ on = "<C-->";     run = "hardlink";                    desc = "Hardlink yanked files"; }
+      	{ on = "Y";         run = "unyank";                      desc = "Cancel the yank status"; }
+      	{ on = "X";         run = "unyank";                      desc = "Cancel the yank status"; }
+      	{ on = "d";         run = "remove";                      desc = "Trash selected files"; }
+      	{ on = "D";         run = "remove --permanently";        desc = "Permanently delete selected files"; }
+      	{ on = "a";         run = "create";                      desc = "Create a file (ends with / for directories)"; }
+      	{ on = "r";         run = "rename --cursor=before_ext";  desc = "Rename selected file(s)"; }
+      	{ on = ";";         run = "shell --interactive";         desc = "Run a shell command"; }
+      	{ on = ":";         run = "shell --block --interactive"; desc = "Run a shell command (block until finishes)"; }
+      	{ on = ".";         run = "hidden toggle";               desc = "Toggle the visibility of hidden files"; }
+      	{ on = "s";         run = "search fd";                   desc = "Search files by name using fd"; }
+      	{ on = "S";         run = "search rg";                   desc = "Search files by content using ripgrep"; }
+      	{ on = "<C-s>";     run = "escape --search";             desc = "Cancel the ongoing search"; }
+      	{ on = "z";         run = "plugin zoxide";               desc = "Jump to a directory using zoxide"; }
+      	{ on = "Z";         run = "plugin fzf";                  desc = "Jump to a directory or reveal a file using fzf"; }
+      	# Linemode
+      	{ on = [ "m" "s" ];       run = "linemode size"; desc = "Set linemode to size"; }
+      	{ on = [ "m" "p" ];       run = "linemode permissions"; desc = "Set linemode to permissions"; }
+      	{ on = [ "m" "c" ];       run = "linemode ctime"; desc = "Set linemode to ctime"; }
+      	{ on = [ "m" "m" ];       run = "linemode mtime"; desc = "Set linemode to mtime"; }
+      	{ on = [ "m" "o" ];       run = "linemode owner"; desc = "Set linemode to owner"; }
+      	{ on = [ "m" "n" ];       run = "linemode none"; desc = "Set linemode to none"; }
+      	# Copy
+      	{ on = [ "c" "c" ];       run = "copy path"; desc = "Copy the file path"; }
+      	{ on = [ "c" "d" ];       run = "copy dirname"; desc = "Copy the directory path"; }
+      	{ on = [ "c" "f" ];       run = "copy filename"; desc = "Copy the filename"; }
+      	{ on = [ "c" "n" ];       run = "copy name_without_ext"; desc = "Copy the filename without extension"; }
+      	# Filter
+      	{ on = "f"; run = "filter --smart"; desc = "Filter files"; }
+      	# Find
+      	{ on = "/"; run = "find --smart";            desc = "Find next file"; }
+      	{ on = "?"; run = "find --previous --smart"; desc = "Find previous file"; }
+      	{ on = "n"; run = "find_arrow";              desc = "Go to the next found"; }
+      	{ on = "N"; run = "find_arrow --previous";   desc = "Go to the previous found"; }
+      	# Sortin
+      	{ on = [ "," "m" ]; run = [ "sort modified --reverse=no" "linemode mtime" ]; desc = "Sort by modified time"; }
+      	{ on = [ "," "M" ]; run = [ "sort modified --reverse" "linemode mtime" ];    desc = "Sort by modified time (reverse)"; }
+      	{ on = [ "," "c" ]; run = [ "sort created --reverse=no" "linemode ctime" ];  desc = "Sort by created time"; }
+      	{ on = [ "," "C" ]; run = [ "sort created --reverse" "linemode ctime" ];     desc = "Sort by created time (reverse)"; }
+      	{ on = [ "," "e" ]; run = "sort extension --reverse=no";                     desc = "Sort by extension"; }
+      	{ on = [ "," "E" ]; run = "sort extension --reverse";                        desc = "Sort by extension (reverse)"; }
+      	{ on = [ "," "a" ]; run = "sort alphabetical --reverse=no";                  desc = "Sort alphabetically"; }
+      	{ on = [ "," "A" ]; run = "sort alphabetical --reverse";                     desc = "Sort alphabetically (reverse)"; }
+      	{ on = [ "," "n" ]; run = "sort natural --reverse=no";                       desc = "Sort naturally"; }
+      	{ on = [ "," "N" ]; run = "sort natural --reverse";                          desc = "Sort naturally (reverse)"; }
+      	{ on = [ "," "s" ]; run = [ "sort size --reverse=no" "linemode size" ];      desc = "Sort by size"; }
+      	{ on = [ "," "S" ]; run = [ "sort size --reverse" "linemode size" ];         desc = "Sort by size (reverse)"; }
+      	# Tab
+      	{ on = "t"; run = "tab_create --current"; desc = "Create a new tab with CWD"; }
+      	{ on = "1"; run = "tab_switch 0"; desc = "Switch to the first tab"; }
+      	{ on = "2"; run = "tab_switch 1"; desc = "Switch to the second tab"; }
+      	{ on = "3"; run = "tab_switch 2"; desc = "Switch to the third tab"; }
+      	{ on = "4"; run = "tab_switch 3"; desc = "Switch to the fourth tab"; }
+      	{ on = "5"; run = "tab_switch 4"; desc = "Switch to the fifth tab"; }
+      	{ on = "6"; run = "tab_switch 5"; desc = "Switch to the sixth tab"; }
+      	{ on = "7"; run = "tab_switch 6"; desc = "Switch to the seventh tab"; }
+      	{ on = "8"; run = "tab_switch 7"; desc = "Switch to the eighth tab"; }
+      	{ on = "9"; run = "tab_switch 8"; desc = "Switch to the ninth tab"; }
+      	{ on = "["; run = "tab_switch -1 --relative"; desc = "Switch to the previous tab"; }
+      	{ on = "]"; run = "tab_switch 1 --relative"; desc = "Switch to the next tab"; }
+      	{ on = "{"; run = "tab_swap -1"; desc = "Swap current tab with previous tab"; }
+      	{ on = "}"; run = "tab_swap 1"; desc = "Swap current tab with next tab"; }
+      	# Task
+      	{ on = "w"; run = "tasks_show"; desc = "Show task manager"; }
+      	# Hel
+      	{ on = "~"; run = "help"; desc = "Open help"; }
+      	{ on = "<F1>"; run = "help"; desc = "Open help"; }
+      ];
+    };
    settings = {
      manager = {
        layout = [2 3 4];
@@ -21,20 +156,15 @@
        linemode = "size";
        show_hidden = false;
        show_symlink = true;
-        append_keymap = [
-          { on = [ "<C-g>" ]; run = "lazygit"; desc = "Run Lazygit in current directory"; }
-          { on = [ "<C-D>" ]; run = ''shell 'dragon -x -i -T "$1"' --confirm''; }
-        ];
      };
      opener = {
        "edit" = [
-	        { run  = ''hx "$@"''; desc = "helix"; block = true;}
-	        { run = ''codium "$@"''; orphan = true;}
-	        { run  = ''nano "$@"''; desc = "nano"; block = true;}
+	        { run = ''hx "$@"''; desc = "helix"; block = true; }
+	        { run = ''codium "$@"''; desc = "helix"; orphan = true; }
        ];
        "play" = [
          { run = ''mpv "$@"''; }
-          { run = ''mediainfo "$1"; echo "Press enter to exit"; read''; block = true; desc = "Show mediainfo";}
+          { run = ''mediainfo "$1"; echo "Press enter to exit"; read''; block = true; desc = "Show mediainfo"; }
        ];
        "archive" = [
          { run = ''unar "$1"''; desc = "Extract here"; }
@@ -42,9 +172,9 @@
          { run = ''unzip "$1"''; desc = "unzip"; }
        ];
        "image" = [
-          { run = ''imv "$@"''; desc = "imv";}
-          { run = ''gimp "$@"''; desc = "gimp";}
-          { run = ''swww img --transition-type wipe --transition-angle 60 --transition-step 120 --transition-fps 120 "$@"''; desc = "swww wallpaper";}
+          { run = ''imv "$@"''; desc = "imv"; }
+          { run = ''gimp "$@"''; desc = "gimp"; }
+          { run = ''swww img --transition-type wipe --transition-angle 60 --transition-step 120 --transition-fps 120 "$@"''; desc = "swww wallpaper"; }
        ];
        "svg" = [
          { run = ''inkscape "$@"''; desc = "inkscape";}
@@ -55,8 +185,8 @@
          { run = ''fontforge "$@"''; desc = "fortforge"; }
        ];
        "document" = [
-          { run = ''zathura "$@"''; desc = "zathura"; }
-          { run = ''xournal "$@"''; desc = "xournal"; }
+          { run = ''zathura "$@"''; desc = "zathura";  orphan = true; }
+          { run = ''xournal "$@"''; desc = "xournal";  orphan = true; }
          { run = ''firefox "$@"''; desc = "firefox"; }
        ];
        "browser" = [
@@ -83,8 +213,8 @@
        ];
      };
      open.rules = [
-        { mime = "text/html";                                       use = ["edit" "browser"]; }
-        { mime = "text/htm";                                        use = ["edit" "browser"]; }
+        { mime = "text/html";                                       use = [ "edit" "browser" ]; }
+        { mime = "text/htm";                                        use = [ "edit" "browser" ]; }
        { mime = "text/x-python";                                   use = "python"; }
        { mime = "text/*";                                          use = "edit"; }

@@ -92,11 +222,12 @@
        { mine = "inode/directory";                                 use = "edit"; }

        { mime = "image/*";                                         use = "image"; }
-        { mime = "image/svg";                                       use = ["image" "edit"]; }
+        { mime = "image/svg";                                       use = [ "image" "edit" ]; }

-        { mime = "video/*";                                         use = "video"; }
+        { mime = "video/*";                                         use = "play"; }
+        { mime = "audio/*";                                         use = "play"; }

-        { mime = "application/x-httpd-php";                         use = ["edit" "browser"]; }
+        { mime = "application/x-httpd-php";                         use = [ "edit" "browser" ]; }
        { mime = "application/json";                                use = "edit"; }
        { mime = "application/ld+json";                             use = "edit"; }
        { mime = "application/pdf";                                 use = "document"; }
@@ -104,9 +235,9 @@
        { mime = "application/vnd.oasis.opendocument.*";            use = "office"; }
        { mime = "application/vnd.ms-powerpoint";                   use = "office"; }
        { mime = "application/vnd.ms-excel";                        use = "office"; }
-        { mime = "application/vnd.openxmlformats-officedocument.*"; use = ["office" "edit"]; }
+        { mime = "application/vnd.openxmlformats-officedocument.*"; use = [ "office" "edit" ]; }
        { mime = "application/rtf";                                 use = "office"; }
-        { mime = "application/x-sh";                                use = ["edit" "shell"]; }
+        { mime = "application/x-sh";                                use = [ "edit" "shell" ]; }
        { mime = "application/x-python-code";                       use = "python"; }
        { mime = "application/xml";                                 use = "edit"; }
        { mime = "application/xul";                                 use = "edit"; }
--- a/home-modules/zathura.nix
+++ b/home-modules/zathura.nix
@@ -12,7 +12,10 @@
      highlight-active-color  = "rgba(${rice.lib.hex-to-rgb-comma-string accent.base},0.5)";
      highlight-color         = "rgba(${rice.lib.hex-to-rgb-comma-string secondary.base},0.5)";
      highlight-fg            = "rgba(${rice.lib.hex-to-rgb-comma-string secondary.base},0.5)";
-      index-active-bg         = background;
+      index-fg                = accent.bright;
+      index-bg                = black.dark;
+      index-active-fg         = background;
+      index-active-bg         = foreground;
      inputbar-bg             = background;
      inputbar-fg             = foreground;
      notification-bg         = background;
@@ -31,6 +34,19 @@

 		  n-completion-items      = 9999999999999;
 		  exec-command = "open";
+		  page-padding = rice.border-width;
+
+      #stop at page boundries
+      scroll-page-aware       = true;
+      smooth-scroll           = true;
+      scroll-full-overlap     = 0.01;
+      scroll-step             = 300;
+	  };
+    mappings = {
+      h = ''feedkeys "<C-Left>"'';
+      j = ''feedkeys "<C-Down>"'';
+      k = ''feedkeys "<C-Up>"'';
+      l = ''feedkeys "<C-Right>"'';
    };
  };
 }
--- a/home.nix
+++ b/home.nix
@@ -14,6 +14,7 @@
    # ./home-modules/foot.nix
    ./home-modules/games.nix
    ./home-modules/gestures.nix
+    ./home-modules/gimp.nix
    ./home-modules/git.nix
    ./home-modules/gpg.nix
    ./home-modules/gtk.nix
@@ -37,7 +38,9 @@
    ./home-modules/pnx.nix
    ./home-modules/programming/c.nix
    ./home-modules/programming/gleam.nix
-    ./home-modules/programming/node.nix
+    ./home-modules/programming/go.nix
+    ./home-modules/programming/java.nix
+    ./home-modules/programming/js.nix
    ./home-modules/programming/python.nix
    ./home-modules/qt.nix
    ./home-modules/rofi.nix
@@ -72,7 +75,7 @@
    
    imv mpv mediainfo exiftool ffmpeg
    pavucontrol
-    fontpreview gtk2fontsel
+    fontpreview 
    lynx w3m browsh
    bat du-dust eza neofetch tldr fzf figlet ripgrep lolcat jq glow
    brightnessctl wev 
@@ -95,6 +98,7 @@
    ghostscript
    
    inputs.zen-browser.packages."${system}".default
+    gnome-calendar
    
  ] ++ (with pkgs-unstable; [
    obsidian
@@ -103,7 +107,6 @@
  ]) ++ (if host != "NxACE" then (with pkgs; [
    signal-desktop
    zoom-us
-    gimp 
    inkscape
  ]) else (with pkgs-unstable; [
    
--- a/sops-secrets.yaml
+++ b/sops-secrets.yaml
--- a/system-modules/boot.nix
+++ b/system-modules/boot.nix
@@ -17,11 +17,9 @@ in
      
    environment.systemPackages = with pkgs; [ sbctl ];
    boot = {
-      lanzaboote = 
-      let
+      lanzaboote =  let
        windows-efi-shell-fs-alias = "HD0a65535a2"; 
-      in
-       {
+      in {
        enable = true;
        pkiBundle = "/etc/secureboot";
        package = lib.mkForce (pkgs.writeShellApplication {
@@ -105,7 +103,7 @@ in
          '';
        };
      };
-      kernelPackages = pkgs-unstable.linuxPackages_6_10;
+      kernelPackages = pkgs-unstable.linuxPackages_6_11;
      extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
      kernelModules = [ "v4l2loopback" ];
      extraModprobeConfig = ''options v4l2loopback devices=1 video_nr=1 card_label="OBS VCam" exclusive_caps=1'';
--- a/system-modules/fonts.nix
+++ b/system-modules/fonts.nix
@@ -7,7 +7,8 @@
 {
  fonts.packages = with pkgs; [
    noto-fonts
-    noto-fonts-cjk
+    noto-fonts-cjk-sans
+    noto-fonts-cjk-serif
    noto-fonts-emoji
    newcomputermodern
    atkinson-hyperlegible
--- a/system-modules/games.nix
+++ b/system-modules/games.nix
@@ -0,0 +1,15 @@
+{ lib, host, ... }:
+lib.mkIf (host == "NxNORTH" || host == "NxACE")
+{
+  programs = {
+    steam = {
+      enable = true;
+    };
+    gamemode = {
+      enable = true;
+    };
+    gamescope = {
+      enable = true;
+    };
+  };
+}
--- a/system-modules/hardware-configuration.nix
+++ b/system-modules/hardware-configuration.nix
@@ -42,11 +42,11 @@
  boot.initrd.kernelModules = if host == "NxXPS" then [ "i915" ] else [];

  environment.variables = if host == "NxXPS" then {
-    VDPAU_DRIVER = lib.mkIf config.hardware.opengl.enable (lib.mkDefault "va_gl");
+    VDPAU_DRIVER = lib.mkIf config.hardware.graphics.enable (lib.mkDefault "va_gl");
  } else {};

-  hardware.opengl.extraPackages = if host == "NxXPS" then with pkgs; [
-    (if (lib.versionOlder (lib.versions.majorMinor lib.version) "24.05") then vaapiIntel else intel-vaapi-driver)
+  hardware.graphics.extraPackages = if host == "NxXPS" then with pkgs; [
+    (if (lib.versionOlder (lib.versions.majorMinor lib.version) "24.11") then vaapiIntel else intel-vaapi-driver)
    libvdpau-va-gl
    intel-media-driver
  ] else [];
--- a/system-modules/health_reminder.nix
+++ b/system-modules/health_reminder.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, host, ... }:
+{ pkgs, lib, host, ... }:
 lib.mkIf (host != "NxACE")
 {
  systemd.timers."health_reminder" = {
@@ -11,11 +11,10 @@ lib.mkIf (host != "NxACE")
    };
  };

-  systemd.services."health_reminder" =
-    let
-      hm =
-      let p = /*python*/ ''
-        #!${pkgs.python3}/bin/python3
+  systemd.services."health_reminder" = let
+      hm = pkgs.writers.writePython3Bin "health_reminder" {
+        flakeIgnore = [ "E302" "E305" "E226" "E501" ];
+      }  /*python*/ ''
        import random
        import re

@@ -35,25 +34,21 @@ lib.mkIf (host != "NxACE")
                return action

        actions = [
-            Action("look away for %o Seconds!",300, ["10", "15"]         ),
-            Action("Posture Check!",           90                        ),
-            Action("Do %o Biceps curls!",      5, ["50", "100", "150"]   ),
-            Action("Do %o Shourlder thingees", 5, ["40 + 40", "50", "60"]),
-            Action("Plank for %o senonds!",    5, ["60", "60", "70"]     ),
-            Action("Strech your upper body!",  20                        ),
-            Action("Strech your core!",        10                        ),
-            Action("Strech your legs!",        10                        ),
-            Action("Make Tea!",                5                         ),
-            Action("Touch Grass!",             5                         )
+            Action(action="look away for %o Seconds!", likelihood=300, options=["10", "15"]),
+            Action(action="Posture Check!", likelihood=300),
+            Action(action="Strech your upper body!", likelihood=20),
+            Action(action="Strech your core!", likelihood=10),
+            Action(action="Strech your legs!", likelihood=10),
+            Action(action="Strech your arms/hands!", likelihood=10),
+            Action(action="Make Tea!", likelihood=5),
+            Action(action="说现在中文的时间！", likelihood=2),
        ]

        total_likelihood = sum(a.likelihood for a in actions)
        random_action = random.choices(actions, [a.likelihood for a in actions], k=1)[0]
        print(random_action)
      '';
-      in pkgs.writeScriptBin "health_reminder" p;
-    in
-    {
+    in {
      script = ''
        set -eu
        export DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/$UID/bus"
--- a/system-modules/nvidia.nix
+++ b/system-modules/nvidia.nix
@@ -57,11 +57,10 @@ lib.mkIf nvidia.enable
      nvidiaSettings = true;

      # Optionally, you may need to select the appropriate driver version for your specific GPU.
-      package = config.boot.kernelPackages.nvidiaPackages.beta;  };
-    opengl = {
+      package = config.boot.kernelPackages.nvidiaPackages.beta;  
+    };
+    graphics = {
      enable = true;
-      driSupport = true;
-      driSupport32Bit = true;
    };
  };
 }
--- a/system-modules/nx2site.nix
+++ b/system-modules/nx2site.nix
@@ -1,9 +1,23 @@
-{ config, pkgs, domain, secrets, ... }:
+{ config, pkgs, user, domain, secrets, ... }:
+let dns-user = "cloudflare"; in
 {
  sops.secrets = {
-    "nx2site/namecheap.pw" = { };
+    # "nx2site/namecheap.pw" = { };
    # "nx2site/cloudflare/api-token-dns-edit" = { };
-    "nx2site/cloudflare/global-api-key" = { };
+    "nx2site/cloudflare/global-api-key" = { 
+      owner = dns-user;
+    };
+  };
+
+  users = {
+    users = {
+      "${dns-user}" = {
+        isSystemUser = true;
+        group = dns-user;
+      };
+      "${user}".extraGroups = [ dns-user ];
+    };
+    groups."${dns-user}" = {};
  };

  systemd = {
@@ -19,22 +33,24 @@
      u = let
        account_id = secrets.email.gmail-online.mail;
        zone_id = "33fecab36e060f49d492127345ea95a0";
-        record_id = {
+        record_id = { # curl --request GET --url https://api.cloudflare.com/client/v4/zones/33fecab36e060f49d492127345ea95a0/dns_records --header 'Content-Type: application/json' --header 'X-Auth-Email: <hidden>@gmail.com' --header "X-Auth-Key: <hiddenreadinsops>" -s | jq
          base  = "58d3412e8d88889d1a611b3669f0700f";
-          sub   = "fc861353142bc05d5dbad1799178e6a1";
          base6 = "d1b90e21d2d747dcb30448bd65312927";
+          sub   = "fc861353142bc05d5dbad1799178e6a1";
          sub6  = "b8082b7afe9e80971fc9f9dda16ec284";
+          ssh   = "c0f14f17f32d6595c202f041dd836eb3";
+          ssh6  = "f1ecb2d9d0522d4eec06437688ca76da";
        };
        passord-file-path = config.sops.secrets."nx2site/cloudflare/global-api-key".path;
        log-file-path = "/var/log/couldflare.log";
        count-file-path = "/var/log/cloudflare-count.txt";
      in pkgs.writers.writePython3Bin "dyn_dns" {
        libraries = with pkgs.python311Packages; [ requests ];
-        flakeIgnore = [ "E501" "E305" "E701" "E704" "E302" "E114" "F841" "E121" "E261" "E303"];
+        flakeIgnore = [ "E501" "E305" "E701" "E704" "E302" "E114" "F841" "E121" "E261" "E303" ];
      } /* python */ ''
        import requests
        import subprocess
-        from datetime import datetime
+        # from datetime import datetime

        def get_public_ip(ipv6=False):
            return subprocess.run(['${pkgs.curl}/bin/curl', '-s', '-6' if ipv6 else '-4', 'https://ifconfig.me'], capture_output=True, text=True).stdout.strip()
@@ -43,13 +59,13 @@
            my_ip = get_public_ip()
            my_ip6 = get_public_ip(ipv6=True)

-            with open("${count-file-path}", "r") as f:
-                content = f.read()
-                if content == "": count = 0
-                else: count = int(content)
-            count += 1
-            with open("${count-file-path}", "w") as f:
-                f.write(str(count))
+            # with open("${count-file-path}", "r") as f:
+            #     content = f.read()
+            #     if content == "": count = 0
+            #     else: count = int(content)
+            # count += 1
+            # with open("${count-file-path}", "w") as f:
+            #     f.write(str(count))

            # 4
            with open("${passord-file-path}", 'r') as pw_file:
@@ -85,7 +101,7 @@
              },
              json={
                "comment": "Domain verification record",
-                "name": "${domain}",
+                "name": "*.${domain}",
                "proxied": True,
                "settings": {},
                "tags": [],
@@ -95,15 +111,34 @@
              }
            )

+            resp_sshd = requests.patch(
+              'https://api.cloudflare.com/client/v4/zones/${zone_id}/dns_records/${record_id.ssh}',
+              headers={
+                'Content-Type': 'application/json',
+                'X-Auth-Email': '${account_id}',
+                'X-Auth-Key': pw
+              },
+              json={
+                "comment": "Domain verification record",
+                "name": "ssh.${domain}",
+                "proxied": False,
+                "settings": {},
+                "tags": [],
+                "ttl": 1, # automatic
+                "content": my_ip,
+                "type": "A"
+              }
+            )
+
            if resp_base.status_code != 200:
                print(resp_base.text)


-            now_str = datetime.now().strftime('%Y/%m/%d-%R')
-            log_entry = f"At {now_str} - to {my_ip} - Response {resp_base.status_code}\n"
-            print(log_entry, end="")
-            with open("${log-file-path}", 'a') as log_file:
-                log_file.write(log_entry)
+            # now_str = datetime.now().strftime('%Y/%m/%d-%R')
+            # log_entry = f"At {now_str} - to {my_ip} - Response {resp_base.status_code}\n"
+            # print(log_entry, end="")
+            # with open("${log-file-path}", 'a') as log_file:
+            #     log_file.write(log_entry)

            # Perform DNS updates
            # https://developers.cloudflare.com/api/operations/dns-records-for-a-zone-update-dns-record
@@ -135,7 +170,7 @@
              },
              json={
                "comment": "Domain verification record",
-                "name": "${domain}",
+                "name": "*.${domain}",
                "proxied": True,
                "settings": {},
                "tags": [],
@@ -145,14 +180,32 @@
              }
            )

+            resp_sshd = requests.patch(
+              'https://api.cloudflare.com/client/v4/zones/${zone_id}/dns_records/${record_id.ssh6}',
+              headers={
+                'Content-Type': 'application/json',
+                'X-Auth-Email': '${account_id}',
+                'X-Auth-Key': pw
+              },
+              json={
+                "comment": "Domain verification record",
+                "name": "ssh.${domain}",
+                "proxied": False,
+                "settings": {},
+                "tags": [],
+                "ttl": 1, # automatic
+                "content": my_ip6,
+                "type": "AAAA"
+              }
+            )
+
            if resp_base.status_code != 200:
                print(resp_base.text)

-
-            now_str = datetime.now().strftime('%Y/%m/%d-%R')
-            log_entry = f"At {now_str} - to {my_ip6} - Response {resp_base.status_code}\n"
-            print(log_entry, end="")
-            with open("${log-file-path}", 'a') as log_file: log_file.write(log_entry)
+            # now_str = datetime.now().strftime('%Y/%m/%d-%R')
+            # log_entry = f"At {now_str} - to {my_ip6} - Response {resp_base.status_code}\n"
+            # print(log_entry, end="")
+            # with open("${log-file-path}", 'a') as log_file: log_file.write(log_entry)

        if __name__ == "__main__":
            main()
@@ -164,7 +217,7 @@
      '';
      serviceConfig = {
        Type = "oneshot";
-        User = "root";
+        User = dns-user;
      };
    };
  };
@@ -174,7 +227,7 @@
    # "172.1.0.9" = [ "matrixdb.docker" ]; 
    # "172.1.4.1" = [ "matrix-ss.docker" ]; 
    # "172.1.0.7" = [ "matrix-ssdb.docker" ]; 
-    "172.1.5.1" = [ "pw.docker" ]; 
+    # "172.1.5.1" = [ "pw.docker" ]; 
    "172.1.6.1" = [ "git.docker" ]; 
    # "172.1.0.10" = [ "gitdb.docker" ];
    # "172.1.7.1" = [ "nn.docker" ]; 
--- a/system-modules/nx2site/gitea.nix
+++ b/system-modules/nx2site/gitea.nix
@@ -1,26 +1,38 @@
-{ config, pkgs-unstable, domain, ... }: 
+{ config, pkgs, secrets, user, domain, ... }: 
+let git-user = "git"; in
 {
  sops.secrets = {
-    "postgres-pw" = { owner = "gitea"; };
+    "postgres-pw" = { owner = config.services.gitea.user; };
+  };
+
+  users = {
+    users = {
+      "${user}".extraGroups = [ git-user ];
+      "${git-user}" = {
+        isSystemUser = true;
+        group = git-user;
+        useDefaultShell = true;
+        home = config.services.gitea.stateDir;
+        openssh.authorizedKeys.keys = config.users.users."${user}".openssh.authorizedKeys.keys;
+      };
+    };
+    groups."${git-user}" = {};
  };

  services.gitea = {
    enable = true;
-    package = pkgs-unstable.gitea;
-    group = "gitea"; # default
-    user = "gitea"; # default
+    package = pkgs.gitea;
+    group = git-user;  
+    user = git-user; 
    appName = "NxGit";
    stateDir = "/var/lib/gitea"; # default
    useWizard = false; # default
    # camoHmacKeyFile = ;
-    customDir = "${config.services.gitea.stateDir}/custom"; # default
    database = {
      createDatabase = false; # default
-      host = "127.0.0.1"; # default
-      port = 5432;
+      host = config.services.postgresql.settings.listen_addresses;
+      port = config.services.postgresql.settings.port;
      passwordFile = config.sops.secrets."postgres-pw".path;
-      # path = "${config.services.gitea.stateDir}/data/gitea.db"; # default
-      # socket = "/run/postgresql";
      socket = null;
      type = "postgres";
      name = "gitea"; # default
@@ -28,37 +40,35 @@
    };
    dump = {
      enable = true;
-      backupDir = "${config.services.gitea.stateDir}/dump"; # default
-      file = null; # default
+      backupDir = "/var/backup/gitea";
+      file = null; # default = chosen by gitea
      interval = "daily";
      type = "zip"; # default
    };
-    extraConfig = null; # default
-    lfs = {
-      enable = false; # default
-      contentDir = "${config.services.gitea.stateDir}/data/lfs"; # default
-    };
-    mailerPasswordFile = null; # default
-    metricsTokenFile = null; # default
-    repositoryRoot = "${config.services.gitea.stateDir}/repositories"; # default
+    # extraConfig = null; # default
+    # lfs = {
+    #   enable = false; # default
+    #   contentDir = "${config.services.gitea.stateDir}/data/lfs"; # default
+    # };
+    # mailerPasswordFile = null; # default
+    # metricsTokenFile = null; # default
+    # repositoryRoot = "${config.services.gitea.stateDir}/repositories"; # default
    settings = {
      log = {
        LEVEL = "Info";
        # LEVEL = "Error";
-        ROOT_PATH = "${config.services.gitea.stateDir}/log"; # default
-      };
-      i18n = {
-        LANGS = "en-US";
      };
      server = {
        DISABLE_SSH = false; # default
-        SSH_PORT = 20022;
-        DOMAIN = "pw2.${domain}";
-        HTTP_ADDR = "http://${config.services.gitea.settings.server.DOMAIN}:${toString config.services.gitea.settings.server.HTTP_PORT}/";
-        HTTP_PORT = 3000; # default
-        PROTOCOL = "http"; # default
-        ROOT_URL = "https:pw2.${domain}/"; # default
-        STATIC_ROOT_PATH = "${config.services.gitea.stateDir}/static";
+        START_SSH_SERVER = false; # default
+        SSH_LISTEN_HOST = "0.0.0.0";
+        SSH_PORT = secrets.ssh.port;
+        DOMAIN = "git.${domain}";
+        SSH_DOMAIN = "ssh.${domain}";
+        # HTTP_ADDR = "${config.services.gitea.settings.server.DOMAIN}";
+        # HTTP_PORT = 3000; # default
+        # PROTOCOL = "http"; # default
+        ROOT_URL = "https://git.${domain}/"; # default
      };
      session = {
        COOKIE_SECURE = true;
@@ -66,6 +76,31 @@
      service = {
        DISABLE_REGISTRATION = true;
      };
+      ui = {
+        DEFAULT_THEME = "pitchblack";
+        THEMES = "gitea,arc-green,pitchblack";
      };
    };
+  };
+  system.activationScripts = let
+    # theme = pkgs.fetchFromGitHub {
+    #   owner = "unixtensor";
+    #   repo = "Gitea-Pitch-Black";
+    #   rev = "v1.15.X.2";
+    #   hash = "sha256-Eibgoc3BJUXWdq8irgXea09fAvfKx2eQrJotp3P5DTg=";
+    # };
+    theme = pkgs.fetchFromGitea {
+      domain = "git.${domain}";
+      owner = "nx2";
+      repo = "Gitea-Pitch-Black";
+      rev = "0.1.0";
+      hash = "sha256-pU4YhgcPOT3PTcmBTjNE3FcyJgl39JGP41ckhRUKN7Y=";
+    };
+  in {
+    "gitea-theme" = /* bash */ ''
+      mkdir -p ${config.services.gitea.stateDir}/custom/public/assets/css/
+      ln -s ${theme}/theme-pitchblack.css ${config.services.gitea.stateDir}/custom/public/assets/css/theme-pitchblack.css
+      chown -R ${git-user}:${git-user} ${config.services.gitea.stateDir}/custom/ 
+    '';
+  };
 }
--- a/system-modules/nx2site/paperless.nix
+++ b/system-modules/nx2site/paperless.nix
@@ -0,0 +1,197 @@
+{ config, pkgs, secrets, user, domain, ... }:
+let paperless-user = "paperless"; in
+{
+  sops.secrets = {
+    "nx2site/paperless.pw" = {
+      owner = paperless-user;
+    };
+  };
+
+  users.users."${user}".extraGroups = [ paperless-user ];
+
+  services = {
+    postgresql = {
+			ensureDatabases = [ paperless-user ];
+			ensureUsers = [{
+				name = paperless-user; 
+				ensureDBOwnership = true;
+			}];
+    };
+    paperless = {
+      enable = true;
+      address = "127.0.0.1";
+      port = 8441;
+      user = paperless-user;
+      consumptionDirIsPublic = true;
+      # package = pkgs.paperless-ngx;
+      # dataDir = "/var/lib/paperless"; # default
+      # address = "127.0.0.1";
+      # mediaDir = "${dataDir}/media";
+      passwordFile = config.sops.secrets."nx2site/paperless.pw".path;
+      # consumptionDir = "${dataDir}/consume";
+      # consumptionDirIsPublic = false;
+      # openMPThreadingWorkaround = true;
+      settings = {
+        # PAPERLESS_REDIS = "redis://localhost:6379";
+        # PAPERLESS_REDIS_PREFIX=""
+
+      PAPERLESS_DBENGINE = "postgresql";
+      # PAPERLESS_DBHOST = "/run/postgresql"; # config.services.postgresql.settings.listen_addresses;
+      # PAPERLESS_DBPORT = config.services.postgresql.settings.port;
+      PAPERLESS_DBNAME = paperless-user;
+      PAPERLESS_DBUSER = paperless-user;
+      PAPERLESS_DBPASS = secrets.nx2site.paperless.PAPERLESS_DBPASS;
+        # PAPERLESS_DBSSLMODE=
+        # PAPERLESS_DBSSLROOTCERT=null; # unset, using the documented path in the home directory.
+        # PAPERLESS_DBSSLCERT=null; # unset, using the documented path in the home directory.
+        # PAPERLESS_DBSSLKEY=null; # unset, using the documented path in the home directory.
+        # PAPERLESS_DB_TIMEOUT=null; # unset, keeping the Django defaults.
+        # PAPERLESS_TIKA_ENABLED=false
+        # PAPERLESS_TIKA_ENDPOINT="http://localhost:9998".
+        # PAPERLESS_TIKA_GOTENBERG_ENDPOINT="http://localhost:3000".
+      PAPERLESS_CONSUMPTION_DIR = "${config.services.paperless.dataDir}/consume/";  
+      # PAPERLESS_DATA_DIR = "${config.services.paperless.dataDir}/data/"; 
+      PAPERLESS_EMPTY_TRASH_DIR ="${config.services.paperless.dataDir}/trash/"; # null = really delete files
+      # PAPERLESS_MEDIA_ROOT = "${config.services.paperless.dataDir}/media/"; 
+      # PAPERLESS_STATICDIR = "${config.services.paperless.dataDir}/static/"; 
+        # PAPERLESS_FILENAME_FORMAT=
+        # PAPERLESS_FILENAME_FORMAT_REMOVE_NONE=
+      # PAPERLESS_LOGGING_DIR = "${config.services.paperless.dataDir}/log/";
+        # PAPERLESS_NLTK_DIR =
+        # PAPERLESS_MODEL_FILE= PAPERLESS_DATA_DIR/classification_model.pickle.
+        # PAPERLESS_LOGROTATE_MAX_SIZE= 1 MiB.
+        # PAPERLESS_LOGROTATE_MAX_BACKUPS= 20.
+        # PAPERLESS_SECRET_KEY=
+        # PAPERLESS_URL="" # empty string, leaving the other settings unaffected.
+        # PAPERLESS_CSRF_TRUSTED_ORIGINS=
+        # PAPERLESS_ALLOWED_HOSTS=
+        # PAPERLESS_CORS_ALLOWED_HOSTS=
+        # PAPERLESS_TRUSTED_PROXIES=
+        # PAPERLESS_FORCE_SCRIPT_NAME=
+        # PAPERLESS_STATIC_URL= "/static/".
+        # PAPERLESS_AUTO_LOGIN_USERNAME=null;
+      PAPERLESS_ADMIN_USER="${user}";
+      PAPERLESS_ADMIN_MAIL=secrets.email.gmail-online.mail;
+      # PAPERLESS_ADMIN_PASSWORD=;
+        # PAPERLESS_COOKIE_PREFIX=
+        # PAPERLESS_ENABLE_HTTP_REMOTE_USER=
+        # PAPERLESS_ENABLE_HTTP_REMOTE_USER_API=
+        # PAPERLESS_HTTP_REMOTE_USER_HEADER_NAME=
+      # PAPERLESS_LOGOUT_REDIRECT_URL="https://youtu.be/dMN-pjcchrE?si=EcFYvAnbXFkounYR";
+        # PAPERLESS_USE_X_FORWARD_HOST= false
+        # PAPERLESS_USE_X_FORWARD_PORT= false
+        # PAPERLESS_PROXY_SSL_HEADER= null
+        # PAPERLESS_EMAIL_CERTIFICATE_LOCATION = null;
+        # PAPERLESS_SOCIALACCOUNT_PROVIDERS=;
+        # PAPERLESS_SOCIAL_AUTO_SIGNUP = false;
+        # PAPERLESS_SOCIALACCOUNT_ALLOW_SIGNUPS= True
+        # PAPERLESS_ACCOUNT_ALLOW_SIGNUPS= False
+        # PAPERLESS_ACCOUNT_DEFAULT_HTTP_PROTOCOL= 'https'
+        # PAPERLESS_ACCOUNT_EMAIL_VERIFICATION= 'optional'
+        # PAPERLESS_DISABLE_REGULAR_LOGIN= False
+        # PAPERLESS_REDIRECT_LOGIN_TO_SSO= False
+        # PAPERLESS_ACCOUNT_SESSION_REMEMBER= True
+        # PAPERLESS_SESSION_COOKIE_AGE= 1209600; # (2 weeks)
+        PAPERLESS_OCR_LANGUAGE = "eng+deu";
+        # PAPERLESS_OCR_MODE= "skip";
+        # PAPERLESS_OCR_SKIP_ARCHIVE_FILE=
+        # PAPERLESS_OCR_CLEAN= clean.
+        # PAPERLESS_OCR_DESKEW = true; # which enables this feature.
+        # PAPERLESS_OCR_ROTATE_PAGES = true; # which enables this feature.
+        # PAPERLESS_OCR_ROTATE_PAGES_THRESHOLD = "12";
+        # PAPERLESS_OCR_OUTPUT_TYPE = "pdfa";
+        # PAPERLESS_OCR_PAGES = null;
+        # PAPERLESS_OCR_IMAGE_DPI = null;
+        # PAPERLESS_OCR_MAX_IMAGE_PIXELS=
+        # PAPERLESS_OCR_COLOR_CONVERSION_STRATEGY=
+        PAPERLESS_OCR_USER_ARGS = {
+          optimize = 1;
+          pdfa_image_compression = "lossless";
+        };
+        # PAPERLESS_TASK_WORKERS= 1
+        # PAPERLESS_THREADS_PER_WORKER=
+        # PAPERLESS_WORKER_TIMEOUT=
+        PAPERLESS_TIME_ZONE = "CET";
+        # PAPERLESS_ENABLE_NLTK=1;
+        # PAPERLESS_EMAIL_TASK_CRON= */10 * * * * or every ten minutes.
+        # PAPERLESS_TRAIN_TASK_CRON= 5 */1 * * * or every hour at 5 minutes past the hour.
+        # PAPERLESS_INDEX_TASK_CRON= 0 0 * * * or daily at midnight.
+        # PAPERLESS_SANITY_TASK_CRON= 30 0 * * sun or Sunday at 30 minutes past midnight.
+        # PAPERLESS_ENABLE_COMPRESSION = 1; # enabling compression.
+        # PAPERLESS_CONVERT_MEMORY_LIMIT = 0; # which disables the limit.
+        # PAPERLESS_CONVERT_TMPDIR =
+        # PAPERLESS_APPS = null;
+        # PAPERLESS_MAX_IMAGE_PIXELS = null;
+        # PAPERLESS_CONSUMER_DELETE_DUPLICATES= false.
+        # PAPERLESS_CONSUMER_RECURSIVE= false.
+        # PAPERLESS_CONSUMER_SUBDIRS_AS_TAGS= false.
+        PAPERLESS_CONSUMER_IGNORE_PATTERNS = [
+          ".DS_Store"
+          ".DS_STORE"
+          "._*"
+          ".stfolder/*"
+          ".stversions/*"
+          ".localized/*"
+          "desktop.ini"
+          "@eaDir/*"
+          "Thumbs.db"
+        ];
+        # PAPERLESS_CONSUMER_BARCODE_SCANNER=
+        # PAPERLESS_PRE_CONSUME_SCRIPT=
+        # PAPERLESS_POST_CONSUME_SCRIPT=
+        # PAPERLESS_FILENAME_DATE_ORDER= none, which disables this feature.
+        # PAPERLESS_NUMBER_OF_SUGGESTED_DATES= 3. Set to 0 to disable this feature.
+        # PAPERLESS_THUMBNAIL_FONT_NAME= /usr/share/fonts/liberation/LiberationSerif-Regular.ttf.
+        # PAPERLESS_IGNORE_DATES="";
+        # PAPERLESS_DATE_ORDER = "DMY";
+        # PAPERLESS_ENABLE_GPG_DECRYPTOR = false;
+        # PAPERLESS_CONSUMER_POLLING = 0; # which disables polling and uses filesystem notifications.
+        # PAPERLESS_CONSUMER_POLLING_RETRY_COUNT = 5;
+        # PAPERLESS_CONSUMER_POLLING_DELAY = 5;
+        # PAPERLESS_CONSUMER_INOTIFY_DELAY= 0.5; # seconds.
+        # PAPERLESS_OAUTH_CALLBACK_BASE_URL = null;
+        # PAPERLESS_GMAIL_OAUTH_CLIENT_ID = null;
+        # PAPERLESS_GMAIL_OAUTH_CLIENT_SECRET = null;
+        # PAPERLESS_OUTLOOK_OAUTH_CLIENT_ID = null;
+        # PAPERLESS_OUTLOOK_OAUTH_CLIENT_SECRET = null;
+        # PAPERLESS_EMAIL_GNUPG_HOME=
+        # PAPERLESS_CONSUMER_ENABLE_BARCODES=
+        # PAPERLESS_CONSUMER_BARCODE_TIFF_SUPPORT= false.
+        # PAPERLESS_CONSUMER_BARCODE_STRING= "PATCHT"
+        # PAPERLESS_CONSUMER_BARCODE_RETAIN_SPLIT_PAGES= false.
+        # PAPERLESS_CONSUMER_ENABLE_ASN_BARCODE= false.
+        # PAPERLESS_CONSUMER_ASN_BARCODE_PREFIX= "ASN"
+        # PAPERLESS_CONSUMER_BARCODE_UPSCALE= 0.0
+        # PAPERLESS_CONSUMER_BARCODE_DPI= "300"
+        # PAPERLESS_CONSUMER_BARCODE_MAX_PAGES= "0"
+        # PAPERLESS_CONSUMER_ENABLE_TAG_BARCODE= false.
+        # PAPERLESS_CONSUMER_TAG_BARCODE_MAPPING=
+        # PAPERLESS_AUDIT_LOG_ENABLED= true.
+        # PAPERLESS_CONSUMER_ENABLE_COLLATE_DOUBLE_SIDED= false.
+        # PAPERLESS_CONSUMER_COLLATE_DOUBLE_SIDED_SUBDIR_NAME= "double-sided".
+        # PAPERLESS_CONSUMER_COLLATE_DOUBLE_SIDED_TIFF_SUPPORT= false.
+      # PAPERLESS_EMPTY_TRASH_DELAY = 30; # days, minimum of 1 day.
+        # PAPERLESS_EMPTY_TRASH_TASK_CRON= 0 1 * * *, once per day.
+        # PAPERLESS_CONVERT_BINARY = "convert".
+      # PAPERLESS_GS_BINARY = "${pkgs.ghostscript}/bin/gs";
+        # PAPERLESS_WEBSERVER_WORKERS= 1;
+        # PAPERLESS_BIND_ADDR= [::], meaning all interfaces, including IPv6.
+        # PAPERLESS_PORT = config.services.paperless.port;
+        # PAPERLESS_OCR_LANGUAGES=
+        # PAPERLESS_ENABLE_FLOWER=
+        # PAPERLESS_SUPERVISORD_WORKING_DIR=
+      # PAPERLESS_APP_TITLE = "NxPPL";
+        # PAPERLESS_APP_LOGO =
+        # PAPERLESS_ENABLE_UPDATE_CHECK=false;
+        # PAPERLESS_EMAIL_HOST = "localhost";
+        # PAPERLESS_EMAIL_PORT= 25.
+        # PAPERLESS_EMAIL_HOST_USER= "";
+        # PAPERLESS_EMAIL_FROM=
+        # PAPERLESS_EMAIL_HOST_PASSWORD = "".
+        # PAPERLESS_EMAIL_USE_TLS = false.
+        # PAPERLESS_EMAIL_USE_SSL = false. 
+
+      };
+    };
+  };
+}
--- a/system-modules/nx2site/proxy.nix
+++ b/system-modules/nx2site/proxy.nix
@@ -14,7 +14,7 @@
    };
    certs = {
      "${domain}" = {
-        extraDomainNames = builtins.map (subd: "${subd}.${domain}") [ "git" "git2" "pw" "pw2" "sync" ];
+        extraDomainNames = builtins.map (subd: "${subd}.${domain}") [ "git" "pw" "sync" ];
      };
    };
  };
@@ -72,7 +72,7 @@
        http3 = true;
        http3_hq = true;
        quic = true;
-        addSSL = true;
+        forceSSL = true;
        enableACME = true;
      };
    in {
@@ -99,18 +99,20 @@
        listen = dl;
        locations = { "~.*" = { return = "502"; }; }; 
      };
+      # "pw.${domain}" = vh // {
+      #   listen = dl;
+      #   locations = let d = "pw.docker:80"; in {
+      #     "/" = { proxyPass = "http://${d}"; };
+      #     "/admin" = { proxyPass = "http://${d}"; };
+      #     "/notifications/hub" = { proxyPass = "http://${d}"; };
+      #     "/notifications/hub/negotiate" = { proxyPass = "http://${d}"; };
+      #   }; 
+      # };
      "pw.${domain}" = vh // {
        listen = dl;
-        locations = let d = "pw.docker:80"; in {
-          "/" = { proxyPass = "http://${d}"; };
-          "/admin" = { proxyPass = "http://${d}"; };
-          "/notifications/hub" = { proxyPass = "http://${d}"; };
-          "/notifications/hub/negotiate" = { proxyPass = "http://${d}"; };
-        }; 
-      };
-      "pw2.${domain}" = vh // {
-        listen = dl;
-        locations = let d = "127.0.0.1:3000"; in {
+        locations = let 
+          d = with config.services.vaultwarden.config; "${ROCKET_ADDRESS}:${builtins.toString ROCKET_PORT}"; 
+        in {
          "/" = { proxyPass = "http://${d}"; };
          "/admin" = { proxyPass = "http://${d}"; };
          "/notifications/hub" = { proxyPass = "http://${d}"; };
@@ -121,13 +123,18 @@
        listen = dl;
        locations = { "/" = { proxyPass = "http://127.0.0.1:11434"; }; }; 
      };
+      # "git.${domain}" = vh // {
+      #   listen = dl;
+      #   locations = { "/" = { proxyPass = "http://git.docker:3000"; }; }; 
+      # };
      "git.${domain}" = vh // {
+        http2 = false;
        listen = dl;
-        locations = { "/" = { proxyPass = "http://git.docker:3000"; }; }; 
+        locations = { "/" = { proxyPass = "http://127.0.0.1:3000"; }; }; 
      };
-      "git2.${domain}" = vh // {
+      "doc.${domain}" = vh // {
        listen = dl;
-        locations = { "/" = { proxyPass = "http://127.0.0.1:8222"; }; }; 
+        locations = { "/" = { proxyPass = "http://127.0.0.1:8441"; }; }; 
      };
      "~^(.*).${domain}$" = {
        listen = dl;
--- a/system-modules/nx2site/vaultwarden.nix
+++ b/system-modules/nx2site/vaultwarden.nix
@@ -0,0 +1,43 @@
+{ config, pkgs, secrets, domain, ... }:
+{
+  sops.secrets = {
+    "nx2site/vaultwarden.env" = {
+      owner = "vaultwarden";
+    };
+  };
+  services.vaultwarden = {
+    enable = true;
+    package = pkgs.vaultwarden;
+    webVaultPackage = pkgs.vaultwarden.webvault;
+    dbBackend = "postgresql";
+    # backupDir = "/var/backup/vaultwarden";
+    environmentFile = config.sops.secrets."nx2site/vaultwarden.env".path;
+    config = {
+      ROCKET_ADDRESS = "127.0.0.1";
+      ROCKET_PORT = 8222;
+
+      DATABASE_URL = "@DATABASE_URL@";
+      # DATABASE_URL = "postgresql://vaultwarden:fakepw123@127.0.0.1:5432/vaultwarden";
+      
+      SMTP_HOST = "smtp.gmail.com";
+      SMTP_FROM = secrets.email.gmail-online.mail;
+      SMTP_PORT = 587;
+      SMTP_SECURITY = "starttls";
+      SMTP_USERNAME = secrets.email.gmail-online.mail;
+      SMTP_PASSWORD = "@SMTP_PASSWORD@";
+      LOGIN_RATELIMIT_MAX_BURST = 10;
+      LOGIN_RATELIMIT_SECONDS = 60;
+      DOMAIN = "https://pw.${domain}";
+      INVITATION_ORG_NAME = "NxPW";
+      INVITATIONS_ALLOWED = true;
+      ADMIN_TOKEN = "@ADMIN_TOKEN@";
+      SIGNUPS_ALLOWED = false;
+      SIGNUPS_VERIFY = true;
+      SIGNUPS_VERIFY_RESEND_TIME = 3600;
+      SIGNUPS_VERIFY_RESEND_LIMIT = 6;
+      EMERGENCY_ACCESS_ALLOWED = true;
+      SENDS_ALLOWED = true;
+      WEB_VAULT_ENABLED = true;
+    };
+  };
+}
--- a/system-modules/ollama.nix
+++ b/system-modules/ollama.nix
@@ -19,7 +19,8 @@ in {
    package = p;
    enable = true;
    acceleration = lib.mkIf nvidia.enable "cuda";
-    listenAddress = if host == "NxACE" then "0.0.0.0:11434" else "127.0.0.1:11434";
+    host = if host == "NxACE" then "0.0.0.0" else "127.0.0.1";
+    port = 11434;
    environmentVariables = {
      OLLAMA_ORIGINS = "*"; 
    };
--- a/system-modules/postgres.nix
+++ b/system-modules/postgres.nix
@@ -23,58 +23,49 @@
 			# recoveryConfig = null;
 			ensureDatabases = [
 				"gitea"
-				# "vaultwarden"
+				"vaultwarden"
 			];
 			settings = {
 				port = 5432; # default
-				listen_addresses = "localhost";
+				listen_addresses = lib.mkForce "127.0.0.1";
 				log_line_prefix = "[%p] "; # default
 				shared_preload_libraries = [ ]; # default
 			};
 			ensureUsers = [
-			 #  {
-				# 	name = "${user}";
-				# 	ensureDBOwnership = false;
-				# 	ensureClauses = {
-				# 		login = true;
-				# 		# inherit
-				# 		createdb = true; 
-				# 		bypassrls = true;
-				# 		superuser = true;
-				# 		createrole = true;
-				# 		replication = true;
-				# 	};
-				# }
-				{
 			  # as liong as there is no declarative user management you gotta set a pw by hand
 				# sudo -u postgres psql -c "ALTER USER gitea PASSWORD 'new-passwd';"
+				{
 					name = "gitea"; 
 					ensureDBOwnership = true;
 				}
+				{
+					name = "vaultwarden";
+					ensureDBOwnership = true;
+				}
 			];
 		};
-# postgresqlBackup = {
-# 	enable
-# 	startAt
-# 	location
-# 	databases
-# 	backupAll
-# 	compression
-# }
-
-
-# postgresqlWalReceiver.receivers."main" = {
-#     postgresqlPackage = pkgs.postgresql_15;
-#     directory = /mnt/pg_wal/main/;
-#     slot = "main_wal_receiver";
-#     connection = "postgresql://user@somehost";
-# 	compress
-# 	extraArgs
-# 	synchronous
-# 	environment
-# 	statusInterval
-#   };
-# }
+		postgresqlBackup = {
+			enable = true;
+			# startAt = "*-*-* 01:15:00";
+			# location = "/var/backup/postgresql";
+			databases = config.services.postgresql.ensureDatabases;
+			backupAll = false;
+			# compression = "gzip";
+			# pgdumpOptions = "-C";
+			# compressionLevel = 6;
+		};
+	# postgresqlWalReceiver.receivers."main" = {
+	#     postgresqlPackage = pkgs.postgresql_15;
+	#     directory = /mnt/pg_wal/main/;
+	#     slot = "main_wal_receiver";
+	#     connection = "postgresql://user@somehost";
+	# 	compress
+	# 	extraArgs
+	# 	synchronous
+	# 	environment
+	# 	statusInterval
+	#   };
+	# };
 	};
 }

--- a/system-modules/sshd.nix
+++ b/system-modules/sshd.nix
@@ -3,7 +3,7 @@
 {
  environment.etc."ssh/ssh_host_ed25519_key.pub".text = if (host == "NxNORTH") then
    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF1r5gUQPPS/dGB0SsvWtP6WdNWoxMwhhHRrqlO19cJt root@NxNORTH"
-    else if ( host == "NxXPS") then
+    else if ( host == "NxXPS" ) then
    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPf+08+t8a0lY2+nR1mhIU3vuksStiJOlojJjzCwFk7r root@NxXPS"
    else 
    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBFfZpWVPlujsz3FklSVAM+tuYn4pzDSijhp5CeYNOZk root@NxACE";
@@ -13,7 +13,7 @@
  };
  services.openssh = {
    enable = true;
-    ports = secrets.ssh.ports;
+    ports = [ secrets.ssh.port ];
    settings = {
      PasswordAuthentication = false;
    };
--- a/system-modules/users.nix
+++ b/system-modules/users.nix
@@ -6,6 +6,7 @@
  users.users."${user}" = {
    isNormalUser = true;
    extraGroups = [ 
+      # TODO: actually put the groups into the relevant files
      "networkmanager" 
      "wheel" 
      "audio" 
@@ -18,7 +19,6 @@
      "acme" 
      "nginx" 
      "adbusers" 
-      "gitea"
      "postgres"
    ];
    useDefaultShell = true;
Author	SHA1	Message	Date
Lennart J. Kurzweg (Nx2)	e61954442f	flake bump	2024-12-23 12:59:32 +01:00
Lennart J. Kurzweg (Nx2)	f5aa965369	update option name (opengl -> graphics)	2024-12-23 12:59:22 +01:00
Lennart J. Kurzweg (Nx2)	eb812dc9e0	nix without llm	2024-12-23 12:58:31 +01:00
Lennart J. Kurzweg (Nx2)	6d4d118685	Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles	2024-12-19 15:19:51 +01:00
Lennart J. Kurzweg (Nx2)	94a78942f8	helix-gpt is to slow	2024-12-19 15:19:47 +01:00
Lennart J. Kurzweg (Nx2)	5c2437cee1	renaming node to js also in imports	2024-12-19 15:19:31 +01:00
Lennart J. Kurzweg (Nx2)	fa8875c0ee	Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles	2024-12-15 15:36:15 +01:00
Lennart J. Kurzweg (Nx2)	2040ce3ea0	fixup	2024-12-15 15:33:39 +01:00
Lennart J. Kurzweg (Nx2)	d9822a7a91	gitea (theme&++)	2024-12-15 15:31:43 +01:00
Lennart J. Kurzweg (Nx2)	d2e0b9d2d3	paperless	2024-12-15 15:14:52 +01:00
Lennart J. Kurzweg (Nx2)	ccdd036935	Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles	2024-12-15 14:53:43 +01:00
Lennart J. Kurzweg (Nx2)	5d36be3804	flake bump	2024-12-15 14:50:36 +01:00
Lennart J. Kurzweg (Nx2)	2640b00b05	better zahtura scrolling	2024-12-15 14:37:58 +01:00
Lennart J. Kurzweg (Nx2)	9087100c42	qt	2024-12-15 14:35:54 +01:00
Lennart J. Kurzweg (Nx2)	5c9a92c68e	helic cleanup + java	2024-12-15 14:35:43 +01:00
Lennart J. Kurzweg (Nx2)	1fd894a3b3	cleanup	2024-12-15 14:28:51 +01:00
Lennart J. Kurzweg (Nx2)	09316011ab	helix-gpt	2024-12-15 14:23:20 +01:00
Lennart J. Kurzweg (Nx2)	fdce6c3d57	go	2024-12-15 14:22:31 +01:00
Lennart J. Kurzweg (Nx2)	1be03c39ad	Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles	2024-12-02 21:48:54 +01:00
Lennart J. Kurzweg (Nx2)	a0c098ea1f	Better "special" window handeling	2024-12-02 21:44:24 +01:00
Lennart J. Kurzweg (Nx2)	9a4e3d7a78	flake bump	2024-12-02 21:33:52 +01:00
Lennart J. Kurzweg (Nx2)	1005cc522d	gnome-calendar	2024-12-02 21:05:13 +01:00
Lennart J. Kurzweg (Nx2)	729e7e5f0e	gnu parallel	2024-12-02 21:04:55 +01:00
Lennart J. Kurzweg (Nx2)	79cbdc9f69	health-reminder++	2024-12-02 21:04:41 +01:00
Lennart J. Kurzweg (Nx2)	c6ca7c95f4	zathura++	2024-12-02 21:04:14 +01:00
Lennart J. Kurzweg (Nx2)	e878158b71	better yazi	2024-12-02 21:03:48 +01:00
Lennart J. Kurzweg (Nx2)	ed5f0784d1	longer mako	2024-12-02 21:03:28 +01:00
Lennart J. Kurzweg (Nx2)	051648954a	gtk tryouts	2024-12-02 21:03:20 +01:00
Lennart J. Kurzweg (Nx2)	f5538e69a5	better color changing (maual)	2024-12-02 21:00:01 +01:00
Lennart J. Kurzweg (Nx2)	a82660b049	Gimp	2024-12-02 20:59:20 +01:00
Lennart J. Kurzweg (Nx2)	f828268b14	24.11 Vicuna	2024-12-02 20:59:00 +01:00
Lennart J. Kurzweg (Nx2)	02c7814ce4	better/less userChrome	2024-12-02 20:49:33 +01:00
Lennart J. Kurzweg (Nx2)	e36ffd828b	chatterino update	2024-12-02 20:46:51 +01:00
Lennart J. Kurzweg (Nx2)	219a19a3a8	fonts (no name2)	2024-12-02 20:46:32 +01:00
Lennart J. Kurzweg (Nx2)	683913e0fe	rice syntax	2024-12-02 20:42:49 +01:00
Lennart J. Kurzweg (Nx2)	837e64c377	wallpaper to color hotkey syntax fix	2024-11-21 22:55:09 +01:00
Lennart J. Kurzweg (Nx2)	f8497f5538	health reminder syntax fix 2	2024-11-21 22:33:47 +01:00
Lennart J. Kurzweg (Nx2)	9c2a69aa03	Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles	2024-11-21 22:28:42 +01:00
Lennart J. Kurzweg (Nx2)	a8c3a12089	xps to linux_6_11	2024-11-21 22:27:48 +01:00
Lennart J. Kurzweg (Nx2)	b8199c24ef	health reminder syntax fix	2024-11-21 22:27:28 +01:00
Lennart J. Kurzweg (Nx2)	971cea5418	steam	2024-11-21 22:19:14 +01:00
Lennart J. Kurzweg (Nx2)	d12b9ddf2f	Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles	2024-11-21 22:17:48 +01:00
Lennart J. Kurzweg (Nx2)	e4ec830aaa	better health reminder	2024-11-21 22:07:53 +01:00
Lennart J. Kurzweg (Nx2)	ebb1da3fc2	typo	2024-11-21 22:07:36 +01:00
Lennart J. Kurzweg (Nx2)	80e06b3f49	more userChrome	2024-11-21 22:07:31 +01:00
Lennart J. Kurzweg (Nx2)	605381b553	waybar prettier battery	2024-11-21 22:07:07 +01:00
Lennart J. Kurzweg (Nx2)	298d31e21a	submaps als functions + TUDa submap	2024-11-21 22:06:55 +01:00
Lennart J. Kurzweg (Nx2)	947b824796	hyprland nxcolor-functions better	2024-11-21 22:06:03 +01:00
Lennart J. Kurzweg (Nx2)	edbe4e7f66	moved NORTH screen	2024-11-20 01:27:20 +01:00
Lennart J. Kurzweg (Nx2)	dbccb827ad	games also on ACE	2024-11-20 01:25:42 +01:00
Lennart J. Kurzweg (Nx2)	f5af726382	nx2site gitea and vaultwarden (working)	2024-11-20 01:24:57 +01:00
Lennart J. Kurzweg (Nx2)	e95332cedb	Merge branch 'master' of ssh://ssh.nx2.site:20022/nx2/dotfiles	2024-11-15 14:10:50 +01:00
Lennart J. Kurzweg (Nx2)	6a7d8fe4be	nx2site002 (unready)	2024-11-15 14:10:48 +01:00
Lennart J. Kurzweg (Nx2)	37eb70db63	Merge branch 'master' of ssh://ssh.nx2.site:20022/nx2/dotfiles	2024-11-14 01:21:42 +01:00
Lennart J. Kurzweg (Nx2)	77e9aa4ddd	games	2024-11-14 01:21:34 +01:00