From 5ff790639200a64e9480c784486b73c007ba9b93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 30 Dec 2024 21:25:46 -0300 Subject: [PATCH 1/8] update --- flake.lock | 57 ++++++++++++++++++++++++---------------- flake.nix | 1 - user/chat.nix | 2 +- user/kakoune/default.nix | 2 +- 4 files changed, 37 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index e166853..9ec7057 100644 --- a/flake.lock +++ b/flake.lock @@ -209,11 +209,11 @@ ] }, "locked": { - "lastModified": 1734701201, - "narHash": "sha256-hk0roBX10j/hospoWIJIJj3i2skd7Oml6yKQBx7mTFk=", + "lastModified": 1735468753, + "narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=", "owner": "nix-community", "repo": "disko", - "rev": "2ee76c861af3b895b3b104bae04777b61397485b", + "rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21", "type": "github" }, "original": { @@ -440,11 +440,11 @@ ] }, "locked": { - "lastModified": 1734366194, - "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", + "lastModified": 1735344290, + "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", "owner": "nix-community", "repo": "home-manager", - "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", + "rev": "613691f285dad87694c2ba1c9e6298d04736292d", "type": "github" }, "original": { @@ -481,11 +481,11 @@ ] }, "locked": { - "lastModified": 1734234111, - "narHash": "sha256-icEMqBt4HtGH52PU5FHidgBrNJvOfXH6VQKNtnD1aw8=", + "lastModified": 1735443188, + "narHash": "sha256-AydPpRBh8+NOkrLylG7vTsHrGO2b5L7XkMEL5HlzcA8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "311d6cf3ad3f56cb051ffab1f480b2909b3f754d", + "rev": "55ab1e1df5daf2476e6b826b69a82862dcbd7544", "type": "github" }, "original": { @@ -501,16 +501,14 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-24_05": [ - "nixpkgs" - ] + "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1734370678, - "narHash": "sha256-a8zkti1QM5Oxkdfnzr/NjrFlyqI36/kYV/X8G1jOmB4=", + "lastModified": 1735230346, + "narHash": "sha256-zgR8NTiNDPVNrfaiOlB9yHSmCqFDo7Ks2IavaJ2dZo4=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "c43d8c4a3ce84a7bebd110b06e69365484db6208", + "rev": "dc0569066e79ae96184541da6fa28f35a33fbf7b", "type": "gitlab" }, "original": { @@ -536,13 +534,28 @@ "type": "github" } }, - "nixpkgs-unstable": { + "nixpkgs-24_11": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1734083684, + "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-24.11", + "type": "indirect" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "github" }, "original": { @@ -599,11 +612,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1734737257, - "narHash": "sha256-GIMyMt1pkkoXdCq9un859bX6YQZ/iYtukb9R5luazLM=", + "lastModified": 1735531152, + "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1c6e20d41d6a9c1d737945962160e8571df55daa", + "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c580335..1e11ec6 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,6 @@ nixos-mailserver = { url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.nixpkgs-24_05.follows = "nixpkgs"; }; dzgui-nix.url = "github:lelgenio/dzgui-nix"; diff --git a/user/chat.nix b/user/chat.nix index fda61e3..b42f6fd 100644 --- a/user/chat.nix +++ b/user/chat.nix @@ -18,6 +18,6 @@ tdesktop discord-canary thunderbird - element-desktop-wayland + element-desktop ]; } diff --git a/user/kakoune/default.nix b/user/kakoune/default.nix index 9963f26..a015bd0 100644 --- a/user/kakoune/default.nix +++ b/user/kakoune/default.nix @@ -127,7 +127,7 @@ in ranger bmenu kak-lsp - unstable.kak-tree-sitter + kak-tree-sitter kak-pager kak-man-pager From f98e1ef0b71696d162d93a55d3f95247fa2e572b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 8 Jan 2025 21:20:08 -0300 Subject: [PATCH 2/8] amdgpu: remove semingly useless configurations OBS was causing gpu panics --- hosts/monolith/amdgpu.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hosts/monolith/amdgpu.nix b/hosts/monolith/amdgpu.nix index 0df9923..ac09b48 100644 --- a/hosts/monolith/amdgpu.nix +++ b/hosts/monolith/amdgpu.nix @@ -13,7 +13,6 @@ in { boot.initrd.kernelModules = [ "amdgpu" ]; boot.kernelParams = [ - "amdgpu.dcdebugmask=0x10" # amdgpu undervolting bug "video=DP-1:1920x1080@144" "amdgpu.ppfeaturemask=0xfffd7fff" # enable undervolting ]; @@ -29,10 +28,6 @@ in hardware.graphics.extraPackages = with pkgs; [ libva - libvdpau - vaapiVdpau - rocmPackages.clr - rocmPackages.rocm-smi ]; services.udev.extraRules = '' From d84480a40d10f7e86122bb7db1b47c0bc9b6e06c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 8 Jan 2025 21:20:45 -0300 Subject: [PATCH 3/8] amdgpu: always restart the fan control script --- hosts/monolith/amdgpu.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hosts/monolith/amdgpu.nix b/hosts/monolith/amdgpu.nix index ac09b48..4c26afa 100644 --- a/hosts/monolith/amdgpu.nix +++ b/hosts/monolith/amdgpu.nix @@ -21,6 +21,10 @@ in script = '' ${lib.getExe pkgs.amd-fan-control} /sys/class/drm/card1/device 60 85 ''; + serviceConfig = { + Restart = "always"; + RestartSec = 10; + }; wantedBy = [ "multi-user.target" ]; }; From 26e013d88f9f7f868aebe7493a4130dc2dded2bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 8 Jan 2025 21:21:11 -0300 Subject: [PATCH 4/8] factorio: wait for network connection before starting --- hosts/monolith/factorio-server.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hosts/monolith/factorio-server.nix b/hosts/monolith/factorio-server.nix index 3c893a5..211e746 100644 --- a/hosts/monolith/factorio-server.nix +++ b/hosts/monolith/factorio-server.nix @@ -10,6 +10,11 @@ extraSettingsFile = config.age.secrets.factorio-settings.path; }; + systemd.services.factorio = { + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + }; + age.secrets.factorio-settings = { file = ../../secrets/factorio-settings.age; mode = "777"; From eda788a9128cab74b0ad6addb78bf8dfc574a68b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 8 Jan 2025 21:22:29 -0300 Subject: [PATCH 5/8] monolith: revert to LTS kernel --- hosts/monolith/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix index 77dfa50..c3764fd 100644 --- a/hosts/monolith/default.nix +++ b/hosts/monolith/default.nix @@ -41,8 +41,6 @@ in package = pkgs.unstable.opentabletdriver; }; - boot.kernelPackages = pkgs.linuxPackages_latest; - boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ]; boot.initrd.kernelModules = [ "amdgpu" ]; From cf2cc34311a6ab1b0b24ff2d7fb2a0926c27c88c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 8 Jan 2025 21:23:18 -0300 Subject: [PATCH 6/8] sway: don't force steam into floating window --- user/sway/sway-assigns.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/user/sway/sway-assigns.nix b/user/sway/sway-assigns.nix index 65e1a97..8f073c7 100644 --- a/user/sway/sway-assigns.nix +++ b/user/sway/sway-assigns.nix @@ -58,7 +58,6 @@ in { app_id = "wdisplays"; } { app_id = "pavucontrol"; } { app_id = ".*[Hh]elvum.*"; } - { workspace = "9"; } ]; }; }; From 8012d3835d4b4bb3da87a411907e55828a0f4cd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 8 Jan 2025 21:23:37 -0300 Subject: [PATCH 7/8] OpenTabletDriver: fix shortcuts and revert draw-area to fullscreen --- user/sway/open-tablet-driver.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user/sway/open-tablet-driver.json b/user/sway/open-tablet-driver.json index 632cd6c..bf49af6 100644 --- a/user/sway/open-tablet-driver.json +++ b/user/sway/open-tablet-driver.json @@ -10,8 +10,8 @@ "Filters": [], "AbsoluteModeSettings": { "Display": { - "Width": 960.0, - "Height": 540.0, + "Width": 1920.0, + "Height": 1080.0, "X": 960.0, "Y": 540.0, "Rotation": 0.0 @@ -76,7 +76,7 @@ "Settings": [ { "Property": "Keys", - "Value": "Control+O" + "Value": "Control+Shift+Z" } ], "Enable": true From e1601a0aefc337af7cdb3041614598ebfc91de48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 8 Jan 2025 21:25:01 -0300 Subject: [PATCH 8/8] update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 9ec7057..b2c2019 100644 --- a/flake.lock +++ b/flake.lock @@ -209,11 +209,11 @@ ] }, "locked": { - "lastModified": 1735468753, - "narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=", + "lastModified": 1736199437, + "narHash": "sha256-TdU0a/x8048rbbJmkKWzSY1CtsbbGKNkIJcMdr8Zf4Q=", "owner": "nix-community", "repo": "disko", - "rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21", + "rev": "49f8aa791f81ff2402039b3efe0c35b9386c4bcf", "type": "github" }, "original": { @@ -227,11 +227,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1733974299, - "narHash": "sha256-fPvJ/ZsQGVqGJqYL2gKotalQUoG1wpUYTJkRKG2BrwA=", + "lastModified": 1735940463, + "narHash": "sha256-qrjv3UrlcFQf8zFjV4lMDmcBnlow/sqyyjGFAXp8mLk=", "owner": "lelgenio", "repo": "dzgui-nix", - "rev": "580022e73efedb17ddf640115539cb9bd1423d44", + "rev": "fccedf1386f484375570e0195c7a08d7687b1df6", "type": "github" }, "original": { @@ -481,11 +481,11 @@ ] }, "locked": { - "lastModified": 1735443188, - "narHash": "sha256-AydPpRBh8+NOkrLylG7vTsHrGO2b5L7XkMEL5HlzcA8=", + "lastModified": 1736047960, + "narHash": "sha256-hutd85FA1jUJhhqBRRJ+u7UHO9oFGD/RVm2x5w8WjVQ=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "55ab1e1df5daf2476e6b826b69a82862dcbd7544", + "rev": "816a6ae88774ba7e74314830546c29e134e0dffb", "type": "github" }, "original": { @@ -551,11 +551,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1735471104, - "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { @@ -612,11 +612,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1735531152, - "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", + "lastModified": 1736061677, + "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", + "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36", "type": "github" }, "original": {