diff --git a/flake.lock b/flake.lock index 84996b7..c9eb174 100644 --- a/flake.lock +++ b/flake.lock @@ -442,11 +442,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1728836804, - "narHash": "sha256-7dd4KUVMBeXIKrPzQn6FO7kfuqHbI0ognYgmoFfNaXM=", + "lastModified": 1728861919, + "narHash": "sha256-VTbYjwDEaYyALE73n4HaWqxy+3Mg+x2yvVGScZ72Zkk=", "ref": "refs/heads/main", - "rev": "5c3bd8e93d9f25be3e16a0445ba6fce8d30b6d73", - "revCount": 5336, + "rev": "e7fd0f5aec85c11a8eaf5e1abf8504f0a6d0710e", + "revCount": 5339, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -825,11 +825,11 @@ }, "nur": { "locked": { - "lastModified": 1728855676, - "narHash": "sha256-d3o+QZ/zRXl5bWdfa3wiM1nkAcs0Y4nHKU95wpR2WmM=", + "lastModified": 1728877747, + "narHash": "sha256-OGSawABgsGqgJoSdWmR0hAuz8gRlAwPcwz4M3u27QaM=", "owner": "nix-community", "repo": "NUR", - "rev": "c85953d50bfafd5d7a67e31e1e47c19b961b7da0", + "rev": "6f359b976f93fc46a3674b2a92ffb79dad8e8840", "type": "github" }, "original": { diff --git a/modules/home/environment/zshell.nix b/modules/home/environment/zshell.nix index b59a6c6..c70e24f 100644 --- a/modules/home/environment/zshell.nix +++ b/modules/home/environment/zshell.nix @@ -40,6 +40,7 @@ shellAliases = { grep = "grep --color=auto"; + vi = "nvim"; mv = "mv -v"; cp = "cp -vr"; gt = "gtrash"; diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix index 0af4bcd..5b06017 100644 --- a/modules/home/hyprland/config.nix +++ b/modules/home/hyprland/config.nix @@ -141,11 +141,11 @@ "super, c, killactive," "super, e, exec, [float;size 45% 70%;move 10 50] kitty btop" "super, n, exec, [float;size 50% 35%;move 10 50] pavucontrol" + "super, p, exec, [float;size 31% 30%;move onscreen cursor 0 0] kitty passhelper" "super, p, exec, aplay ~/media/sound/soundtest.wav" "super shift, q, exit," "super, m, exec, fuzzel" "super, r, exec, neovide" - "super, p, pseudo, # dwindle" "super, b, togglesplit, # dwindle" "super, f, togglefloating" "super, g, fullscreen" diff --git a/modules/home/scripts/default.nix b/modules/home/scripts/default.nix index fdfa4ae..f49f4eb 100644 --- a/modules/home/scripts/default.nix +++ b/modules/home/scripts/default.nix @@ -2,6 +2,7 @@ let compress = (import ./commands/compress.nix { self = self; pkgs = pkgs;}); + passhelper = (import ./wm-controls/passhelper.nix { self = self; pkgs = pkgs;}); crs = (import ./commands/crs.nix { self = self; pkgs = pkgs;}); extract = (import ./commands/extract.nix { self = self; pkgs = pkgs;}); invoke = (import ./commands/invoke.nix { self = self; pkgs = pkgs;}); @@ -29,6 +30,7 @@ in { home.packages = [ compress + passhelper crs extract garbage-collect diff --git a/modules/home/scripts/wm-controls/passhelper.nix b/modules/home/scripts/wm-controls/passhelper.nix new file mode 100644 index 0000000..b57ece7 --- /dev/null +++ b/modules/home/scripts/wm-controls/passhelper.nix @@ -0,0 +1,11 @@ +{ self, pkgs, ... }: + +pkgs.writeShellScriptBin "passhelper" ('' +#!/run/current-system/sw/bin/bash + +pass_string=$(find $HOME/.password-store -type f | sed 's|.*/.password-store/||; s|\.gpg$||' | rg -v ".gpg-id$" | fzf) + +pass -c "$pass_string" +sleep 1.5 +exit 0 +'') diff --git a/modules/sys/software/programs.nix b/modules/sys/software/programs.nix index fe62d65..4d2e02e 100644 --- a/modules/sys/software/programs.nix +++ b/modules/sys/software/programs.nix @@ -2,7 +2,6 @@ { programs = { - steam.enable = true; hyprland.enable = true; zsh.enable = true; nix-ld = { diff --git a/modules/sys/software/users.nix b/modules/sys/software/users.nix index c7c2995..b84e101 100644 --- a/modules/sys/software/users.nix +++ b/modules/sys/software/users.nix @@ -2,9 +2,11 @@ let nur = config.nur; + steamcfg = if (host == "desktop") then [ ./steam.nix ] else []; in { - imports = [ inputs.home-manager.nixosModules.home-manager ]; + imports = [ inputs.home-manager.nixosModules.home-manager ] + ++ steamcfg; home-manager = { useUserPackages = true; useGlobalPkgs = true;