From d17d87f66feff30350ca28ad25c08e1f767ebabb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 9 Dec 2023 12:10:14 -0300 Subject: [PATCH 01/47] switch to nixpkgs unstable --- flake.lock | 387 ++++-------------- flake.nix | 4 +- ...m-generation-after-generation-switch.patch | 27 -- system/configuration.nix | 2 + 4 files changed, 83 insertions(+), 337 deletions(-) delete mode 100644 patches/nixpkgs/fix-steam-generation-after-generation-switch.patch diff --git a/flake.lock b/flake.lock index f25a618..ca0d863 100644 --- a/flake.lock +++ b/flake.lock @@ -38,15 +38,14 @@ "home-manager": "home-manager", "nixpkgs": [ "nixpkgs" - ], - "systems": "systems" + ] }, "locked": { - "lastModified": 1707830867, - "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", + "lastModified": 1701216516, + "narHash": "sha256-jKSeJn+7hZ1dZdiH1L+NWUGT2i/BGomKAJ54B9kT06Q=", "owner": "ryantm", "repo": "agenix", - "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", + "rev": "13ac9ac6d68b9a0896e3d43a082947233189e247", "type": "github" }, "original": { @@ -55,22 +54,6 @@ "type": "github" } }, - "blobs": { - "flake": false, - "locked": { - "lastModified": 1604995301, - "narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=", - "owner": "simple-nixos-mailserver", - "repo": "blobs", - "rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265", - "type": "gitlab" - }, - "original": { - "owner": "simple-nixos-mailserver", - "repo": "blobs", - "type": "gitlab" - } - }, "crane": { "inputs": { "flake-compat": "flake-compat", @@ -127,11 +110,11 @@ ] }, "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "lastModified": 1673295039, + "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", "type": "github" }, "original": { @@ -205,7 +188,9 @@ "dzgui-nix": { "inputs": { "dzgui": "dzgui", - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1702850463, @@ -305,25 +290,9 @@ "type": "github" } }, - "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1681202837, @@ -359,7 +328,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1681202837, @@ -392,7 +361,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_6" + "systems": "systems_4" }, "locked": { "lastModified": 1681202837, @@ -410,7 +379,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_7" + "systems": "systems_5" }, "locked": { "lastModified": 1681202837, @@ -428,7 +397,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_9" + "systems": "systems_7" }, "locked": { "lastModified": 1694529238, @@ -446,7 +415,7 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_10" + "systems": "systems_8" }, "locked": { "lastModified": 1681202837, @@ -464,7 +433,7 @@ }, "flake-utils_8": { "inputs": { - "systems": "systems_11" + "systems": "systems_9" }, "locked": { "lastModified": 1681202837, @@ -488,11 +457,11 @@ ] }, "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "lastModified": 1682203081, + "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", "owner": "nix-community", "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", "type": "github" }, "original": { @@ -508,64 +477,35 @@ ] }, "locked": { - "lastModified": 1706981411, - "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", + "lastModified": 1703026685, + "narHash": "sha256-AkualfMbc40HkDR2AZc6u71pcap50wDQOXFCY1ULDUA=", "owner": "nix-community", "repo": "home-manager", - "rev": "652fda4ca6dafeb090943422c34ae9145787af37", + "rev": "efc177c15f2a8bb063aeb250fe3c7c21e1de265e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", "repo": "home-manager", "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": "hyprlang", - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1710257359, - "narHash": "sha256-43re5pzE/cswFAgw92/ugsB3+d5ufDaCcLtl9ztKfBo=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "1761f6cefd77f4fcd2039d930c88d6716ddc4974", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, "hyprland": { "inputs": { - "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang_2", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_5", + "systems": "systems_3", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1710864211, - "narHash": "sha256-Uve1/UBnwD4M/9xD0E3XATnLrF8B5vL6MTBhX6Is+TE=", + "lastModified": 1702986956, + "narHash": "sha256-HSXyJxXKqDqaAVoJhvbA+u8iDLS/TuCD6+w4eDqMIeI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "bcba3951f45f11245d424274130eb3a0ac790d93", + "rev": "d9b74ff96b3e3f0341a386451b9a3375b6f05503", "type": "github" }, "original": { @@ -599,54 +539,6 @@ "type": "github" } }, - "hyprlang": { - "inputs": { - "nixpkgs": [ - "hyprland", - "hyprcursor", - "nixpkgs" - ], - "systems": "systems_4" - }, - "locked": { - "lastModified": 1709914708, - "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_2": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1709914708, - "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, "lipsum": { "flake": false, "locked": { @@ -689,11 +581,11 @@ "material-wifi-icons": { "flake": false, "locked": { - "lastModified": 1703850449, - "narHash": "sha256-KykU5J7SdpBDG+6rkD//XeHd+6pK3qabe+88RduhwKc=", + "lastModified": 1537083724, + "narHash": "sha256-neh+keoYyKum2K1lutE4HKVscA+TeWccikB85osbX/8=", "owner": "dcousens", "repo": "material-wifi-icons", - "rev": "2daf6b3d96d65beb2a3e37a9a53556aab3826d97", + "rev": "d56927c95ca17aa3e0dda15b23840ba3ad3f44cb", "type": "github" }, "original": { @@ -709,11 +601,11 @@ ] }, "locked": { - "lastModified": 1710644923, - "narHash": "sha256-0fjbN5GYYDKPyPay0l8gYoH+tFfNqPPwP5sxxBreeA4=", + "lastModified": 1702864432, + "narHash": "sha256-xR5Igg2hnm979W3YgMDrSjErHFhHo4rbMboF6DC0mbc=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "e25efda85e39fcdc845e371971ac4384989c4295", + "rev": "4605ccd764fac78b9e4b5b058698cb9f04430b91", "type": "github" }, "original": { @@ -724,15 +616,15 @@ }, "nix-software-center": { "inputs": { - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "utils": "utils" }, "locked": { - "lastModified": 1703105285, - "narHash": "sha256-BHoW1RQMc2Auz8paBvTBriKv0F6FI99+3nnz/ELLawg=", + "lastModified": 1693158194, + "narHash": "sha256-jDTKAmei9UgwoVHAskalRilTunWYlWOESNGY4BKscuU=", "owner": "vlinkz", "repo": "nix-software-center", - "rev": "68e87fb6e24fb3e6fe65449918d0cbda96622b65", + "rev": "8faa762f9b710520f8b7f81f4892a6e0aba749dc", "type": "github" }, "original": { @@ -744,15 +636,15 @@ "nixos-conf-editor": { "inputs": { "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "snowfall-lib": "snowfall-lib" }, "locked": { - "lastModified": 1707338010, - "narHash": "sha256-UtLeZzDdk96sLTRcWsGrkWCslNUDytrGe0VmOTB/iig=", + "lastModified": 1698685411, + "narHash": "sha256-N93S17LLkckv25qB/aMdFyfV+sNvhiGyHfFVMczoBs8=", "owner": "vlinkz", "repo": "nixos-conf-editor", - "rev": "27b5e92f580f794c690093503869aab242f075ab", + "rev": "f79009587708571f79b3299898723c131473e2b4", "type": "github" }, "original": { @@ -761,78 +653,7 @@ "type": "github" } }, - "nixos-mailserver": { - "inputs": { - "blobs": "blobs", - "flake-compat": "flake-compat_5", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-23_05": "nixpkgs-23_05", - "nixpkgs-23_11": "nixpkgs-23_11", - "utils": "utils_2" - }, - "locked": { - "lastModified": 1706219574, - "narHash": "sha256-qO+8UErk+bXCq2ybHU4GzXG4Ejk4Tk0rnnTPNyypW4g=", - "owner": "simple-nixos-mailserver", - "repo": "nixos-mailserver", - "rev": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf", - "type": "gitlab" - }, - "original": { - "owner": "simple-nixos-mailserver", - "ref": "nixos-23.11", - "repo": "nixos-mailserver", - "type": "gitlab" - } - }, "nixpkgs": { - "locked": { - "lastModified": 1702539185, - "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixpkgs-unstable", - "type": "indirect" - } - }, - "nixpkgs-23_05": { - "locked": { - "lastModified": 1704290814, - "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.05", - "type": "indirect" - } - }, - "nixpkgs-23_11": { - "locked": { - "lastModified": 1706098335, - "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.11", - "type": "indirect" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1692638711, "narHash": "sha256-J0LgSFgJVGCC1+j5R2QndadWI1oumusg6hCtYAzLID4=", @@ -848,7 +669,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_2": { "locked": { "lastModified": 1698318101, "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", @@ -864,18 +685,18 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "lastModified": 1702830618, + "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-23.11", + "ref": "nixos-unstable", "type": "indirect" } }, @@ -898,11 +719,11 @@ "ranger-icons": { "flake": false, "locked": { - "lastModified": 1709209315, - "narHash": "sha256-ETE13REDIVuoFIbvWqWvQLj/2fGST+1koowmmuBzGmo=", + "lastModified": 1691165140, + "narHash": "sha256-6JEhyU08QEkGdRW2L00ynRaoaaR5PaiVUccEUbtTQuU=", "owner": "alexanderjeurissen", "repo": "ranger_devicons", - "rev": "ed718dd6a6d5d2c0f53cba8474c5ad96185057e9", + "rev": "de64ab26fb581c00a803381d522c6b3e48b79415", "type": "github" }, "original": { @@ -925,8 +746,7 @@ "nix-index-database": "nix-index-database", "nix-software-center": "nix-software-center", "nixos-conf-editor": "nixos-conf-editor", - "nixos-mailserver": "nixos-mailserver", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "plymouth-themes": "plymouth-themes", "ranger-icons": "ranger-icons", "tlauncher": "tlauncher", @@ -1042,36 +862,6 @@ "type": "github" } }, - "systems_10": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_11": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1088,6 +878,21 @@ } }, "systems_3": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1102,33 +907,18 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, "systems_5": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1215,7 +1005,7 @@ }, "utils": { "inputs": { - "systems": "systems_8" + "systems": "systems_6" }, "locked": { "lastModified": 1689068808, @@ -1231,21 +1021,6 @@ "type": "github" } }, - "utils_2": { - "locked": { - "lastModified": 1605370193, - "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5021eac20303a61fafe17224c087f5519baed54d", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "wl-crosshair": { "inputs": { "flake-utils": "flake-utils_8", @@ -1271,18 +1046,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1709983277, - "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=", + "lastModified": 1701368958, + "narHash": "sha256-7kvyoA91etzVEl9mkA/EJfB6z/PltxX7Xc4gcr7/xlo=", "owner": "wlroots", "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", + "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", + "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350", "type": "gitlab" } }, @@ -1292,10 +1067,6 @@ "hyprland", "hyprland-protocols" ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -1306,11 +1077,11 @@ ] }, "locked": { - "lastModified": 1709299639, - "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", + "lastModified": 1702334919, + "narHash": "sha256-ibOZ3TLjqndGMcj2f+07NFwDWoum4IbzF58byZuJJNg=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "2d2fb547178ec025da643db57d40a971507b82fe", + "rev": "f5c3576c3b6cb1c31a8dfa3e4113f59bfe40cd71", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2b64fb4..06e915f 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,8 @@ { description = "My system config"; inputs = { - nixpkgs.url = "nixpkgs/nixos-23.11"; - home-manager.url = "github:nix-community/home-manager/release-23.11"; + nixpkgs.url = "nixpkgs/nixos-unstable"; + home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nix-index-database = { diff --git a/patches/nixpkgs/fix-steam-generation-after-generation-switch.patch b/patches/nixpkgs/fix-steam-generation-after-generation-switch.patch deleted file mode 100644 index 7c2b37f..0000000 --- a/patches/nixpkgs/fix-steam-generation-after-generation-switch.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ac4d51306af54a088e29e2e5efcfac5dfe87d95c Mon Sep 17 00:00:00 2001 -From: lelgenio -Date: Fri, 4 Aug 2023 01:25:04 -0300 -Subject: [PATCH] HACK: fix steam after generation switch - ---- - pkgs/build-support/build-fhsenv-bubblewrap/default.nix | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix -index 3500e5e9216f..4d7ac0aa7618 100644 ---- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix -+++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix -@@ -152,6 +152,10 @@ let - fi - if [[ -L $i ]]; then - symlinks+=(--symlink "$(${coreutils}/bin/readlink "$i")" "$i") -+ elif [[ -f $i && -r $i ]]; then -+ SNAPSHOT=$(mktemp --dry-run) -+ cp "$i" "$SNAPSHOT" -+ ro_mounts+=(--ro-bind-try "$SNAPSHOT" "$i") - else - ro_mounts+=(--ro-bind-try "$i" "$i") - fi --- -2.42.0 - diff --git a/system/configuration.nix b/system/configuration.nix index 3c146b1..76e64c0 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -11,6 +11,8 @@ ./nix.nix ]; + boot.kernelPackages = pkgs.linuxPackages_latest; + zramSwap.enable = true; programs.adb.enable = true; From 65ffe202ae610a43637ae76a1b36a66a21925a64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 22 Dec 2023 22:46:34 -0300 Subject: [PATCH 02/47] update --- flake.lock | 36 ++++++++++++++++++------------------ flake.nix | 10 +--------- 2 files changed, 19 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index ca0d863..63013d3 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1701216516, - "narHash": "sha256-jKSeJn+7hZ1dZdiH1L+NWUGT2i/BGomKAJ54B9kT06Q=", + "lastModified": 1703260116, + "narHash": "sha256-ipqShkBmHKC9ft1ZAsA6aeKps32k7+XZSPwfxeHLsAU=", "owner": "ryantm", "repo": "agenix", - "rev": "13ac9ac6d68b9a0896e3d43a082947233189e247", + "rev": "d0d4ad5be611da43da04321f49684ad72d705c7e", "type": "github" }, "original": { @@ -477,11 +477,11 @@ ] }, "locked": { - "lastModified": 1703026685, - "narHash": "sha256-AkualfMbc40HkDR2AZc6u71pcap50wDQOXFCY1ULDUA=", + "lastModified": 1703265279, + "narHash": "sha256-5jVtOwyMH1FzclxHrsFWzBdB+VyjUUSu1wyZhZlR6WU=", "owner": "nix-community", "repo": "home-manager", - "rev": "efc177c15f2a8bb063aeb250fe3c7c21e1de265e", + "rev": "07c322a7cff03267fd881adae1afe63367c5d608", "type": "github" }, "original": { @@ -501,11 +501,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1702986956, - "narHash": "sha256-HSXyJxXKqDqaAVoJhvbA+u8iDLS/TuCD6+w4eDqMIeI=", + "lastModified": 1703271271, + "narHash": "sha256-q6bb5S6l/fEIpO4QRmxACgNfVdTvWktEvKVKWtygzx8=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "d9b74ff96b3e3f0341a386451b9a3375b6f05503", + "rev": "c416880cf96aee783b6a00f356512e5d758e6056", "type": "github" }, "original": { @@ -620,11 +620,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1693158194, - "narHash": "sha256-jDTKAmei9UgwoVHAskalRilTunWYlWOESNGY4BKscuU=", + "lastModified": 1703105285, + "narHash": "sha256-BHoW1RQMc2Auz8paBvTBriKv0F6FI99+3nnz/ELLawg=", "owner": "vlinkz", "repo": "nix-software-center", - "rev": "8faa762f9b710520f8b7f81f4892a6e0aba749dc", + "rev": "68e87fb6e24fb3e6fe65449918d0cbda96622b65", "type": "github" }, "original": { @@ -640,11 +640,11 @@ "snowfall-lib": "snowfall-lib" }, "locked": { - "lastModified": 1698685411, - "narHash": "sha256-N93S17LLkckv25qB/aMdFyfV+sNvhiGyHfFVMczoBs8=", + "lastModified": 1703104726, + "narHash": "sha256-9wD01mLe7tQCzTtLIRzUaAvOKzfPuWPfpCfYkeCsQD0=", "owner": "vlinkz", "repo": "nixos-conf-editor", - "rev": "f79009587708571f79b3299898723c131473e2b4", + "rev": "18dc1d25b2025dc437490c71653429a05f9e0bf2", "type": "github" }, "original": { @@ -687,11 +687,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1702830618, - "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 06e915f..3bff3c6 100644 --- a/flake.nix +++ b/flake.nix @@ -76,17 +76,9 @@ overlays = old_overlays.all; }; - bootstrapPkgs = import inputs.nixpkgs nixpkgsConfig; - nixpkgs = bootstrapPkgs.applyPatches { - name = "patched-nixpkgs"; - src = inputs.nixpkgs; - patches = lib.mapAttrsToList (k: v: ./patches/nixpkgs/${k}) - (builtins.readDir ./patches/nixpkgs); - }; - inherit (import ./user/variables.nix) desktop; system = "x86_64-linux"; - pkgs = import nixpkgs nixpkgsConfig; + pkgs = import inputs.nixpkgs nixpkgsConfig; lib = inputs.nixpkgs.lib; packages = import ./pkgs { inherit pkgs inputs; }; From 7d1709e598c32c924f44d8dc1a6676d29c62d41a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 26 Dec 2023 02:41:54 -0300 Subject: [PATCH 03/47] update --- flake.lock | 114 +++++++++++++++++++++++++++++---------------------- user/gpg.nix | 2 +- 2 files changed, 66 insertions(+), 50 deletions(-) diff --git a/flake.lock b/flake.lock index 63013d3..fa629df 100644 --- a/flake.lock +++ b/flake.lock @@ -38,14 +38,15 @@ "home-manager": "home-manager", "nixpkgs": [ "nixpkgs" - ] + ], + "systems": "systems" }, "locked": { - "lastModified": 1703260116, - "narHash": "sha256-ipqShkBmHKC9ft1ZAsA6aeKps32k7+XZSPwfxeHLsAU=", + "lastModified": 1703433843, + "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=", "owner": "ryantm", "repo": "agenix", - "rev": "d0d4ad5be611da43da04321f49684ad72d705c7e", + "rev": "417caa847f9383e111d1397039c9d4337d024bf0", "type": "github" }, "original": { @@ -110,11 +111,11 @@ ] }, "locked": { - "lastModified": 1673295039, - "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", "type": "github" }, "original": { @@ -292,7 +293,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1681202837, @@ -328,7 +329,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1681202837, @@ -361,7 +362,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1681202837, @@ -379,7 +380,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1681202837, @@ -397,7 +398,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1694529238, @@ -415,7 +416,7 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_8" + "systems": "systems_9" }, "locked": { "lastModified": 1681202837, @@ -433,7 +434,7 @@ }, "flake-utils_8": { "inputs": { - "systems": "systems_9" + "systems": "systems_10" }, "locked": { "lastModified": 1681202837, @@ -457,11 +458,11 @@ ] }, "locked": { - "lastModified": 1682203081, - "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", "owner": "nix-community", "repo": "home-manager", - "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", "type": "github" }, "original": { @@ -477,11 +478,11 @@ ] }, "locked": { - "lastModified": 1703265279, - "narHash": "sha256-5jVtOwyMH1FzclxHrsFWzBdB+VyjUUSu1wyZhZlR6WU=", + "lastModified": 1703527373, + "narHash": "sha256-AjypRssRtS6F3xkf7rE3/bXkIF2WJOZLbTIspjcE1zM=", "owner": "nix-community", "repo": "home-manager", - "rev": "07c322a7cff03267fd881adae1afe63367c5d608", + "rev": "80679ea5074ab7190c4cce478c600057cfb5edae", "type": "github" }, "original": { @@ -496,16 +497,16 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_3", + "systems": "systems_4", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1703271271, - "narHash": "sha256-q6bb5S6l/fEIpO4QRmxACgNfVdTvWktEvKVKWtygzx8=", + "lastModified": 1703525245, + "narHash": "sha256-uDkNQgMmmVtTDKvRjO2TmUwlKSV4gwMLGj5pGr3xDIM=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "c416880cf96aee783b6a00f356512e5d758e6056", + "rev": "4f99e805b900b72f5e2bed54a1a44d10c8d54771", "type": "github" }, "original": { @@ -601,11 +602,11 @@ ] }, "locked": { - "lastModified": 1702864432, - "narHash": "sha256-xR5Igg2hnm979W3YgMDrSjErHFhHo4rbMboF6DC0mbc=", + "lastModified": 1703387252, + "narHash": "sha256-XKJqGj0BaEn/zyctEnkgVIh6Ba1rgTRc+UBi9EU8Y54=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "4605ccd764fac78b9e4b5b058698cb9f04430b91", + "rev": "f4340c1a42c38d79293ba69bfd839fbd6268a538", "type": "github" }, "original": { @@ -687,11 +688,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1703013332, - "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", + "lastModified": 1703255338, + "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", + "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", "type": "github" }, "original": { @@ -862,6 +863,21 @@ "type": "github" } }, + "systems_10": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -878,21 +894,6 @@ } }, "systems_3": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -907,6 +908,21 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "systems_5": { "locked": { "lastModified": 1681028828, @@ -1005,7 +1021,7 @@ }, "utils": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1689068808, @@ -1077,11 +1093,11 @@ ] }, "locked": { - "lastModified": 1702334919, - "narHash": "sha256-ibOZ3TLjqndGMcj2f+07NFwDWoum4IbzF58byZuJJNg=", + "lastModified": 1703514399, + "narHash": "sha256-VRr5Xc4S/VPr/gU3fiOD3vSIL2+GJ+LUrmFTWTwnTz4=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "f5c3576c3b6cb1c31a8dfa3e4113f59bfe40cd71", + "rev": "0a318a7a217a6402b0b705837cd5b50b0e94b31b", "type": "github" }, "original": { diff --git a/user/gpg.nix b/user/gpg.nix index e215440..a56529e 100644 --- a/user/gpg.nix +++ b/user/gpg.nix @@ -4,7 +4,7 @@ enable = true; defaultCacheTtl = 604800; maxCacheTtl = 604800; - pinentryFlavor = "gtk2"; + pinentryFlavor = "qt"; extraConfig = '' allow-preset-passphrase ''; From 1204b61de445960709927623a74e19b26278c54a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 26 Dec 2023 21:10:32 -0300 Subject: [PATCH 04/47] sway: disable 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 96790be..84e3b6e 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -52,7 +52,7 @@ in }; output = { "*" = { - adaptive_sync = "on"; + adaptive_sync = "off"; bg = "${theme.background} fill"; mode = "1920x1080@144.000Hz"; }; From a91bddc7125d16de5a0dc654d7bfd141aa4d6dc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 7 Jan 2024 18:40:39 -0300 Subject: [PATCH 05/47] update --- flake.lock | 108 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 78 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index fa629df..d1af186 100644 --- a/flake.lock +++ b/flake.lock @@ -189,9 +189,7 @@ "dzgui-nix": { "inputs": { "dzgui": "dzgui", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1702850463, @@ -478,11 +476,11 @@ ] }, "locked": { - "lastModified": 1703527373, - "narHash": "sha256-AjypRssRtS6F3xkf7rE3/bXkIF2WJOZLbTIspjcE1zM=", + "lastModified": 1704498488, + "narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=", "owner": "nix-community", "repo": "home-manager", - "rev": "80679ea5074ab7190c4cce478c600057cfb5edae", + "rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee", "type": "github" }, "original": { @@ -502,11 +500,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1703525245, - "narHash": "sha256-uDkNQgMmmVtTDKvRjO2TmUwlKSV4gwMLGj5pGr3xDIM=", + "lastModified": 1704632672, + "narHash": "sha256-roOtCL13u9/UBMyA3DJtSfRD7bn89iKoqPWrZzXQxWM=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "4f99e805b900b72f5e2bed54a1a44d10c8d54771", + "rev": "7904188de9ca631436484cde733ef871f518d962", "type": "github" }, "original": { @@ -540,6 +538,24 @@ "type": "github" } }, + "hyprlang": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1704287638, + "narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "6624f2bb66d4d27975766e81f77174adbe58ec97", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, "lipsum": { "flake": false, "locked": { @@ -582,11 +598,11 @@ "material-wifi-icons": { "flake": false, "locked": { - "lastModified": 1537083724, - "narHash": "sha256-neh+keoYyKum2K1lutE4HKVscA+TeWccikB85osbX/8=", + "lastModified": 1703850449, + "narHash": "sha256-KykU5J7SdpBDG+6rkD//XeHd+6pK3qabe+88RduhwKc=", "owner": "dcousens", "repo": "material-wifi-icons", - "rev": "d56927c95ca17aa3e0dda15b23840ba3ad3f44cb", + "rev": "2daf6b3d96d65beb2a3e37a9a53556aab3826d97", "type": "github" }, "original": { @@ -602,11 +618,11 @@ ] }, "locked": { - "lastModified": 1703387252, - "narHash": "sha256-XKJqGj0BaEn/zyctEnkgVIh6Ba1rgTRc+UBi9EU8Y54=", + "lastModified": 1704596958, + "narHash": "sha256-BK3Ohsz7m8X6qVKFxDtr8KVcHipfr5hYE9PDIJevHbQ=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "f4340c1a42c38d79293ba69bfd839fbd6268a538", + "rev": "f46800ac5a6e9f892fe36e50821c5d85794ecc62", "type": "github" }, "original": { @@ -617,7 +633,7 @@ }, "nix-software-center": { "inputs": { - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_3", "utils": "utils" }, "locked": { @@ -637,7 +653,7 @@ "nixos-conf-editor": { "inputs": { "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_4", "snowfall-lib": "snowfall-lib" }, "locked": { @@ -655,6 +671,37 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1702539185, + "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixpkgs-unstable", + "type": "indirect" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1702645756, + "narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "40c3c94c241286dd2243ea34d3aef8a488f9e4d0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1692638711, "narHash": "sha256-J0LgSFgJVGCC1+j5R2QndadWI1oumusg6hCtYAzLID4=", @@ -670,7 +717,7 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_4": { "locked": { "lastModified": 1698318101, "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", @@ -686,13 +733,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_5": { "locked": { - "lastModified": 1703255338, - "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", + "lastModified": 1704194953, + "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", + "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", "type": "github" }, "original": { @@ -747,7 +794,7 @@ "nix-index-database": "nix-index-database", "nix-software-center": "nix-software-center", "nixos-conf-editor": "nixos-conf-editor", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_5", "plymouth-themes": "plymouth-themes", "ranger-icons": "ranger-icons", "tlauncher": "tlauncher", @@ -1062,18 +1109,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1701368958, - "narHash": "sha256-7kvyoA91etzVEl9mkA/EJfB6z/PltxX7Xc4gcr7/xlo=", + "lastModified": 1703963193, + "narHash": "sha256-ke8drv6PTrdQDruWbajrRJffP9A9PU6FRyjJGNZRTs4=", "owner": "wlroots", "repo": "wlroots", - "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350", + "rev": "f81c3d93cd6f61b20ae784297679283438def8df", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350", + "rev": "f81c3d93cd6f61b20ae784297679283438def8df", "type": "gitlab" } }, @@ -1083,6 +1130,7 @@ "hyprland", "hyprland-protocols" ], + "hyprlang": "hyprlang", "nixpkgs": [ "hyprland", "nixpkgs" @@ -1093,11 +1141,11 @@ ] }, "locked": { - "lastModified": 1703514399, - "narHash": "sha256-VRr5Xc4S/VPr/gU3fiOD3vSIL2+GJ+LUrmFTWTwnTz4=", + "lastModified": 1704400467, + "narHash": "sha256-IsEAKBCorRlN53FwFAMbyGLRsPVu/ZrWEJtCwykPds8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "0a318a7a217a6402b0b705837cd5b50b0e94b31b", + "rev": "1c802128f6cc3db29a8ef01552b1a22f894eeefd", "type": "github" }, "original": { From 2f91c49f6d07e38ec770313db3067a54972b3f4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 31 Jan 2024 17:35:26 -0300 Subject: [PATCH 06/47] update --- flake.lock | 70 ++++++++++++++++++++++-------------------------------- 1 file changed, 29 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index d1af186..be15b30 100644 --- a/flake.lock +++ b/flake.lock @@ -476,11 +476,11 @@ ] }, "locked": { - "lastModified": 1704498488, - "narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=", + "lastModified": 1706473109, + "narHash": "sha256-iyuAvpKTsq2u23Cr07RcV5XlfKExrG8gRpF75hf1uVc=", "owner": "nix-community", "repo": "home-manager", - "rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee", + "rev": "d634c3abafa454551f2083b054cd95c3f287be61", "type": "github" }, "original": { @@ -500,11 +500,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1704632672, - "narHash": "sha256-roOtCL13u9/UBMyA3DJtSfRD7bn89iKoqPWrZzXQxWM=", + "lastModified": 1706571425, + "narHash": "sha256-VwVUPb5vuy4GGUx1XMhDMaKk9n8Gs5xUTG9CItoHL04=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "7904188de9ca631436484cde733ef871f518d962", + "rev": "3ff59e7e1d859daa503b88ef125d087bc100abfe", "type": "github" }, "original": { @@ -540,7 +540,11 @@ }, "hyprlang": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "hyprland", + "xdph", + "nixpkgs" + ] }, "locked": { "lastModified": 1704287638, @@ -618,11 +622,11 @@ ] }, "locked": { - "lastModified": 1704596958, - "narHash": "sha256-BK3Ohsz7m8X6qVKFxDtr8KVcHipfr5hYE9PDIJevHbQ=", + "lastModified": 1706411424, + "narHash": "sha256-BzziJYucEZvdCE985vjPoo3ztWcmUiSQ1wJ2CoT6jCc=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "f46800ac5a6e9f892fe36e50821c5d85794ecc62", + "rev": "c782f2a4f6fc94311ab5ef31df2f1149a1856181", "type": "github" }, "original": { @@ -633,7 +637,7 @@ }, "nix-software-center": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "utils": "utils" }, "locked": { @@ -653,7 +657,7 @@ "nixos-conf-editor": { "inputs": { "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "snowfall-lib": "snowfall-lib" }, "locked": { @@ -686,22 +690,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1702645756, - "narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "40c3c94c241286dd2243ea34d3aef8a488f9e4d0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1692638711, "narHash": "sha256-J0LgSFgJVGCC1+j5R2QndadWI1oumusg6hCtYAzLID4=", @@ -717,7 +705,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1698318101, "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", @@ -733,13 +721,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { - "lastModified": 1704194953, - "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", + "lastModified": 1706371002, + "narHash": "sha256-dwuorKimqSYgyu8Cw6ncKhyQjUDOyuXoxDTVmAXq88s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", + "rev": "c002c6aa977ad22c60398daaa9be52f2203d0006", "type": "github" }, "original": { @@ -794,7 +782,7 @@ "nix-index-database": "nix-index-database", "nix-software-center": "nix-software-center", "nixos-conf-editor": "nixos-conf-editor", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "plymouth-themes": "plymouth-themes", "ranger-icons": "ranger-icons", "tlauncher": "tlauncher", @@ -1109,18 +1097,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1703963193, - "narHash": "sha256-ke8drv6PTrdQDruWbajrRJffP9A9PU6FRyjJGNZRTs4=", + "lastModified": 1706359063, + "narHash": "sha256-5HUTG0p+nCJv3cn73AmFHRZdfRV5AD5N43g8xAePSKM=", "owner": "wlroots", "repo": "wlroots", - "rev": "f81c3d93cd6f61b20ae784297679283438def8df", + "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "f81c3d93cd6f61b20ae784297679283438def8df", + "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", "type": "gitlab" } }, @@ -1141,11 +1129,11 @@ ] }, "locked": { - "lastModified": 1704400467, - "narHash": "sha256-IsEAKBCorRlN53FwFAMbyGLRsPVu/ZrWEJtCwykPds8=", + "lastModified": 1706145785, + "narHash": "sha256-j9MP4fv2U/vdRKAXXc2gyMTmYwVnHP6kHx1/y6jprrU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "1c802128f6cc3db29a8ef01552b1a22f894eeefd", + "rev": "5a592647587cd20b9692a347df6939b6d371b3bb", "type": "github" }, "original": { From 2b413406bf7ec015ef47f3f0e4c05e74811cb119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 8 Feb 2024 23:54:47 -0300 Subject: [PATCH 07/47] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index be15b30..e7be22f 100644 --- a/flake.lock +++ b/flake.lock @@ -476,11 +476,11 @@ ] }, "locked": { - "lastModified": 1706473109, - "narHash": "sha256-iyuAvpKTsq2u23Cr07RcV5XlfKExrG8gRpF75hf1uVc=", + "lastModified": 1707175763, + "narHash": "sha256-0MKHC6tQ4KEuM5rui6DjKZ/VNiSANB4E+DJ/+wPS1PU=", "owner": "nix-community", "repo": "home-manager", - "rev": "d634c3abafa454551f2083b054cd95c3f287be61", + "rev": "f99eace7c167b8a6a0871849493b1c613d0f1b80", "type": "github" }, "original": { @@ -500,11 +500,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1706571425, - "narHash": "sha256-VwVUPb5vuy4GGUx1XMhDMaKk9n8Gs5xUTG9CItoHL04=", + "lastModified": 1707431350, + "narHash": "sha256-fCt2EOgBdpS4DslBsFJBhmQCvkV97tFxS6KWFaAd7SQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "3ff59e7e1d859daa503b88ef125d087bc100abfe", + "rev": "289d4241bea72ebd891e037996ec4ffd356aadc8", "type": "github" }, "original": { @@ -622,11 +622,11 @@ ] }, "locked": { - "lastModified": 1706411424, - "narHash": "sha256-BzziJYucEZvdCE985vjPoo3ztWcmUiSQ1wJ2CoT6jCc=", + "lastModified": 1707016097, + "narHash": "sha256-V4lHr6hFQ3rK650dh64Xffxsf4kse9vUYWsM+ldjkco=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "c782f2a4f6fc94311ab5ef31df2f1149a1856181", + "rev": "3e3dad2808379c522138e2e8b0eb73500721a237", "type": "github" }, "original": { @@ -661,11 +661,11 @@ "snowfall-lib": "snowfall-lib" }, "locked": { - "lastModified": 1703104726, - "narHash": "sha256-9wD01mLe7tQCzTtLIRzUaAvOKzfPuWPfpCfYkeCsQD0=", + "lastModified": 1707338010, + "narHash": "sha256-UtLeZzDdk96sLTRcWsGrkWCslNUDytrGe0VmOTB/iig=", "owner": "vlinkz", "repo": "nixos-conf-editor", - "rev": "18dc1d25b2025dc437490c71653429a05f9e0bf2", + "rev": "27b5e92f580f794c690093503869aab242f075ab", "type": "github" }, "original": { @@ -723,11 +723,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1706371002, - "narHash": "sha256-dwuorKimqSYgyu8Cw6ncKhyQjUDOyuXoxDTVmAXq88s=", + "lastModified": 1707268954, + "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c002c6aa977ad22c60398daaa9be52f2203d0006", + "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", "type": "github" }, "original": { @@ -755,11 +755,11 @@ "ranger-icons": { "flake": false, "locked": { - "lastModified": 1691165140, - "narHash": "sha256-6JEhyU08QEkGdRW2L00ynRaoaaR5PaiVUccEUbtTQuU=", + "lastModified": 1707118400, + "narHash": "sha256-HLeiV3c+8fl3kiht01s3H/HGPABPC2033rMB/uXKwLM=", "owner": "alexanderjeurissen", "repo": "ranger_devicons", - "rev": "de64ab26fb581c00a803381d522c6b3e48b79415", + "rev": "2c3c19dffb4238d01c74515c9eed5088066db243", "type": "github" }, "original": { From c720dfb6d81c9751141daabdd0509241a70d9ae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 9 Feb 2024 00:24:20 -0300 Subject: [PATCH 08/47] update renamed xkb config --- system/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/configuration.nix b/system/configuration.nix index 76e64c0..189fa1c 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -40,9 +40,9 @@ # services.xserver.displayManager.autologin.user = "lelgenio"; # Configure keymap in X11 - services.xserver = { + services.xserver.xkb = { layout = "us"; - xkbVariant = "colemak"; + variant = "colemak"; }; console.keyMap = "colemak"; # Enable CUPS to print documents. From bff15c521c896b7e2c4c59c1e47bec1a495981ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 10 Feb 2024 17:50:58 -0300 Subject: [PATCH 09/47] alacritty: update config --- user/alacritty.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user/alacritty.nix b/user/alacritty.nix index 313b573..8c7ec22 100644 --- a/user/alacritty.nix +++ b/user/alacritty.nix @@ -31,8 +31,8 @@ in cyan = "${color.normal.cyan}"; white = "${color.normal.white}"; }; + draw_bold_text_with_bright_colors = false; }; - draw_bold_text_with_bright_colors = false; window = { opacity = theme.opacity / 100.0; dynamic_padding = true; @@ -65,7 +65,7 @@ in }]; }; mouse = { hide_when_typing = true; }; - key_bindings = [ + keyboard.bindings = [ { key = lib.toUpper key.up; mode = "Vi|~Search"; From ab1a7baf652ba2ec31214f8946e75cc9a5efec53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 16 Feb 2024 01:17:58 -0300 Subject: [PATCH 10/47] kak-lsp: update config to new format --- user/kakoune/kak-lsp.toml | 263 +++++++++----------------------------- 1 file changed, 57 insertions(+), 206 deletions(-) diff --git a/user/kakoune/kak-lsp.toml b/user/kakoune/kak-lsp.toml index 413de9e..ef96bc4 100644 --- a/user/kakoune/kak-lsp.toml +++ b/user/kakoune/kak-lsp.toml @@ -7,7 +7,7 @@ verbosity = 2 # set to 0 to disable timeout = 1800 # seconds = 30 minutes -[language.angular] +[language_server.angular] filetypes = ["angular"] roots = [".angular", ".git"] command = "node" @@ -20,134 +20,80 @@ args = [ "--stdio", ] -[language.bash] +[language_server.bash-language-server] filetypes = ["sh"] roots = [".git", ".hg"] command = "bash-language-server" args = ["start"] -[language.c_cpp] +[language_server.clangd] filetypes = ["c", "cpp"] -roots = [ "compile_commands.json", ".clangd", ".git" ] +roots = ["compile_commands.json", ".clangd", ".git", ".hg"] command = "clangd" -[language.crystal] -filetypes = ["crystal"] -roots = ["shard.yml"] -command = "scry" - -[language.css] +[language_server.css-language-server] filetypes = ["css"] -roots = ["package.json"] +roots = ["package.json", ".git", ".hg"] command = "vscode-css-languageserver" args = ["--stdio"] -[language.less] +[language_server.less-language-server] filetypes = ["less"] -roots = ["package.json", ".git"] +roots = ["package.json", ".git", ".hg"] command = "vscode-css-languageserver" args = ["--stdio"] -[language.d] -filetypes = ["d", "di"] -roots = [".git", "dub.sdl", "dub.json"] -command = "dls" - -[language.dart] -# start shell to find path to dart analysis server source -filetypes = ["dart"] -roots = ["pubspec.yaml", ".git"] -command = "sh" -args = ["-c", "dart $(dirname $(which dart))/snapshots/analysis_server.dart.snapshot --lsp"] - -[language.elm] -filetypes = ["elm"] -roots = ["elm.json"] -command = "elm-language-server" -args = ["--stdio"] - -# [language.elm.initialization_options] -# runtime = "node" -# elmPath = "elm" -# elmFormatPath = "elm-format" -# elmTestPath = "elm-test" - -[language.go] -filetypes = ["go"] -roots = ["Gopkg.toml", "go.mod", ".git", ".hg"] -command = "gopls" -offset_encoding = "utf-8" - -[language.haskell] -filetypes = ["haskell"] -roots = ["Setup.hs", "stack.yaml", "*.cabal"] -command = "haskell-language-server-wrapper" -args = ["--lsp"] - -[language.html] +[language_server.html-language-server] filetypes = ["html"] roots = ["package.json"] command = "vscode-html-languageserver" args = ["--stdio"] +settings_section = "_" +[language_server.html-language-server.settings._] +# quotePreference = "single" +# javascript.format.semicolons = "insert" -[language.javascript] -filetypes = ["javascript"] -roots = [".flowconfig"] -command = "flow" -args = ["lsp"] - -[language.typescript] -filetypes = ["typescript"] -roots = ["package.json"] +[language_server.typescript-language-server] +filetypes = ["javascript", "typescript"] +roots = ["package.json", "tsconfig.json", "jsconfig.json", ".git", ".hg"] command = "typescript-language-server" args = ["--stdio"] +settings_section = "_" +[language_server.typescript-language-server.settings._] +# quotePreference = "double" +# typescript.format.semicolons = "insert" -[language.json] +[language_server.json-language-server] filetypes = ["json"] roots = ["package.json"] command = "vscode-json-languageserver" args = ["--stdio"] -[language.latex] -filetypes = ["latex"] -roots = [".git"] -command = "texlab" - -[language.nim] -filetypes = ["nim"] -roots = ["*.nimble", ".git"] -command = "nimlsp" - -[language.nix] +[language_server.rnix-lsp] filetypes = ["nix"] command = "nil" roots = ["flake.nix", "shell.nix", ".git"] [language.nix.settings.nil] formatting.command = [ "nixpkgs-fmt" ] -[language.ocaml] -filetypes = ["ocaml"] -roots = ["Makefile", "opam", "*.opam", "dune"] -command = "ocaml-language-server" -args = ["--stdio"] - -[language.php] +[language_server.intelephense] filetypes = ["php"] roots = [".htaccess", "composer.json"] command = "intelephense" args = ["--stdio"] settings_section = "intelephense" -[language.php.settings] -intelephense.format.braces = "k&r" -intelephense.storagePath = "/tmp/intelephense" -intelephense.environment.includePaths = [ +[language_server.intelephense.settings.intelephense] +storagePath = "/tmp/intelephense" + +format.braces = "k&r" +environment.includePaths = [ "./vendor", "./vendor/autoload", "./vendor/laravel/framework/", "./vendor/laravel/framework/src/", "./vendor/laravel/framework/src/Illuminate/" ] -intelephense.files.exclude = [ +files.exclude = [ "**/.git/**", "**/.svn/**", "**/.hg/**", @@ -159,42 +105,9 @@ intelephense.files.exclude = [ "**/resources/views/**" ] -[language.python] -filetypes = ["python"] -roots = ["requirements.txt", "setup.py", ".git", ".hg"] -command = "pyls" -offset_encoding = "utf-8" - -[language.reason] -filetypes = ["reason"] -roots = ["package.json", "Makefile", ".git", ".hg"] -command = "ocaml-language-server" -args = ["--stdio"] - -[language.ruby] -filetypes = ["ruby"] -roots = ["Gemfile"] -command = "solargraph" -args = ["stdio"] - -# [language.rust] -# filetypes = ["rust"] -# roots = ["Cargo.toml"] -# command = "sh" -# args = [ -# "-c", -# """ -# if path=$(rustup which rls 2>/dev/null); then -# "$path" -# else -# rls -# fi -# """, -# ] - -[language.rust] +[language_server.rust-analyzer] filetypes = ["rust"] -roots = ["rust-toolchain.toml", "rust-toolchain", "Cargo.toml"] +roots = ["Cargo.toml"] command = "sh" args = [ "-c", @@ -206,99 +119,37 @@ args = [ fi """, ] -[language.rust.settings.rust-analyzer] -## this can use too much space and processing power -# checkOnSave.extraArgs = ["--target-dir", "./target/check"] +[language_server.rust-analyzer.settings.rust-analyzer] +# See https://rust-analyzer.github.io/manual.html#configuration +# cargo.features = [] checkOnSave.command = "clippy" hoverActions.enable = false # kak-lsp doesn't support this at the moment -# procMacro.enable = true -# cargo.loadOutDirsFromCheck = true -# rustfmt.rangeFormatting.enable = true -# rustfmt.extraArgs = ["+nightly"] -[language.terraform] -filetypes = ["terraform"] -roots = ["*.tf"] -command = "terraform-ls" -args = ["serve"] - -[language.godot] +[language_server.godot] filetypes = ["gd", "gdscript", "gdscript3"] roots = ["project.godot", ".git/"] command = "nc" args = [ "localhost", "6008"] -[language.clojure] -filetypes = ["clojure"] -roots = ["project.clj", ".git/"] -command = "clojure-lsp" -args = [] - - - - -[semantic_scopes] -# Map textmate scopes to kakoune faces for semantic highlighting -# the underscores are translated to dots, and indicate nesting. -# That is, if variable_other_field is omitted, it will try the face for -# variable_other and then variable -# -# To see a list of available scopes in the debug buffer, run lsp-semantic-available-scopes -variable = "variable" -entity_name_function = "function" -entity_name_type = "type" -variable_other_enummember = "variable" -entity_name_namespace = "module" - -[semantic_modifiers] -documentation = "documentation" -readonly = "default+d" - - - -[[semantic_tokens]] -token = "comment" -face = "documentation" -modifiers = ["documentation"] - -[[semantic_tokens]] -token = "comment" -face = "comment" - -[[semantic_tokens]] -token = "function" -face = "function" - -[[semantic_tokens]] -token = "keyword" -face = "keyword" - -[[semantic_tokens]] -token = "namespace" -face = "module" - -[[semantic_tokens]] -token = "operator" -face = "operator" - -[[semantic_tokens]] -token = "string" -face = "string" - -[[semantic_tokens]] -token = "type" -face = "type" - -[[semantic_tokens]] -token = "variable" -face = "default+d" -modifiers = ["readonly"] - -[[semantic_tokens]] -token = "variable" -face = "default+d" -modifiers = ["constant"] - -[[semantic_tokens]] -token = "variable" -face = "variable" +# Semantic tokens support +# See https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_semanticTokens +# for the default list of tokens and modifiers. +# However, many language servers implement their own values. +# Make sure to check the output of `lsp-capabilities` and each server's documentation and source code as well. +# Examples: +# - TypeScript: https://github.com/microsoft/vscode-languageserver-node/blob/main/client/src/common/semanticTokens.ts +# - Rust Analyzer: https://github.com/rust-analyzer/rust-analyzer/blob/master/crates/ide/src/syntax_highlighting.rs +[semantic_tokens] +faces = [ + {face="documentation", token="comment", modifiers=["documentation"]}, + {face="comment", token="comment"}, + {face="function", token="function"}, + {face="keyword", token="keyword"}, + {face="module", token="namespace"}, + {face="operator", token="operator"}, + {face="string", token="string"}, + {face="type", token="type"}, + {face="default+d", token="variable", modifiers=["readonly"]}, + {face="default+d", token="variable", modifiers=["constant"]}, + {face="variable", token="variable"}, +] From e22633ae07f0bd8cd5bf25797647eab1d95d8fe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 17 Feb 2024 20:06:09 -0300 Subject: [PATCH 11/47] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index e7be22f..01252a1 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1703433843, - "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=", + "lastModified": 1707830867, + "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", "owner": "ryantm", "repo": "agenix", - "rev": "417caa847f9383e111d1397039c9d4337d024bf0", + "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", "type": "github" }, "original": { @@ -476,11 +476,11 @@ ] }, "locked": { - "lastModified": 1707175763, - "narHash": "sha256-0MKHC6tQ4KEuM5rui6DjKZ/VNiSANB4E+DJ/+wPS1PU=", + "lastModified": 1708031129, + "narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=", "owner": "nix-community", "repo": "home-manager", - "rev": "f99eace7c167b8a6a0871849493b1c613d0f1b80", + "rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8", "type": "github" }, "original": { @@ -500,11 +500,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1707431350, - "narHash": "sha256-fCt2EOgBdpS4DslBsFJBhmQCvkV97tFxS6KWFaAd7SQ=", + "lastModified": 1708186866, + "narHash": "sha256-xkTtBVu9uJvTet0IRVD/FYosB1LrFQhL37qVM+P1Hq0=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "289d4241bea72ebd891e037996ec4ffd356aadc8", + "rev": "289d952a6ee02f6d54a0899870bbec52ff9a53df", "type": "github" }, "original": { @@ -622,11 +622,11 @@ ] }, "locked": { - "lastModified": 1707016097, - "narHash": "sha256-V4lHr6hFQ3rK650dh64Xffxsf4kse9vUYWsM+ldjkco=", + "lastModified": 1707620986, + "narHash": "sha256-XE0tCSkSVBeJDWhjFwusNInwAhrnp+TloUNUpvnTiLw=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "3e3dad2808379c522138e2e8b0eb73500721a237", + "rev": "0cb4345704123492e6d1f1068629069413c80de0", "type": "github" }, "original": { @@ -723,11 +723,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1707268954, - "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", + "lastModified": 1708118438, + "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", + "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", "type": "github" }, "original": { @@ -1129,11 +1129,11 @@ ] }, "locked": { - "lastModified": 1706145785, - "narHash": "sha256-j9MP4fv2U/vdRKAXXc2gyMTmYwVnHP6kHx1/y6jprrU=", + "lastModified": 1706521509, + "narHash": "sha256-AInZ50acOJ3wzUwGzNr1TmxGTMx+8j6oSTzz4E7Vbp8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "5a592647587cd20b9692a347df6939b6d371b3bb", + "rev": "c06fd88b3da492b8f9067be021b9184f7012b5a8", "type": "github" }, "original": { From 1a2a768045eb74168054a5e373885d35e1b95ea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 28 Feb 2024 01:00:29 -0300 Subject: [PATCH 12/47] btop: enable gpu monitoring --- hosts/monolith.nix | 1 + user/home.nix | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hosts/monolith.nix b/hosts/monolith.nix index 451a6e7..0ab6229 100644 --- a/hosts/monolith.nix +++ b/hosts/monolith.nix @@ -43,6 +43,7 @@ in vaapiVdpau rocm-opencl-icd rocm-opencl-runtime + rocmPackages.rocm-smi ]; programs.corectrl.enable = true; diff --git a/user/home.nix b/user/home.nix index d55c77b..d7a00a3 100644 --- a/user/home.nix +++ b/user/home.nix @@ -70,7 +70,9 @@ comma # System monitors - btop + (btop.override { + cudaSupport = true; + }) amdgpu_top inxi dmidecode From 181fac91dce61e80426845bc262149baa37c97fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 15 Mar 2024 19:33:18 -0300 Subject: [PATCH 13/47] update --- flake.lock | 61 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 01252a1..652a398 100644 --- a/flake.lock +++ b/flake.lock @@ -476,11 +476,11 @@ ] }, "locked": { - "lastModified": 1708031129, - "narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=", + "lastModified": 1709764752, + "narHash": "sha256-+lM4J4JoJeiN8V+3WSWndPHj1pJ9Jc1UMikGbXLqCTk=", "owner": "nix-community", "repo": "home-manager", - "rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8", + "rev": "cf111d1a849ddfc38e9155be029519b0e2329615", "type": "github" }, "original": { @@ -492,6 +492,7 @@ "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", + "hyprlang": "hyprlang", "nixpkgs": [ "nixpkgs" ], @@ -500,11 +501,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1708186866, - "narHash": "sha256-xkTtBVu9uJvTet0IRVD/FYosB1LrFQhL37qVM+P1Hq0=", + "lastModified": 1709818078, + "narHash": "sha256-U/o8d5E+0GlTUFNkAzt56wHlUHfoIg3sZPer+GywDFQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "289d952a6ee02f6d54a0899870bbec52ff9a53df", + "rev": "6c4e2489a0a153ac2a92744ecb2985280c97fc89", "type": "github" }, "original": { @@ -542,16 +543,19 @@ "inputs": { "nixpkgs": [ "hyprland", - "xdph", "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1704287638, - "narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=", + "lastModified": 1709775675, + "narHash": "sha256-G+gIMUQBtfbbrnsM/OPJzebdqKFP6typplNCE7X8Szw=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "6624f2bb66d4d27975766e81f77174adbe58ec97", + "rev": "f1db1a7e1faee2a5c67d03b6bd283da82eed3730", "type": "github" }, "original": { @@ -622,11 +626,11 @@ ] }, "locked": { - "lastModified": 1707620986, - "narHash": "sha256-XE0tCSkSVBeJDWhjFwusNInwAhrnp+TloUNUpvnTiLw=", + "lastModified": 1709708644, + "narHash": "sha256-XAFOkZ6yexsqeJrCXWoHxopq0i+7ZqbwATXomMnGmr4=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "0cb4345704123492e6d1f1068629069413c80de0", + "rev": "94a1e46434736a40f976a454f8bd3ea2144f349b", "type": "github" }, "original": { @@ -723,11 +727,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1708118438, - "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", + "lastModified": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "type": "github" }, "original": { @@ -755,11 +759,11 @@ "ranger-icons": { "flake": false, "locked": { - "lastModified": 1707118400, - "narHash": "sha256-HLeiV3c+8fl3kiht01s3H/HGPABPC2033rMB/uXKwLM=", + "lastModified": 1709209315, + "narHash": "sha256-ETE13REDIVuoFIbvWqWvQLj/2fGST+1koowmmuBzGmo=", "owner": "alexanderjeurissen", "repo": "ranger_devicons", - "rev": "2c3c19dffb4238d01c74515c9eed5088066db243", + "rev": "ed718dd6a6d5d2c0f53cba8474c5ad96185057e9", "type": "github" }, "original": { @@ -1097,18 +1101,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1706359063, - "narHash": "sha256-5HUTG0p+nCJv3cn73AmFHRZdfRV5AD5N43g8xAePSKM=", + "lastModified": 1708558866, + "narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=", "owner": "wlroots", "repo": "wlroots", - "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", + "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", + "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", "type": "gitlab" } }, @@ -1118,7 +1122,10 @@ "hyprland", "hyprland-protocols" ], - "hyprlang": "hyprlang", + "hyprlang": [ + "hyprland", + "hyprlang" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -1129,11 +1136,11 @@ ] }, "locked": { - "lastModified": 1706521509, - "narHash": "sha256-AInZ50acOJ3wzUwGzNr1TmxGTMx+8j6oSTzz4E7Vbp8=", + "lastModified": 1709299639, + "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "c06fd88b3da492b8f9067be021b9184f7012b5a8", + "rev": "2d2fb547178ec025da643db57d40a971507b82fe", "type": "github" }, "original": { From 2402e691441b5dd4b61c7a2643fa5a08b424ffb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 15 Mar 2024 23:08:35 -0300 Subject: [PATCH 14/47] lsp: replace rnix-lsp with nil --- user/kakoune/kak-lsp.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user/kakoune/kak-lsp.toml b/user/kakoune/kak-lsp.toml index ef96bc4..3a62a08 100644 --- a/user/kakoune/kak-lsp.toml +++ b/user/kakoune/kak-lsp.toml @@ -69,11 +69,11 @@ roots = ["package.json"] command = "vscode-json-languageserver" args = ["--stdio"] -[language_server.rnix-lsp] +[language_server.nil] filetypes = ["nix"] command = "nil" roots = ["flake.nix", "shell.nix", ".git"] -[language.nix.settings.nil] +[language_server.nil.settings.nil] formatting.command = [ "nixpkgs-fmt" ] [language_server.intelephense] From 6a3e3a671bb7a8d1dcca1e06f4a77ffae79a7bc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 15 Mar 2024 23:08:57 -0300 Subject: [PATCH 15/47] update --- flake.lock | 129 +++++++++++++++++++++++++++++++----------- user/fish/default.nix | 1 - 2 files changed, 97 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 652a398..e551703 100644 --- a/flake.lock +++ b/flake.lock @@ -360,7 +360,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1681202837, @@ -378,7 +378,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1681202837, @@ -396,7 +396,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_8" + "systems": "systems_9" }, "locked": { "lastModified": 1694529238, @@ -414,7 +414,7 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_9" + "systems": "systems_10" }, "locked": { "lastModified": 1681202837, @@ -432,7 +432,7 @@ }, "flake-utils_8": { "inputs": { - "systems": "systems_10" + "systems": "systems_11" }, "locked": { "lastModified": 1681202837, @@ -476,11 +476,11 @@ ] }, "locked": { - "lastModified": 1709764752, - "narHash": "sha256-+lM4J4JoJeiN8V+3WSWndPHj1pJ9Jc1UMikGbXLqCTk=", + "lastModified": 1710532761, + "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=", "owner": "nix-community", "repo": "home-manager", - "rev": "cf111d1a849ddfc38e9155be029519b0e2329615", + "rev": "206f457fffdb9a73596a4cb2211a471bd305243d", "type": "github" }, "original": { @@ -489,23 +489,50 @@ "type": "github" } }, + "hyprcursor": { + "inputs": { + "hyprlang": "hyprlang", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1710257359, + "narHash": "sha256-43re5pzE/cswFAgw92/ugsB3+d5ufDaCcLtl9ztKfBo=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "1761f6cefd77f4fcd2039d930c88d6716ddc4974", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, "hyprland": { "inputs": { + "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang", + "hyprlang": "hyprlang_2", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4", + "systems": "systems_5", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1709818078, - "narHash": "sha256-U/o8d5E+0GlTUFNkAzt56wHlUHfoIg3sZPer+GywDFQ=", + "lastModified": 1710538160, + "narHash": "sha256-p5Wkl2rXjFftd+Nugiq71BgGAl4E9byYxKV0ahLTo+U=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "6c4e2489a0a153ac2a92744ecb2985280c97fc89", + "rev": "2a2da6082e5f1501731004b755d35a8dbb605fde", "type": "github" }, "original": { @@ -540,6 +567,29 @@ } }, "hyprlang": { + "inputs": { + "nixpkgs": [ + "hyprland", + "hyprcursor", + "nixpkgs" + ], + "systems": "systems_4" + }, + "locked": { + "lastModified": 1709914708, + "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_2": { "inputs": { "nixpkgs": [ "hyprland", @@ -551,11 +601,11 @@ ] }, "locked": { - "lastModified": 1709775675, - "narHash": "sha256-G+gIMUQBtfbbrnsM/OPJzebdqKFP6typplNCE7X8Szw=", + "lastModified": 1709914708, + "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f1db1a7e1faee2a5c67d03b6bd283da82eed3730", + "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", "type": "github" }, "original": { @@ -626,11 +676,11 @@ ] }, "locked": { - "lastModified": 1709708644, - "narHash": "sha256-XAFOkZ6yexsqeJrCXWoHxopq0i+7ZqbwATXomMnGmr4=", + "lastModified": 1710120787, + "narHash": "sha256-tlLuB73OCOKtU2j83bQzSYFyzjJo3rjpITZE5MoofG8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "94a1e46434736a40f976a454f8bd3ea2144f349b", + "rev": "e76ff2df6bfd2abe06abd8e7b9f217df941c1b07", "type": "github" }, "original": { @@ -727,11 +777,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1710451336, + "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "d691274a972b3165335d261cc4671335f5c67de9", "type": "github" }, "original": { @@ -917,6 +967,21 @@ "type": "github" } }, + "systems_11": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -964,16 +1029,16 @@ }, "systems_5": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -1060,7 +1125,7 @@ }, "utils": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1689068808, @@ -1101,18 +1166,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1708558866, - "narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=", + "lastModified": 1709983277, + "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=", "owner": "wlroots", "repo": "wlroots", - "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", + "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", + "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", "type": "gitlab" } }, diff --git a/user/fish/default.nix b/user/fish/default.nix index 344207e..913e514 100644 --- a/user/fish/default.nix +++ b/user/fish/default.nix @@ -69,7 +69,6 @@ in { programs = { zoxide.enable = true; eza.enable = true; - eza.enableAliases = true; direnv.enable = true; direnv.nix-direnv.enable = true; }; From d3bb6e187033b65462cdde15f253b6559189d9e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 15 Mar 2024 23:10:43 -0300 Subject: [PATCH 16/47] gpg: simplify config --- user/gpg.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/gpg.nix b/user/gpg.nix index a56529e..5dc20d0 100644 --- a/user/gpg.nix +++ b/user/gpg.nix @@ -4,7 +4,7 @@ enable = true; defaultCacheTtl = 604800; maxCacheTtl = 604800; - pinentryFlavor = "qt"; + pinentryPackage = pkgs.pinentry-curses; extraConfig = '' allow-preset-passphrase ''; From 6e296dc684d036b845ec083bf8a5b2278631ab41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 16 Mar 2024 00:23:11 -0300 Subject: [PATCH 17/47] mangohud: install patch to fix keybind crash --- overlays/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/overlays/default.nix b/overlays/default.nix index 6782ca4..b34ed17 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -52,6 +52,14 @@ patches = old.patches ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ]; }); + mangohud = prev.mangohud.overrideAttrs (o: { + patches = o.patches ++ [ + (prev.fetchpatch { + url = "https://github.com/flightlessmango/MangoHud/commit/95141de657e02577f1d3fab0ca12122bfb68bc56.patch"; + hash = "sha256-a2tESliGBkfF7uYQn8TDgeFt07A9FOioI4VcTT7DC7A="; + }) + ]; + }); }); variables = (final: prev: { From a5ffa3a1846a6aac4e609df7c62bb8422541bfb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 17 Mar 2024 00:07:13 -0300 Subject: [PATCH 18/47] syncthing: enable tray icon --- user/syncthing.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/user/syncthing.nix b/user/syncthing.nix index ff2d4db..7177ff7 100644 --- a/user/syncthing.nix +++ b/user/syncthing.nix @@ -1,8 +1,6 @@ -{ config, pkgs, lib, inputs, ... }: -let inherit (pkgs.uservars) key theme color accent font; -in { +{ ... }: { services.syncthing = { enable = true; - # tray.enable = true; + tray.enable = true; }; } From 4c16219ecccb63bb5f3bb9c7e088e7759cae039f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 17 Mar 2024 00:07:26 -0300 Subject: [PATCH 19/47] theme: improve qt theming --- user/sway/theme.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/user/sway/theme.nix b/user/sway/theme.nix index 74b6157..414a588 100644 --- a/user/sway/theme.nix +++ b/user/sway/theme.nix @@ -33,12 +33,10 @@ lib.mkIf (desktop == "sway") in { gtk4 = shared; gtk3 = shared; } ); - # qt = { - # enable = true; - # platformTheme = "gtk"; - # # style.package = pkgs.libsForQt5.qtstyleplugins; - # # style.name = "gtk2"; - # }; + qt = { + enable = true; + platformTheme = "qtct"; + }; dconf.settings = { "org/gnome/desktop/interface" = { @@ -79,10 +77,11 @@ lib.mkIf (desktop == "sway") }; }; - home.sessionVariables = { QT_QPA_PLATFORMTHEME = "gtk3"; }; home.packages = with pkgs; [ libsForQt5.qt5ct libsForQt5.qtstyleplugin-kvantum + qt6Packages.qt6ct + qt6Packages.qtstyleplugin-kvantum pkgs.bibata-cursors pkgs.orchis_theme_compact From e08a1bb25705bbfedcc971ca267b1ca55588598e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 20 Mar 2024 16:11:45 -0300 Subject: [PATCH 20/47] kdenlive: fix theme --- system/media-packages.nix | 2 +- user/gnome.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/system/media-packages.nix b/system/media-packages.nix index 95675be..e72ea0a 100644 --- a/system/media-packages.nix +++ b/system/media-packages.nix @@ -16,7 +16,7 @@ in { gimp inkscape krita - kdenlive + kdePackages.kdenlive pitivi blender-hip libreoffice diff --git a/user/gnome.nix b/user/gnome.nix index 956c1cd..70438c3 100644 --- a/user/gnome.nix +++ b/user/gnome.nix @@ -36,6 +36,8 @@ libsForQt5.qt5ct libsForQt5.qtstyleplugin-kvantum + qt6Packages.qt6ct + qt6Packages.qtstyleplugin-kvantum ]; home.sessionVariables = { QT_QPA_PLATFORMTHEME = "qt5ct"; }; From 155a809144f6af2c7ee24f48505a5f7b4e5cf8f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 24 Mar 2024 12:30:09 -0300 Subject: [PATCH 21/47] syncthing: way for tray --- user/syncthing.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/user/syncthing.nix b/user/syncthing.nix index 7177ff7..8f36eeb 100644 --- a/user/syncthing.nix +++ b/user/syncthing.nix @@ -1,6 +1,9 @@ { ... }: { services.syncthing = { enable = true; - tray.enable = true; + tray = { + enable = true; + command = "syncthingtray --wait"; + }; }; } From 9b397bc4ce33c54f003b0d3dfc3cf23f8d16399d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 27 Mar 2024 16:46:04 -0300 Subject: [PATCH 22/47] flake: update lockfile --- flake.lock | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/flake.lock b/flake.lock index e551703..9984cc7 100644 --- a/flake.lock +++ b/flake.lock @@ -55,6 +55,22 @@ "type": "github" } }, + "blobs": { + "flake": false, + "locked": { + "lastModified": 1604995301, + "narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=", + "owner": "simple-nixos-mailserver", + "repo": "blobs", + "rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265", + "type": "gitlab" + }, + "original": { + "owner": "simple-nixos-mailserver", + "repo": "blobs", + "type": "gitlab" + } + }, "crane": { "inputs": { "flake-compat": "flake-compat", @@ -289,6 +305,22 @@ "type": "github" } }, + "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -728,6 +760,32 @@ "type": "github" } }, + "nixos-mailserver": { + "inputs": { + "blobs": "blobs", + "flake-compat": "flake-compat_5", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-23_05": "nixpkgs-23_05", + "nixpkgs-23_11": "nixpkgs-23_11", + "utils": "utils_2" + }, + "locked": { + "lastModified": 1706219574, + "narHash": "sha256-qO+8UErk+bXCq2ybHU4GzXG4Ejk4Tk0rnnTPNyypW4g=", + "owner": "simple-nixos-mailserver", + "repo": "nixos-mailserver", + "rev": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf", + "type": "gitlab" + }, + "original": { + "owner": "simple-nixos-mailserver", + "ref": "nixos-23.11", + "repo": "nixos-mailserver", + "type": "gitlab" + } + }, "nixpkgs": { "locked": { "lastModified": 1702539185, @@ -743,6 +801,36 @@ "type": "indirect" } }, + "nixpkgs-23_05": { + "locked": { + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.05", + "type": "indirect" + } + }, + "nixpkgs-23_11": { + "locked": { + "lastModified": 1706098335, + "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.11", + "type": "indirect" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1692638711, @@ -836,6 +924,7 @@ "nix-index-database": "nix-index-database", "nix-software-center": "nix-software-center", "nixos-conf-editor": "nixos-conf-editor", + "nixos-mailserver": "nixos-mailserver", "nixpkgs": "nixpkgs_4", "plymouth-themes": "plymouth-themes", "ranger-icons": "ranger-icons", @@ -1141,6 +1230,21 @@ "type": "github" } }, + "utils_2": { + "locked": { + "lastModified": 1605370193, + "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5021eac20303a61fafe17224c087f5519baed54d", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "wl-crosshair": { "inputs": { "flake-utils": "flake-utils_8", From 71bbb84e20aefc7e60e65b754d01c1fc4e65d4e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 6 Apr 2024 20:45:03 -0300 Subject: [PATCH 23/47] sway: add more env vars to dbus activation --- overlays/sway.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlays/sway.nix b/overlays/sway.nix index 4de4395..c6d8d5e 100644 --- a/overlays/sway.nix +++ b/overlays/sway.nix @@ -11,7 +11,7 @@ executable = true; text = '' systemctl --user import-environment - dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway + dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway SWAYSOCK # systemctl --user stop pipewire wireplumber xdg-desktop-portal xdg-desktop-portal-wlr # systemctl --user start pipewire wireplumber xdg-desktop-portal xdg-desktop-portal-wlr ''; From b0d1b2fbff9bc8392da8a5210ca06e3f5fc061fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 6 Apr 2024 20:45:30 -0300 Subject: [PATCH 24/47] sshd: disable until xz is secure --- system/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/configuration.nix b/system/configuration.nix index 189fa1c..93d828c 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -59,7 +59,7 @@ security.rtkit.enable = true; services.openssh = { - enable = true; + enable = false; ports = [ 9022 ]; settings = { PermitRootLogin = "no"; From 9bfd9503b67fc40db1d64e064e1e7497f6e2febf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 6 Apr 2024 20:51:48 -0300 Subject: [PATCH 25/47] monolith: add forgejo runner --- flake.nix | 1 + secrets/monolith-forgejo-runner-token.age | Bin 0 -> 682 bytes secrets/secrets.nix | 1 + system/monolith-forgejo-runner.nix | 19 +++++++++++++++++++ system/secrets.nix | 2 ++ 5 files changed, 23 insertions(+) create mode 100644 secrets/monolith-forgejo-runner-token.age create mode 100644 system/monolith-forgejo-runner.nix diff --git a/flake.nix b/flake.nix index 3bff3c6..f3a4532 100644 --- a/flake.nix +++ b/flake.nix @@ -123,6 +123,7 @@ modules = [ ./hosts/monolith.nix ./system/monolith-gitlab-runner.nix + ./system/monolith-forgejo-runner.nix ./system/nix-serve.nix ./system/steam.nix ] ++ common_modules; diff --git a/secrets/monolith-forgejo-runner-token.age b/secrets/monolith-forgejo-runner-token.age new file mode 100644 index 0000000000000000000000000000000000000000..aa3deb8968d525267e9c1267b5d556cc19a70f39 GIT binary patch literal 682 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!*`Do#{zDlf0_Nasp73NNfOP6|n} zNDQ$EOUmv%k*^f4KoRG^b4+ZDy;Bz%k}pNPY(+;F%L_0O$*jfukgurHO{m! zEXpWy%lGv3_b*DzEA%(yN{vXW(l<3K&T%v}a82_sPp%3#4^1sg@y{_buWtZ+*8EG|uV^zt_j$}Dv8ObUnyEVaxC$_NSa$}_Y`EDkcUOicEg-r zSAW_6O^oT4 Date: Wed, 1 May 2024 15:53:07 -0300 Subject: [PATCH 26/47] monolith: enable all features of corectrl --- hosts/monolith.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/hosts/monolith.nix b/hosts/monolith.nix index 0ab6229..c5dcece 100644 --- a/hosts/monolith.nix +++ b/hosts/monolith.nix @@ -46,7 +46,14 @@ in rocmPackages.rocm-smi ]; - programs.corectrl.enable = true; + programs.corectrl = { + enable = true; + gpuOverclock = { + enable = true; + ppfeaturemask = "0xffffffff"; + }; + }; + virtualisation.virtualbox.host.enable = true; fileSystems."/" = { From bef0b2e702792aaa75cf11dd36b23d9c9c415e66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 10 May 2024 17:29:11 -0300 Subject: [PATCH 27/47] firefox: add substitoot extension --- user/firefox.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/user/firefox.nix b/user/firefox.nix index 9c29b25..49314e4 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -43,6 +43,11 @@ in url = "https://addons.mozilla.org/firefox/downloads/file/4215691/mastodon_simplified_federation-2.2.xpi"; hash = "sha256-4iU25chpjsdsMTPaa0yQOTWc9V9q1qFz6YV0lYtNjLA="; }) + (pkgs.fetchFirefoxAddon { + name = "substitoot"; + url = "https://addons.mozilla.org/firefox/downloads/file/4236602/substitoot-0.7.2.0.xpi"; + hash = "sha256-1auSqEjkebwRSbmAVUsYwy77dl7TQCOnqgozpoVnqgI="; + }) # Locale (pkgs.fetchFirefoxAddon { From 3e8cd7ad5771c77a1e8755f7e7cfd13d87001b15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 10 May 2024 19:48:35 -0300 Subject: [PATCH 28/47] update --- flake.lock | 221 ++++++++++------------- overlays/default.nix | 4 - patches/webcord/fix-reading-config.patch | 14 -- system/configuration.nix | 2 +- user/sway/kanshi.nix | 50 ++--- user/sway/swaylock.nix | 2 +- user/sway/theme.nix | 2 +- user/variables.nix | 4 +- 8 files changed, 133 insertions(+), 166 deletions(-) delete mode 100644 patches/webcord/fix-reading-config.patch diff --git a/flake.lock b/flake.lock index 9984cc7..7dc918c 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1707830867, - "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", + "lastModified": 1715290355, + "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=", "owner": "ryantm", "repo": "agenix", - "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", + "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0", "type": "github" }, "original": { @@ -186,33 +186,16 @@ "type": "github" } }, - "dzgui": { - "flake": false, - "locked": { - "lastModified": 1702780245, - "narHash": "sha256-cdW5LN2Q7eYW8xIqKPQfeYPd7e6VdJGaoA9NMHesCrE=", - "owner": "aclist", - "repo": "dztui", - "rev": "28323f3edb8fa747dc559d1939ccdd7729e4e3a1", - "type": "github" - }, - "original": { - "owner": "aclist", - "repo": "dztui", - "type": "github" - } - }, "dzgui-nix": { "inputs": { - "dzgui": "dzgui", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1702850463, - "narHash": "sha256-qR/c/GjsLUzrCyHN/Q9nnClduf6OqTg26S1AFYKPzxA=", + "lastModified": 1715128199, + "narHash": "sha256-mj23cBtiDKy3pgg+J26UA8giZgmJApO8IQlC6+XTAx8=", "owner": "lelgenio", "repo": "dzgui-nix", - "rev": "2ed6515b27d8186b9fedfe1dcaf861f07e796a0d", + "rev": "03968bade43d23c47e8b4f102c711c171c446645", "type": "github" }, "original": { @@ -392,7 +375,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1681202837, @@ -410,7 +393,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1681202837, @@ -428,7 +411,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1694529238, @@ -446,7 +429,7 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_10" + "systems": "systems_9" }, "locked": { "lastModified": 1681202837, @@ -464,14 +447,14 @@ }, "flake-utils_8": { "inputs": { - "systems": "systems_11" + "systems": "systems_10" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -508,11 +491,11 @@ ] }, "locked": { - "lastModified": 1710532761, - "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=", + "lastModified": 1715359697, + "narHash": "sha256-FJYyXqulIbCdsUCTFBTu/bIH4aN+7jzjQAn52Qc6qPg=", "owner": "nix-community", "repo": "home-manager", - "rev": "206f457fffdb9a73596a4cb2211a471bd305243d", + "rev": "f2c5ba5e720fd584d83f2f97399dac0d26ae60b9", "type": "github" }, "original": { @@ -523,7 +506,10 @@ }, "hyprcursor": { "inputs": { - "hyprlang": "hyprlang", + "hyprlang": [ + "hyprland", + "hyprlang" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -534,11 +520,11 @@ ] }, "locked": { - "lastModified": 1710257359, - "narHash": "sha256-43re5pzE/cswFAgw92/ugsB3+d5ufDaCcLtl9ztKfBo=", + "lastModified": 1713612213, + "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "1761f6cefd77f4fcd2039d930c88d6716ddc4974", + "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1", "type": "github" }, "original": { @@ -550,21 +536,20 @@ "hyprland": { "inputs": { "hyprcursor": "hyprcursor", - "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang_2", + "hyprlang": "hyprlang", + "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_5", - "wlroots": "wlroots", + "systems": "systems_4", "xdph": "xdph" }, "locked": { - "lastModified": 1710538160, - "narHash": "sha256-p5Wkl2rXjFftd+Nugiq71BgGAl4E9byYxKV0ahLTo+U=", + "lastModified": 1715342341, + "narHash": "sha256-jHCjAwaukNCI7yVsbB8oppl1dUujvFAfRiXaecqWGI0=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "2a2da6082e5f1501731004b755d35a8dbb605fde", + "rev": "38911d6df4977b6b00557cc887eb151d032e505b", "type": "github" }, "original": { @@ -577,10 +562,12 @@ "inputs": { "nixpkgs": [ "hyprland", + "xdph", "nixpkgs" ], "systems": [ "hyprland", + "xdph", "systems" ] }, @@ -602,17 +589,19 @@ "inputs": { "nixpkgs": [ "hyprland", - "hyprcursor", "nixpkgs" ], - "systems": "systems_4" + "systems": [ + "hyprland", + "systems" + ] }, "locked": { - "lastModified": 1709914708, - "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", "type": "github" }, "original": { @@ -621,7 +610,7 @@ "type": "github" } }, - "hyprlang_2": { + "hyprwayland-scanner": { "inputs": { "nixpkgs": [ "hyprland", @@ -633,16 +622,16 @@ ] }, "locked": { - "lastModified": 1709914708, - "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", + "lastModified": 1715287423, + "narHash": "sha256-B7AJIjOyWgVMKhu7DlOnWa0VprdhywUVHuB/j+EwSxM=", "owner": "hyprwm", - "repo": "hyprlang", - "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", + "repo": "hyprwayland-scanner", + "rev": "e2fc1c0eb8b392110588f478cce644348ead7271", "type": "github" }, "original": { "owner": "hyprwm", - "repo": "hyprlang", + "repo": "hyprwayland-scanner", "type": "github" } }, @@ -708,11 +697,11 @@ ] }, "locked": { - "lastModified": 1710120787, - "narHash": "sha256-tlLuB73OCOKtU2j83bQzSYFyzjJo3rjpITZE5MoofG8=", + "lastModified": 1714878592, + "narHash": "sha256-E68C03sYRsYFsK7wiGHUIJm8IsyPRALOrFoTL0glXnI=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "e76ff2df6bfd2abe06abd8e7b9f217df941c1b07", + "rev": "a362555e9dbd4ecff3bb98969bbdb8f79fe87f10", "type": "github" }, "original": { @@ -723,15 +712,16 @@ }, "nix-software-center": { "inputs": { + "nixos-appstream-data": "nixos-appstream-data", "nixpkgs": "nixpkgs_2", "utils": "utils" }, "locked": { - "lastModified": 1703105285, - "narHash": "sha256-BHoW1RQMc2Auz8paBvTBriKv0F6FI99+3nnz/ELLawg=", + "lastModified": 1714856183, + "narHash": "sha256-Ue7xV+rZqImux4DDj3VMla4LIH2g8VeXbTJwgvX7wOo=", "owner": "vlinkz", "repo": "nix-software-center", - "rev": "68e87fb6e24fb3e6fe65449918d0cbda96622b65", + "rev": "b9e0f53536e1e94e7d8c3cda3c6866b3f9d01386", "type": "github" }, "original": { @@ -740,6 +730,32 @@ "type": "github" } }, + "nixos-appstream-data": { + "inputs": { + "flake-utils": [ + "nix-software-center", + "utils" + ], + "nixpkgs": [ + "nix-software-center", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712858390, + "narHash": "sha256-XE7gr+zU3N4SHPAhsgk8cVAFp1iBg+Lxxp3y4dUF1vE=", + "owner": "korfuri", + "repo": "nixos-appstream-data", + "rev": "0465d42a4433faa63b7a5eb0b8d397937c9fc13a", + "type": "github" + }, + "original": { + "owner": "korfuri", + "ref": "flake", + "repo": "nixos-appstream-data", + "type": "github" + } + }, "nixos-conf-editor": { "inputs": { "flake-compat": "flake-compat_3", @@ -788,11 +804,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702539185, - "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", + "lastModified": 1714562304, + "narHash": "sha256-Mr3U37Rh6tH0FbaDFu0aZDwk9mPAe7ASaqDOGgLqqLU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", + "rev": "bcd44e224fd68ce7d269b4f44d24c2220fd821e7", "type": "github" }, "original": { @@ -865,11 +881,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1710451336, - "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=", + "lastModified": 1715266358, + "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d691274a972b3165335d261cc4671335f5c67de9", + "rev": "f1010e0469db743d14519a1efd37e23f8513d714", "type": "github" }, "original": { @@ -897,11 +913,11 @@ "ranger-icons": { "flake": false, "locked": { - "lastModified": 1709209315, - "narHash": "sha256-ETE13REDIVuoFIbvWqWvQLj/2fGST+1koowmmuBzGmo=", + "lastModified": 1713564482, + "narHash": "sha256-sijO9leDXgnjgcVlh5fKYalhjOupwFMRyH0xh2g/rEQ=", "owner": "alexanderjeurissen", "repo": "ranger_devicons", - "rev": "ed718dd6a6d5d2c0f53cba8474c5ad96185057e9", + "rev": "a8d626485ca83719e1d8d5e32289cd96a097c861", "type": "github" }, "original": { @@ -1056,21 +1072,6 @@ "type": "github" } }, - "systems_11": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1118,16 +1119,16 @@ }, "systems_5": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1214,7 +1215,7 @@ }, "utils": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1689068808, @@ -1253,11 +1254,11 @@ ] }, "locked": { - "lastModified": 1685576039, - "narHash": "sha256-WMkWurJsZZG7YkWzW/k2SNquYLsAZjzFs7CFswSjDew=", + "lastModified": 1715216838, + "narHash": "sha256-q5key9BWJjJQqECrhflso9ZTzULBeScvromo0S4fjqE=", "owner": "lelgenio", "repo": "wl-crosshair", - "rev": "57d0908e10d9f58fc37fe866404cc8b66be1f0d9", + "rev": "39b716cf410a1b45006f50f32f8d63de5c43aedb", "type": "github" }, "original": { @@ -1266,31 +1267,9 @@ "type": "github" } }, - "wlroots": { - "flake": false, - "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1709983277, - "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", - "type": "gitlab" - }, - "original": { - "host": "gitlab.freedesktop.org", - "owner": "wlroots", - "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", - "type": "gitlab" - } - }, "xdph": { "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], + "hyprland-protocols": "hyprland-protocols", "hyprlang": [ "hyprland", "hyprlang" @@ -1305,11 +1284,11 @@ ] }, "locked": { - "lastModified": 1709299639, - "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", + "lastModified": 1714662532, + "narHash": "sha256-Pj2xGSYhapYbXL7sk7TTlOtCZcTfPQoL3fPbZeg7L4Y=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "2d2fb547178ec025da643db57d40a971507b82fe", + "rev": "1f228ba2f1f254195c0b571302b37482861abee3", "type": "github" }, "original": { diff --git a/overlays/default.nix b/overlays/default.nix index b34ed17..c5d145d 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -35,10 +35,6 @@ tlauncher = inputs.tlauncher.packages.${prev.system}.tlauncher; maildir-notify-daemon = inputs.maildir-notify-daemon.packages.${prev.system}.default; wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default; - - webcord = (prev.webcord.overrideAttrs (old: { - patches = (old.patches or [ ]) ++ [ ../patches/webcord/fix-reading-config.patch ]; - })); }); patches = (final: prev: { diff --git a/patches/webcord/fix-reading-config.patch b/patches/webcord/fix-reading-config.patch deleted file mode 100644 index 92e89ca..0000000 --- a/patches/webcord/fix-reading-config.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/sources/code/main/modules/config.ts b/sources/code/main/modules/config.ts -index caf51df..41faabe 100644 ---- a/sources/code/main/modules/config.ts -+++ b/sources/code/main/modules/config.ts -@@ -158,6 +158,9 @@ class Config { - #read(): unknown { - const encodedData = readFileSync(this.#path+this.#pathExtension); - let decodedData = encodedData.toString(); -+ if (decodedData === "") -+ return {}; -+ - if(this.#pathExtension === FileExt.Encrypted) - decodedData = safeStorage.decryptString(encodedData); - return JSON.parse(decodedData); diff --git a/system/configuration.nix b/system/configuration.nix index 93d828c..7c6bbb3 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -99,7 +99,7 @@ }; # Enable touchpad support (enabled default in most desktopManager). - services.xserver.libinput.enable = true; + services.libinput.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. users.mutableUsers = false; diff --git a/user/sway/kanshi.nix b/user/sway/kanshi.nix index edc2e3f..22d9550 100644 --- a/user/sway/kanshi.nix +++ b/user/sway/kanshi.nix @@ -5,29 +5,35 @@ let in { services.kanshi = { - profiles = { - sedetary = { - outputs = [ - { + settings = [ + { + profile = { + name = "sedetary"; + outputs = [ + { + criteria = "eDP-1"; + status = "disable"; + position = "1920,312"; + } + { + criteria = "HDMI-A-1"; + position = "0,0"; + } + ]; + exec = [ "xrdb .Xresources" ]; + }; + } + { + profile = { + name = "nomad"; + outputs = [{ criteria = "eDP-1"; - status = "disable"; + status = "enable"; position = "1920,312"; - } - { - criteria = "HDMI-A-1"; - position = "0,0"; - } - ]; - exec = [ "xrdb .Xresources" ]; - }; - nomad = { - outputs = [{ - criteria = "eDP-1"; - status = "enable"; - position = "1920,312"; - }]; - exec = [ "xrdb .Xresources" ]; - }; - }; + }]; + exec = [ "xrdb .Xresources" ]; + }; + } + ]; }; } diff --git a/user/sway/swaylock.nix b/user/sway/swaylock.nix index dfd99bc..f9f06eb 100644 --- a/user/sway/swaylock.nix +++ b/user/sway/swaylock.nix @@ -5,7 +5,7 @@ let in { programs.swaylock.settings = { - image = theme.background; + image = toString theme.background; font = font.interface; font-size = font.size.medium; indicator-thickness = 20; diff --git a/user/sway/theme.nix b/user/sway/theme.nix index 414a588..2fc1fc1 100644 --- a/user/sway/theme.nix +++ b/user/sway/theme.nix @@ -35,7 +35,7 @@ lib.mkIf (desktop == "sway") ); qt = { enable = true; - platformTheme = "qtct"; + platformTheme.name = "qtct"; }; dconf.settings = { diff --git a/user/variables.nix b/user/variables.nix index 1103e8b..80ac8ba 100644 --- a/user/variables.nix +++ b/user/variables.nix @@ -27,7 +27,7 @@ let icon_theme = "Papirus-Dark"; cursor_theme = "Bibata-Modern-Classic"; - background = "~/.local/share/backgrounds/nixos-dark-pattern.png"; + background = ./backgrounds/nixos-dark-pattern.png; opacity = 95; opacityHex = "ee"; color = { @@ -58,7 +58,7 @@ let icon_theme = "Papirus-Light"; cursor_theme = "Bibata-Modern-Classic"; - background = "~/.local/share/backgrounds/nixos-light-pattern.png"; + background = ./backgrounds/nixos-light-pattern.png; opacity = 95; opacityHex = "ee"; color = { From cf2e2d6d39169e0105fddd3a158a058bc5f2313f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 11 May 2024 18:45:55 -0300 Subject: [PATCH 29/47] sway: make gaming windows floating by default --- 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 3731222..1ec8cf5 100644 --- a/user/sway/sway-assigns.nix +++ b/user/sway/sway-assigns.nix @@ -59,6 +59,7 @@ in { app_id = "wdisplays"; } { app_id = "pavucontrol"; } { app_id = ".*[Hh]elvum.*"; } + { workspace = "9"; } ]; }; }; From 0f72d959fa5335dec6d6460f4ea7f596adae525a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 15 May 2024 12:46:38 -0300 Subject: [PATCH 30/47] ssh: update hostnames --- user/ssh.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user/ssh.nix b/user/ssh.nix index a29dded..8230dc1 100644 --- a/user/ssh.nix +++ b/user/ssh.nix @@ -6,12 +6,12 @@ in { programs.ssh.matchBlocks = { monolith = { user = "lelgenio"; - hostname = "lelgenio.1337.cx"; + hostname = "monolith.lelgenio.com"; port = 9022; }; phantom = { user = "root"; - hostname = "phantom.lelgenio.xyz"; + hostname = "phantom.lelgenio.com"; port = 9022; }; }; From 794e72fc6b2269b0b310d59c1edf68ee3699235c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 15 May 2024 12:46:54 -0300 Subject: [PATCH 31/47] firefox: add i dont care about cookies --- user/firefox.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/user/firefox.nix b/user/firefox.nix index 49314e4..b60f808 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -28,6 +28,12 @@ in url = "https://addons.mozilla.org/firefox/downloads/file/4198829/ublock_origin-1.54.0.xpi"; hash = "sha256-l5cWCQgZFxD/CFhTa6bcKeytmSPDCyrW0+XjcddZ5E0="; }) + (pkgs.fetchFirefoxAddon { + name = "i-still-dont-care-about-cookies"; + url = "https://github.com/OhMyGuus/I-Still-Dont-Care-About-Cookies/releases/download/v1.1.4/istilldontcareaboutcookies-1.1.4.xpi"; + hash = "sha256-yt6yRiLTuaK4K/QwgkL9gCVGsSa7ndFOHqZvKqIGZ5U="; + }) + (pkgs.fetchFirefoxAddon { name = "vimium_ff"; url = "https://addons.mozilla.org/firefox/downloads/file/4191523/vimium_ff-2.0.6.xpi"; 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 32/47] 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 33/47] 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 34/47] 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 35/47] 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 36/47] 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 37/47] 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 38/47] 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 39/47] 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 40/47] 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"; From 61b94b8229f0c6b96a11a0b4b37c370fe8736e69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 25 May 2024 19:43:34 -0300 Subject: [PATCH 41/47] flake: update to 24.05 --- flake.lock | 15 ++++++++------- flake.nix | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 7dc918c..76a2850 100644 --- a/flake.lock +++ b/flake.lock @@ -491,15 +491,16 @@ ] }, "locked": { - "lastModified": 1715359697, - "narHash": "sha256-FJYyXqulIbCdsUCTFBTu/bIH4aN+7jzjQAn52Qc6qPg=", + "lastModified": 1716563886, + "narHash": "sha256-MKSVKxP50gEbdP60G0M5LampyVSIGT8FGGB88nKPmi8=", "owner": "nix-community", "repo": "home-manager", - "rev": "f2c5ba5e720fd584d83f2f97399dac0d26ae60b9", + "rev": "00a86e4f7a6455ad58b7090a931f1c6097e4fcd7", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -881,16 +882,16 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "lastModified": 1716408587, + "narHash": "sha256-el71IUaQdEmntmd51GBpkJs/Hqh6S4dmfmUGP8GQaME=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "rev": "1a7abfa62e8a36f7f2dbe463722ed9ea31be5e43", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-unstable", + "ref": "nixos-24.05", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index f3a4532..7b042c9 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,8 @@ { description = "My system config"; inputs = { - nixpkgs.url = "nixpkgs/nixos-unstable"; - home-manager.url = "github:nix-community/home-manager"; + nixpkgs.url = "nixpkgs/nixos-24.05"; + home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nix-index-database = { From af640e2ba517cbe40a97037abd3bec162474b08e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 25 May 2024 19:43:52 -0300 Subject: [PATCH 42/47] monolith: disable virtualbox while it's borked --- hosts/monolith.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/hosts/monolith.nix b/hosts/monolith.nix index 39ba16f..c447c45 100644 --- a/hosts/monolith.nix +++ b/hosts/monolith.nix @@ -55,8 +55,6 @@ in }; }; - virtualisation.virtualbox.host.enable = true; - fileSystems."/" = { device = "/dev/disk/by-label/BTRFS_ROOT"; fsType = "btrfs"; From 68b627fbfb67f60f5a4f510b8f6b266354a9ed0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 25 May 2024 19:44:10 -0300 Subject: [PATCH 43/47] qutebrowser: don't install if not the default browser --- user/qutebrowser/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/qutebrowser/default.nix b/user/qutebrowser/default.nix index 467340b..0f2914a 100644 --- a/user/qutebrowser/default.nix +++ b/user/qutebrowser/default.nix @@ -10,7 +10,7 @@ in ]; config = { - programs.qutebrowser = { + programs.qutebrowser = lib.mkIf (browser == "qutebrowser") { enable = true; # enableDefaultBindings = false; keyBindings = { From 44772b3063a5ce271a9e8cfd083eb60c57e737b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 27 May 2024 00:10:11 -0300 Subject: [PATCH 44/47] scripts: add pass export script --- scripts/default.nix | 1 + scripts/pass-export | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100755 scripts/pass-export diff --git a/scripts/default.nix b/scripts/default.nix index 54ee0a2..bc2ac3d 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -42,6 +42,7 @@ create_scripts [ ]; # This will not work unless programs.wshowkeys is enabled systemwide terminal = [ alacritty ]; playerctl-status = [ playerctl ]; + pass-export = [ pass2csv gnupg ]; wpass = [ final.wdmenu fd pass sd wl-clipboard wtype ]; screenshotsh = [ capitaine-cursors grim slurp jq sway wl-clipboard xdg-user-dirs ]; diff --git a/scripts/pass-export b/scripts/pass-export new file mode 100755 index 0000000..658f803 --- /dev/null +++ b/scripts/pass-export @@ -0,0 +1,10 @@ +#!/bin/sh + +if test -z "$PASSWORD_STORE_DIR"; then + PASSWORD_STORE_DIR="$HOME/.password-store" +fi + +pass2csv "$PASSWORD_STORE_DIR" "$HOME/passwords.csv" \ + -f User '(user|login)(:\s*)?' \ + -f TOTP 'otpauth(:)?' \ + -f URL 'url(:\s*)?' From 019580240d2386429488321f2c556be8afe31fac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 27 May 2024 09:44:01 -0300 Subject: [PATCH 45/47] gnome: update autologin config --- system/gnome.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/gnome.nix b/system/gnome.nix index 855f5d5..5af171c 100644 --- a/system/gnome.nix +++ b/system/gnome.nix @@ -8,7 +8,7 @@ services.xserver.displayManager.gdm.enable = true; services.xserver.desktopManager.gnome.enable = true; - services.xserver.displayManager.autoLogin = { + services.displayManager.autoLogin = { enable = true; user = "lelgenio"; }; From 18138295c787480c13bcf7de789e01f047f7473e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 27 May 2024 11:52:17 -0300 Subject: [PATCH 46/47] kdeconect: update config --- system/configuration.nix | 1 - system/gnome.nix | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/system/configuration.nix b/system/configuration.nix index fbcd724..e72bcff 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -26,7 +26,6 @@ networking.networkmanager.enable = true; # Open kde connect ports programs.kdeconnect.enable = true; - networking.firewall.allowedTCPPorts = [ 55201 ]; # Set your time zone. time.timeZone = "America/Sao_Paulo"; diff --git a/system/gnome.nix b/system/gnome.nix index 5af171c..cb8c106 100644 --- a/system/gnome.nix +++ b/system/gnome.nix @@ -13,13 +13,17 @@ user = "lelgenio"; }; + programs.kdeconnect = { + enable = true; + package = pkgs.gnomeExtensions.gsconnect; + }; + # services.xserver.displayManager.autologin.user = "lelgenio"; environment.systemPackages = with pkgs; with gnome; [ gnome-tweaks dconf-editor chrome-gnome-shell - gnomeExtensions.gsconnect gnomeExtensions.quick-settings-audio-devices-hider ]; } From 93bff2ab4513e6957d9ae25455dc1ad445088fc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 27 May 2024 12:29:42 -0300 Subject: [PATCH 47/47] configuration: extract nixos config into more files --- system/bluetooth.nix | 14 +++++ system/configuration.nix | 120 +++------------------------------------ system/containers.nix | 11 ++++ system/fonts.nix | 9 +++ system/locale.nix | 12 ++++ system/network.nix | 24 ++++++++ system/sound.nix | 11 ++++ system/steam.nix | 3 + system/users.nix | 20 +++++++ 9 files changed, 111 insertions(+), 113 deletions(-) create mode 100644 system/bluetooth.nix create mode 100644 system/containers.nix create mode 100644 system/fonts.nix create mode 100644 system/locale.nix create mode 100644 system/network.nix create mode 100644 system/sound.nix create mode 100644 system/users.nix diff --git a/system/bluetooth.nix b/system/bluetooth.nix new file mode 100644 index 0000000..20eb72e --- /dev/null +++ b/system/bluetooth.nix @@ -0,0 +1,14 @@ +{ pkgs, ... }: { + services.blueman.enable = true; + hardware.bluetooth = { + enable = true; + settings = { + General = { + DiscoverableTimeout = 0; + # Discoverable = true; + AlwaysPairable = true; + }; + Policy = { AutoEnable = true; }; + }; + }; +} diff --git a/system/configuration.nix b/system/configuration.nix index e72bcff..130ca7d 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -9,6 +9,13 @@ ./boot.nix ./thunar.nix ./nix.nix + ./fonts.nix + ./sound.nix + ./bluetooth.nix + ./locale.nix + ./users.nix + ./containers.nix + ./network.nix ]; boot.kernelPackages = pkgs.linuxPackages_latest; @@ -18,108 +25,9 @@ programs.adb.enable = true; services.udev.packages = [ pkgs.android-udev-rules ]; - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - # Enable networking - networking.networkmanager.enable = true; - # Open kde connect ports - programs.kdeconnect.enable = true; - - # Set your time zone. - time.timeZone = "America/Sao_Paulo"; - environment.variables.TZ = config.time.timeZone; - # Select internationalisation properties. - i18n.defaultLocale = "pt_BR.utf8"; - - # Enable the GNOME Desktop Environment. - # services.xserver.displayManager.gdm.enable = true; - # services.xserver.desktopManager.gnome.enable = true; - # services.xserver.displayManager.autologin.user = "lelgenio"; - - # Configure keymap in X11 - services.xserver.xkb = { - layout = "us"; - variant = "colemak"; - }; - console.keyMap = "colemak"; - # Enable CUPS to print documents. - # services.printing.enable = true; - services.flatpak.enable = true; - virtualisation.docker.enable = true; - virtualisation.docker.autoPrune.enable = true; - virtualisation.docker.autoPrune.dates = "monthly"; - virtualisation.docker.autoPrune.flags = [ "--all --volumes" ]; - - programs.extra-container.enable = true; - - programs.firejail.enable = true; - - security.rtkit.enable = true; - services.openssh = { - enable = true; - ports = [ 9022 ]; - settings = { - PermitRootLogin = "no"; - PasswordAuthentication = false; - KbdInteractiveAuthentication = false; - }; - }; - # programs.ssh = { - # startAgent = true; - # extraConfig = '' - # AddKeysToAgent yes - # ''; - # }; - - ## Enable sound with pipewire. - sound.enable = true; - hardware.pulseaudio.enable = false; - services.pipewire = { - enable = true; - wireplumber.enable = true; - pulse.enable = true; - alsa.enable = true; - jack.enable = true; - }; - - services.blueman.enable = true; - hardware.bluetooth = { - enable = true; - settings = { - General = { - DiscoverableTimeout = 0; - # Discoverable = true; - AlwaysPairable = true; - }; - Policy = { AutoEnable = true; }; - }; - }; - # Enable touchpad support (enabled default in most desktopManager). services.libinput.enable = true; - # Define a user account. Don't forget to set a password with ‘passwd’. - users.mutableUsers = false; - users.users.lelgenio = { - isNormalUser = true; - description = "Leonardo Eugênio"; - hashedPassword = "$y$j9T$0e/rczjOVCy7PuwC3pG0V/$gTHZhfO4wQSlFvbDyfghbCnGI2uDI0a52zSrQ/yOA5A"; - extraGroups = [ "networkmanager" "wheel" "docker" "adbusers" "bluetooth" "corectrl" "vboxusers" ]; - shell = pkgs.fish; - openssh.authorizedKeys.keys = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15" - ]; - }; - users.users.root.initialHashedPassword = "$y$j9T$E3aBBSSq0Gma8hZD9L7ov0$iCGDW4fqrXWfHO0qodBYYgMFA9CpIraoklHcPbJJrM3"; - - # services.getty.autologinUser = "lelgenio"; - programs.fish.enable = true; - - programs.dzgui.enable = true; - programs.dzgui.package = inputs.dzgui-nix.packages.${pkgs.system}.default; - packages.media-packages.enable = true; environment.systemPackages = with pkgs; [ pavucontrol @@ -130,21 +38,7 @@ gnome3.adwaita-icon-theme # default gnome cursors ]; - fonts.enableDefaultPackages = true; - fonts.packages = with pkgs; [ - noto-fonts - noto-fonts-cjk - noto-fonts-emoji - nerdfonts_fira_hack - ]; - services.geoclue2.enable = true; - # programs.qt5ct.enable = true; - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - services.pcscd.enable = true; - security.sudo.wheelNeedsPassword = false; systemd.extraConfig = '' DefaultTimeoutStopSec=10s diff --git a/system/containers.nix b/system/containers.nix new file mode 100644 index 0000000..c2c2941 --- /dev/null +++ b/system/containers.nix @@ -0,0 +1,11 @@ +{ pkgs, ... }: { + services.flatpak.enable = true; + virtualisation.docker.enable = true; + virtualisation.docker.autoPrune.enable = true; + virtualisation.docker.autoPrune.dates = "monthly"; + virtualisation.docker.autoPrune.flags = [ "--all --volumes" ]; + + programs.extra-container.enable = true; + + programs.firejail.enable = true; +} diff --git a/system/fonts.nix b/system/fonts.nix new file mode 100644 index 0000000..e6d4ccd --- /dev/null +++ b/system/fonts.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: { + fonts.enableDefaultPackages = true; + fonts.packages = with pkgs; [ + noto-fonts + noto-fonts-cjk + noto-fonts-emoji + nerdfonts_fira_hack + ]; +} diff --git a/system/locale.nix b/system/locale.nix new file mode 100644 index 0000000..bb344c7 --- /dev/null +++ b/system/locale.nix @@ -0,0 +1,12 @@ +{ pkgs, config, ... }: { + time.timeZone = "America/Sao_Paulo"; + environment.variables.TZ = config.time.timeZone; + i18n.defaultLocale = "pt_BR.utf8"; + + # Configure keymap in X11 + services.xserver.xkb = { + layout = "us"; + variant = "colemak"; + }; + console.keyMap = "colemak"; +} diff --git a/system/network.nix b/system/network.nix new file mode 100644 index 0000000..c8ebdd9 --- /dev/null +++ b/system/network.nix @@ -0,0 +1,24 @@ +{ pkgs, ... }: { + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + # Enable networking + networking.networkmanager.enable = true; + # Open kde connect ports + programs.kdeconnect.enable = true; + + # Enable CUPS to print documents. + # services.printing.enable = true; + + security.rtkit.enable = true; + services.openssh = { + enable = true; + ports = [ 9022 ]; + settings = { + PermitRootLogin = "no"; + PasswordAuthentication = false; + KbdInteractiveAuthentication = false; + }; + }; +} diff --git a/system/sound.nix b/system/sound.nix new file mode 100644 index 0000000..3cdbf58 --- /dev/null +++ b/system/sound.nix @@ -0,0 +1,11 @@ +{ pkgs, ... }: { + sound.enable = true; + hardware.pulseaudio.enable = false; + services.pipewire = { + enable = true; + wireplumber.enable = true; + pulse.enable = true; + alsa.enable = true; + jack.enable = true; + }; +} diff --git a/system/steam.nix b/system/steam.nix index 3a60930..ce94c3d 100644 --- a/system/steam.nix +++ b/system/steam.nix @@ -17,4 +17,7 @@ protontricks bottles ]; + + programs.dzgui.enable = true; + programs.dzgui.package = inputs.dzgui-nix.packages.${pkgs.system}.default; } diff --git a/system/users.nix b/system/users.nix new file mode 100644 index 0000000..2334897 --- /dev/null +++ b/system/users.nix @@ -0,0 +1,20 @@ +{ pkgs, ... }: { + security.sudo.wheelNeedsPassword = false; + + # services.getty.autologinUser = "lelgenio"; + programs.fish.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.mutableUsers = false; + users.users.lelgenio = { + isNormalUser = true; + description = "Leonardo Eugênio"; + hashedPassword = "$y$j9T$0e/rczjOVCy7PuwC3pG0V/$gTHZhfO4wQSlFvbDyfghbCnGI2uDI0a52zSrQ/yOA5A"; + extraGroups = [ "networkmanager" "wheel" "docker" "adbusers" "bluetooth" "corectrl" "vboxusers" ]; + shell = pkgs.fish; + openssh.authorizedKeys.keys = [ + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15" + ]; + }; + users.users.root.initialHashedPassword = "$y$j9T$E3aBBSSq0Gma8hZD9L7ov0$iCGDW4fqrXWfHO0qodBYYgMFA9CpIraoklHcPbJJrM3"; +}