From 9e61c6cad3737943da25781491c216c65fce0992 Mon Sep 17 00:00:00 2001 From: Alexander Heldt Date: Thu, 19 Mar 2026 10:54:32 +0100 Subject: [PATCH] pinwheel: Assign default workspaces to monitor(s) --- hosts/pinwheel/modules/git/default.nix | 23 ++++++++++++++++ hosts/pinwheel/modules/hyprland/default.nix | 26 ++++++++++++++---- .../alex.pinwheel-github.com-signing.age | Bin 0 -> 786 bytes .../alex.pinwheel-github.com-signing.pub.age | Bin 0 -> 423 bytes secrets/secrets.nix | 2 ++ 5 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 secrets/pinwheel/alex.pinwheel-github.com-signing.age create mode 100644 secrets/pinwheel/alex.pinwheel-github.com-signing.pub.age diff --git a/hosts/pinwheel/modules/git/default.nix b/hosts/pinwheel/modules/git/default.nix index 983541f..aa0243b 100644 --- a/hosts/pinwheel/modules/git/default.nix +++ b/hosts/pinwheel/modules/git/default.nix @@ -23,8 +23,16 @@ in { path = ./gitconfig; } ]; + signing = { + key = config.age.secrets."alex.pinwheel-github.com-signing.pub".path; + signByDefault = true; + }; + settings = { rerere.enable = true; + + # Tells Git to use SSH instead of the default GPG + gpg.format = "ssh"; }; }; @@ -35,5 +43,20 @@ in set main-view-line-number-interval = 1 ''; }; + + age.secrets = { + "alex.pinwheel-github.com-signing" = { + file = ../../../../secrets/pinwheel/alex.pinwheel-github.com-signing.age; + path = "/home/alex/.ssh/alex.pinwheel-github.com-signing"; + owner = "alex"; + group = "users"; + }; + "alex.pinwheel-github.com-signing.pub" = { + file = ../../../../secrets/pinwheel/alex.pinwheel-github.com-signing.pub.age; + path = "/home/alex/.ssh/alex.pinwheel-github.com-signing.pub"; + owner = "alex"; + group = "users"; + }; + }; }; } diff --git a/hosts/pinwheel/modules/hyprland/default.nix b/hosts/pinwheel/modules/hyprland/default.nix index 98aaed7..4bbc025 100644 --- a/hosts/pinwheel/modules/hyprland/default.nix +++ b/hosts/pinwheel/modules/hyprland/default.nix @@ -29,19 +29,16 @@ let local external batch="" if external=$(get_active_external); then - # External monitor connected: 1-5 on external, 6-10 on internal + # External monitor connected: move workspaces 1-5 to external, 6-10 to internal for ws in 1 2 3 4 5; do - batch="$batch keyword workspace $ws,monitor:$external,default:true;" batch="$batch dispatch moveworkspacetomonitor $ws $external;" done for ws in 6 7 8 9 10; do - batch="$batch keyword workspace $ws,monitor:$INTERNAL,default:true;" batch="$batch dispatch moveworkspacetomonitor $ws $INTERNAL;" done else - # No external monitor: all workspaces on internal + # No external monitor: move all workspaces to internal for ws in 1 2 3 4 5 6 7 8 9 10; do - batch="$batch keyword workspace $ws,monitor:$INTERNAL,default:true;" batch="$batch dispatch moveworkspacetomonitor $ws $INTERNAL;" done fi @@ -103,6 +100,25 @@ in monitor=HDMI-A-1, 2560x1440@100, auto-center-up, 1 monitor=DP-3, 2560x1440@60, auto-center-up, 1 + # Workspaces 1-5 on external monitors (HDMI-A-1 or DP-3) + workspace = 1, monitor:HDMI-A-1, default:true + workspace = 2, monitor:HDMI-A-1 + workspace = 3, monitor:HDMI-A-1 + workspace = 4, monitor:HDMI-A-1 + workspace = 5, monitor:HDMI-A-1 + workspace = 1, monitor:DP-3, default:true + workspace = 2, monitor:DP-3 + workspace = 3, monitor:DP-3 + workspace = 4, monitor:DP-3 + workspace = 5, monitor:DP-3 + + # Workspaces 6-10 on internal monitor + workspace = 6, monitor:eDP-1, default:true + workspace = 7, monitor:eDP-1 + workspace = 8, monitor:eDP-1 + workspace = 9, monitor:eDP-1 + workspace = 10, monitor:eDP-1 + workspace = w[tv1], gapsout:0, gapsin:0 workspace = f[1], gapsout:0, gapsin:0 windowrule = border_size 0, match:float 0, match:workspace w[tv1] diff --git a/secrets/pinwheel/alex.pinwheel-github.com-signing.age b/secrets/pinwheel/alex.pinwheel-github.com-signing.age new file mode 100644 index 0000000000000000000000000000000000000000..41fdd190a299dbcb90a917ff558c754fd24ccbc9 GIT binary patch literal 786 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCSHs|ZMnN>@mCGB!7 z$2YLjpw!np!{04A**qY`F~GIJr#!zbvm`P*B%e#Wz}qM_ry?@IG^Eh9wA?!?)!8S- zA~-e7qRPo4xHK<4)49^jIou~V*^^6GS69I;sUSSU!#~QvH^MdF(b3npJUGlC)Gx(2 zSHChaGb$iIKQbyiBgDWU-;=90c(P4q_iF`-7Kf&+nk9d_O+_Yey0q_>TcO|FWoKWr zciHJ$O!-^LaC%0|-UWSX43{De(`{^z`#Q~B=I~~FK}c*xjHBJ3_|KEF7KM6?Wqfwr zbW`Yuq#`F5qtmw&Eglj3J}*BX#wTgu!``~e-0GH()scmszH%#dZZ7TiX!8o{^piU{ zG5kep;@^2u7bZWE$PH*X5mx>+&qaKF{{^c%eZ@B-@5)>kFL2md-L^pMom9Q;)y>;p z?lV2QSj69~itRw|W|kW)n=9-eaIU$u;?r!kf?u~k*%$WASmiKPneG4fZ~JH09$WSN z+T+&`~LJey+p<}YKxY|F+?vFyK1AMBly5)@yX zTX~?%+u>Eniy0?%cYGHM*!4Ceq&iGZ?9Hsn6aNN&_xs23i@DGKqs)QVUf=#53SK$K zd3of-g`E?2@0)hl`TO0>74xrL6nNlMCD)b|a&vBl`;(2Pw=SkzFoXno?=y{KoECnw zW3PVt&T|*)W7L=26ONh0K9NCpP5F|?<+*vMmxsN5TlMYmD*2V2r@9g|n$)5kxn^9l zQM(;*#qMXY;@$Vf+uoH`YrLPOdo0Fwsma>?5?VU7duM(OWfd)MnfaLgmQ?w=1w6Cs b-7>FV*uMM4<9R9(a~~~a>PoEGhCc z%gYWmF9~uA$teqW%nmp84|FUK@Gmqnbj^1REOrTvN{{r(bL6V3C`-$YC^fezFZB=f zsR~F9Pccmj@+--U3JVHP)lM-E$TM;dPH_(p3q-d~JKrzSBTymB&9^edv%)+tR6Ej3 zKQAy`yDX~0B(yj=u%JA>)UzVb(K{k1r!>#S$dfCuDBQv;zaYQd+b}3B(=XpFE!D}@ zv!Kk&H7F-Nv^b(X(8$ZO)Xc2NFqBJIS63m#xX{tmOy9yQFDcvE*SX9%FSOh^H7z9~ zCtcq%!#mQ`(8AKM(!HW2&6n$3a0Y|HlUL_!bGnRt`&Np7a!#{rjC`Z-e`k}jV_)l{ zZ97v07T?wCpT9H0_raT|{`og1^tUpD3k|qDdN-@;u?QJV<#W0?^~*s+;{sWm Gug?MZgPfiK literal 0 HcmV?d00001 diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 302574a..0169e94 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -17,6 +17,8 @@ in { "pinwheel/alex.pinwheel-tadpole.pub.age".publicKeys = [ pinwheel tadpole alex ]; "pinwheel/alex.pinwheel-github.com.age".publicKeys = [ pinwheel alex ]; "pinwheel/alex.pinwheel-github.com.pub.age".publicKeys = [ pinwheel alex ]; + "pinwheel/alex.pinwheel-github.com-signing.age".publicKeys = [ pinwheel alex ]; + "pinwheel/alex.pinwheel-github.com-signing.pub.age".publicKeys = [ pinwheel alex ]; "pinwheel/alex.pinwheel-git.ppp.pm.age".publicKeys = [ pinwheel alex ]; "pinwheel/alex.pinwheel-git.ppp.pm.pub.age".publicKeys = [ pinwheel alex ];