From ade2927e8b2b2da817fb06c20d679bb1f2c293da Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 4 Jul 2023 08:06:17 +0200 Subject: [PATCH 1/5] Desktop: restructure folder structure --- roles/desktop/default.nix | 6 ++---- roles/desktop/programs/default.nix | 10 ++++++++++ roles/desktop/{ => programs}/discord.nix | 0 roles/desktop/{ => programs}/firefox.nix | 0 roles/desktop/{ => programs}/keepassxc.nix | 0 roles/desktop/{ => programs}/micro.nix | 0 roles/desktop/services/default.nix | 7 +++++++ 7 files changed, 19 insertions(+), 4 deletions(-) mode change 100755 => 100644 roles/desktop/default.nix create mode 100755 roles/desktop/programs/default.nix rename roles/desktop/{ => programs}/discord.nix (100%) rename roles/desktop/{ => programs}/firefox.nix (100%) rename roles/desktop/{ => programs}/keepassxc.nix (100%) rename roles/desktop/{ => programs}/micro.nix (100%) create mode 100644 roles/desktop/services/default.nix diff --git a/roles/desktop/default.nix b/roles/desktop/default.nix old mode 100755 new mode 100644 index 6aa4825..cb3d38f --- a/roles/desktop/default.nix +++ b/roles/desktop/default.nix @@ -2,9 +2,7 @@ { imports = [ - ./discord.nix - ./firefox.nix - ./micro.nix - ./keepassxc.nix + ./services + ./programs ]; } diff --git a/roles/desktop/programs/default.nix b/roles/desktop/programs/default.nix new file mode 100755 index 0000000..6aa4825 --- /dev/null +++ b/roles/desktop/programs/default.nix @@ -0,0 +1,10 @@ +{ ... }: + +{ + imports = [ + ./discord.nix + ./firefox.nix + ./micro.nix + ./keepassxc.nix + ]; +} diff --git a/roles/desktop/discord.nix b/roles/desktop/programs/discord.nix similarity index 100% rename from roles/desktop/discord.nix rename to roles/desktop/programs/discord.nix diff --git a/roles/desktop/firefox.nix b/roles/desktop/programs/firefox.nix similarity index 100% rename from roles/desktop/firefox.nix rename to roles/desktop/programs/firefox.nix diff --git a/roles/desktop/keepassxc.nix b/roles/desktop/programs/keepassxc.nix similarity index 100% rename from roles/desktop/keepassxc.nix rename to roles/desktop/programs/keepassxc.nix diff --git a/roles/desktop/micro.nix b/roles/desktop/programs/micro.nix similarity index 100% rename from roles/desktop/micro.nix rename to roles/desktop/programs/micro.nix diff --git a/roles/desktop/services/default.nix b/roles/desktop/services/default.nix new file mode 100644 index 0000000..c6786ec --- /dev/null +++ b/roles/desktop/services/default.nix @@ -0,0 +1,7 @@ +{ ... }: + +{ + imports = [ + + ]; +} From b202fe478dafe8e27c414da91f75137b2c33716f Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 4 Jul 2023 08:46:05 +0200 Subject: [PATCH 2/5] Desktop: start ssh-agent on login --- roles/desktop/services/default.nix | 2 +- roles/desktop/services/ssh-agent.nix | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 roles/desktop/services/ssh-agent.nix diff --git a/roles/desktop/services/default.nix b/roles/desktop/services/default.nix index c6786ec..48f9952 100644 --- a/roles/desktop/services/default.nix +++ b/roles/desktop/services/default.nix @@ -2,6 +2,6 @@ { imports = [ - + ./ssh-agent.nix ]; } diff --git a/roles/desktop/services/ssh-agent.nix b/roles/desktop/services/ssh-agent.nix new file mode 100644 index 0000000..7081761 --- /dev/null +++ b/roles/desktop/services/ssh-agent.nix @@ -0,0 +1,10 @@ +{ config, pkgs, ... }: + +{ + programs.ssh.startAgent = true; + /* + Home assistant added an option that does this + https://github.com/nix-community/home-manager/commit/2d9210f25ed18d5d4e11e6b886de4027c0c51a94 + but since I still need to fix home-manager's envvars not applying I'll stick to the NixOS one + */ +} From 70baaaca0f01ca87bf21e93bfc80b172226de6b6 Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 4 Jul 2023 08:48:05 +0200 Subject: [PATCH 3/5] Gitignore: ignore swap files from kate --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 3357b94..1df9283 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,7 @@ # Ignore build outputs from performing a nix-build or `nix build` command result result-* + +# ---> Kate +# Ignore kate's swap files +*.kate-swp From c690057adde405aaa9e5483b065d61a059087c3e Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 4 Jul 2023 09:37:45 +0200 Subject: [PATCH 4/5] KeepassXC: enable ssh-agent integration --- roles/desktop/programs/keepassxc.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/desktop/programs/keepassxc.nix b/roles/desktop/programs/keepassxc.nix index 8018453..53f42da 100644 --- a/roles/desktop/programs/keepassxc.nix +++ b/roles/desktop/programs/keepassxc.nix @@ -18,6 +18,7 @@ let # monochrome-light, monochrome-dark or colorful TrayIconAppearance = "monochrome-light"; }; + SSHAgent.Enabled = true; }; in From 1c35c527a591eafc71b5919beb53ef9c2e69248f Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 4 Jul 2023 09:38:30 +0200 Subject: [PATCH 5/5] Ssh-agent: add temporary workaround --- roles/desktop/services/ssh-agent.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/roles/desktop/services/ssh-agent.nix b/roles/desktop/services/ssh-agent.nix index 7081761..31b9f73 100644 --- a/roles/desktop/services/ssh-agent.nix +++ b/roles/desktop/services/ssh-agent.nix @@ -7,4 +7,15 @@ https://github.com/nix-community/home-manager/commit/2d9210f25ed18d5d4e11e6b886de4027c0c51a94 but since I still need to fix home-manager's envvars not applying I'll stick to the NixOS one */ + /* + TODO: fix SSH_AUTH_SOCK not being set in Plasma + Turns out the NixOS module also has issues :3 + The env is set but only in bash, not in the DE, so + keepass can't pick it up. For now I'll just set it manually + */ + home-manager.users.toast.xdg.configFile."plasma-workspace/env/ssh-agent.sh".text = '' + if [[ -z "$SSH_AUTH_SOCK" ]]; then + export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent + fi + ''; }