idk just wanted

flake.lock

@@ -723,12 +723,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-sqiwECSAWTdYkRhW36rK357dPIMGIsO09lgvvBt0b1s=",
-        "path": "./pkgs",
+        "narHash": "sha256-MpAojq1F1ypVQByvQQ1l7R02eT5HvALp7D3htL4p3bs=",
+        "path": "pkgs",
         "type": "path"
       },
       "original": {
-        "path": "./pkgs",
+        "path": "pkgs",
         "type": "path"
       }
     }

flake.nix

@@ -41,7 +41,7 @@
     };
 
     xpk = {
-      url = "path:./pkgs";
+      url = "path:pkgs";
       inputs.n.follows = "nixpkgs";
     };
     base16 = {

machines/default.nix

@@ -9,7 +9,7 @@
         ver = "24.05";
       };
       path = {
-        flakeDir = "/persist/flake";
+        flake = "/persist/flake";
         pass = "/persist/vault/passwords.kdbx";
       };
       styl = {
@@ -26,7 +26,7 @@
         ver = "24.05";
       };
       path = {
-        flakeDir = "/persist/flake";
+        flake = "/persist/flake";
         pass = "/persist/vault/passwords.kdbx";
       };
       styl = {

machines/embrace/home/pkgs.nix

@@ -22,7 +22,6 @@ in
     cli.pkgs = with pkgs; [
       atool
       zip
-      p7zip-rar
       ouch
 
       imagemagick

machines/embrace/host/default.nix

@@ -53,6 +53,7 @@ in
       protonmail = off;
       security = on;
       terraria = off;
+      users.passwd = "$2b$05$KxzRemxpLZBhgRObiACMBuZqXgCSdy8OEu2WtGohJkiCiabRhHAtm";
       variables = on;
     };
   };

machines/embrace/host/pkgs.nix

@@ -5,7 +5,7 @@
 }:
 {
   imports = with inputs; [
-    "${self}/modules/nixos/disko/default.nix"
+    (import ../../../modules/nixos/disko/default.nix { device = "/dev/nvme0n1"; })
     disko.nixosModules.default
     hardware.nixosModules.lenovo-thinkpad-t14-amd-gen1
   ];

machines/jetpure/host/default.nix

@@ -54,6 +54,7 @@ in
       protonmail = off;
       security = on;
       terraria = off;
+      users.passwd = "$2a$05$yafhLZqwJZaPtcvo1alcQekxot7ef8m9rbYIbIH5AKCywCOZK3URy";
       variables = on;
     };
   };

modules/home/programs/cli/archivers/default.nix

@@ -23,7 +23,6 @@ in
       zip
       unzip
       unrar
-      p7zip-rar
     ];
   };
 }

modules/home/programs/cli/git/default.nix

@@ -26,7 +26,7 @@ in
       extraConfig = {
         color.ui = true;
         init.defaultBranch = "main";
-        safe.directory = path.flakeDir;
+        safe.directory = path.flake;
       };
     };
   };

modules/home/programs/cli/yazi/binds.nix

@@ -210,29 +210,10 @@ with lib.x;
         on = [
           "g"
           "f"
-          "f"
         ];
-        run = "cd ${path.flakeDir}";
+        run = "cd ${path.flake}";
         desc = "Go to flake main dir";
       }
-      {
-        on = [
-          "g"
-          "f"
-          "h"
-        ];
-        run = "cd ${path.flakeDir}/modules/home";
-        desc = "Go to home modules";
-      }
-      {
-        on = [
-          "g"
-          "f"
-          "H"
-        ];
-        run = "cd ${path.flakeDir}/modules/host";
-        desc = "Go to nixos modules";
-      }
       {
         on = [
           "g"

modules/home/programs/gui/qutebrowser/plugins.nix

@@ -16,8 +16,4 @@ in
     url = "https://raw.githubusercontent.com/afreakk/greasemonkeyscripts/refs/heads/master/youtube_adblock.js";
     sha256 = "sha256-AyD9VoLJbKPfqmDEwFIEBMl//EIV/FYnZ1+ona+VU9c=";
   })
-  (fetchurl {
-    url = "https://gist.githubusercontent.com/uwuwuwde/9c4f3d9bbb20dcf15bd801dcbf72159a/raw/4790935aaaa68f1709fdae2ba2f8c56d6c4b3939/untrack";
-    sha256 = "sha256-CDdCPgcjW/4P+1+JU4HB8RvMFCMEXxSqbK0FRgk4KUg=";
-  })
 ]

modules/home/shells/alias/default.nix

@@ -11,6 +11,7 @@ in
 
 {
   home.shellAliases = with pkgs; {
+    goToFlake = "cd ${lib.x.path.flake}";
     rebuild = "nh os switch -H ${lib.x.machineName}";
     # quality of life
     e = "$EDITOR";

modules/home/themes/stylix/default.nix

@@ -30,7 +30,6 @@ in
         tinos
         code-new-roman
         dejavu-sans-mono
-        inputs.xpk.pkgs.base16-preview
       ];
     stylix = on // {
       autoEnable = false;
@@ -65,7 +64,8 @@ in
       iconTheme = on // {
         dark = "Papirus-Dark";
         light = "Papirus-Light";
-        package = with pkgs; papirus-icon-theme.override { color = cfg.icon; };
+        # package = with pkgs; papirus-icon-theme.override { color = cfg.icon; };
+        package = with pkgs; papirus-icon-theme;
       };
       fonts = rec {
         monospace = {

modules/nixos/disko/default.nix

@@ -1,5 +1,5 @@
 {
-  device ? "/dev/sda",
+  device ? throw,
   ...
 }:
 
@@ -8,7 +8,7 @@ let
 in
 
 {
-  disko.devices.disk.default = {
+  disko.devices.disk.disko = {
     inherit device;
     type = "disk";
     content = {
@@ -39,8 +39,8 @@ in
                   compress
                 ];
               };
-              "/persistent" = {
-                mountpoint = "/persistent";
+              "/persist" = {
+                mountpoint = "/persist";
                 mountOptions = [
                   compress
                 ];

modules/nixos/hardware/impermanence/default.nix

@@ -33,7 +33,7 @@ in
           #sh
           ''
             mkdir /btrfs_tmp
-            mount /dev/disk/by-partlabel/disk-primary-root /btrfs_tmp
+            mount /dev/disk/by-partlabel/disk-disko-root /btrfs_tmp
             if [[ -e /btrfs_tmp/root ]]; then
                 mkdir -p /btrfs_tmp/old_roots
                 timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/root)" "+%Y-%m-%-d_%H:%M:%S")

modules/nixos/misc/users/default.nix

@@ -15,7 +15,9 @@ in
 {
   options = {
     module.misc.users = {
-      passwd = mkStr "$6$T4HzrtblHxoBy.OJ$lHfkK82NM333C93PfFvuZZF0OfxY4.9V74.pKpYMRQiTDxkBYQn/H9Xmo40llzLkJiOauSm6hafGpDoc6AtLw.";
+      passwd = mkStr "$2b$05$vfFJcNMZaHujKhPSERV/o.nLa2GqYlM0e8ovlfwnhj4XdOJ3Gv7h2"; # nixos
+      user.passwd = mkStr cfg.passwd;
+      root.passwd = mkStr cfg.passwd;
     };
   };
 
@@ -47,9 +49,9 @@ in
             createHome = true;
             isNormalUser = true;
             extraGroups = grp;
-            initialHashedPassword = cfg.passwd;
+            initialHashedPassword = cfg.user.passwd;
           };
-          root.initialHashedPassword = cfg.passwd;
+          root.initialHashedPassword = cfg.root.passwd;
         };
       };
   };

modules/nixos/programs/common/default.nix

@@ -33,7 +33,7 @@ in
       };
       ryzen-monitor-ng = if x.sys.is == "desktop" then on else off;
       nh = on // {
-        flake = path.flakeDir;
+        flake = path.flake;
       };
     };
   };

pkgs/pkgs/base16-preview/package.nix

@@ -3,7 +3,7 @@
 pkgs.writeScriptBin "base16-preview" (
   builtins.readFile (
     pkgs.fetchurl {
-      url = "https://raw.githubusercontent.com/uwuwuwde/base16/refs/heads/master/preview-for-nix.py";
+      url = ""https://raw.githubusercontent.com/xmozoid/base16/refs/heads/master/tools/base16-preview/base16-preview.py;
       sha256 = "sha256-NQdCm73E7BS6EXrygIS6TmjwkVIwZwIyBaHuvo6p8B0=";
     }
   )

xlib/builder/default.nix

@@ -19,7 +19,7 @@ let
       },
       path ? {
         pass = null;
-        flakeDir = "/etc/nixos";
+        flake = "/etc/nixos";
       },
       styl ? {
         theme = "horizon-dark";