change key

flake.lock

@@ -3,9 +3,7 @@
     "aagl": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs",
-          "nixpkgs"
-        ],
         "rust-overlay": "rust-overlay"
       },
       "locked": {
@@ -25,9 +23,7 @@
     "ags": {
       "inputs": {
         "astal": "astal",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_2"
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1744557573,
@@ -234,22 +230,6 @@
         "type": "github"
       }
     },
-    "flake-compat_3": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1767039857,
-        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -435,7 +415,7 @@
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
         "hyprwire": "hyprwire",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_3",
         "pre-commit-hooks": "pre-commit-hooks",
         "systems": "systems",
         "xdph": "xdph"
@@ -718,15 +698,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1784356753,
+        "lastModified": 1785454630,
-        "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=",
+        "narHash": "sha256-LQy14TZp77TwbQf40gg1V3jo8FwJG0jGDkAH+zRHqg8=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a",
+        "rev": "1559d3daa3ecc813a650b79375ea61b6741b8746",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -765,6 +745,38 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1743583204,
+        "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1784356753,
+        "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1789149629,
         "narHash": "sha256-H6GwaZzZf+4npqv0tph94w9tZddSjFjmQrVsW0z78uk=",
@@ -780,6 +792,54 @@
         "type": "github"
       }
     },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1782175435,
+        "narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "89570f24e97e614aa34aa9ab1c927b6578a43775",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1785454630,
+        "narHash": "sha256-LQy14TZp77TwbQf40gg1V3jo8FwJG0jGDkAH+zRHqg8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "1559d3daa3ecc813a650b79375ea61b6741b8746",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_7": {
+      "locked": {
+        "lastModified": 1783279667,
+        "narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nur": {
       "inputs": {
         "flake-parts": [
@@ -836,12 +896,11 @@
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "hyprland-plugins": "hyprland-plugins",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_4",
         "nixpkgs-pinned": "nixpkgs-pinned",
         "nixpkgs-stable": "nixpkgs-stable",
         "sops-nix": "sops-nix",
         "stylix": "stylix",
-        "waybar": "waybar",
         "yazi": "yazi",
         "yazi-plugins": "yazi-plugins"
       }
@@ -911,9 +970,7 @@
     },
     "sops-nix": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_5"
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1788914643,
@@ -938,9 +995,7 @@
         "firefox-gnome-theme": "firefox-gnome-theme",
         "flake-parts": "flake-parts",
         "gnome-shell": "gnome-shell",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_6",
-          "nixpkgs"
-        ],
         "nur": "nur",
         "systems": "systems_2",
         "tinted-kitty": "tinted-kitty",
@@ -1072,27 +1127,6 @@
         "type": "github"
       }
     },
-    "waybar": {
-      "inputs": {
-        "flake-compat": "flake-compat_3",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1789627973,
-        "narHash": "sha256-OJBVQSIpW0Ozb3czGP3+TQyDC5BBqMQtx2asPsspFHo=",
-        "owner": "Alexays",
-        "repo": "Waybar",
-        "rev": "1687ec724a89756e79371784a2ba3f9700f8e5c6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Alexays",
-        "repo": "Waybar",
-        "type": "github"
-      }
-    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": [
@@ -1137,9 +1171,7 @@
     "yazi": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_7",
-          "nixpkgs"
-        ],
         "rust-overlay": "rust-overlay_3"
       },
       "locked": {

flake.nix

@@ -19,72 +19,39 @@
   };
 
   inputs = {
-    aagl = {
+    aagl.url = "github:ezKEa/aagl-gtk-on-nix";
-      url = "github:ezKEa/aagl-gtk-on-nix";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-      inputs.nixpkgs.follows = "nixpkgs";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-26.05";
-    };
+    nixpkgs-pinned.url = "github:nixos/nixpkgs/ec942ba042dad5ef097e2ef3a3effc034241f011";
-
-    ags = {
-      url = "github:Aylur/ags/3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     disko = {
       url = "github:nix-community/disko";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    sops-nix.url = "github:Mic92/sops-nix";
+    stylix.url = "github:danth/stylix";
+    ags.url = "github:Aylur/ags/3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6";
 
     helix-steel = {
       url = "github:mattwparas/helix/steel-event-system";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    home-manager = {
+    yazi.url = "github:sxyazi/yazi";
-      url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    hyprland = {
-      url = "github:hyprwm/Hyprland/v0.56.1";
-      # inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    hyprland-plugins = {
-      url = "github:hyprwm/hyprland-plugins";
-      inputs = {
-        hyprland.follows = "hyprland";
-      # nixpkgs.follows = "nixpkgs";
-      };
-    };
-
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixpkgs-pinned.url = "github:nixos/nixpkgs/ec942ba042dad5ef097e2ef3a3effc034241f011";
-    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-26.05";
-
-    sops-nix = {
-      url = "github:Mic92/sops-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    stylix = {
-      url = "github:danth/stylix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    waybar = {
-      url = "github:Alexays/Waybar";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    yazi = {
-      url = "github:sxyazi/yazi";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     yazi-plugins = {
       url = "github:yazi-rs/plugins";
       flake = false;
     };
+
+    hyprland.url = "github:hyprwm/Hyprland/v0.56.1";
+    hyprland-plugins = {
+      url = "github:hyprwm/hyprland-plugins";
+      inputs.hyprland.follows = "hyprland";
+    };
+
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = { self, nixpkgs, nixpkgs-stable, nixpkgs-pinned, home-manager, ... }@inputs: let

host/Inaho/modules/syncthing.nix

@@ -26,11 +26,6 @@
           path = "/home/sweetbread/Documents/Obsidian";
           devices = [ "Rias" "Akeno" "Koneko" ];
         };
-
-        "Documents" = {
-          path = "/home/sweetbread/Documents";
-          devices = [ "Rias" ];
-        };
       };
     };
   };

host/Rias/hardware-configuration.nix

@@ -11,10 +11,6 @@
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  environment.etc.crypttab.text = ''
-    storage UUID=9327148b-788a-4c23-ac73-28464ffabe1b none luks
-  '';
-
   fileSystems."/" = {
     device = "/dev/disk/by-label/NixOS";
     fsType = "ext4";
@@ -27,9 +23,9 @@
   };
 
   fileSystems."/mnt/D" = {
-    device = "/dev/mapper/storage";
+    device = "/dev/disk/by-label/Data";
-    fsType = "ext4";
+    fsType = "ntfs3";
-    options = [ "noatime" "nofail" ];
+    options = ["umask=0022" "gid=100" "uid=1000" "nofail" ];
   };
 
   swapDevices = [ ];

host/Rias/modules/syncthing.nix

@@ -34,18 +34,13 @@
 
         "Music" = {
           path = "/home/sweetbread/Music";
-          devices = [ "Akeno" "Koneko" "Inaho" ];
+          devices = [ "Akeno" "Koneko" ];
         };
 
         "Obsidian" = {
           path = "/mnt/D/Obsidian";
           devices = [ "Koneko" "Inaho" ];
         };
-
-        "Documents" = {
-          path = "/home/sweetbread/Documents";
-          devices = [ "Inaho" ];
-        };
       };
     };
   };

modules/user/helix.nix

@@ -1,4 +1,4 @@
-{ inputs, pkgs, lib, config, ... }: let
+{ inputs, pkgs, ... }: let
   helixSteel =
     inputs.helix-steel.packages.${pkgs.system}.default.overrideAttrs (old: {
       cargoBuildFlags = (old.cargoBuildFlags or []) ++ [
@@ -71,19 +71,8 @@ in {
   home.packages = with pkgs; [
     asm-lsp
     fasm
-    steel
-    wakatime-cli
   ];
 
-  home.activation.installWakatimeHx = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
-    export PATH="${pkgs.steel}/bin:$PATH"
-    export STEEL_HOME="${config.xdg.dataHome}/steel"
-
-    if [ ! -f "$STEEL_HOME/cogs/wakatime/wakatime.scm" ]; then
-      forge pkg install --git https://github.com/Xerxes-2/wakatime.hx.git
-    fi
-  '';
-
   programs.helix = {
     enable = true;
     package = helixSteel;
@@ -196,7 +185,6 @@ in {
     '';
     "helix/init.scm".text = ''
       ;; Steel init file
-      (require "wakatime/wakatime.scm")
     '';
   };
 }

modules/user/zsh.nix

@@ -74,7 +74,6 @@
         eval "$(zoxide init zsh)"
         source "$(fzf-share)/key-bindings.zsh"
         source "$(fzf-share)/completion.zsh"
-        nr() { nix run "nixpkgs#$1" -- "''${@:2}" }
       '';
 
       envExtra = ''

user/chest/modules/waybar.nix

@@ -1,11 +1,4 @@
-{
+{ osConfig, config, pkgs, lib, ... }: {
-  osConfig,
-  config,
-  inputs,
-  pkgs,
-  lib,
-  ...
- }: {
   home.packages = with pkgs; [
     font-awesome
     nerd-fonts.symbols-only
@@ -17,7 +10,6 @@
   programs.waybar = {
     enable = true;
     systemd.enable = true;
-    package = inputs.waybar.packages.${pkgs.stdenv.hostPlatform.system}.default;
 
     settings.mainBar = {
       modules-center = [

user/sweetbread/home.nix

@@ -7,7 +7,6 @@
       enableWidevine = true;
     })
     weechat
-    insomnia
   ];
 
   xdg.mimeApps = {

user/sweetbread/modules/hyprland.nix

@@ -155,6 +155,7 @@
           shadow.enabled = false;
         };
 
+        input.kb_variant = "colemak,";
         animations.enabled = true;
         dwindle.smart_split = true;
         master.new_status = "master";

user/sweetbread/modules/waybar.nix

@@ -1,11 +1,4 @@
-{
+{ osConfig, config, pkgs, lib, ... }: {
-  osConfig,
-  config,
-  inputs,
-  pkgs,
-  lib,
-  ...
-}: {
   home.packages = with pkgs; [
     playerctl
     cava
@@ -22,7 +15,6 @@
   in {
     enable = true;
     systemd.enable = true;
-    package = inputs.waybar.packages.${pkgs.stdenv.hostPlatform.system}.default;
 
     settings.mainBar = {
       spacing = 8;