From f94d3aeffc4b65dad621f7b2c8cb3e64d53b3394 Mon Sep 17 00:00:00 2001 From: javif89 Date: Sat, 9 Aug 2025 04:50:24 -0400 Subject: [PATCH] Not having a good time --- configuration.nix | 15 +++++++++++++++ home.nix | 3 --- home/hyprland/binds.nix | 1 + home/shell.nix | 2 -- home/ssh.nix | 32 -------------------------------- 5 files changed, 16 insertions(+), 37 deletions(-) delete mode 100644 home/ssh.nix diff --git a/configuration.nix b/configuration.nix index 38ded5f..5f772f4 100755 --- a/configuration.nix +++ b/configuration.nix @@ -102,8 +102,23 @@ brave neovim git + openssh ]; + services.openssh = { + enable = true; + }; + + programs.ssh = { + startAgent = true; + extraConfig = " + Host myhost + Hostname gitgud.foo + Port 22 + User javi + "; + }; + system.stateVersion = "25.05"; # Did you read the comment? nix.settings.experimental-features = [ diff --git a/home.nix b/home.nix index 6aa127c..f2a9766 100755 --- a/home.nix +++ b/home.nix @@ -6,7 +6,6 @@ { imports = [ ./home/kitty.nix - ./home/ssh.nix ./home/shell.nix ./home/starship.nix ./home/git.nix @@ -59,8 +58,6 @@ nodejs_22 bun - # Util - # Media mpc ]; diff --git a/home/hyprland/binds.nix b/home/hyprland/binds.nix index a7089c5..93cb79e 100644 --- a/home/hyprland/binds.nix +++ b/home/hyprland/binds.nix @@ -51,6 +51,7 @@ "$mod, SPACE, exec, wofi --show drun" "$mod SHIFT, s, togglespecialworkspace, comms" + "$mod SHIFT, a, togglespecialworkspace, research" "$mod SHIFT ALT, x, exec, hyprctl dispatch exit" "SHIFT, Print, exec, grimblast copy area" "CTRL, Print, exec, grimblast copy active" diff --git a/home/shell.nix b/home/shell.nix index c36e567..f90fe6c 100755 --- a/home/shell.nix +++ b/home/shell.nix @@ -51,8 +51,6 @@ # Additional bash configuration bashrcExtra = '' - # Custom functions - # Project selector function (equivalent to your custom keybinding) proj() { if [ -d "$HOME/projects" ]; then diff --git a/home/ssh.nix b/home/ssh.nix deleted file mode 100644 index 0b407fe..0000000 --- a/home/ssh.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ config, pkgs, ... }: - -{ - programs.ssh = { - enable = true; - addKeysToAgent = "yes"; - }; - - services.ssh-agent.enable = true; - - systemd.user.services."ssh-add-all-keys" = { - Unit = { - Description = "Add all SSH keys from ~/.ssh to ssh-agent"; - After = [ "ssh-agent.service" ]; - Requires = [ "ssh-agent.service" ]; - # Skip running if there are no id_* keys: - ConditionPathExistsGlob = "%h/.ssh/id_*"; - }; - Service = { - Type = "oneshot"; - ExecStart = '' - ${pkgs.bash}/bin/bash -lc '${pkgs.openssh}/bin/ssh-add -q %h/.ssh/id_* 2>/dev/null || true' - ''; - # Make it non-interactive (don’t pop up askpass): - Environment = [ - "SSH_ASKPASS=/bin/false" - "DISPLAY=ignored" - ]; - }; - Install.WantedBy = [ "default.target" ]; - }; -}