Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles

ghossty using module
chromium rename
2025-06-10 19:39:19 +02:00 · 2025-06-10 19:36:21 +02:00 · 2025-06-10 19:36:03 +02:00 · 2025-06-10 19:35:53 +02:00 · 2025-06-10 19:34:56 +02:00 · 2025-06-10 19:33:34 +02:00
17 changed files with 477 additions and 895 deletions
--- a/.ignore
+++ b/.ignore
@@ -0,0 +1,15 @@
+flake.lock
+*.remmina
+*.pem
+*.env
+*.key
+*.ovpn
+sops-secrets.yaml
+*.png
+*.jpg
+*.webp
+*.gif
+*.mp3
+*.mp4
+
+
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,7 +1,9 @@
 { pkgs, hyper, inputs, ... }:
 {
-  imports = ([
+  imports = [
    inputs.sops-nix.nixosModules.sops
+    inputs.nixpkgs.nixosModules.readOnlyPkgs
+
    ./system-modules/adb.nix
    ./system-modules/auto-mount.nix
    ./system-modules/boot.nix
@@ -41,7 +43,7 @@
    ./system-modules/users.nix
    ./system-modules/virtualisation.nix
    ./system-modules/ydotool.nix
-  ]) ++ (if (hyper.host == "NxACE") then [ 
+  ] ++ (if (hyper.host == "NxACE") then [ 
    ./system-modules/nx2site.nix
    ./system-modules/hugo.nix
    ./system-modules/postgres.nix
@@ -136,9 +138,9 @@
  systemd.extraConfig = "DefaultLimitNOFILE=2048";
  boot.tmp.useTmpfs = false; 

-  system.stateVersion = "25.05";
+  system.stateVersion = pkgs.version;

-  nixpkgs.config.allowUnfree = true;
+  nixpkgs.pkgs = pkgs;

  nix = {
    settings = {
--- a/flake-modules/allowed.nix
+++ b/flake-modules/allowed.nix
@@ -4,6 +4,8 @@
    "discord"
    "spotify"
    "obsidian"
+    "steam"
+    "steam-unwrapped"
    "zoom-us"
    "zoom"

@@ -35,6 +37,8 @@
    "libnvjitlink"
    "libcusparse"
    "libnpp"
+
+    "vscode-extension-mhutchie-git-graph"
  ];

  inecure = [
--- a/flake-modules/colors.json
+++ b/flake-modules/colors.json
@@ -1,13 +1,13 @@
 {
    "base": {
-        "foreground": "#dbd2f8",
-        "background": "#0f062c"
+        "foreground": "#fecccc",
+        "background": "#330000"
    },
    "to_alter": {
-        "accent": "#724ce5",
-        "secondary": "#ff3271",
-        "tertiary": "#ffc932",
-        "special": "#bfe54b",
-        "weird": "#e54b8b"
+        "accent": "#ff3232",
+        "secondary": "#ff3232",
+        "tertiary": "#ff3232",
+        "special": "#31feff",
+        "weird": "#baff31"
    }
 }
--- a/flake-modules/rice.nix
+++ b/flake-modules/rice.nix
@@ -13,7 +13,7 @@ pkgs: rec {
    alter     = let f = lib.alter-luminace-hex; in             color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; };
    # ccolor = builtins.mapAttrs alter-set (builtins.fromJSON (builtins.readFile ./colors.json));
    ccolor = builtins.mapAttrs alter-set {
-      black =   "#111111"; # "#111111" "#001100";
+      black =   "#040404"; # "#111111" "#001100";
      white =   "#dddddd"; # "#dddddd" "#66dd66";
      blue =    "#4444dd"; # "#3333dd" "#003300";
      cyan =    "#44dddd"; # "#11dddd" "#00dd55";
--- a/flake.lock
+++ b/flake.lock
@@ -34,30 +34,12 @@
      }
    },
    "crane": {
-      "inputs": {
-        "flake-compat": [
-          "lanzaboote",
-          "flake-compat"
-        ],
-        "flake-utils": [
-          "lanzaboote",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "lanzaboote",
-          "nixpkgs"
-        ],
-        "rust-overlay": [
-          "lanzaboote",
-          "rust-overlay"
-        ]
-      },
      "locked": {
-        "lastModified": 1681177078,
-        "narHash": "sha256-ZNIjBDou2GOabcpctiQykEQVkI8BDwk7TyvlWlI4myE=",
+        "lastModified": 1731098351,
+        "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=",
        "owner": "ipetkov",
        "repo": "crane",
-        "rev": "0c9f468ff00576577d83f5019a66c557ede5acf6",
+        "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28",
        "type": "github"
      },
      "original": {
@@ -69,11 +51,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1733328505,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
        "type": "github"
      },
      "original": {
@@ -99,22 +81,6 @@
      }
    },
    "flake-compat_3": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_4": {
      "flake": false,
      "locked": {
        "lastModified": 1733328505,
@@ -131,24 +97,6 @@
      }
    },
    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
-      "locked": {
-        "lastModified": 1735774679,
-        "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_2": {
      "inputs": {
        "nixpkgs-lib": [
          "lanzaboote",
@@ -156,11 +104,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1680392223,
-        "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=",
+        "lastModified": 1730504689,
+        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5",
+        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
        "type": "github"
      },
      "original": {
@@ -170,67 +118,9 @@
      }
    },
    "flake-utils": {
-      "inputs": {
-        "systems": "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"
-      }
-    },
-    "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_3"
      },
-      "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_4"
-      },
      "locked": {
        "lastModified": 1731533236,
        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
@@ -245,50 +135,6 @@
        "type": "github"
      }
    },
-    "flake-utils_4": {
-      "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"
-      }
-    },
-    "ghostty": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
-        "nixpkgs-stable": "nixpkgs-stable",
-        "nixpkgs-unstable": "nixpkgs-unstable",
-        "zig": "zig",
-        "zon2nix": "zon2nix"
-      },
-      "locked": {
-        "lastModified": 1748207486,
-        "narHash": "sha256-4kR7VyauWpNMrBePHMM8yzQvUzHHGRVkQpJ3DyoKcH0=",
-        "owner": "ghostty-org",
-        "repo": "ghostty",
-        "rev": "3f6c02b49e08aed51e4be85d87b79b9dbea34a85",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ghostty-org",
-        "repo": "ghostty",
-        "type": "github"
-      }
-    },
    "gitignore": {
      "inputs": {
        "nixpkgs": [
@@ -320,11 +166,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1660459072,
-        "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
        "owner": "hercules-ci",
        "repo": "gitignore.nix",
-        "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
        "type": "github"
      },
      "original": {
@@ -333,28 +179,6 @@
        "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": [
@@ -362,11 +186,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1748226808,
-        "narHash": "sha256-GaBRgxjWO1bAQa8P2+FDxG4ANBVhjnSjBms096qQdxo=",
+        "lastModified": 1748665073,
+        "narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "83665c39fa688bd6a1f7c43cf7997a70f6a109f9",
+        "rev": "282e1e029cb6ab4811114fc85110613d72771dea",
        "type": "github"
      },
      "original": {
@@ -467,15 +291,15 @@
        "hyprwayland-scanner": "hyprwayland-scanner",
        "nixpkgs": "nixpkgs",
        "pre-commit-hooks": "pre-commit-hooks",
-        "systems": "systems_2",
+        "systems": "systems",
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1748295224,
-        "narHash": "sha256-yR8zw5bSEHd28fGfGM64nW8y72NOfxFvvrXcR2p4WUE=",
+        "lastModified": 1748696522,
+        "narHash": "sha256-MA3oA3nkQojHI3SMdr7qPlvc2rOkfTW6Uh2G7SwrALw=",
        "ref": "refs/heads/main",
-        "rev": "be6ee6e55f08387a9e2fbf712c061fb238a70319",
-        "revCount": 6141,
+        "rev": "4078e1d17c0fb1439ee5a0ba1e539f06a8f47aab",
+        "revCount": 6151,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland"
@@ -503,11 +327,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1748271549,
-        "narHash": "sha256-MiVqB5DoHqxNSaQVbYmkaIDz02AJ4XS3oXHI1x2lEX0=",
+        "lastModified": 1748526041,
+        "narHash": "sha256-QyUACXhQJ2+K0YxwEuAfpyCXqbdCCHj1jNAWJy+vUxw=",
        "owner": "hyprwm",
        "repo": "hyprland-plugins",
-        "rev": "d81d96e9d68c182a202e0bbf14384d60929b4454",
+        "rev": "2eee96fe52fa0923c0aae647eb7901b5b51df3db",
        "type": "github"
      },
      "original": {
@@ -638,24 +462,24 @@
        "type": "github"
      }
    },
-    "hyprswitch": {
+    "hyprspace": {
      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_2",
-        "rust-overlay": "rust-overlay"
+        "hyprland": [
+          "hyprland"
+        ],
+        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1745860672,
-        "narHash": "sha256-tJKLjWaOcJW4Ttu1noSY+lddlJvyX2eonTrgR5IycZo=",
-        "owner": "h3rmt",
-        "repo": "hyprswitch",
-        "rev": "313e7d5730af2e37ab73fe238b1bd3a2d3e5552f",
+        "lastModified": 1747531250,
+        "narHash": "sha256-uDhXNURTJgQSpiaCgzqAizbblpcEWEB1WGWEqtCnLLM=",
+        "owner": "KZDKM",
+        "repo": "Hyprspace",
+        "rev": "511d399120bdcafb43e57ca5ff35167c2bba6db8",
        "type": "github"
      },
      "original": {
-        "owner": "h3rmt",
-        "ref": "release",
-        "repo": "hyprswitch",
+        "owner": "KZDKM",
+        "repo": "Hyprspace",
        "type": "github"
      }
    },
@@ -712,24 +536,23 @@
    "lanzaboote": {
      "inputs": {
        "crane": "crane",
-        "flake-compat": "flake-compat_3",
-        "flake-parts": "flake-parts_2",
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_3",
+        "flake-compat": "flake-compat_2",
+        "flake-parts": "flake-parts",
+        "nixpkgs": "nixpkgs_2",
        "pre-commit-hooks-nix": "pre-commit-hooks-nix",
-        "rust-overlay": "rust-overlay_2"
+        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1682802423,
-        "narHash": "sha256-Fb5TeRTdvUlo/5Yi2d+FC8a6KoRLk2h1VE0/peMhWPs=",
+        "lastModified": 1737639419,
+        "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=",
        "owner": "nix-community",
        "repo": "lanzaboote",
-        "rev": "64b903ca87d18cef2752c19c098af275c6e51d63",
+        "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "v0.3.0",
+        "ref": "v0.4.2",
        "repo": "lanzaboote",
        "type": "github"
      }
@@ -785,8 +608,8 @@
    },
    "nixos-wsl": {
      "inputs": {
-        "flake-compat": "flake-compat_4",
-        "nixpkgs": "nixpkgs_4"
+        "flake-compat": "flake-compat_3",
+        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
        "lastModified": 1746453552,
@@ -805,11 +628,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1748026106,
-        "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=",
+        "lastModified": 1748460289,
+        "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c",
+        "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102",
        "type": "github"
      },
      "original": {
@@ -853,11 +676,11 @@
    },
    "nixpkgs-latest": {
      "locked": {
-        "lastModified": 1748330006,
-        "narHash": "sha256-g6dhnA/An7un00tBZ8MeC7V0lU9lLySP9+brMXrm3TU=",
+        "lastModified": 1748700333,
+        "narHash": "sha256-tnWVoQc2Uwe9O1k8AJqj68ziB36e7XcaiEAHSMqIYEw=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "68a7635955e17148449379318fefcb60b894e775",
+        "rev": "3c1d72614f693ff5ef271a299f1dfdb20d0d290f",
        "type": "github"
      },
      "original": {
@@ -867,73 +690,29 @@
        "type": "github"
      }
    },
-    "nixpkgs-lib": {
-      "locked": {
-        "lastModified": 1735774519,
-        "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=",
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"
-      }
-    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1741992157,
-        "narHash": "sha256-nlIfTsTrMSksEJc1f7YexXiPVuzD1gOfeN1ggwZyUoc=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "da4b122f63095ca1199bd4d526f9e26426697689",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "release-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable_2": {
-      "locked": {
-        "lastModified": 1678872516,
-        "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
+        "lastModified": 1730741070,
+        "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8",
+        "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-22.11",
+        "ref": "nixos-24.05",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1741865919,
-        "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-unstable_2": {
-      "locked": {
-        "lastModified": 1748190013,
-        "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=",
+        "lastModified": 1748460289,
+        "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "62b852f6c6742134ade1abdd2a21685fd617a291",
+        "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102",
        "type": "github"
      },
      "original": {
@@ -944,26 +723,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1735831304,
-        "narHash": "sha256-92A/Zr8UzZzlFYmkgO3HAgX/Cr53eodgNyvJA+Ibkz0=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "0725951bfc4bbc2efff3a537837ca13159b4aec9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1682741954,
-        "narHash": "sha256-RPZxzRu8XU0YD2WeYUFYzJy5yAvWUsxkuK+zWw+6WVk=",
+        "lastModified": 1731919951,
+        "narHash": "sha256-vOM6ETpl1yu9KLi/icTmLJIPbbdJCdAVYUXZceO/Ce4=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "373e9eb4c42b2fc0611d794de5ea715a35d72393",
+        "rev": "04386ac325a813047fc314d4b4d838a5b1e3c7fe",
        "type": "github"
      },
      "original": {
@@ -973,7 +737,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
      "locked": {
        "lastModified": 1742937945,
        "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=",
@@ -989,13 +753,13 @@
        "type": "github"
      }
    },
-    "nixpkgs_5": {
+    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1748162331,
-        "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=",
+        "lastModified": 1748437600,
+        "narHash": "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
+        "rev": "7282cb574e0607e65224d33be8241eae7cfe0979",
        "type": "github"
      },
      "original": {
@@ -1004,7 +768,7 @@
        "type": "indirect"
      }
    },
-    "nixpkgs_6": {
+    "nixpkgs_5": {
      "locked": {
        "lastModified": 1747312588,
        "narHash": "sha256-MmJvj6mlWzeRwKGLcwmZpKaOPZ5nJb/6al5CXqJsgjo=",
@@ -1020,22 +784,6 @@
        "type": "github"
      }
    },
-    "nixpkgs_7": {
-      "locked": {
-        "lastModified": 1727348695,
-        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "nmd": {
      "flake": false,
      "locked": {
@@ -1092,7 +840,7 @@
    },
    "pre-commit-hooks": {
      "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat",
        "gitignore": "gitignore",
        "nixpkgs": [
          "hyprland",
@@ -1119,23 +867,19 @@
          "lanzaboote",
          "flake-compat"
        ],
-        "flake-utils": [
-          "lanzaboote",
-          "flake-utils"
-        ],
        "gitignore": "gitignore_2",
        "nixpkgs": [
          "lanzaboote",
          "nixpkgs"
        ],
-        "nixpkgs-stable": "nixpkgs-stable_2"
+        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1681413034,
-        "narHash": "sha256-/t7OjNQcNkeWeSq/CFLYVBfm+IEnkjoSm9iKvArnUUI=",
+        "lastModified": 1731363552,
+        "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
        "owner": "cachix",
        "repo": "pre-commit-hooks.nix",
-        "rev": "d3de8f69ca88fb6f8b09e5b598be5ac98d28ede5",
+        "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
        "type": "github"
      },
      "original": {
@@ -1146,36 +890,33 @@
    },
    "root": {
      "inputs": {
-        "ghostty": "ghostty",
        "home-manager": "home-manager",
        "hyprland": "hyprland",
        "hyprland-plugins": "hyprland-plugins",
-        "hyprswitch": "hyprswitch",
+        "hyprspace": "hyprspace",
        "lanzaboote": "lanzaboote",
        "nix-on-droid": "nix-on-droid",
        "nixos-wsl": "nixos-wsl",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_4",
        "nixpkgs-latest": "nixpkgs-latest",
-        "nixpkgs-unstable": "nixpkgs-unstable_2",
+        "nixpkgs-unstable": "nixpkgs-unstable",
        "sops-nix": "sops-nix",
-        "yazi": "yazi",
-        "yazi-plugins": "yazi-plugins",
-        "zen-browser": "zen-browser"
+        "yazi": "yazi"
      }
    },
    "rust-overlay": {
      "inputs": {
        "nixpkgs": [
-          "hyprswitch",
+          "lanzaboote",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1735784864,
-        "narHash": "sha256-tIl5p3ueaPw7T5T1UXkLc8ISMk6Y8CI/D/rd0msf73I=",
+        "lastModified": 1731897198,
+        "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "04d5f1836721461b256ec452883362c5edc5288e",
+        "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5",
        "type": "github"
      },
      "original": {
@@ -1185,31 +926,6 @@
      }
    },
    "rust-overlay_2": {
-      "inputs": {
-        "flake-utils": [
-          "lanzaboote",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "lanzaboote",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1682129965,
-        "narHash": "sha256-1KRPIorEL6pLpJR04FwAqqnt4Tzcm4MqD84yhlD+XSk=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "2c417c0460b788328220120c698630947547ee83",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "rust-overlay_3": {
      "inputs": {
        "nixpkgs": [
          "yazi",
@@ -1268,16 +984,16 @@
    },
    "systems": {
      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
        "type": "github"
      },
      "original": {
        "owner": "nix-systems",
-        "repo": "default",
+        "repo": "default-linux",
        "type": "github"
      }
    },
@@ -1311,36 +1027,6 @@
        "type": "github"
      }
    },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_5": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
    "xdph": {
      "inputs": {
        "hyprland-protocols": [
@@ -1384,16 +1070,16 @@
    },
    "yazi": {
      "inputs": {
-        "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_6",
-        "rust-overlay": "rust-overlay_3"
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs_5",
+        "rust-overlay": "rust-overlay_2"
      },
      "locked": {
-        "lastModified": 1748249183,
-        "narHash": "sha256-I+JvW3752iZq4QrTOUDvhVA++0LHq974XxHjQrjA6lM=",
+        "lastModified": 1748623187,
+        "narHash": "sha256-Er9d/5F34c2Uw+DN/9j+j7TdeWiSxMQlZSgsATC04cM=",
        "owner": "sxyazi",
        "repo": "yazi",
-        "rev": "74a8ea9bc0289f093c34b15755c05fa25a1c5ace",
+        "rev": "b65a88075a824e4304dca5428ba05de1404fa635",
        "type": "github"
      },
      "original": {
@@ -1401,102 +1087,6 @@
        "repo": "yazi",
        "type": "github"
      }
-    },
-    "yazi-plugins": {
-      "inputs": {
-        "flake-utils": "flake-utils_4",
-        "flake-utils-plus": "flake-utils-plus",
-        "haumea": "haumea",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": "systems_5"
-      },
-      "locked": {
-        "lastModified": 1747505540,
-        "narHash": "sha256-wJTXPH8VellWNupRxMvv9kkIo+271t4XVupgvT1RkTU=",
-        "owner": "lordkekz",
-        "repo": "nix-yazi-plugins",
-        "rev": "f3daa56d0f9ea29bd1ecff557f3604ada00fbe31",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lordkekz",
-        "repo": "nix-yazi-plugins",
-        "type": "github"
-      }
-    },
-    "zen-browser": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_7"
-      },
-      "locked": {
-        "lastModified": 1727721329,
-        "narHash": "sha256-QYlWZwUSwrM7BuO+dXclZIwoPvBIuJr6GpFKv9XKFPI=",
-        "owner": "MarceColl",
-        "repo": "zen-browser-flake",
-        "rev": "e6ab73f405e9a2896cce5956c549a9cc359e5fcc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "MarceColl",
-        "repo": "zen-browser-flake",
-        "type": "github"
-      }
-    },
-    "zig": {
-      "inputs": {
-        "flake-compat": [
-          "ghostty"
-        ],
-        "flake-utils": [
-          "ghostty",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "ghostty",
-          "nixpkgs-stable"
-        ]
-      },
-      "locked": {
-        "lastModified": 1741825901,
-        "narHash": "sha256-aeopo+aXg5I2IksOPFN79usw7AeimH1+tjfuMzJHFdk=",
-        "owner": "mitchellh",
-        "repo": "zig-overlay",
-        "rev": "0b14285e283f5a747f372fb2931835dd937c4383",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mitchellh",
-        "repo": "zig-overlay",
-        "type": "github"
-      }
-    },
-    "zon2nix": {
-      "inputs": {
-        "flake-utils": [
-          "ghostty",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "ghostty",
-          "nixpkgs-unstable"
-        ]
-      },
-      "locked": {
-        "lastModified": 1742104771,
-        "narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=",
-        "owner": "jcollie",
-        "repo": "zon2nix",
-        "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
-        "type": "github"
-      },
-      "original": {
-        "owner": "jcollie",
-        "ref": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
-        "repo": "zon2nix",
-        "type": "github"
-      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@@ -12,22 +12,19 @@
    nix-on-droid =     { url = "github:nix-community/nix-on-droid/release-24.05";     inputs.nixpkgs.follows = "nixpkgs";   };

    sops-nix =         { url = "github:Mic92/sops-nix";                               inputs.nixpkgs.follows = "nixpkgs";   };
-    lanzaboote =       { url = "github:nix-community/lanzaboote/v0.3.0";                                                    };
+    lanzaboote =       { url = "github:nix-community/lanzaboote/v0.4.2";                                                    };

    hyprland =         { url = "git+https://github.com/hyprwm/Hyprland?submodules=1";                                       };
    hyprland-plugins = { url = "github:hyprwm/hyprland-plugins";                      inputs.hyprland.follows = "hyprland"; };
-    hyprswitch =       { url = "github:h3rmt/hyprswitch/release";                                                           };
+    hyprspace =        { url = "github:KZDKM/Hyprspace";                              inputs.hyprland.follows = "hyprland"; };

    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";                                                        };
-    ghostty =          { url = "github:ghostty-org/ghostty";                                                                };
  };

-  outputs = { self, ... }@inputs: with inputs; let
+  outputs = { ... }@inputs: with inputs; let

    system = "x86_64-linux";
-    config = { allowUnfree = true; allowUnfreePredicate = pkg: builtins.elem (pkgs.lib.getName pkg) (import ./flake-modules/allowed.nix).unfree; };
+    config = { allowUnfreePredicate = pkg: builtins.elem (pkgs.lib.getName pkg) (import ./flake-modules/allowed.nix).unfree; };

    hyper-base = rec {
      inherit system;
@@ -36,7 +33,7 @@
      home   = "/home/${user}/";
    };

-    pkgs = import nixpkgs { inherit system config; } // {
+    pkgs = (import nixpkgs { inherit system config; }) // {
      unstable = import nixpkgs-unstable { inherit system config; };
      latest   = import nixpkgs-latest   { inherit system config; };
      version  = "25.05";
@@ -52,18 +49,15 @@
    nvidia-base = import ./flake-modules/nvidia.nix;
    secrets     = import ./git-crypt/secrets.nix;
    rice        = import ./flake-modules/rice.nix pkgs;
-
  in {
    nixosConfigurations = let
      make-nixos-system = host: nvidia-settings: nixpkgs.lib.nixosSystem { 
-        inherit system;
        modules = [ ./configuration.nix ];
        specialArgs = let
-          hyper = hyper-base // { inherit host; nvidia = nvidia-base // nvidia-settings; };
+          hyper = hyper-base // { inherit host; nvidia = (nvidia-base // nvidia-settings); };
        in { inherit pkgs inputs hyper rice secrets; };
      };
      make-nixos-wsl-system = host: nixpkgs.lib.nixosSystem { 
-        inherit system;
        modules = [ ./nixos-wsl.nix ];
        specialArgs = let
          hyper = hyper-base // { inherit host; };
--- a/home-modules/chatterino.nix
+++ b/home-modules/chatterino.nix
@@ -193,7 +193,7 @@ in {
            "external": {
                "streamlink": {
                  "quality": "",
-                  "options": "--config /${hyper.home}/.config/streamlink/config"
+                  "options": "--config ${hyper.home}/.config/streamlink/config"
                }
            }
          }
--- a/home-modules/clipboard.nix
+++ b/home-modules/clipboard.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+{
+  services.clipman = {
+    package = pkgs.clipman;
+    enable = true;
+  };
+}
--- a/home-modules/discord.nix
+++ b/home-modules/discord.nix
@@ -3,197 +3,198 @@ pkgs.lib.mkIf (hyper.host != "NxACE")
 {
  home = {
    packages = with pkgs; [
-      vesktop
+      # vesktop
+      discord
    ];

-    file.".config/vesktop/settings/settings.json".text = let 
-      settingsSyncVersion = "1729179678715";
-    in /* json */ ''{
-          "notifyAboutUpdates": true,
-          "autoUpdate": false,
-          "autoUpdateNotification": true,
-          "useQuickCss": true,
-          "themeLinks": [
-              "https://luckfire.github.io/amoled-cord/src/amoled-cord.css"
-          ],
-          "enabledThemes": [],
-          "enableReactDevtools": false,
-          "frameless": false,
-          "transparent": true,
-          "winCtrlQ": false,
-          "macosTranslucency": false,
-          "disableMinSize": false,
-          "winNativeTitleBar": false,
-          "plugins": {
-              "BadgeAPI": { "enabled": true },
-              "CommandsAPI": { "enabled": true },
-              "ContextMenuAPI": { "enabled": true },
-              "MemberListDecoratorsAPI": { "enabled": false },
-              "MessageAccessoriesAPI": { "enabled": false },
-              "MessageDecorationsAPI": { "enabled": false },
-              "MessageEventsAPI": { "enabled": false },
-              "MessagePopoverAPI": { "enabled": false },
-              "NoticesAPI": { "enabled": true },
-              "ServerListAPI": { "enabled": false },
-              "NoTrack": { "enabled": true },
-              "Settings": {
-                  "enabled": true,
-                  "settingsLocation": "aboveActivity"
-              },
-              "SupportHelper": { "enabled": true },
-              "ChatInputButtonAPI": { "enabled": false },
-              "AlwaysAnimate": { "enabled": true },
-              "AlwaysTrust": { "enabled": true },
-              "AnonymiseFileNames": { "enabled": false },
-              "WebRichPresence (arRPC)": { "enabled": false },
-              "BANger": { "enabled": false },
-              "BetterFolders": { "enabled": false },
-              "BetterGifAltText": { "enabled": false },
-              "BetterGifPicker": { "enabled": false },
-              "BetterNotesBox": { "enabled": false },
-              "BetterRoleDot": { "enabled": false },
-              "BetterUploadButton": { "enabled": false },
-              "BiggerStreamPreview": { "enabled": false },
-              "BlurNSFW": { "enabled": false },
-              "CallTimer": { "enabled": false },
-              "ClearURLs": { "enabled": false },
-              "ClientTheme": { "enabled": false },
-              "ColorSighted": { "enabled": false },
-              "ConsoleShortcuts": { "enabled": false },
-              "CopyUserURLs": { "enabled": false },
-              "CrashHandler": { "enabled": true },
-              "CustomRPC": { "enabled": false },
-              "Dearrow": { "enabled": false },
-              "Decor": { "enabled": false },
-              "DisableCallIdle": { "enabled": false },
-              "EmoteCloner": { "enabled": false },
-              "Experiments": { "enabled": false },
-              "F8Break": { "enabled": false },
-              "FakeNitro": { "enabled": false },
-              "FakeProfileThemes": { "enabled": true },
-              "FavoriteEmojiFirst": { "enabled": false },
-              "FavoriteGifSearch": { "enabled": false },
-              "FixCodeblockGap": { "enabled": false },
-              "FixSpotifyEmbeds": { "enabled": false },
-              "FixYoutubeEmbeds": { "enabled": false },
-              "ForceOwnerCrown": { "enabled": false },
-              "FriendInvites": { "enabled": false },
-              "GameActivityToggle": { "enabled": false },
-              "GifPaste": { "enabled": false },
-              "GreetStickerPicker": { "enabled": false },
-              "HideAttachments": { "enabled": false },
-              "iLoveSpam": { "enabled": false },
-              "IgnoreActivities": { "enabled": false },
-              "ImageZoom": { "enabled": false },
-              "InvisibleChat": { "enabled": false },
-              "KeepCurrentChannel": { "enabled": false },
-              "LastFMRichPresence": { "enabled": false },
-              "LoadingQuotes": { "enabled": false },
-              "MemberCount": { "enabled": false },
-              "MessageClickActions": { "enabled": false },
-              "MessageLinkEmbeds": { "enabled": false },
-              "MessageLogger": { "enabled": false },
-              "MessageTags": { "enabled": false },
-              "MoreCommands": { "enabled": false },
-              "MoreKaomoji": { "enabled": false },
-              "MoreUserTags": { "enabled": false },
-              "Moyai": { "enabled": false },
-              "MutualGroupDMs": { "enabled": false },
-              "NewGuildSettings": { "enabled": false },
-              "NoBlockedMessages": { "enabled": false },
-              "NoDevtoolsWarning": { "enabled": false },
-              "NoF1": { "enabled": false },
-              "NoMosaic": { "enabled": false },
-              "NoPendingCount": { "enabled": false },
-              "NoProfileThemes": { "enabled": false },
-              "NoReplyMention": { "enabled": false },
-              "NoScreensharePreview": { "enabled": false },
-              "NoTypingAnimation": { "enabled": false },
-              "NoUnblockToJump": { "enabled": false },
-              "NormalizeMessageLinks": { "enabled": false },
-              "NotificationVolume": { "enabled": false },
-              "NSFWGateBypass": { "enabled": false },
-              "OnePingPerDM": { "enabled": false },
-              "oneko": { "enabled": false },
-              "OpenInApp": { "enabled": false },
-              "Party mode 🎉": { "enabled": false },
-              "PermissionFreeWill": { "enabled": false },
-              "PermissionsViewer": { "enabled": false },
-              "petpet": { "enabled": false },
-              "PictureInPicture": { "enabled": false },
-              "PinDMs": { "enabled": false },
-              "PlainFolderIcon": { "enabled": false },
-              "PlatformIndicators": { "enabled": false },
-              "PreviewMessage": { "enabled": false },
-              "PronounDB": { "enabled": false },
-              "QuickMention": { "enabled": false },
-              "QuickReply": { "enabled": false },
-              "ReactErrorDecoder": { "enabled": false },
-              "ReadAllNotificationsButton": { "enabled": false },
-              "RelationshipNotifier": { "enabled": false },
-              "RevealAllSpoilers": { "enabled": false },
-              "ReverseImageSearch": { "enabled": false },
-              "ReviewDB": { "enabled": false },
-              "RoleColorEverywhere": { "enabled": true },
-              "SearchReply": { "enabled": false },
-              "SecretRingToneEnabler": { "enabled": false },
-              "SendTimestamps": { "enabled": false },
-              "ServerListIndicators": { "enabled": false },
-              "ServerProfile": { "enabled": false },
-              "ShikiCodeblocks": { "enabled": false },
-              "ShowAllMessageButtons": { "enabled": false },
-              "ShowConnections": { "enabled": false },
-              "ShowHiddenChannels": { "enabled": false },
-              "ShowMeYourName": { "enabled": false },
-              "ShowTimeouts": { "enabled": false },
-              "SilentMessageToggle": { "enabled": false },
-              "SilentTyping": { "enabled": false },
-              "SortFriendRequests": { "enabled": false },
-              "SpotifyControls": { "enabled": false },
-              "SpotifyCrack": { "enabled": false },
-              "SpotifyShareCommands": { "enabled": false },
-              "StartupTimings": { "enabled": false },
-              "SuperReactionTweaks": { "enabled": false },
-              "TextReplace": { "enabled": false },
-              "ThemeAttributes": { "enabled": false },
-              "TimeBarAllActivities": { "enabled": false },
-              "Translate": { "enabled": false },
-              "TypingIndicator": { "enabled": false },
-              "TypingTweaks": { "enabled": false },
-              "Unindent": { "enabled": false },
-              "UnsuppressEmbeds": { "enabled": false },
-              "UrbanDictionary": { "enabled": false },
-              "UserVoiceShow": { "enabled": false },
-              "USRBG": { "enabled": false },
-              "ValidUser": { "enabled": false },
-              "VoiceChatDoubleClick": { "enabled": false },
-              "VcNarrator": { "enabled": false },
-              "VencordToolbox": { "enabled": false },
-              "ViewIcons": { "enabled": false },
-              "ViewRaw": { "enabled": false },
-              "VoiceMessages": { "enabled": false },
-              "WebContextMenus": {
-                 "enabled": true,
-                 "addBack": true },
-              "WebKeybinds": { "enabled": true },
-              "WhoReacted": { "enabled": false },
-              "Wikisearch": { "enabled": false },
-              "XSOverlay": { "enabled": false }
-          },
-          "notifications": {
-              "timeout": 5000,
-              "position": "bottom-right",
-              "useNative": "not-focused",
-              "logLimit": 50
-          },
-          "cloud": {
-              "authenticated": false,
-              "url": "https://api.vencord.dev/",
-              "settingsSync": false,
-              "settingsSyncVersion": ${settingsSyncVersion}
-          }
-      }
-    '';
+    # file.".config/vesktop/settings/settings.json".text = let 
+    #   settingsSyncVersion = "1729179678715";
+    # in /* json */ ''{
+    #       "notifyAboutUpdates": true,
+    #       "autoUpdate": false,
+    #       "autoUpdateNotification": true,
+    #       "useQuickCss": true,
+    #       "themeLinks": [
+    #           "https://luckfire.github.io/amoled-cord/src/amoled-cord.css"
+    #       ],
+    #       "enabledThemes": [],
+    #       "enableReactDevtools": false,
+    #       "frameless": false,
+    #       "transparent": true,
+    #       "winCtrlQ": false,
+    #       "macosTranslucency": false,
+    #       "disableMinSize": false,
+    #       "winNativeTitleBar": false,
+    #       "plugins": {
+    #           "BadgeAPI": { "enabled": true },
+    #           "CommandsAPI": { "enabled": true },
+    #           "ContextMenuAPI": { "enabled": true },
+    #           "MemberListDecoratorsAPI": { "enabled": false },
+    #           "MessageAccessoriesAPI": { "enabled": false },
+    #           "MessageDecorationsAPI": { "enabled": false },
+    #           "MessageEventsAPI": { "enabled": false },
+    #           "MessagePopoverAPI": { "enabled": false },
+    #           "NoticesAPI": { "enabled": true },
+    #           "ServerListAPI": { "enabled": false },
+    #           "NoTrack": { "enabled": true },
+    #           "Settings": {
+    #               "enabled": true,
+    #               "settingsLocation": "aboveActivity"
+    #           },
+    #           "SupportHelper": { "enabled": true },
+    #           "ChatInputButtonAPI": { "enabled": false },
+    #           "AlwaysAnimate": { "enabled": true },
+    #           "AlwaysTrust": { "enabled": true },
+    #           "AnonymiseFileNames": { "enabled": false },
+    #           "WebRichPresence (arRPC)": { "enabled": false },
+    #           "BANger": { "enabled": false },
+    #           "BetterFolders": { "enabled": false },
+    #           "BetterGifAltText": { "enabled": false },
+    #           "BetterGifPicker": { "enabled": false },
+    #           "BetterNotesBox": { "enabled": false },
+    #           "BetterRoleDot": { "enabled": false },
+    #           "BetterUploadButton": { "enabled": false },
+    #           "BiggerStreamPreview": { "enabled": false },
+    #           "BlurNSFW": { "enabled": false },
+    #           "CallTimer": { "enabled": false },
+    #           "ClearURLs": { "enabled": false },
+    #           "ClientTheme": { "enabled": false },
+    #           "ColorSighted": { "enabled": false },
+    #           "ConsoleShortcuts": { "enabled": false },
+    #           "CopyUserURLs": { "enabled": false },
+    #           "CrashHandler": { "enabled": true },
+    #           "CustomRPC": { "enabled": false },
+    #           "Dearrow": { "enabled": false },
+    #           "Decor": { "enabled": false },
+    #           "DisableCallIdle": { "enabled": false },
+    #           "EmoteCloner": { "enabled": false },
+    #           "Experiments": { "enabled": false },
+    #           "F8Break": { "enabled": false },
+    #           "FakeNitro": { "enabled": false },
+    #           "FakeProfileThemes": { "enabled": true },
+    #           "FavoriteEmojiFirst": { "enabled": false },
+    #           "FavoriteGifSearch": { "enabled": false },
+    #           "FixCodeblockGap": { "enabled": false },
+    #           "FixSpotifyEmbeds": { "enabled": false },
+    #           "FixYoutubeEmbeds": { "enabled": false },
+    #           "ForceOwnerCrown": { "enabled": false },
+    #           "FriendInvites": { "enabled": false },
+    #           "GameActivityToggle": { "enabled": false },
+    #           "GifPaste": { "enabled": false },
+    #           "GreetStickerPicker": { "enabled": false },
+    #           "HideAttachments": { "enabled": false },
+    #           "iLoveSpam": { "enabled": false },
+    #           "IgnoreActivities": { "enabled": false },
+    #           "ImageZoom": { "enabled": false },
+    #           "InvisibleChat": { "enabled": false },
+    #           "KeepCurrentChannel": { "enabled": false },
+    #           "LastFMRichPresence": { "enabled": false },
+    #           "LoadingQuotes": { "enabled": false },
+    #           "MemberCount": { "enabled": false },
+    #           "MessageClickActions": { "enabled": false },
+    #           "MessageLinkEmbeds": { "enabled": false },
+    #           "MessageLogger": { "enabled": false },
+    #           "MessageTags": { "enabled": false },
+    #           "MoreCommands": { "enabled": false },
+    #           "MoreKaomoji": { "enabled": false },
+    #           "MoreUserTags": { "enabled": false },
+    #           "Moyai": { "enabled": false },
+    #           "MutualGroupDMs": { "enabled": false },
+    #           "NewGuildSettings": { "enabled": false },
+    #           "NoBlockedMessages": { "enabled": false },
+    #           "NoDevtoolsWarning": { "enabled": false },
+    #           "NoF1": { "enabled": false },
+    #           "NoMosaic": { "enabled": false },
+    #           "NoPendingCount": { "enabled": false },
+    #           "NoProfileThemes": { "enabled": false },
+    #           "NoReplyMention": { "enabled": false },
+    #           "NoScreensharePreview": { "enabled": false },
+    #           "NoTypingAnimation": { "enabled": false },
+    #           "NoUnblockToJump": { "enabled": false },
+    #           "NormalizeMessageLinks": { "enabled": false },
+    #           "NotificationVolume": { "enabled": false },
+    #           "NSFWGateBypass": { "enabled": false },
+    #           "OnePingPerDM": { "enabled": false },
+    #           "oneko": { "enabled": false },
+    #           "OpenInApp": { "enabled": false },
+    #           "Party mode 🎉": { "enabled": false },
+    #           "PermissionFreeWill": { "enabled": false },
+    #           "PermissionsViewer": { "enabled": false },
+    #           "petpet": { "enabled": false },
+    #           "PictureInPicture": { "enabled": false },
+    #           "PinDMs": { "enabled": false },
+    #           "PlainFolderIcon": { "enabled": false },
+    #           "PlatformIndicators": { "enabled": false },
+    #           "PreviewMessage": { "enabled": false },
+    #           "PronounDB": { "enabled": false },
+    #           "QuickMention": { "enabled": false },
+    #           "QuickReply": { "enabled": false },
+    #           "ReactErrorDecoder": { "enabled": false },
+    #           "ReadAllNotificationsButton": { "enabled": false },
+    #           "RelationshipNotifier": { "enabled": false },
+    #           "RevealAllSpoilers": { "enabled": false },
+    #           "ReverseImageSearch": { "enabled": false },
+    #           "ReviewDB": { "enabled": false },
+    #           "RoleColorEverywhere": { "enabled": true },
+    #           "SearchReply": { "enabled": false },
+    #           "SecretRingToneEnabler": { "enabled": false },
+    #           "SendTimestamps": { "enabled": false },
+    #           "ServerListIndicators": { "enabled": false },
+    #           "ServerProfile": { "enabled": false },
+    #           "ShikiCodeblocks": { "enabled": false },
+    #           "ShowAllMessageButtons": { "enabled": false },
+    #           "ShowConnections": { "enabled": false },
+    #           "ShowHiddenChannels": { "enabled": false },
+    #           "ShowMeYourName": { "enabled": false },
+    #           "ShowTimeouts": { "enabled": false },
+    #           "SilentMessageToggle": { "enabled": false },
+    #           "SilentTyping": { "enabled": false },
+    #           "SortFriendRequests": { "enabled": false },
+    #           "SpotifyControls": { "enabled": false },
+    #           "SpotifyCrack": { "enabled": false },
+    #           "SpotifyShareCommands": { "enabled": false },
+    #           "StartupTimings": { "enabled": false },
+    #           "SuperReactionTweaks": { "enabled": false },
+    #           "TextReplace": { "enabled": false },
+    #           "ThemeAttributes": { "enabled": false },
+    #           "TimeBarAllActivities": { "enabled": false },
+    #           "Translate": { "enabled": false },
+    #           "TypingIndicator": { "enabled": false },
+    #           "TypingTweaks": { "enabled": false },
+    #           "Unindent": { "enabled": false },
+    #           "UnsuppressEmbeds": { "enabled": false },
+    #           "UrbanDictionary": { "enabled": false },
+    #           "UserVoiceShow": { "enabled": false },
+    #           "USRBG": { "enabled": false },
+    #           "ValidUser": { "enabled": false },
+    #           "VoiceChatDoubleClick": { "enabled": false },
+    #           "VcNarrator": { "enabled": false },
+    #           "VencordToolbox": { "enabled": false },
+    #           "ViewIcons": { "enabled": false },
+    #           "ViewRaw": { "enabled": false },
+    #           "VoiceMessages": { "enabled": false },
+    #           "WebContextMenus": {
+    #              "enabled": true,
+    #              "addBack": true },
+    #           "WebKeybinds": { "enabled": true },
+    #           "WhoReacted": { "enabled": false },
+    #           "Wikisearch": { "enabled": false },
+    #           "XSOverlay": { "enabled": false }
+    #       },
+    #       "notifications": {
+    #           "timeout": 5000,
+    #           "position": "bottom-right",
+    #           "useNative": "not-focused",
+    #           "logLimit": 50
+    #       },
+    #       "cloud": {
+    #           "authenticated": false,
+    #           "url": "https://api.vencord.dev/",
+    #           "settingsSync": false,
+    #           "settingsSyncVersion": ${settingsSyncVersion}
+    #       }
+    #   }
+    # '';
  };
 }

--- a/home-modules/ghostty.nix
+++ b/home-modules/ghostty.nix
@@ -1,54 +1,48 @@
-{ config, rice, hyper, inputs, ... }:
+{ pkgs, rice, ... }:
 {
-  home = {
-  packages = [ inputs.ghostty.packages.${hyper.system}.default ];
-    file."${config.xdg.configHome}/ghostty/config".text = with rice.color; /* ini */ ''
-      font-family="${rice.font.code.name}"
-      clipboard-read=allow
-      # clipboard-write=allow
-      # clipboard-read=deny
-      # clipboard-write=deny
-      clipboard-trim-trailing-spaces=true
-      clipboard-paste-protection=false
-      
-      window-decoration=false
-      confirm-close-surface=false
-
-      window-padding-x=5
-      window-padding-y=5
-
-      keybind=ctrl+comma=reload_config
-      keybind=ctrl+equal=increase_font_size:1
-      keybind=ctrl+minus=decrease_font_size:1
-      keybind=ctrl+shift+v=paste_from_clipboard
-
-      background=${background}
-      foreground=${foreground}
-
-      background-opacity=${builtins.toString rice.transparency}
-
-      cursor-color=${special.bright}
-      cursor-opacity=0.8
-
-      palette=0=${black.base}
-      palette=8=${black.bright}
-      palette=1=${red.base}
-      palette=9=${red.bright}
-      palette=2=${green.base}
-      palette=10=${green.bright}
-      palette=3=${yellow.base}
-      palette=11=${yellow.bright}
-      palette=4=${blue.base}
-      palette=12=${blue.bright}
-      palette=5=${magenta.base}
-      palette=13=${magenta.bright}
-      palette=6=${cyan.base}
-      palette=14=${cyan.bright}
-      palette=7=${white.base}
-      palette=15=${white.bright}
-
-      selection-background=${accent.base} 
-      selection-foreground=${background}
-    '';
+  programs.ghostty = {
+    enable = true;
+    package = pkgs.ghostty;
+    settings = with rice.color; {
+      background = background;
+      background-opacity = builtins.toString rice.transparency;
+      clipboard-paste-protection = false;
+      clipboard-read = "allow";
+      clipboard-trim-trailing-spaces = true;
+      confirm-close-surface = false;
+      cursor-color = special.bright;
+      cursor-opacity = 0.8;
+      font-family = "${rice.font.code.name}";
+      foreground = foreground;
+      keybind = [
+        "ctrl+comma=reload_config"
+        "ctrl+equal=increase_font_size:1"
+        "ctrl+minus=decrease_font_size:1"
+        "ctrl+shift+v=paste_from_clipboard"
+      ];
+      palette = with rice; [
+        "0=${black.base}"
+        "8=${black.bright}"
+        "1=${red.base}"
+        "9=${red.bright}"
+        "2=${green.base}"
+        "10=${green.bright}"
+        "3=${yellow.base}"
+        "11=${yellow.bright}"
+        "4=${blue.base}"
+        "12=${blue.bright}"
+        "5=${magenta.base}"
+        "13=${magenta.bright}"
+        "6=${cyan.base}"
+        "14=${cyan.bright}"
+        "7=${white.base}"
+        "15=${white.bright}"
+      ];
+      selection-background = accent.base; 
+      selection-foreground = background;
+      window-decoration = false;
+      window-padding-x = 5;
+      window-padding-y = 5;
+    };
  };
 }
--- a/home-modules/hyprland-autoname-workspaces.nix
+++ b/home-modules/hyprland-autoname-workspaces.nix
@@ -10,6 +10,7 @@
        "blueman-manager"       = "󰂯"
        "chatterino"            = ""
        "Chromium"              = ""
+        "chromium-browser"      = ""
        "code"                  = "󰨞"
        "code-oss"              = "󰨞"
        "codium"                = "󰨞"
--- a/home-modules/hyprland.nix
+++ b/home-modules/hyprland.nix
@@ -66,6 +66,7 @@ in {
    hyprland-protocols
    hyprlock
    hypridle
+    hyprshot
    hyprpicker
    hyprcursor

@@ -74,8 +75,8 @@ in {

  # ]) ++ (with pkgs-unstable; [
    
-  ]) ++ (with inputs; [
-    hyprswitch.packages.x86_64-linux.default
+  # ]) ++ (with inputs; [
+    # hyprswitch.packages.x86_64-linux.default
  ]);
  

@@ -90,7 +91,8 @@ in {
      # inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo
      # inputs.hyprfocus.packages.${pkgs.system}.hyprfocus
      # inputs.hycov.packages.${pkgs.system}.hycov
-      # inputs.Hyprspace.packages.${pkgs.system}.Hyprspace
+      pkgs.hyprlandPlugins.hyprspace
+      # inputs.hyprspace.packages.${pkgs.system}.Hyprspace
    ];

    settings = {
@@ -133,7 +135,7 @@ in {
        "27, monitor:${d2}"
        "28, monitor:${d2}"
        "29, monitor:${d2}"
-        "20, monitor:${d2}"
+        "20, monitor:${d2}, ${compact}"
        "31, monitor:${d3}, default:${let x = if hyper.host == "NxNORTH" then "true" else "false"; in x}"
        "32, monitor:${d3}"
        "33, monitor:${d3}"
@@ -208,7 +210,7 @@ in {

        blur = {
          enabled = true;
-          size = "3";
+          size = "10";
          passes = "2";
          xray = false;
          vibrancy = 0.5;
@@ -218,9 +220,10 @@ in {

      animations = {
        enabled = true;
-        # bezier = "myBezier, 0.01, 0.9, 0.1, 1.0"; #o
+        bezier = "myBezier, 0.01, 0.9, 0.1, 1.0"; #o
        # bezier = "myBezier, 0.83, 0, 0.17, 1"; # io
-        bezier = "myBezier, 0.33, 1, 0.68, 1";
+        # bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
+        # bezier = "myBezier, 0.33, 1, 0.68, 1";
        animation = let direction = if hyper.host == "NxXPS" then "slide" else "slidevert"; in [
          "windows, 1, ${animation-speed}, myBezier, slide"
          "border, 1, ${animation-speed}, myBezier"
@@ -273,65 +276,51 @@ in {
      windowrulev2 = [
        "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)$" 
-
-        # "float, initialTitle:^(Edit Item)$" # thunderbid calendar
-        # "dimaround on, initialTitle:^(Edit Item)$" # thunderbid calendar
-        "float,class:^(thunderbird)$"
-        # "float,class:^(thunderbird)$,title:^(.*)(Reminder)(.*)$"
-        # "float,class:^(thunderbird)$,title:^About(.*)$"
-        # "float,class:^(thunderbird)$,title:^(Check Spelling)$"
-
-        "center 1,class:^(gimp)$"
-      ] ++ [
        "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]"
+      ] ++ [
+        "center 1,class:^(gimp)$"
+
+        "float, class:^(ibus-ui.*)$"
+        "float, class:^(ibus-ui-gtk3)$"
+        "float, class:^(imv)$"
+        "float, class:^(org.kde.polkit-kde-authentication-agent-1)$"
+        "float, class:^(presenter)$" # sent
+        "float, class:^(thunderbird)$"
+        "float, title:^(Compact folders)$"
+        "float, title:^(Ibus-ui.*)$"
+        "float, title:^(Ibus-ui-gtk3)$"
+        "float, title:^(Page Info — .*)$"
+        "float, title:^(Picture-in-Picture)$"
+        "float, title:^(wlogout)$"
+
+        "fullscreen, class:^(imv)$" 
+        "fullscreen, class:^(sent)$"
+        "fullscreen, class:^(wlogout)$"
+
+        "noanim, class:^(imv)$"
+        "noanim, class:^(presenter)$" # sent

-        # "opacity ${transparency}, firefox"
-        "opacity ${transparency}, class:^(code-oss)$"
-        "opacity ${transparency}, class:^(VSCodium)$"
        "opacity ${transparency}, class:^(Code)$"
-        # "opacity ${transparency}, sent"
-        "opacity ${transparency}, class:^(neovide)$"
-        "opacity ${transparency}, class:^(obsidian)$"
-        # "opacity ${transparency}, zathura"
-        # "bordercolor rgba(${rice.lib.nohash rice.color.foreground}ff) rgba(${rice.lib.nohash rice.color.background}${rice.lib.float-to-drune rice.transparency}), Alacritty"
-        # "bordercolor rgba(${rice.lib.nohash rice.color.foreground}ff) rgba(${rice.lib.nohash rice.color.background}${rice.lib.float-to-drune rice.transparency}), ${terminal}"
+        "opacity ${transparency}, class:^(code-oss)$"
        "opacity ${transparency}, class:^(discord)$"
-        "opacity ${transparency}, class:^(vesktop)$"
+        "opacity ${transparency}, class:^(element)$"
        "opacity ${transparency}, class:^(Element)$"
        "opacity ${transparency}, class:^(lutris)$"
-        "opacity ${transparency}, class:^(element)$"
-        # "opacity ${transparency}, ^([sS]potify)$"
-        # "opacity ${transparency}, virt-manager"
-        # "opacity ${transparency}, thunar"
+        "opacity ${transparency}, class:^(neovide)$"
+        "opacity ${transparency}, class:^(obsidian)$"
+        "opacity ${transparency}, class:^(vesktop)$"
+        "opacity ${transparency}, class:^(VSCodium)$"
        "opacity ${transparency}, title:^(wlogout)$"
+
        "opaque, title:^(GNU Image Manipulation Program)$"
-        "float, title:^(Picture-in-Picture)$"
-        # "float, class:^(Ibus-ui.*)$"
-        # "float, ^(ibus-ui.*)$"
-        # "float, ^(ibus-ui-gtk3)$"
-        "float, title:^(Ibus-ui-gtk3)$"
+        
        "pin, title:^(Picture-in-Picture)$"
-        "float, class:^(org.kde.polkit-kde-authentication-agent-1)$"
-        "float, title:^(wlogout)$"
-        "float, class:^(imv)$"
-        "float, title:^(Page Info — .*)$"
-        "float, title:^(Compact folders)$"
+
        "tile, class:^(sent)$"
-        "fullscreen, class:^(wlogout)$"
-        "fullscreen, class:^(sent)$"
-        "workspace 14, class:^(lutris)$"
-        "workspace 100, title:^(Apex Legends)$"
-        # "workspace 100, ^(cyberpunk2077.exe)$"
-        "workspace 100, title:^(No Man.s Sky)$"
+
        "workspace 100, class:^(gamescope)$"
      ];

@@ -354,7 +343,6 @@ in {
      ###########################################################################
      ## ROW 0:
      bind = [
-        "SUPER SHIFT, Escape, exit, "
        "SUPER,       F1, workspace,       100"
        "SUPER SHIFT, F1, movetoworkspace, 100"
        # "SUPER,       F2,"
@@ -405,8 +393,8 @@ in {
        ###########################################################################
        ## ROW 2:

-        #bind = SUPER,       TAB, hycov:toggleoverview
-        # "SUPER,       TAB, overview:toggle"
+        # "SUPER,       TAB, hycov:toggleoverview"
+        "SUPER,       TAB, overview:toggle"
        # "SUPER,       TAB, hyprexpo:expo, toggle"
        "ALT,         TAB, focuscurrentorlast"
        # "SUPER,       TAB, exec, hyprswitch --daemon"
@@ -437,7 +425,8 @@ in {
        "SUPER,       A, execr, waybar_mode set ' 󰹑 '"
        "SUPER,       A, submap, scrL"
        "SUPER,       S, exec, spotify"
-        "SUPER,       D, exec, vesktop --disable-gpu-compositing"
+        # "SUPER,       D, exec, vesktop --disable-gpu-compositing"
+        "SUPER,       D, exec, discord"
        "SUPER,       F, fullscreen"
        # "SUPER,       G,"
        "SUPER,       H, movefocus, l"
@@ -491,7 +480,9 @@ in {
        ###########################################################################
        ## MEGA KEYS:

-        ''     , Print, exec, grim -g "$(slurp)"''
+        ", Print, execr, waybar_mode set '󰄀 '"
+        ", Print, submap, screenshot"
+
        # "SUPER, Next, resizeactive, 5% 5%" # binde
        # "SUPER, Prior, resizeactive, -5% -5%" # binde

@@ -528,6 +519,39 @@ in {
        "SUPER, Next, resizeactive, 10% 10%" 
        "SUPER, Prior, resizeactive, -10% -10%" 
      ];
+      plugin = {
+        overview = {
+          # panelHeight = 
+          # panelBorderWidth = 
+          onBottom = false; # whether if panel should be on bottom instead of top
+          # workspaceMargin = # spacing of workspaces with eachother and the edge of the panel
+          # reservedArea = # padding on top of the panel, for Macbook camera notch
+          workspaceBorderSize = rice.border-width; #
+          centerAligned = true; # whether if workspaces should be aligned at the center (KDE / macOS style) or at the left (Windows style)
+          hideBackgroundLayers = true; # do not draw background and bottom layers in overview
+          hideTopLayers = false; # do not draw top layers in overview
+          hideOverlayLayers = false; # do not draw overlay layers in overview
+          hideRealLayers = false; # whether to hide layers in actual workspace
+          drawActiveWorkspace = true; # draw the active workspace in overview as-is
+          overrideGaps = false; # whether if overview should override the layout gaps in the current workspace using the following values
+          # gapsIn = #
+          # gapsOut = #
+          affectStrut = false; # whether the panel should push window aside, disabling this option also 
+
+          dots_center = true;
+          autoDrag = true;  # mouse click always drags window when overview is open
+          autoScroll = true;  # mouse scroll on active workspace area always switch workspace
+          exitOnClick = true;  # mouse click without dragging exits overview
+          switchOnDrop = true;  # switch to the workspace when a window is droppped into it
+          exitOnSwitch = true;  # overview exits when overview is switched by clicking on workspace view or by switchOnDrop
+          showNewWorkspace = false;  # add a new empty workspace at the end of workspaces view
+          showEmptyWorkspace = false;  # show empty workspaces that are inbetween non-empty workspaces
+          showSpecialWorkspace = false;  # defaults to false
+          disableGestures = true;
+          reverseSwipe = true;  # reverses the direction of swipe gesture, for macOS peeps?
+          exitKey = true;
+        };
+      };
    };


@@ -614,6 +638,13 @@ in {
      bind = , Escape, submap, reset
      submap = reset

+      submap = screenshot
+      ${action_simple { key = "W"; cmd = ''exec,hyprshot -m window''; }}
+      ${action_simple { key = "M"; cmd = ''exec,hyprshot -m output''; }}
+      ${action_simple { key = "R"; cmd = ''exec,hyprshot -m region''; }}
+      bind = , Escape, execr, waybar_mode unset
+      bind = , Escape, submap, reset
+      submap = reset
      
    '';
  };
--- a/home-modules/yazi.nix
+++ b/home-modules/yazi.nix
@@ -10,14 +10,10 @@
    package = inputs.yazi.packages.${hyper.system}.default;
    enableFishIntegration = true;
    shellWrapperName = "ya";
-    plugins = with inputs.yazi-plugins.packages.${hyper.system}; {
-      inherit
-      # chmod
-      starship;
-    };
+    # plugins = with inputs.yazi-plugins.packages.${hyper.system}; { };
    # initLua = /* lua */  '' '';
    keymap = {
-      manager.keymap = [
+      mgr.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";          }
@@ -181,7 +177,7 @@
      ];
    };
    settings = {
-      manager = {
+      mgr = {
        layout = [2 3 4];
        sort_by = "natural";
        sort_sensitive = true;
@@ -293,7 +289,7 @@
      ];
    };
    theme = with rice.color; {
-      manager = {
+      mgr = {
        cwd             = { fg = foreground;    bg = background; };
        hovered         = { fg = background;    bg = accent.base; };
        preview_hovered = { underline = false;  };
--- a/home.nix
+++ b/home.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, inputs, ... }:
+{ pkgs, hyper, ... }:
 {
  imports = [
    ./home-modules/auto-mount.nix
@@ -6,6 +6,7 @@
    ./home-modules/bitwarden.nix
    ./home-modules/calendar.nix
    ./home-modules/chatterino.nix
+    ./home-modules/clipboard.nix
    ./home-modules/color-pallete.nix
    ./home-modules/direnv.nix
    ./home-modules/discord.nix
@@ -103,7 +104,6 @@
    reflex
    ripgrep
    screen
-    # speedtest-go
    spicetify-cli
    sssnake
    swww
@@ -116,11 +116,7 @@
    wl-clipboard
    xclip
    xfce.thunar
-    # xournal
    yt-dlp
-
-    inputs.zen-browser.packages."${system}".default
-    
  ] ++ (if (hyper.host != "NxACE") then [
    signal-desktop
    obsidian
--- a/system-modules/boot.nix
+++ b/system-modules/boot.nix
@@ -17,62 +17,14 @@ in
      
    environment.systemPackages = with pkgs; [ sbctl ];
    boot = {
-      lanzaboote =  let
-        windows-efi-shell-fs-alias = "HD0a65535a2"; 
-      in {
+      lanzaboote = {
        enable = true;
-        pkiBundle = "/etc/secureboot";
-        package = pkgs.lib.mkForce (pkgs.writeShellApplication {
-          name = "lzbt";
-          runtimeInputs = [
-            inputs.lanzaboote.packages.x86_64-linux.tool
-            pkgs.coreutils
-            pkgs.sbctl
-          ];
-          # https://forum.endeavouros.com/t/tutorial-add-a-systemd-boot-loader-menu-entry-for-a-windows-installation-using-a-separate-esp-partition/37431
-          text = /*bash*/ ''
-            # execute normal lanazboote functionality
-            lzbt "$@"
-
-            # Create windows.nsh file 
-            ESP='${config.boot.loader.efi.efiSysMountPoint}'
-            echo "${windows-efi-shell-fs-alias}:EFI\Microsoft\Boot\Bootmgfw.efi" > "$ESP/windows.nsh"
-            
-            # cp efi-shell boot file
-            # systemd-boot will automatically add an entry for it 
-            cp -f '${pkgs.edk2-uefi-shell.efi}' "$ESP/shellx64.efi"
-            # should exist already
-            mkdir -p "$ESP/loader/entries"
-            # sign shell file
-            sbctl sign -s "$ESP/shellx64.efi"
-            # Create windows.conf boot entry
-            cat << EOF > "$ESP/loader/entries/windows.conf"
-            title   Windows-Hack
-            efi     /shellx64.efi
-            options -nointerrupt -noconsolein -noconsoleout windows.nsh
-            EOF
-          '';
-        });
+        pkiBundle = "/var/lib/sbctl";
      };
      loader.systemd-boot = {
        enable = false; # let lanzaboote install systemd-boot
        consoleMode = "max";
        configurationLimit = 10;
-        # extraEntries = {
-        #   "Windo7s-11.conf" = ''
-        #     Windows eleven
-        #     search --file --no-floppy --set=root /EFI/Microsoft/Boot/bootmgfw.efi
-        #     chainloader (''${root})/EFI/Microsoft/Boot/bootmgfw.efi
-        #   '';
-        #   "Firmware.conf" = ''
-        #     Firmware
-        #     fwsetup
-        #   '';
-        #   "Shutdown.conf" = ''
-        #     title Shutdown
-        #     halt
-        #   '';
-        # };
      };
      kernelPackages = pkgs.linuxPackages_zen;
      extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
--- a/system-modules/hardware-configuration.nix
+++ b/system-modules/hardware-configuration.nix
@@ -31,7 +31,6 @@

  networking.useDHCP = pkgs.lib.mkDefault true;

-  nixpkgs.hostPlatform = pkgs.lib.mkDefault "x86_64-linux";
  hardware.cpu.intel.updateMicrocode = pkgs.lib.mkDefault config.hardware.enableRedistributableFirmware;

  # from nixos-hardware
Author	SHA1	Message	Date
Lennart J. Kurzweg (Nx2)	10344ce639	Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles	2025-06-10 19:39:19 +02:00
Lennart J. Kurzweg (Nx2)	a76fe844c6	ghossty using module	2025-06-10 19:36:21 +02:00
Lennart J. Kurzweg (Nx2)	feb6d269de	chromium rename	2025-06-10 19:36:03 +02:00
Lennart J. Kurzweg (Nx2)	76e83f6498	more fixes	2025-06-10 19:35:53 +02:00
Lennart J. Kurzweg (Nx2)	46ad89fe0d	new version fixes	2025-06-10 19:34:56 +02:00
Lennart J. Kurzweg (Nx2)	c186666394	chatterino path fix	2025-06-10 19:33:34 +02:00
Lennart J. Kurzweg (Nx2)	6b8d1d277b	blacker black	2025-06-10 19:33:16 +02:00
Lennart J. Kurzweg (Nx2)	2c358380e4	flake fix	2025-06-10 19:32:59 +02:00
Lennart J. Kurzweg (Nx2)	935beadb3b	add .ignore	2025-06-10 19:30:09 +02:00
Lennart J. Kurzweg (Nx2)	5775bc88d6	lanazboote fix	2025-06-10 19:30:01 +02:00