From 73d096b328799660dae729332f745b98e82e35f0 Mon Sep 17 00:00:00 2001 From: Nickolaj Jepsen Date: Wed, 19 Feb 2025 20:32:36 +0000 Subject: [PATCH] fix desktop public key --- parts/modules/base/secrets.nix | 2 +- parts/modules/base/user.nix | 4 ++-- parts/modules/desktop/hyprland/default.nix | 12 ++++-------- ...314d1153383e45885fa463da8a-hosts-private.age | 7 +++++++ ...57e9d3b07c3b2ac3c67-hashed-user-password.age | 9 --------- ...9c4b92cb7f347ac9b2928663c3-hosts-private.age | 9 --------- ...39eef7c92756704a2f02dbc28dae754c-ssh-key.age | Bin 0 -> 720 bytes ...414c36a2327ce7b848f024f39d1a9-ssh-key-ao.age | Bin 0 -> 2209 bytes ...67bfd959f8272d5c86924c52d4bc8-ssh-key-ao.age | Bin 2082 -> 0 bytes ...d2eab34dbcc75fb0c877f5ebc803e4a8-ssh-key.age | 8 -------- ...c0a94f806599c7e59ee-hashed-user-password.age | 9 +++++++++ secrets/hosts/desktop/id_ed25519.pub | 2 +- ...c0a94f806599c7e59ee-hashed-user-password.age | Bin 434 -> 330 bytes 13 files changed, 24 insertions(+), 38 deletions(-) create mode 100644 secrets/hosts/desktop/.rekey/0cf462314d1153383e45885fa463da8a-hosts-private.age delete mode 100644 secrets/hosts/desktop/.rekey/17eacaf7b15fa57e9d3b07c3b2ac3c67-hashed-user-password.age delete mode 100644 secrets/hosts/desktop/.rekey/17f5ff9c4b92cb7f347ac9b2928663c3-hosts-private.age create mode 100644 secrets/hosts/desktop/.rekey/39eef7c92756704a2f02dbc28dae754c-ssh-key.age create mode 100644 secrets/hosts/desktop/.rekey/9d8414c36a2327ce7b848f024f39d1a9-ssh-key-ao.age delete mode 100644 secrets/hosts/desktop/.rekey/c3467bfd959f8272d5c86924c52d4bc8-ssh-key-ao.age delete mode 100644 secrets/hosts/desktop/.rekey/d2eab34dbcc75fb0c877f5ebc803e4a8-ssh-key.age create mode 100644 secrets/hosts/desktop/.rekey/ee5a41ab13f76c0a94f806599c7e59ee-hashed-user-password.age diff --git a/parts/modules/base/secrets.nix b/parts/modules/base/secrets.nix index e9e6d8e..8138d07 100644 --- a/parts/modules/base/secrets.nix +++ b/parts/modules/base/secrets.nix @@ -2,13 +2,13 @@ hostSecrets = ../../../secrets/hosts + ("/" + hostname); publicKey = builtins.readFile (hostSecrets + "/id_ed25519.pub"); in { + age.identityPaths = ["/etc/ssh/ssh_host_ed25519_key"]; age.rekey = { storageMode = "local"; hostPubkey = publicKey; masterIdentities = [ { identity = ../../../secrets/yubikey-identity.pub; - # pubkey = "age1yubikey1q25a8ax2t0ujv7q5wvpmlpa52h599n6682jprxuftlw4zpxy2xu9s6lhrel"; } ]; extraEncryptionPubkeys = [ diff --git a/parts/modules/base/user.nix b/parts/modules/base/user.nix index 3c74cab..38202bd 100644 --- a/parts/modules/base/user.nix +++ b/parts/modules/base/user.nix @@ -19,8 +19,8 @@ in { users.users.${username} = { isNormalUser = true; extraGroups = ["wheel"]; - initialPassword = "password"; - #hashedPasswordFile = secrets.hashed-user-password.path; + # initialPassword = "password"; + hashedPasswordFile = secrets.hashed-user-password.path; }; home-manager = { diff --git a/parts/modules/desktop/hyprland/default.nix b/parts/modules/desktop/hyprland/default.nix index 4a8c6e0..2b32181 100644 --- a/parts/modules/desktop/hyprland/default.nix +++ b/parts/modules/desktop/hyprland/default.nix @@ -11,13 +11,6 @@ with lib; let }; in { config = { - # assertions = [ - # { - # message = "The terminal must be set to enable Hyprland"; - # assertion = config.defaults.terminal != null; - # } - # ]; - programs.uwsm.enable = true; programs.hyprland = { enable = true; @@ -137,7 +130,6 @@ in { "SUPER, RETURN, exec, ${getExe config.programs.uwsm.package} app -- ${cfg.default-apps.terminal}" "SUPER, BACKSPACE, killactive" "SUPER, SPACE, exec, ${getExe config.programs.uwsm.package} app -- walker" - # "SUPER SHIFT, SPACE, exec, uwsm app -- walker --modules applications" "SUPER, p, exec, ${getExe config.programs.uwsm.package} app -- loginctl lock-session" "SUPER, S, togglefloating" "SUPER, A, pseudo" @@ -168,6 +160,10 @@ in { "SUPER, tab, changegroupactive, f" "SUPER SHIFT, tab, changegroupactive, b" ]; + bindm = [ + "SUPER, mouse:272, movewindow" + "SUPER, mouse:273, resizewindow" + ]; layerrule = [ "noanim, gtk4-layer-shell" ]; diff --git a/secrets/hosts/desktop/.rekey/0cf462314d1153383e45885fa463da8a-hosts-private.age b/secrets/hosts/desktop/.rekey/0cf462314d1153383e45885fa463da8a-hosts-private.age new file mode 100644 index 0000000..9dd4138 --- /dev/null +++ b/secrets/hosts/desktop/.rekey/0cf462314d1153383e45885fa463da8a-hosts-private.age @@ -0,0 +1,7 @@ +age-encryption.org/v1 +-> ssh-ed25519 UqEUow u6/RRC5NcVzXn8tdtvEvUwQGJN2jE0xk3f5HGRmp/hk +Q4iSNDZw14gmOsLABO5LphhQ84u/fsiUZ1rVG27LRsQ +-> MAskmMnK-grease N@S4Bj]M # o~4B +jP9Rl2WxLEF+juAY/6/O/bV+jQmJc/GwKQ +--- wf9BUbi+gvb1v0zFxWTBXHCh0iz+A0LHrQcvVebGS78 +vB!(o wfRW{h1Uy ݂ݹB iLsõͼǃ☗-1,x+ZW=haP嫍T`"W:J*f"]K{ \ No newline at end of file diff --git a/secrets/hosts/desktop/.rekey/17eacaf7b15fa57e9d3b07c3b2ac3c67-hashed-user-password.age b/secrets/hosts/desktop/.rekey/17eacaf7b15fa57e9d3b07c3b2ac3c67-hashed-user-password.age deleted file mode 100644 index 278181a..0000000 --- a/secrets/hosts/desktop/.rekey/17eacaf7b15fa57e9d3b07c3b2ac3c67-hashed-user-password.age +++ /dev/null @@ -1,9 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 A8c9xw D9IFvUr0BSZy79t3fSE2npoMN0jrwYajs90kugmsJHg -iBkPdDy08n9/jLNZMtAmo/4H2z6ecUFtX7RLLoILMT8 --> %+-grease Gzov) -HDGg1mWlWIWQrJlxYOS6yQMl7hYTYs8BuVsMCLzvqd69Zkno6wu18glvdJa8vE7K -GMGA/Y+rNNOKUfuA ---- 38IhzDL/m22pXh3P3EwGdkaOb41zhOEgjCjklDinKLY ->k!!E|-!5 -\NIZ^{mb|$qrJ ,e3mեyE֓V\!fz{\RoL:5ba$< \ No newline at end of file diff --git a/secrets/hosts/desktop/.rekey/17f5ff9c4b92cb7f347ac9b2928663c3-hosts-private.age b/secrets/hosts/desktop/.rekey/17f5ff9c4b92cb7f347ac9b2928663c3-hosts-private.age deleted file mode 100644 index 1d832ed..0000000 --- a/secrets/hosts/desktop/.rekey/17f5ff9c4b92cb7f347ac9b2928663c3-hosts-private.age +++ /dev/null @@ -1,9 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 A8c9xw vwvIaZMn8QyG84uMuab+w4Rd5BhcWr8BiVP0q3Q8Vmw -Q8H1A0qsDJrseCPp/0b2izZ5YFH8AkcoYdZOToVRh64 --> SqbTHL-grease G p2 -Jxq1dNLGCEOINUnUv823NkzQ1qs0VRiK9U4PX31SNFIUZOVa2bY0OrJTcbHZ0pSA -CP2MkJOU697eKau5EqU ---- gK7PWlbmYYYm55M6rAlmwXkIQyLXECCkqXDhuvqRiTk -4Vb( -wr!)$*HR, o%Px,A~K.s'pYU~a|y?f!גH{UZ>|5ׁu[M񸲁uac+$= V \ No newline at end of file diff --git a/secrets/hosts/desktop/.rekey/39eef7c92756704a2f02dbc28dae754c-ssh-key.age b/secrets/hosts/desktop/.rekey/39eef7c92756704a2f02dbc28dae754c-ssh-key.age new file mode 100644 index 0000000000000000000000000000000000000000..89040835e84aaf681f2c873f7e08e156082f102a GIT binary patch literal 720 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Ep!ddFITWIPR%lR z_4e@h)HifC4vQ>KuJF#t$cjjJH#hM&Eifo_jWo9~^>hmgwcx7q&x@X0Il$uBeyOa|FjVyIT_YN(rDl$uzas$d^%7@nhN zrjX+0m8NN?5L8lLr;u%wk>j2clf_k(k(Cz~=w)D073mikoTZ(eA71J0o*$X-86Irn z5o(!i8JwRLl$Yof$fc{Rt6<=lT43m3<&zZY7ap!}>XK1eT3}od7*SQAUs#mtRO0TG znv?Hdl96c|%GIqGCAGO@O~T(zlSJDO=}epJ<)B|Wd8_N6c?&M*zjr+Pc_Z_ot-B4v z|DXA&nNpu~-XiK5Ncu90yo-m_COhR`GZ%dz_fIXTRdT~2U%mS)A3RwX z8+=fB<-Lkq7j6H}ET;b}Z8J6>GZR{BgyhUaT2}SAVVf7}m7K#d;6N+Fe#Xt}+u2 zZd1P0Wih=WDWLJ^|Lw zmWjPdVbIy5<`dIr9-O46#&!E-=I!?Fn=@B5z1WZy%d^J!T(nSjRHRN%_jW`7)Zpu$ Wm+r3E-y(IoDKhxr6Z5iD-hTjQ1Ucvc literal 0 HcmV?d00001 diff --git a/secrets/hosts/desktop/.rekey/9d8414c36a2327ce7b848f024f39d1a9-ssh-key-ao.age b/secrets/hosts/desktop/.rekey/9d8414c36a2327ce7b848f024f39d1a9-ssh-key-ao.age new file mode 100644 index 0000000000000000000000000000000000000000..3f07f04e95021054534e89d2e4a6fc9b077a06da GIT binary patch literal 2209 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 ZTYIkc;n7QuY>v`JpY}ibmUi;XK4X-lI zOf_}M_Vx91FAUCh&&W-&&^FF4$Se&=FY+)o2nE|#s+%6>5~7=4l$uzas$iF9P{$SS zZD5*Vp6^^~;8*CH@5rUAtE&*4?CoEWlNB72nPr^pWoB%d;bW9n;+OA{UYZ_YnQUPg zZkgSwOL5W4XWwrW?akS-x_!@=*E1T~_DGa`cyQ{!=`6utukNdL-hB}# zoV5CLzL0C`j>}EKhaXBkxuWj8Bq{UOitKA@`LjQseKqshMge7&=gKu-C?8+Fd{id=W2vw8gS3bGXb)tVnokql0%kD#BJHAf3baTy;MOU1{ z7qK1DUw6)f{hoL9DU~<71pal;F}rb{Z|d6Pp&zb(*wJ?J&ZYG2+%tHx-X@y69@o4! zYgRx@I!i|S{_+KSUlU%s7wHDcEpOF((!V^gdaK3%T$%X%-KH<6g|7{C=v~)1pP8Y) zc@B?xVy?UQG|%?F z%SSlFrdru|9&Xrrc0uN{KQp=tguaE8^vg6TtkylSxcPv@v^b?M1GgTIoYVt*i$cvl zf8c%orn_(U0X5N54d(>CUh$WX4grgKB_-|P1R}TK3k^LIHjiDhX0odU72z5;CE5M)uJn&ZQY{o8|7x{|L0=i zc9rwio&O!4`0kndkNttSc+khthSz0GM}ntFC249sSa8g;*IVgxX!7&C-0LN>3O|&1 z6%R8{|GM*Ei00u5-fl)T? zgykmFf7xy6V2^Wq5LvMARE??sdI3$HX=j5XYnJGpaPcpSS~fRR*T{pb&++M~%$fC7<$Zl=c(#rE zL}S0&f}_tfpB3L`nVp_F_5beUOBD87cue^_+d#qOeJ{(Z1M%hJ8LrxAOV_`tcYYxl zKEJrc^rUdQ_mQk8#qVy-J?JAl_u}#1?9V|dNB*TSyme1bJ#^RiYIkS%m4!X0-h7_0 z@!Dyn>h1s3|9anU+E=eVKgNRbQ|69aI_W=HW>!2ttA8q@F?%iF2X(ucHlxV2zjR#z}S5Ef*GNEo^)5(i_oHyl` zcJMwCTd^Qa;_lvipW>KHG!FNf6-_UFl;y|psnUXa!t#|$Z^}4aj zpTDT!-c_R3V$JboMb8(@iuL#2omPD&TE*hiz_e3xwr9Sbe9}I_gQgc(UtP{Ax=!W% zvuEO6ovfkp2b}yDH{RWNcA0eK#HH352WuK4Qz9JKu1%Sc)zN7f_WbfG@kJ5ZFS+z< zT>efxn`!2l`b)BE(zTewM=KBVGG|LNXi3fTw^-Nvck-;aqL+RdYI82j)L&!O5^(J0 zubW8;U#h=zt(vgGzCDbsp0jxI-LB0+6Ju7$s$BWHSpNHmjsu>z6!*5jXl*EZKBHSb z@y4Cb1KG{irCZs*xax^&z0cger-sS<;kLlSz^hGLL{sXw#5vCAy&=2$_*u@wawd@% z`hQ-XrFk#?TH1uAhZgZSov}{&Yh|DKLL*&BHiY9-n(slqnO7No^jPKW|Gitvv+vm1 z-YBQ~od*|O5jRRRJNkC>p7_GOwZT&se7h>X=CGn!=FGe`9CrogE>De?H2nMef?0{P z`#g@!Nvs)bCg0L&40dyyvDaUhgR|bb&+2KBu>FNc%%@!5e0nN$xB3a^=IE(6?;i^5 zt9V*@^T4^O8}|oPOg(RPFl1Xbyr%YPneS)hyaxS|)+_C4K!^RDK5dj8WDzuDSiJ6GcI ssh-ed25519 A8c9xw qCaqMTHiVFpmQo4DXNF1mYrolsIyAOhmaeZnBQaij2w -s/ZmUahbNMGvXpZkR6eneNSpCDwqeWDdAljbbG38DOw --> 3_!S5-grease @U_EDTXu =1'PeW0i XZ -KhlRKp2Wl3vDf43wQy4V48RT2BEKPB3e+/7sv7kXHLaTdA+hb3RvV9+q6zpXIPcG -kKYNklB0ot33u0ZMtb/BseNTb9GsaQ ---- APmzE7xvyCNYSddLXLdU9m4xCJSzZWPQsQHAmD+93Dc -b9ylʾXUͪ/KT}]|D됝~*[5=/\*66$oˊmA:+&)Kq…,v ;斞@Ӛ۽7󑭼.mĘ EoQ8>)[ ssh-ed25519 UqEUow lOiqtaU59sviO86OjdXbv2mnReguEiYVI2UwHjz+3DY +wx441QWONFPp5nsFDSPznMpksHj6T7cbyOkb/u441Y8 +-> 05t*\i";-grease +aCx/vBx9OI/xyUnu+YKgkongRLrCkVayx7aDE7gJIxDKjOZ5167SP74QH+fUBTR8 + +--- m4axBN9TgMRF6joQESnU32wnbWn0L4LdkZyr8N+P8zI +[ЊV91#Acd/3ÛÞF?P4RT/bڊ +_~2SnV]ұ;+E+Gv/xmX \ No newline at end of file diff --git a/secrets/hosts/desktop/id_ed25519.pub b/secrets/hosts/desktop/id_ed25519.pub index 3976143..8defab3 100644 --- a/secrets/hosts/desktop/id_ed25519.pub +++ b/secrets/hosts/desktop/id_ed25519.pub @@ -1 +1 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFtjpdHPRXg75YBonNshQdeuNZ3W3k/RzdYY+8QuQ3Pc nickolaj1177@gmail.com +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMdBiNbNPcMdI/hp4zgBS3ShqYuVVRvUAA1ffrdiBQ0k nickolaj@fireproof.website \ No newline at end of file diff --git a/secrets/hosts/laptop/.rekey/ee5a41ab13f76c0a94f806599c7e59ee-hashed-user-password.age b/secrets/hosts/laptop/.rekey/ee5a41ab13f76c0a94f806599c7e59ee-hashed-user-password.age index 86cb0cb5440909f1f86c407227d1c2fe8479eac0..9eaf31e68d16de86b6e51f55417153a7c4666701 100644 GIT binary patch delta 295 zcmdnQe2Qs;PJM1bfkkk*e|V9PpPNURL87m|pRb2|YHn(fS6HZNS(c-}xxRZ;WNKu( zFPEjcp>srvwn0v4j;E_nU}CP%@XUuC9V}X{kX~j(<>A zsH<;zR$)Y-o2mlU7ccJUgfPuuT>dhyt46DWm*@Y?>BnLZ6&rM2ZxO%p)REyPxBFhjb1%#j_)j0Z wG%eoGCU+uRivmN+`48Ejns!(QO;uU5%*ZY7R=JXN=#-fe-pejIHce3i05NiIy#N3J delta 400 zcmX@bw266wPQ8bAUPPE-m0z-@NwQCpi+)6=ab$>3VOCUdP`-{v;u3=u9TUttvqg$vYm$|l|iMDpWUwKA`Q*KsnK&W3%sb5J*NNIYyiLs}# zX^CS*g??Uofn$YdSXFY0g@=cBSZYCDl8Z&DQ+ctzHH~# zS+Ym6c73o}nrnq&cD|cmVNr6Tp+?As<<=9SDM*T|P^=1B> z32vDs#of-)JJ=?(3-Y}G<92HL8`h2muMgdQnacfZr$$9e>=vJsoKZH4FF%ScII~#C xCXli1{$E{|2KJ)-=CztV@zI5h@8@ryJ}uzLalA0{|ZNlV$(_