From 7e8aa89ad32c2e524f22dd95980a7fc746bd9141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 16 May 2024 01:17:57 -0300 Subject: [PATCH 1/9] forgejo-runner: update runner token and url --- secrets/monolith-forgejo-runner-token.age | Bin 682 -> 688 bytes system/monolith-forgejo-runner.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/secrets/monolith-forgejo-runner-token.age b/secrets/monolith-forgejo-runner-token.age index aa3deb8968d525267e9c1267b5d556cc19a70f39..fff63ca77be3834049d16ab0bbac97efd8e6b8a8 100644 GIT binary patch delta 660 zcmZ3*x`B0qMtz2xc0s6#dy-FRezu=wxMfQv6vulofrl(t;sk^D8 zcYtANfw!x3M3KHxd6ctziJxa$nxT1?d6i39S&>PSM}0*VS4nz?c|f5>R6w4SYoLXD zx@Tm1X-KGNsE4t)S#gejuCaD*rLmEruaT*FNI-hJYj|Erl8cvLRJfCezE?qIDVLK| zSaPL%ii@RhkatB{kZ-tCh*MZ%PD+7ma7u2ze{fl%XS%yzkg1njVPr^oMpQ;_S)ONr zcZO?~NqxSzlYt*sZgOHygi%JJS-xdyenh!@mT_*Go2g}{Pf@yis&}?=lu4wyVOmak zLAigirG9#Oo{O=Mak686aj;QXYPhx`m!n~%yT4_Xr>S;eKvbG(aGq19satt^Xi9NX zUXXK`qj9FCr$L^NQ+B3zPOf`qj#)@XWng5ac73^HMx?J-KmeDIU!_N2h?kjRaJZps zX0Ur|v0;EquB*0pW{7E$W0YHBKvHmWMWlITXlb^iUy_+$VTD-ge%- delta 654 zcmdnMx{7szMt!wLVu(dpQl7taXpnJAR#;Amg;&0JnL)NeL1d}7zkXn8 zu5o~`S6Qlyab}TQP?%?dQFv;$zbTh*T4lOhh_i=Vrl*^4m`RAEUvQ;UVTG?-uD?fk zdRU-|d03)rTCje4g-@=lai)b~QAUwlzNe?Ze^FXqVZFa0S87C3mAw_}L2k-58Nj)zB1k+;4}Rews^FsCG%JM`VRls%LR&x}%rBaZqNVi)T_mL}009Mo>mb zkXN3eMPhM~iDhb1P)SjxQMyHCsjpEnSCCVpkBM<^xwmI(R*-9kTX0pHNos{hQdV$g zNnl8Ma!#&Uj$=uFWqGEzrMrPyvSqfjc93JaNqw$%v5}>*PZ?K=hp&sJae-fUdSsM| zORzra9C!bt3gqrNoIPIpHEalQbB~DkymhtrKxdpuB(~1hqix4m1B}?a(F~(rM9D? zaeYv*rBP*;t8tdQJ{Om+uC9W6gkhpVVMJ=0ca(l9&ka2lLkYSojWT1(cQ+j?x zS$IZHsdiC_Q7G4Z4~Bks<9laI7f+tQ`pf=rVoa|r&-z~ZeL4Tyac>prm?W08WtkE3 pYaB(=vW#xCy*4Uq4%f?-TO!iavNcxy@lyH4>|zmav$ySR0RTA7-q!#C diff --git a/system/monolith-forgejo-runner.nix b/system/monolith-forgejo-runner.nix index 2fa82b4..ee07410 100644 --- a/system/monolith-forgejo-runner.nix +++ b/system/monolith-forgejo-runner.nix @@ -4,7 +4,7 @@ instances.default = { enable = true; name = "monolith"; - url = "https://git.lelgenio.xyz"; + url = "https://git.lelgenio.com"; tokenFile = config.age.secrets.monolith-forgejo-runner-token.path; labels = [ # provide a debian base with nodejs for actions From c4c9bf90997833352885d4d37b61073eb6985de7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 19 May 2024 01:10:21 -0300 Subject: [PATCH 2/9] sway: enable adaptive sync --- user/sway/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/sway/default.nix b/user/sway/default.nix index 84e3b6e..72a34be 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -52,7 +52,7 @@ in }; output = { "*" = { - adaptive_sync = "off"; + adaptive_sync = "enabled"; bg = "${theme.background} fill"; mode = "1920x1080@144.000Hz"; }; From bcb1cdf3b774dceae9d9240166269c228a2fda15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 19 May 2024 01:10:31 -0300 Subject: [PATCH 3/9] monolith: add gpu crash work-around --- hosts/monolith.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/monolith.nix b/hosts/monolith.nix index c5dcece..39ba16f 100644 --- a/hosts/monolith.nix +++ b/hosts/monolith.nix @@ -23,6 +23,7 @@ in "zenpower" ]; boot.kernelParams = [ + "amdgpu.dcdebugmask=0x10" # amdgpu undervolting bug "video=DP-1:1920x1080@144" # hibernation "resume=LABEL=BTRFS_ROOT" # findmnt -o LABEL --noheadings /swap/ From 3b285cafa64b139e838b0bbc69b6bce60105227e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 19 May 2024 15:58:51 -0300 Subject: [PATCH 4/9] update: pass arguments to ./switch --- update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update b/update index 89694e6..59bd11a 100755 --- a/update +++ b/update @@ -1,4 +1,4 @@ #!/bin/sh nix flake update --verbose --print-build-logs -./switch +exec ./switch "$@" From ca1b4055bd9c7666b2a9b8f2fc8169ea0eeb002e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 25 May 2024 01:03:51 -0300 Subject: [PATCH 5/9] git: enable lfs --- user/git.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/user/git.nix b/user/git.nix index 09be75c..f5392df 100644 --- a/user/git.nix +++ b/user/git.nix @@ -4,6 +4,7 @@ in { config = { programs.git = { enable = true; + lfs.enable = true; extraConfig = { user = { name = username; From 3bf03423573af3502deb3d236cd88cb2917ae571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 25 May 2024 01:04:09 -0300 Subject: [PATCH 6/9] sway: autostart corectrl --- user/sway/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/user/sway/default.nix b/user/sway/default.nix index 72a34be..f832aaa 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -89,6 +89,7 @@ in exec ${pkgs.dbus-sway-environment}/bin/dbus-sway-environment exec swaymsg workspace 2 exec_always systemctl --user restart waybar.service + exec corectrl --minimize-systray ''; }; services.gammastep = { From efc00f040a1f8adc10a3154cd9f6275d98c4b21c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 25 May 2024 01:04:19 -0300 Subject: [PATCH 7/9] sway: set godot windows to floating --- user/sway/sway-assigns.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/user/sway/sway-assigns.nix b/user/sway/sway-assigns.nix index 1ec8cf5..ff46238 100644 --- a/user/sway/sway-assigns.nix +++ b/user/sway/sway-assigns.nix @@ -54,6 +54,7 @@ in }; floating = { criteria = [ + { class = "Godot"; } { class = "file_picker"; } { app_id = "file_picker"; } { app_id = "wdisplays"; } From 3ac56e531d5b6c1c6338dd78ad84755288955e70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 25 May 2024 13:38:40 -0300 Subject: [PATCH 8/9] sway: don't require rebuilding sway dependencies --- overlays/default.nix | 10 ++++++---- user/sway/default.nix | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/overlays/default.nix b/overlays/default.nix index c5d145d..060a0c0 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -44,10 +44,12 @@ --replace ZWLR_LAYER_SHELL_V1_LAYER_TOP ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY ''; }); - sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: { - patches = old.patches - ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ]; - }); + mySway = prev.sway.override { + sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: { + patches = old.patches + ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ]; + }); + }; mangohud = prev.mangohud.overrideAttrs (o: { patches = o.patches ++ [ (prev.fetchpatch { diff --git a/user/sway/default.nix b/user/sway/default.nix index f832aaa..7719370 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -21,6 +21,7 @@ in wayland.windowManager.sway = { enable = true; + package = pkgs.mySway; config = { bars = [ ]; @@ -105,7 +106,7 @@ in xdg.configFile."OpenTabletDriver/settings.json".source = ./open-tablet-driver.json; home.packages = with pkgs; [ - sway + mySway swaybg swaylock wdisplays From 49d373ee4d30c027144b965ce2cbcb7620008b7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 25 May 2024 18:58:28 -0300 Subject: [PATCH 9/9] Revert "sshd: disable until xz is secure" This reverts commit b0d1b2fbff9bc8392da8a5210ca06e3f5fc061fe. --- system/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/configuration.nix b/system/configuration.nix index 7c6bbb3..fbcd724 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -59,7 +59,7 @@ security.rtkit.enable = true; services.openssh = { - enable = false; + enable = true; ports = [ 9022 ]; settings = { PermitRootLogin = "no";