From 7c8c81a9aac6afbb99f2deafef539476ee5a3233 Mon Sep 17 00:00:00 2001 From: xeovalyte Date: Tue, 18 Jun 2024 11:22:58 +0200 Subject: [PATCH] SSH configuration and desktop fixes --- README.md | 4 ++++ hosts/laptop/home.nix | 2 ++ modules/home/desktop/hyprland/default.nix | 13 ++++++++++++- modules/home/desktop/hyprland/waybar.nix | 4 +++- modules/system/desktop/keyring.nix | 2 ++ 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0111148..ea8195a 100644 --- a/README.md +++ b/README.md @@ -17,3 +17,7 @@ 1. `ssh-keygen -f ~/.ssh/gitea -t ed25519 -C "me+gitea@xeovalyte.dev"` 2. Upload to [Gitea](https://gitea.xeovalyt.dev) 3. Verify ssh key (follow instructions on Gitea) + +### 4. Add SSH keys +1. `ssh-add ~/.ssh/gitea` +2. `ssh-add ~/.ssh/archserver` diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index 174d628..6ef6737 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -29,6 +29,8 @@ unstable.joplin-desktop unstable.moonlight-qt + + unstable.prusa-slicer ]; home.stateVersion = "24.05"; diff --git a/modules/home/desktop/hyprland/default.nix b/modules/home/desktop/hyprland/default.nix index 41b38d8..01e00bb 100644 --- a/modules/home/desktop/hyprland/default.nix +++ b/modules/home/desktop/hyprland/default.nix @@ -92,7 +92,18 @@ "8, monitor:HDMI-A-1" "9, monitor:HDMI-A-1" "10, monitor:HDMI-A-1" - ] else [ ]; + ] else [ + "1, monitor:DP-10" + "2, monitor:DP-10" + "3, monitor:DP-10" + "4, monitor:DP-10" + "5, monitor:DP-9" + "6, monitor:DP-9" + "7, monitor:DP-9" + "8, monitor:eDP-1" + "9, monitor:eDP-1" + "10, monitor:eDP-1" + ]; bind = [ "$mod, Q, exec, alacritty" diff --git a/modules/home/desktop/hyprland/waybar.nix b/modules/home/desktop/hyprland/waybar.nix index c88cba1..f18ec81 100644 --- a/modules/home/desktop/hyprland/waybar.nix +++ b/modules/home/desktop/hyprland/waybar.nix @@ -29,7 +29,9 @@ "on-scroll-down" = "hyprctl dispatch workspace e-1"; "on-click" = "activate"; "persistent-workspaces" = if hostName == "xv-laptop" then { - "*" = 8; + "DP-10" = [ 1 2 3 4 ]; + "DP-9" = [ 5 6 7 ]; + "eDP-1" = [ 8 9 10 ]; } else { "DP-2" = [ 1 2 3 4 5 ]; "HDMI-A-1" = [ 6 7 8 9 10 ]; diff --git a/modules/system/desktop/keyring.nix b/modules/system/desktop/keyring.nix index 7b65b8e..8384e31 100644 --- a/modules/system/desktop/keyring.nix +++ b/modules/system/desktop/keyring.nix @@ -4,4 +4,6 @@ services.gnome.gnome-keyring.enable = true; security.pam.services.greetd.enableGnomeKeyring = true; + + programs.ssh.startAgent = true; }