From d60c09d981988b35026de7c2e071c18fb2c3c4df Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Sun, 16 Feb 2025 00:14:29 -0800 Subject: [PATCH] feat: in tree changes --- flake.lock | 271 ++++++++++-------- flake.nix | 3 +- home/environments/gnome/extensions.nix | 9 +- home/environments/kde/gtk.nix | 2 - home/environments/kde/kde.nix | 4 +- home/environments/kde/qt.nix | 4 - home/environments/sway/gtk.nix | 2 +- home/environments/sway/sway.nix | 9 +- home/environments/sway/waybar.nix | 2 + home/environments/xfce/ssh.nix | 2 +- home/profiles/common/packages.nix | 5 + home/profiles/graphical/chromium.nix | 4 +- home/profiles/graphical/packages.nix | 1 + nixos/common/packages.nix | 5 + nixos/environments/kde/xserver.nix | 3 + nixos/environments/openbox/openbox.nix | 26 ++ nixos/environments/sway/sway.nix | 3 +- nixos/profiles/gaming/lutris.nix | 3 - nixos/profiles/gaming/quest.nix | 1 - nixos/profiles/graphical/mullvad.nix | 3 + nixos/profiles/graphical/packages.nix | 2 +- nixos/profiles/graphical/qt.nix | 4 +- nixos/profiles/graphical/sound.nix | 2 +- nixos/profiles/laptop/cpufreq.nix | 3 +- .../profiles/laptop/power-profiles-daemon.nix | 3 - nixos/profiles/wireless/bluetooth.nix | 2 +- nixos/profiles/wireless/wifi.nix | 2 +- packages/arcmenu/default.nix | 38 +++ packages/arcmenu/fix_gmenu.patch | 31 ++ packages/cppyy/default.nix | 29 ++ systems/koishi.nix | 13 +- tree.nix | 3 - 32 files changed, 339 insertions(+), 155 deletions(-) create mode 100644 home/profiles/common/packages.nix create mode 100644 nixos/common/packages.nix create mode 100644 nixos/environments/openbox/openbox.nix create mode 100644 nixos/profiles/graphical/mullvad.nix delete mode 100644 nixos/profiles/laptop/power-profiles-daemon.nix create mode 100644 packages/arcmenu/default.nix create mode 100644 packages/arcmenu/fix_gmenu.patch create mode 100644 packages/cppyy/default.nix diff --git a/flake.lock b/flake.lock index ee319cfb..8b8df982 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1729701038, - "narHash": "sha256-o225MlLIjcFiGgEKVT8YmrI4kHO9k7HqAedk4exHGJc=", + "lastModified": 1736099359, + "narHash": "sha256-cGQB3WkgB0izThndWHmW07kJt0I0G2cGwhSETVNrjl0=", "owner": "arcnmx", "repo": "nixexprs", - "rev": "881c6f3075a5502b635876dac730948167022c15", + "rev": "8cce84df087eb40f6c0681575f2551ffcb0e3ca8", "type": "github" }, "original": { @@ -73,11 +73,11 @@ "ci": { "flake": false, "locked": { - "lastModified": 1726101086, - "narHash": "sha256-veBakX/c/GfwzLtp62bcEm6Coype+03Hz8Aydi2b9xg=", + "lastModified": 1733469829, + "narHash": "sha256-eFiBQgPQ5xQLlLruYw0l8hO+SZuKtSWyxCz8HnlLHOA=", "owner": "arcnmx", "repo": "ci", - "rev": "154533df13bc059400186a9d52e000363f0a3cb2", + "rev": "0f95b2c2573c592cdc0cb3b4d42e30a1be7f9141", "type": "github" }, "original": { @@ -89,29 +89,17 @@ }, "crane": { "inputs": { - "flake-compat": [ - "lanzaboote", - "flake-compat" - ], - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], "nixpkgs": [ "lanzaboote", "nixpkgs" - ], - "rust-overlay": [ - "lanzaboote", - "rust-overlay" ] }, "locked": { - "lastModified": 1681177078, - "narHash": "sha256-ZNIjBDou2GOabcpctiQykEQVkI8BDwk7TyvlWlI4myE=", + "lastModified": 1717535930, + "narHash": "sha256-1hZ/txnbd/RmiBPNUs7i8UQw2N89uAK3UzrGAWdnFfU=", "owner": "ipetkov", "repo": "crane", - "rev": "0c9f468ff00576577d83f5019a66c557ede5acf6", + "rev": "55e7754ec31dac78980c8be45f8a28e80e370946", "type": "github" }, "original": { @@ -127,11 +115,11 @@ ] }, "locked": { - "lastModified": 1731454423, - "narHash": "sha256-TtwvgFxUa0wyptLhQbKaixgNW1UXf3+TDqfX3Kp63oM=", + "lastModified": 1736370755, + "narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "6c71c49e2448e51ad830ed211024e6d0edc50116", + "rev": "57733bd1dc81900e13438e5b4439239f1b29db0e", "type": "github" }, "original": { @@ -202,11 +190,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -223,11 +211,32 @@ ] }, "locked": { - "lastModified": 1680392223, - "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -280,17 +289,17 @@ "freetype2": { "flake": false, "locked": { - "lastModified": 1687587065, - "narHash": "sha256-+Fh+/k+NWL5Ow9sDLtp8Cv/8rLNA1oByQQCIQS/bysY=", - "owner": "wez", - "repo": "freetype2", - "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d", + "lastModified": 1723459814, + "narHash": "sha256-4l90lDtpgm5xlh2m7ifrqNy373DTRTULRkAzicrM93c=", + "owner": "freetype", + "repo": "freetype", + "rev": "42608f77f20749dd6ddc9e0536788eaad70ea4b5", "type": "github" }, "original": { - "owner": "wez", - "repo": "freetype2", - "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d", + "owner": "freetype", + "ref": "VER-2-13-3", + "repo": "freetype", "type": "github" } }, @@ -303,11 +312,11 @@ ] }, "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -319,16 +328,16 @@ "harfbuzz": { "flake": false, "locked": { - "lastModified": 1711722720, - "narHash": "sha256-GdxcAPx5QyniSHPAN1ih28AD9JLUPR0ItqW9JEsl3pU=", + "lastModified": 1719502711, + "narHash": "sha256-2ieCf3ftNk851FZBDPVl+7QHWBqD729KiUxUyxi26Yg=", "owner": "harfbuzz", "repo": "harfbuzz", - "rev": "63973005bc07aba599b47fdd4cf788647b601ccd", + "rev": "9c03576c49db6e7207d9bcdfe3abd170a809157f", "type": "github" }, "original": { "owner": "harfbuzz", - "ref": "8.4.0", + "ref": "9.0.0", "repo": "harfbuzz", "type": "github" } @@ -340,11 +349,11 @@ ] }, "locked": { - "lastModified": 1731535640, - "narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=", + "lastModified": 1736421950, + "narHash": "sha256-RyrX0WFXxFrYvzHNLTIyuk3NcNl3UBykuYru/P0zW5E=", "owner": "nix-community", "repo": "home-manager", - "rev": "35b055009afd0107b69c286fca34d2ad98940d57", + "rev": "d4aebb947a301b8da8654a804979a738c5c5da50", "type": "github" }, "original": { @@ -394,16 +403,16 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1682802423, - "narHash": "sha256-Fb5TeRTdvUlo/5Yi2d+FC8a6KoRLk2h1VE0/peMhWPs=", + "lastModified": 1718178907, + "narHash": "sha256-eSZyrQ9uoPB9iPQ8Y5H7gAmAgAvCw3InStmU3oEjqsE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "64b903ca87d18cef2752c19c098af275c6e51d63", + "rev": "b627ccd97d0159214cee5c7db1412b75e4be6086", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v0.3.0", + "ref": "v0.4.1", "repo": "lanzaboote", "type": "github" } @@ -411,17 +420,17 @@ "libpng": { "flake": false, "locked": { - "lastModified": 1549245649, - "narHash": "sha256-1+cRp0Ungme/OGfc9kGJbklYIWAFxk8Il1M+NV4KSgw=", - "owner": "glennrp", + "lastModified": 1726173884, + "narHash": "sha256-gBfHgGaqVYdmhWXoNKZzPyGzyw2rr3zp+DjWmfC41jk=", + "owner": "pnggroup", "repo": "libpng", - "rev": "8439534daa1d3a5705ba92e653eda9251246dd61", + "rev": "f5e92d76973a7a53f517579bc95d61483bf108c0", "type": "github" }, "original": { - "owner": "glennrp", + "owner": "pnggroup", + "ref": "v1.6.44", "repo": "libpng", - "rev": "8439534daa1d3a5705ba92e653eda9251246dd61", "type": "github" } }, @@ -438,11 +447,11 @@ ] }, "locked": { - "lastModified": 1731375802, - "narHash": "sha256-CvWPEzrl2EA3xrtg9X6K8aqV7T5r0SaDz6PLpGA0yIY=", + "lastModified": 1736473741, + "narHash": "sha256-mt/uzoQ9J7o4lEP1mBJSArE6jsXKhpbnBWFfeOu0CUc=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "b873a123366b9a62f9262414ada8d83b03f1f0bf", + "rev": "39e804edbf69b926d25db2bb43b80995911d5776", "type": "github" }, "original": { @@ -458,11 +467,11 @@ ] }, "locked": { - "lastModified": 1731209121, - "narHash": "sha256-BF7FBh1hIYPDihdUlImHGsQzaJZVLLfYqfDx41wjuF0=", + "lastModified": 1736440205, + "narHash": "sha256-QJgTI//KEGuEJC6FDxuI9Dq8PewIpnxD2NVx2/OHbfc=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "896019f04b22ce5db4c0ee4f89978694f44345c3", + "rev": "a2200b499efa01ca8646173e94cdfcc93188f2b8", "type": "github" }, "original": { @@ -473,11 +482,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731403644, - "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=", + "lastModified": 1736441705, + "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f6581f1c3b137086e42a08a906bdada63045f991", + "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", "type": "github" }, "original": { @@ -488,11 +497,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1683185507, - "narHash": "sha256-Wcj09pigMFgj+0borXeoJvVMwH2Rc4gkSq4BwNq3k7s=", + "lastModified": 1733205999, + "narHash": "sha256-ospvtfltUSDx1N/Sb2sx+ztyrag9urXZjUXUT/K3sl0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63464b8c2837ec56e1d610f5bd2a9b8e1f532c07", + "rev": "fcc6fd8761d9979517225721b2d4b6e672ff4da3", "type": "github" }, "original": { @@ -502,27 +511,43 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1678872516, - "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1736344531, + "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1736344531, + "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "type": "github" }, "original": { @@ -533,12 +558,17 @@ } }, "nur": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_3", + "treefmt-nix": "treefmt-nix" + }, "locked": { - "lastModified": 1731537929, - "narHash": "sha256-8BN+r2bHiuERmxNcfME82ciiMkgJ+ZLAKSvFnNbVCgY=", + "lastModified": 1736478119, + "narHash": "sha256-E06gp8mRYBMkS9ePNATbd2YToKOiD+F3Xrcb1rpC/6c=", "owner": "nix-community", "repo": "NUR", - "rev": "bd5ead048fb2a5bb3635111761d2d75f1f19debc", + "rev": "659c5904ac04aac2684c7dc802d4172549936e04", "type": "github" }, "original": { @@ -557,11 +587,11 @@ ] }, "locked": { - "lastModified": 1731193165, - "narHash": "sha256-pGF8L5g9QpkQtJP9JmNIRNZfcyhJHf7uT+d8tqI1h6Y=", + "lastModified": 1735049224, + "narHash": "sha256-fWUd9kyXdepphJ7cCzOsuSo7l0kbFCkUqfgKqZyFZzE=", "owner": "pjones", "repo": "plasma-manager", - "rev": "f33173b9d22e554a6f869626bc01808d35995257", + "rev": "d16bbded0ae452bc088489e7dca3ef58d8d1830b", "type": "github" }, "original": { @@ -576,10 +606,6 @@ "lanzaboote", "flake-compat" ], - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], "gitignore": "gitignore", "nixpkgs": [ "lanzaboote", @@ -588,11 +614,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1681413034, - "narHash": "sha256-/t7OjNQcNkeWeSq/CFLYVBfm+IEnkjoSm9iKvArnUUI=", + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "d3de8f69ca88fb6f8b09e5b598be5ac98d28ede5", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", "type": "github" }, "original": { @@ -645,11 +671,11 @@ ] }, "locked": { - "lastModified": 1682129965, - "narHash": "sha256-1KRPIorEL6pLpJR04FwAqqnt4Tzcm4MqD84yhlD+XSk=", + "lastModified": 1717813066, + "narHash": "sha256-wqbRwq3i7g5EHIui0bIi84mdqZ/It1AXBSLJ5tafD28=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2c417c0460b788328220120c698630947547ee83", + "rev": "6dc3e45fe4aee36efeed24d64fc68b1f989d5465", "type": "github" }, "original": { @@ -666,11 +692,11 @@ ] }, "locked": { - "lastModified": 1729477859, - "narHash": "sha256-r0VyeJxy4O4CgTB/PNtfQft9fPfN1VuGvnZiCxDArvg=", + "lastModified": 1735871325, + "narHash": "sha256-6Ta5E4mhSfCP6LdkzkG2+BciLOCPeLKuYTJ6lOHW+mI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ada8266712449c4c0e6ee6fcbc442b3c217c79e1", + "rev": "a599f011db521766cbaf7c2f5874182485554f00", "type": "github" }, "original": { @@ -709,17 +735,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "nixpkgs-stable": [ - "nixpkgs" ] }, "locked": { - "lastModified": 1731364708, - "narHash": "sha256-HC0anOL+KmUQ2hdRl0AtunbAckasxrkn4VLmxbW/WaA=", + "lastModified": 1736203741, + "narHash": "sha256-eSjkBwBdQk+TZWFlLbclF2rAh4JxbGg8az4w/Lfe7f4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4c91d52db103e757fc25b58998b0576ae702d659", + "rev": "c9c88f08e3ee495e888b8d7c8624a0b2519cb773", "type": "github" }, "original": { @@ -805,6 +828,27 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "utils": { "inputs": { "systems": [ @@ -841,11 +885,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1730734444, - "narHash": "sha256-lNgCAphrq3/bYGjgDxEl2rVcer6GnmfWXDhxc+kdYOk=", + "lastModified": 1735931735, + "narHash": "sha256-4wzEN5IPYmqLP8TAdFatoRhCZ7W9y65AWoYN0Qgvbg8=", "owner": "wez", "repo": "wezterm", - "rev": "51c794ac500a2033b9dc570c71810518bfa667a9", + "rev": "8e9cf912e66f704f300fac6107206a75036de1e7", "type": "github" }, "original": { @@ -861,19 +905,16 @@ "flake-compat": [ "flake-compat" ], - "flake-utils": [ - "utils" - ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1730453870, - "narHash": "sha256-d+kIgz4BvTXb7emjSFV3zjNydGmLUmuluQjdBb51R9o=", + "lastModified": 1736095716, + "narHash": "sha256-csysw/Szu98QDiA2lhWk9seYOyCebeVEWL89zh1cduM=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "adb6bc4b661a43328752b4575be4968a4990c033", + "rev": "63c3b4ed1712a3a0621002cd59bfdc80875ecbb0", "type": "github" }, "original": { @@ -885,16 +926,16 @@ "zlib": { "flake": false, "locked": { - "lastModified": 1484501380, - "narHash": "sha256-j5b6aki1ztrzfCqu8y729sPar8GpyQWIrajdzpJC+ww=", + "lastModified": 1705948357, + "narHash": "sha256-TkPLWSN5QcPlL9D0kc/yhH0/puE9bFND24aj5NVDKYs=", "owner": "madler", "repo": "zlib", - "rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f", + "rev": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf", "type": "github" }, "original": { "owner": "madler", - "ref": "v1.2.11", + "ref": "v1.3.1", "repo": "zlib", "type": "github" } diff --git a/flake.nix b/flake.nix index 32b77341..9b238337 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,7 @@ description = "Kat's Infrastructure"; inputs = { systems.url = "github:nix-systems/default"; + # to allow non-nix 2.4 evaluation flake-compat = { url = "github:edolstra/flake-compat"; @@ -18,7 +19,7 @@ url = "github:nixos/nixpkgs/nixos-unstable"; }; lanzaboote = { - url = "github:nix-community/lanzaboote/v0.3.0"; + url = "github:nix-community/lanzaboote/v0.4.1"; # Optional but recommended to limit the size of your system closure. inputs = { diff --git a/home/environments/gnome/extensions.nix b/home/environments/gnome/extensions.nix index c27766e9..06bbad25 100644 --- a/home/environments/gnome/extensions.nix +++ b/home/environments/gnome/extensions.nix @@ -7,15 +7,16 @@ # `gnome-extensions list` for a list enabled-extensions = [ "user-theme@gnome-shell-extensions.gcampax.github.com" - "trayIconsReloaded@selfmade.pl" "Vitals@CoreCoding.com" "dash-to-panel@jderose9.github.com" "space-bar@luchrioh" + "appindicatorsupport@rgcjonas.gmail.com" + "arcmenu@arcmenu.com" "date-menu-formatter@marcinjakubowski.github.com" ]; }; - "org/gnome/shell/extensions/date-menu-formatter" = { - pattern = "y-MM-dd HH:mm Z"; + "org/gnome/shell/extensions/daerte-menu-formatter" = { + pattern = "y-MM-dd HH:mm:ss "; "font-size" = "12"; }; "org/gnome/shell/extensions/vitals" = { @@ -25,10 +26,12 @@ }; home.packages = with pkgs.gnomeExtensions; [ + pkgs.arcmenu space-bar user-themes tray-icons-reloaded appindicator + caffeine vitals dash-to-panel date-menu-formatter diff --git a/home/environments/kde/gtk.nix b/home/environments/kde/gtk.nix index aa742ff0..6ff3c030 100644 --- a/home/environments/kde/gtk.nix +++ b/home/environments/kde/gtk.nix @@ -16,6 +16,4 @@ package = pkgs.numix-cursor-theme; }; }; - - home.sessionVariables.GTK_THEME = "Arc"; } diff --git a/home/environments/kde/kde.nix b/home/environments/kde/kde.nix index bc7b02a6..766d3c3d 100644 --- a/home/environments/kde/kde.nix +++ b/home/environments/kde/kde.nix @@ -1,4 +1,7 @@ {pkgs, ...}: { + home.sessionVariables = { + QT_QPA_PLATFORMTHEME = "qt5ct"; + }; home.packages = with pkgs.kdePackages; [ kscreen kwin @@ -60,7 +63,6 @@ "kdeglobals"."General"."TerminalApplication" = "konsole"; "kdeglobals"."General"."TerminalService" = "org.wezfurlong.wezterm.desktop"; "kxkbrc"."Layout"."ResetOldOptions" = true; - "plasmarc"."Theme"."name" = "Arc"; "kxkbrc"."Layout"."Options" = "terminate:ctrl_alt_bksp,ctrl:hyper_capscontrol"; }; }; diff --git a/home/environments/kde/qt.nix b/home/environments/kde/qt.nix index cf75c4c2..d5c3d75e 100644 --- a/home/environments/kde/qt.nix +++ b/home/environments/kde/qt.nix @@ -2,9 +2,5 @@ qt = { enable = false; platformTheme = "kde"; - style = { - name = "arc"; - package = pkgs.arc-kde-theme; - }; }; } diff --git a/home/environments/sway/gtk.nix b/home/environments/sway/gtk.nix index b4d01a37..b172f798 100644 --- a/home/environments/sway/gtk.nix +++ b/home/environments/sway/gtk.nix @@ -1,6 +1,6 @@ {pkgs, ...}: { home.packages = with pkgs; [ - gnome.adwaita-icon-theme + adwaita-icon-theme ]; gtk = { diff --git a/home/environments/sway/sway.nix b/home/environments/sway/sway.nix index 90532067..be979427 100644 --- a/home/environments/sway/sway.nix +++ b/home/environments/sway/sway.nix @@ -29,7 +29,7 @@ in { sessionVariables = { XDG_CURRENT_DESKTOP = "Unity"; XDG_SESSION_TYPE = "wayland"; - WLR_DRM_DEVICES = "/dev/dri/card0"; + WLR_DRM_DEVICES = "/dev/dri/card1"; }; packages = with pkgs; [ grim @@ -123,11 +123,16 @@ in { input = { "*" = { - xkb_layout = "us_gbp_map"; xkb_options = "compose:rctrl,ctrl:nocaps"; }; }; + output = { + "*" = { + scale = "1.25"; + }; + }; + gaps = { smartBorders = "no_gaps"; }; diff --git a/home/environments/sway/waybar.nix b/home/environments/sway/waybar.nix index c1d300e2..bdcbeda5 100644 --- a/home/environments/sway/waybar.nix +++ b/home/environments/sway/waybar.nix @@ -32,6 +32,7 @@ "network" "temperature" "idle_inhibitor" + "battery" "tray" ]; @@ -50,6 +51,7 @@ "sway/window" = { format = "{}"; }; + battery = {}; tray = { show-passive-items = true; icon-size = 12; diff --git a/home/environments/xfce/ssh.nix b/home/environments/xfce/ssh.nix index c279ca6e..28104912 100644 --- a/home/environments/xfce/ssh.nix +++ b/home/environments/xfce/ssh.nix @@ -9,7 +9,7 @@ in { # Disable gnome-keyring ssh-agent xdg.configFile."autostart/gnome-keyring-ssh.desktop".text = '' - ${fileContents "${pkgs.gnome3.gnome-keyring}/etc/xdg/autostart/gnome-keyring-ssh.desktop"} + ${fileContents "${pkgs.gnome-keyring}/etc/xdg/autostart/gnome-keyring-ssh.desktop"} Hidden=true ''; } diff --git a/home/profiles/common/packages.nix b/home/profiles/common/packages.nix new file mode 100644 index 00000000..190b5dbc --- /dev/null +++ b/home/profiles/common/packages.nix @@ -0,0 +1,5 @@ +{ pkgs, ... }: { + home.packages = [ + pkgs.magic-wormhole + ]; +} diff --git a/home/profiles/graphical/chromium.nix b/home/profiles/graphical/chromium.nix index 4f1c1bcb..3d9c3352 100644 --- a/home/profiles/graphical/chromium.nix +++ b/home/profiles/graphical/chromium.nix @@ -1,6 +1,6 @@ -_: { +{ pkgs, ...}: { # Backup browser! For aliexpress and things. home.packages = [ - #pkgs.ungoogled-chromium + pkgs.ungoogled-chromium ]; } diff --git a/home/profiles/graphical/packages.nix b/home/profiles/graphical/packages.nix index 34c3e0ea..6c6f1007 100644 --- a/home/profiles/graphical/packages.nix +++ b/home/profiles/graphical/packages.nix @@ -16,6 +16,7 @@ # Chat fractal # Matrix + element-desktop tdesktop # Telegram dino # XMPP signal-desktop diff --git a/nixos/common/packages.nix b/nixos/common/packages.nix new file mode 100644 index 00000000..43c3eca0 --- /dev/null +++ b/nixos/common/packages.nix @@ -0,0 +1,5 @@ +{ pkgs, ... }: { + environment.systemPackages = [ + pkgs.magic-wormhole + ]; +} \ No newline at end of file diff --git a/nixos/environments/kde/xserver.nix b/nixos/environments/kde/xserver.nix index a625879b..ede35ae4 100644 --- a/nixos/environments/kde/xserver.nix +++ b/nixos/environments/kde/xserver.nix @@ -2,6 +2,9 @@ environment.systemPackages = with pkgs; [ xclip wl-clipboard + libsForQt5.qtstyleplugin-kvantum + qt6Packages.qtstyleplugin-kvantum + ]; services = { xserver = { diff --git a/nixos/environments/openbox/openbox.nix b/nixos/environments/openbox/openbox.nix new file mode 100644 index 00000000..07f106f5 --- /dev/null +++ b/nixos/environments/openbox/openbox.nix @@ -0,0 +1,26 @@ +{pkgs, ...}: { + services = { + gnome.gnome-keyring.enable = true; + xserver = { + enable = true; + libinput.touchpad = { + tappingButtonMap = "lrm"; + clickMethod = "clickfinger"; + }; + windowManager = { + openbox.enable = true; + }; + displayManager.defaultSession = "none+openbox"; + xkbOptions = "ctrl:nocaps"; + }; + colord.enable = true; + }; + programs.xfconf.enable = true; + + environment.systemPackages = with pkgs; [ + menumaker + xclip + obconf + numix-gtk-theme + ]; +} diff --git a/nixos/environments/sway/sway.nix b/nixos/environments/sway/sway.nix index 02918943..3850a12f 100644 --- a/nixos/environments/sway/sway.nix +++ b/nixos/environments/sway/sway.nix @@ -9,11 +9,12 @@ inherit (std) set list; inherit (lib.modules) mkForce; in { - imports = with tree.nixos.roles; [ + imports = with tree.nixos.profiles; [ graphical ]; programs.sway = { enable = list.any (user: user.wayland.windowManager.sway.enable) (set.values config.home-manager.users); + package = pkgs.swayfx; extraPackages = with pkgs; mkForce [xwayland swaylock swayidle swaylock-fancy wmctrl]; }; } diff --git a/nixos/profiles/gaming/lutris.nix b/nixos/profiles/gaming/lutris.nix index 018d5a5a..dde37cf3 100644 --- a/nixos/profiles/gaming/lutris.nix +++ b/nixos/profiles/gaming/lutris.nix @@ -1,7 +1,4 @@ {pkgs, ...}: { - hardware.opengl = { - driSupport32Bit = true; - }; hardware.graphics = { enable32Bit = true; extraPackages32 = with pkgs; [ diff --git a/nixos/profiles/gaming/quest.nix b/nixos/profiles/gaming/quest.nix index 788a8142..400ee65f 100644 --- a/nixos/profiles/gaming/quest.nix +++ b/nixos/profiles/gaming/quest.nix @@ -1,6 +1,5 @@ {pkgs, ...}: { environment.systemPackages = with pkgs; [ - questpatcher sidequest gsettings-desktop-schemas ]; diff --git a/nixos/profiles/graphical/mullvad.nix b/nixos/profiles/graphical/mullvad.nix new file mode 100644 index 00000000..e50ef2b6 --- /dev/null +++ b/nixos/profiles/graphical/mullvad.nix @@ -0,0 +1,3 @@ +_: { + services.mullvad-vpn.enable = true; +} \ No newline at end of file diff --git a/nixos/profiles/graphical/packages.nix b/nixos/profiles/graphical/packages.nix index b01686d8..6290dc1d 100644 --- a/nixos/profiles/graphical/packages.nix +++ b/nixos/profiles/graphical/packages.nix @@ -10,8 +10,8 @@ plexamp prusa-slicer super-slicer-beta - chromium inputs.konawall-py.packages.${pkgs.system}.konawall-py + barrier ]; services.udev.packages = [ pkgs.android-udev-rules diff --git a/nixos/profiles/graphical/qt.nix b/nixos/profiles/graphical/qt.nix index 8ace19bf..2c47bf2a 100644 --- a/nixos/profiles/graphical/qt.nix +++ b/nixos/profiles/graphical/qt.nix @@ -1,7 +1,7 @@ _: { qt = { enable = true; - style = "adwaita-dark"; - platformTheme = "gnome"; + platformTheme = "qt5ct"; + style = "kvantum"; }; } diff --git a/nixos/profiles/graphical/sound.nix b/nixos/profiles/graphical/sound.nix index 8436b7a5..b1c80d33 100644 --- a/nixos/profiles/graphical/sound.nix +++ b/nixos/profiles/graphical/sound.nix @@ -1,7 +1,7 @@ {pkgs, ...}: { environment.systemPackages = with pkgs; [pulsemixer]; - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; security.rtkit.enable = true; diff --git a/nixos/profiles/laptop/cpufreq.nix b/nixos/profiles/laptop/cpufreq.nix index 56f70d1b..c2e7520c 100644 --- a/nixos/profiles/laptop/cpufreq.nix +++ b/nixos/profiles/laptop/cpufreq.nix @@ -1,3 +1,2 @@ _: { - powerManagement.cpuFreqGovernor = "performance"; -} +} \ No newline at end of file diff --git a/nixos/profiles/laptop/power-profiles-daemon.nix b/nixos/profiles/laptop/power-profiles-daemon.nix deleted file mode 100644 index bce55e3d..00000000 --- a/nixos/profiles/laptop/power-profiles-daemon.nix +++ /dev/null @@ -1,3 +0,0 @@ -_: { - services.power-profiles-daemon.enable = true; -} diff --git a/nixos/profiles/wireless/bluetooth.nix b/nixos/profiles/wireless/bluetooth.nix index b8427f94..73789684 100644 --- a/nixos/profiles/wireless/bluetooth.nix +++ b/nixos/profiles/wireless/bluetooth.nix @@ -29,7 +29,7 @@ home-manager.sharedModules = [ { xsession.preferStatusNotifierItems = true; - services.blueman-applet.enable = true; + services.blueman-applet.enable = false; } ]; } diff --git a/nixos/profiles/wireless/wifi.nix b/nixos/profiles/wireless/wifi.nix index 9ae5c88e..a8283c04 100644 --- a/nixos/profiles/wireless/wifi.nix +++ b/nixos/profiles/wireless/wifi.nix @@ -22,7 +22,7 @@ in { home-manager.sharedModules = [ { xsession.preferStatusNotifierItems = true; - services.network-manager-applet.enable = true; + #services.network-manager-applet.enable = true; } ]; } diff --git a/packages/arcmenu/default.nix b/packages/arcmenu/default.nix new file mode 100644 index 00000000..255f448c --- /dev/null +++ b/packages/arcmenu/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitLab, glib, gettext, substituteAll, gnome-menus }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-arcmenu"; + version = "63"; + + src = fetchFromGitLab { + owner = "arcmenu"; + repo = "ArcMenu"; + rev = "v${version}"; + hash = "sha256-XlDkdNINTnUAqr2bxL0u2tHWfiggqT1oOryED7sG/vs="; + }; + + patches = [ + (substituteAll { + src = ./fix_gmenu.patch; + gmenu_path = "${gnome-menus}/lib/girepository-1.0"; + }) + ]; + + buildInputs = [ + glib gettext + ]; + + makeFlags = [ "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" ]; + + passthru = { + extensionUuid = "arcmenu@arcmenu.com"; + extensionPortalSlug = "arcmenu"; + }; + + meta = with lib; { + description = "Application menu for GNOME Shell, designed to provide a more traditional user experience and workflow"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ dkabot ]; + homepage = "https://gitlab.com/arcmenu/ArcMenu"; + }; +} \ No newline at end of file diff --git a/packages/arcmenu/fix_gmenu.patch b/packages/arcmenu/fix_gmenu.patch new file mode 100644 index 00000000..8bf1f97b --- /dev/null +++ b/packages/arcmenu/fix_gmenu.patch @@ -0,0 +1,31 @@ +--- a/menuWidgets.js ++++ b/menuWidgets.js +@@ -3,7 +3,11 @@ + import Atk from 'gi://Atk'; + import Clutter from 'gi://Clutter'; + import Gio from 'gi://Gio'; + import GLib from 'gi://GLib'; +-import GMenu from 'gi://GMenu'; ++ ++import GIRepository from 'gi://GIRepository'; ++GIRepository.Repository.prepend_search_path('@gmenu_path@'); ++const {default: GMenu} = await import('gi://GMenu'); ++ + import GObject from 'gi://GObject'; + import Graphene from 'gi://Graphene'; + import Pango from 'gi://Pango'; +--- a/menulayouts/baseMenuLayout.js ++++ b/menulayouts/baseMenuLayout.js +@@ -1,7 +1,11 @@ + import Clutter from 'gi://Clutter'; + import Gio from 'gi://Gio'; + import GLib from 'gi://GLib'; +-import GMenu from 'gi://GMenu'; ++ ++import GIRepository from 'gi://GIRepository'; ++GIRepository.Repository.prepend_search_path('@gmenu_path@'); ++const {default: GMenu} = await import('gi://GMenu'); ++ + import GObject from 'gi://GObject'; + import Shell from 'gi://Shell'; + import St from 'gi://St'; diff --git a/packages/cppyy/default.nix b/packages/cppyy/default.nix new file mode 100644 index 00000000..aab708d3 --- /dev/null +++ b/packages/cppyy/default.nix @@ -0,0 +1,29 @@ +{ + stdenv, + lib, + fetchFromGitHub, + pkg-config, + cmake, + setuptools, + python, +}: let + cppyy = python.buildPythonPackage rec { + pname = "cppyy"; + version = "3.5.0"; + + src = fetchFromGitHub { + owner = "wlav"; + repo = pname; + rev = version; + sha256 = lib.fakeSha256; + }; + + pythonImportsCheck = ["cppyy" "test"]; + + meta = with lib; { + homepage = "https://github.com/wlav/cppyy"; + description = "Python C++ bindings interface based on Cling/LLVM"; + license = licenses.bsd3Lbnl; + }; + }; +in cppyy \ No newline at end of file diff --git a/systems/koishi.nix b/systems/koishi.nix index 0e9ab9f1..1807ea37 100644 --- a/systems/koishi.nix +++ b/systems/koishi.nix @@ -19,8 +19,11 @@ _: let secureboot ]) ++ (with tree.nixos.environments; [ - #kde - gnome + #sway + #xfce + #openbox + kde + #gnome ]); config = { home-manager.users.kat.imports = @@ -29,8 +32,10 @@ _: let devops ]) ++ (with tree.home.environments; [ - #kde - gnome + #xfce + #sway + kde + #gnome ]); fileSystems."/" = { diff --git a/tree.nix b/tree.nix index d099f3a7..1fea0f98 100644 --- a/tree.nix +++ b/tree.nix @@ -61,9 +61,6 @@ enable = true; }; }; - "nixos/hardware" = { - external = inputs.nixos-hardware.outputs.nixosModules; - }; "nixos/hardware/conditional" = { functor.enable = true; };