From 21f6b46021893a44d4329d5473a789ee5ee4ba65 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 23:23:26 +1100 Subject: [PATCH 001/403] packages/spotify-adblock: change to cargoHash --- packages/spotify-adblock/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/spotify-adblock/default.nix b/packages/spotify-adblock/default.nix index d076e87..89161f0 100644 --- a/packages/spotify-adblock/default.nix +++ b/packages/spotify-adblock/default.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage { version = "1.0"; src = inputs.spotify-adblock; - cargoSha256 = "sha256-yxumYGAMObgl1u6GlbEQOKOn1DWxXN8bbT7BjiWT96o="; + cargoHash = "sha256-yxumYGAMObgl1u6GlbEQOKOn1DWxXN8bbT7BjiWT96o="; patches = [ ./0002-allow-setting-config-from-environment-variable.patch ]; From faad8ea374765bbf0f71e8a0e9086a92b34fb860 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 23:32:16 +1100 Subject: [PATCH 002/403] workflow: use bash for update.sh i tried... --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index c9ce776..6167e8c 100755 --- a/update.sh +++ b/update.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env -S nix shell 'nixpkgs#git' 'nixpkgs#curl' -c sh +#!/usr/bin/env -S nix shell 'nixpkgs#git' 'nixpkgs#curl' -c bash update_kernel() { previous_ver=$(cat packages/linux-lava/sources.nix | grep "version =" | sed --expression='s/[^0-9.]//g') From b6c10e73256e6e464873e67ac9ed517bc5f35677 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 23:48:59 +1100 Subject: [PATCH 003/403] workflow: use pat token to allow for workflow chaining --- .github/workflows/autoupdate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/autoupdate.yml b/.github/workflows/autoupdate.yml index 67158bd..aeaef9b 100644 --- a/.github/workflows/autoupdate.yml +++ b/.github/workflows/autoupdate.yml @@ -44,5 +44,5 @@ jobs: if: steps.check.outputs.skip == 0 uses: ad-m/github-push-action@master with: - github_token: ${{ secrets.GITHUB_TOKEN }} + github_token: ${{ secrets.PAT_TOKEN }} branch: ${{ steps.check.outputs.branch_name }} From 6eda948d6e41b4778d4087c25bb924c333c9258e Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 23:53:47 +1100 Subject: [PATCH 004/403] workflow: fixup pat token --- .github/workflows/autoupdate.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/autoupdate.yml b/.github/workflows/autoupdate.yml index aeaef9b..6ab9707 100644 --- a/.github/workflows/autoupdate.yml +++ b/.github/workflows/autoupdate.yml @@ -12,6 +12,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + with: + token: ${{ secrets.PAT_TOKEN }} - name: Check for updates id: check From 4ce28a177c210fd1b4a6858b64078e573bf4e675 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 18 Mar 2025 00:09:46 +1100 Subject: [PATCH 005/403] packages/linux-lava: don't use ccache by default --- flake.nix | 1 + overlays/linux-lava.nix | 7 +++---- packages/linux-lava/default.nix | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index b728f33..d785db3 100644 --- a/flake.nix +++ b/flake.nix @@ -80,6 +80,7 @@ in { inherit (pkgs.me) linux-lava spotify-adblock; + linux-lava-ccache = pkgs.me.linux-lava.override { useCcache = true; }; }; }; } diff --git a/overlays/linux-lava.nix b/overlays/linux-lava.nix index d83fb98..4cfa1a4 100644 --- a/overlays/linux-lava.nix +++ b/overlays/linux-lava.nix @@ -10,12 +10,11 @@ self: super: let echo " -resource-dir=${llvmPackages.libclang.lib}/lib/clang/${clangVersion}" >> $out/nix-support/cc-cflags ''; }; - stdenv = super.ccacheStdenv.override { - stdenv = super.overrideCC llvmPackages.stdenv cc; - }; + stdenv = super.overrideCC llvmPackages.stdenv cc; + ccacheStdenv = super.ccacheStdenv.override { inherit stdenv; }; in { linuxLavaEnv = { - inherit llvmPackages clangVersion cc stdenv; + inherit llvmPackages clangVersion cc stdenv ccacheStdenv; }; rust-bindgen-unwrapped = super.rust-bindgen-unwrapped.override { clang = cc; diff --git a/packages/linux-lava/default.nix b/packages/linux-lava/default.nix index a4623d9..0287a51 100644 --- a/packages/linux-lava/default.nix +++ b/packages/linux-lava/default.nix @@ -3,6 +3,7 @@ , inputs , lib , linuxLavaEnv +, useCcache ? false , ... } @ args: @@ -10,7 +11,7 @@ let sources = callPackage ./sources.nix { inherit inputs; }; kernel = buildLinux (args // { inherit (sources) src kernelPatches; - inherit (linuxLavaEnv) stdenv; + stdenv = if useCcache then linuxLavaEnv.ccacheStdenv else linuxLavaEnv.stdenv; version = "${sources.version}-tkg-Lava"; isZen = true; extraMakeFlags = [ "LLVM=1" "LLVM_IAS=1" ]; From c0b65cd53bded27b47dc62a73395ad8f80f7a00c Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 18 Mar 2025 11:22:01 +1100 Subject: [PATCH 006/403] workflows/cachix: remove packages for more free build space --- .github/workflows/cachix.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml index bdc63ba..2112f8d 100644 --- a/.github/workflows/cachix.yml +++ b/.github/workflows/cachix.yml @@ -23,6 +23,14 @@ jobs: name: Build linux-lava for x86_64-linux runs-on: ubuntu-latest steps: + # credits to https://github.com/easimon/maximize-build-space/issues/45 + - name: Remove unneeded packages to maximise build space + shell: bash + run: | + df -h + sudo rm -rf /usr/share/dotnet + sudo rm -rf /usr/local/lib/android + df -h - uses: actions/checkout@v4 with: fetch-depth: 0 From 7d8dbaef0d273bdb66c52740bcb45dcc867fbc5c Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 18 Mar 2025 17:29:53 +1100 Subject: [PATCH 007/403] user/catppuccin: create specialisations for more streamlined switching --- modules/user/catppuccin.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/user/catppuccin.nix b/modules/user/catppuccin.nix index e941fc0..cf22df4 100644 --- a/modules/user/catppuccin.nix +++ b/modules/user/catppuccin.nix @@ -15,7 +15,7 @@ config = { catppuccin = { accent = "maroon"; - flavor = "mocha"; + flavor = lib.mkDefault "mocha"; kitty.enable = true; gtk.enable = true; hyprlock.enable = true; @@ -27,5 +27,10 @@ style.name = "kvantum"; platformTheme.name = "kvantum"; }; + + specialisation = { + light.configuration.catppuccin.flavor = "latte"; + dark.configuration.catppuccin.flavor = "mocha"; + }; }; } From 8818d8a1aab5d3035f643f0e47d2bd242db505e3 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 18 Mar 2025 18:01:59 +1100 Subject: [PATCH 008/403] user/catppuccin: create specialisation switcher --- modules/user/catppuccin.nix | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/modules/user/catppuccin.nix b/modules/user/catppuccin.nix index cf22df4..f16d161 100644 --- a/modules/user/catppuccin.nix +++ b/modules/user/catppuccin.nix @@ -1,4 +1,4 @@ -{ config, inputs, lib, ... }: { +{ config, inputs, lib, pkgs, ... }: { imports = [ inputs.catppuccin.homeManagerModules.catppuccin ]; @@ -32,5 +32,27 @@ light.configuration.catppuccin.flavor = "latte"; dark.configuration.catppuccin.flavor = "mocha"; }; + + home.packages = [(pkgs.writeShellScriptBin "theme" '' + if [ "$1" != "dark" ] && [ "$1" != "light" ]; then + echo "invalid theme, valid values: [dark, light]" + exit 1 + fi + current="$HOME/.local/state/nix/profiles/home-manager" + cached="$HOME/.local/state/last-parent-specialisation" + if [ -d "$current/specialisation" ]; then + if [ -d "$cached" ]; then + rm -f "$cached" + fi + ln -sf "$(readlink -f $current)" "$cached" + fi + + if [ ! -d "$cached/specialisation" ]; then + echo "no specialisations found" + exit 1 + fi + + "$cached/specialisation/$1/activate" + '')]; }; } From a9e3d8421e4ec2bbad1edb6a459d73b14d7ce7f0 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 18 Mar 2025 18:59:47 +1100 Subject: [PATCH 009/403] user/eww-wayland: use 'bad wifi' icon for missing net strength --- res/eww-wayland/eww.yuck | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/eww-wayland/eww.yuck b/res/eww-wayland/eww.yuck index 288b89c..08b41ce 100644 --- a/res/eww-wayland/eww.yuck +++ b/res/eww-wayland/eww.yuck @@ -106,7 +106,7 @@ :space-evenly false (label :text { (lnetwork == "Disconnected") ? "" - : (network_strength == "") ? "" + : (network_strength == "") ? "" : (network_strength < 20) ? "" : (network_strength < 30) ? "" : (network_strength < 55) ? "" From e447adb0ce5b28842b00d149107dd5f985c44428 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 18 Mar 2025 00:37:15 +1100 Subject: [PATCH 010/403] system/greetd_wayland: fix and source zshrc --- modules/system/greetd_wayland.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/system/greetd_wayland.nix b/modules/system/greetd_wayland.nix index 9295b27..b441dfa 100644 --- a/modules/system/greetd_wayland.nix +++ b/modules/system/greetd_wayland.nix @@ -8,7 +8,7 @@ }; initial_session = { - command = "Hyprland > \"$XDG_RUNTIME_DIR/Hyprland.out\""; + command = "source $HOME/.config/zsh/.zshrc && Hyprland > \"$XDG_RUNTIME_DIR/Hyprland.out\""; user = "rin"; }; }; From 9ef4231da07e861b54817bd40afec9db3f02890b Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 18 Mar 2025 19:41:03 +1100 Subject: [PATCH 011/403] user/hyprlock: styling to match eww --- modules/user/hyprlock.nix | 53 +++++++++++++++++++++++++++++++-------- 1 file changed, 43 insertions(+), 10 deletions(-) diff --git a/modules/user/hyprlock.nix b/modules/user/hyprlock.nix index 2311d52..c99fd84 100644 --- a/modules/user/hyprlock.nix +++ b/modules/user/hyprlock.nix @@ -16,6 +16,28 @@ monitor = ""; color = "$base"; }; + shape = [ + # Battery pill + { + monitor = ""; + size = "165, 65"; + color = "$crust"; + rounding = -1; + halign = "right"; + valign = "top"; + position = "-595,-10"; + } + # Time pill + { + monitor = ""; + size = "545, 65"; + color = "$crust"; + rounding = -1; + halign = "right"; + valign = "top"; + position = "-40,-10"; + } + ]; label = [ # Fingerprint icon { @@ -50,28 +72,39 @@ halign = "center"; valign = "center"; } - # Time + # Battery icon { monitor = ""; - text = "$TIME"; - color = "$text"; - font_size = 90; - font_family = "Open Sans"; - position = "-50, 0"; + text = ""; + color = "$accent"; + font_family = "Material Symbols Outlined"; + font_size = 27; + position = "-695, -20"; halign = "right"; valign = "top"; } - # Date + # Battery percentage { monitor = ""; - text = "cmd[update:43200000] date +'%A, %d %B %Y'"; + text = ''cmd[update:60000] echo "$(cat /sys/class/power_supply/BATT/capacity)%"''; color = "$text"; - font_size = 25; + font_size = 23; font_family = "Open Sans"; - position = "-50, -150"; + position = "-625, -20"; halign = "right"; valign = "top"; } + # Time and Date + { + monitor = ""; + color = "$text"; + font_family = "Open Sans"; + font_size = 23; + halign = "right"; + valign = "top"; + position = "-70, -20"; + text = ''cmd[update:1000] echo "$(date '+%A, %d %B %Y') $(date +%H:%M)$(date +:%S)"''; + } ]; input-field = { monitor = ""; From cd1b1da2fcf53bc733187bc222004733813c40ba Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 17 Mar 2025 13:11:41 +0000 Subject: [PATCH 012/403] flake: bump inputs --- flake.lock | 99 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index 15c58b3..9a7f278 100644 --- a/flake.lock +++ b/flake.lock @@ -72,11 +72,11 @@ "catppuccin-palette": { "flake": false, "locked": { - "lastModified": 1741384489, - "narHash": "sha256-aIIwnSRJPQGaAwprYIRQ7Bp5MtpAhJS8Y007cBi0UsI=", + "lastModified": 1741520281, + "narHash": "sha256-SVF1fNFdvWxZq5vZWiA5WL1VT2qFxuZ5l0ncCwGiy4E=", "owner": "catppuccin", "repo": "palette", - "rev": "5bb0420add3b61e4c7e32549e014f06e03dfbc42", + "rev": "1d13846d736bdd96ca84e8406209c834ed9f8fc6", "type": "github" }, "original": { @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1740872218, - "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3876f6b87db82f33775b1ef5ea343986105db764", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -229,11 +229,11 @@ ] }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -246,11 +246,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1740872218, - "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3876f6b87db82f33775b1ef5ea343986105db764", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -287,11 +287,11 @@ ] }, "locked": { - "lastModified": 1740915799, - "narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=", + "lastModified": 1742058297, + "narHash": "sha256-b4SZc6TkKw8WQQssbN5O2DaCEzmFfvSTPYHlx/SFW9Y=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "42b1ba089d2034d910566bf6b40830af6b8ec732", + "rev": "59f17850021620cd348ad2e9c0c64f4e6325ce2a", "type": "github" }, "original": { @@ -331,11 +331,11 @@ ] }, "locked": { - "lastModified": 1739595404, - "narHash": "sha256-0CjCfbq0yHWexOrpO06e2WU1r5JAqR6ffy1zgM3NksI=", + "lastModified": 1742014779, + "narHash": "sha256-I6fG1zrfdLFcp/imGZElig0BJO3YU0QEXLgvwWoOpJ8=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "06519cec8fb32d219006da6eacd255504a9996af", + "rev": "524637ef84c177661690b924bf64a1ce18072a2c", "type": "github" }, "original": { @@ -415,11 +415,11 @@ ] }, "locked": { - "lastModified": 1741416850, - "narHash": "sha256-iqRxCsRxE/Q/3W1RHxQMthPKEda0hhY65uxEpE5TNk4=", + "lastModified": 1741955947, + "narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=", "owner": "nix-community", "repo": "home-manager", - "rev": "26f6b862645ff281f3bada5d406e8c20de8d837c", + "rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4", "type": "github" }, "original": { @@ -459,11 +459,11 @@ "linux-tkg": { "flake": false, "locked": { - "lastModified": 1741397765, - "narHash": "sha256-39zEl8F5HUOHdVaMeo+0jYs056w3vDmjdPhK/GzbqBU=", + "lastModified": 1741917569, + "narHash": "sha256-53CtqldMcB7R8Zx/xoLA+5ks6V2bGAGNHpJc4eGfUJc=", "owner": "Frogging-Family", "repo": "linux-tkg", - "rev": "1146bf0623e06befb70e2905f42f033351fbd19f", + "rev": "ea7470efe0d98ddccdee7d80bb422a5cbd8402ba", "type": "github" }, "original": { @@ -485,11 +485,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1741306000, - "narHash": "sha256-qaDw0TyUceZBLntPBOdd1642T/mBGMNtK5NBuv2gWiY=", + "lastModified": 1742205116, + "narHash": "sha256-u8Nq1jptSJnjwSvuWf/DIbNK++Kqnee9WPCgjEdz2H0=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "c1855b306b8eeb70118b3ba70471188a65e694e7", + "rev": "acd0f86437b2aeb4f5fab804d6addf951d03f48d", "type": "github" }, "original": { @@ -501,11 +501,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1741302428, - "narHash": "sha256-zcgucpL/rgEC/IIii6R4NvmtJsYT+/F0ub1FQOWVv0Q=", + "lastModified": 1742165799, + "narHash": "sha256-cv6TDPYQe5mQUqY5p0KDXO1W4CPeJ5Jw277LeXoJW7c=", "owner": "neovim", "repo": "neovim", - "rev": "e46f07b1d2942c7b5c08fca9a4cac735ee2c0c71", + "rev": "502324a7b5f875ba61d65444cee34146f47c8f74", "type": "github" }, "original": { @@ -520,11 +520,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1741311896, - "narHash": "sha256-M/ppn20it9Ru2hoYoWIYzEWyTfBVxQiAQ7SvRws+luY=", + "lastModified": 1742176115, + "narHash": "sha256-gWZhY2Il5aGL2lxwwHaOQ1jPF4ZEW/eQLAPzqpO/xmQ=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "0e78e723bdf5a13dc45f3a6b994715b871c3f650", + "rev": "7a5e1f3c5ed63bcf047103d1edd9276e77b4f684", "type": "github" }, "original": { @@ -551,14 +551,17 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1740872140, - "narHash": "sha256-3wHafybyRfpUCLoE8M+uPVZinImg3xX+Nm6gEfN3G8I=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz" + "lastModified": 1740877520, + "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz" + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" } }, "nixpkgs-stable": { @@ -579,11 +582,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1740791350, - "narHash": "sha256-igS2Z4tVw5W/x3lCZeeadt0vcU9fxtetZ/RyrqsCRQ0=", + "lastModified": 1741865919, + "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "199169a2135e6b864a888e89a2ace345703c025d", + "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", "type": "github" }, "original": { @@ -595,11 +598,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1741246872, - "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", + "lastModified": 1742069588, + "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", + "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "type": "github" }, "original": { @@ -635,11 +638,11 @@ "nvim-treesitter": { "flake": false, "locked": { - "lastModified": 1741416594, - "narHash": "sha256-nnnCrsOFm82/Oa6/ipbRQiy7K4f5o9bw4G6qGaYNGIU=", + "lastModified": 1742194526, + "narHash": "sha256-/VEZSYkaSZrKSkNDFb58njvQM/uf129t8Xr0/r4m0ac=", "owner": "nvim-treesitter", "repo": "nvim-treesitter", - "rev": "ee8e149a4ff75ebd5f1b065831746ddaf0e480ec", + "rev": "d76a8b6e1b67fd3bcffec4a5d45fd9dee4dbbee8", "type": "github" }, "original": { From c826c7f3816f2f5de2100636f171c2efa2f2745e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 17 Mar 2025 13:11:42 +0000 Subject: [PATCH 013/403] packages/linux-lava: bump to 6.13.7 --- packages/linux-lava/sources.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix index f084b98..fad3ed0 100644 --- a/packages/linux-lava/sources.nix +++ b/packages/linux-lava/sources.nix @@ -1,8 +1,8 @@ { fetchFromGitHub, inputs, lib }: let - version = "6.13.6"; + version = "6.13.7"; kernelHash = "0vhdz1as27kxav81rkf6fm85sqrbj5hjhz5hpyxcd5b6p1pcr7g7"; - kernelPatchHash = "11jbq6j7kz47p1291ys9b7v7jh7skaw1n4rj10ahl5m701lsk0vz"; + kernelPatchHash = "0akxqc8fdf6gkiy967crp7m1ikidd3rlhx804y3da1jl75dgqcrw"; mm = lib.versions.majorMinor version; tkgPatches = [ From bc793316b9701dc849fec37dd2a23aa929e59a61 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 19 Mar 2025 00:35:57 +1100 Subject: [PATCH 014/403] system/greetd_wayland: fix autologin --- modules/system/greetd_wayland.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/system/greetd_wayland.nix b/modules/system/greetd_wayland.nix index b441dfa..367e74f 100644 --- a/modules/system/greetd_wayland.nix +++ b/modules/system/greetd_wayland.nix @@ -8,7 +8,9 @@ }; initial_session = { - command = "source $HOME/.config/zsh/.zshrc && Hyprland > \"$XDG_RUNTIME_DIR/Hyprland.out\""; + command = "${pkgs.writeShellScript "launch.sh" '' + zsh -c "source $HOME/.config/zsh/.zshrc && Hyprland > \"$XDG_RUNTIME_DIR/Hyprland.out\"" + ''}"; user = "rin"; }; }; From 3c5d4ba108eff9ea47aaed9ffcf135c2eb955ba4 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 19 Mar 2025 00:36:17 +1100 Subject: [PATCH 015/403] anemone/kernel: allow hibernation on ac --- hosts/anemone/kernel.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/anemone/kernel.nix b/hosts/anemone/kernel.nix index 97d19be..45fa976 100644 --- a/hosts/anemone/kernel.nix +++ b/hosts/anemone/kernel.nix @@ -32,7 +32,7 @@ systemd.sleep.extraConfig = '' HibernateDelaySec=14400 SuspendEstimationSec=3600 - HibernateOnACPower=false + HibernateOnACPower=true ''; powerManagement.cpufreq.min = 400000; From f9de112a18005207853c2cbec6db8a7dd5908bf8 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 19 Mar 2025 13:52:11 +1100 Subject: [PATCH 016/403] user/catppuccin: persist theme on reboot --- modules/user/catppuccin.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/modules/user/catppuccin.nix b/modules/user/catppuccin.nix index f16d161..9cbac38 100644 --- a/modules/user/catppuccin.nix +++ b/modules/user/catppuccin.nix @@ -34,8 +34,19 @@ }; home.packages = [(pkgs.writeShellScriptBin "theme" '' - if [ "$1" != "dark" ] && [ "$1" != "light" ]; then - echo "invalid theme, valid values: [dark, light]" + last_path="$HOME/.local/state/last-theme" + target="$1" + if [ "$target" == "restore" ]; then + echo "restoring theme" + if [ ! -e "$last_path" ]; then + echo "no last theme found; assuming dark" + target="dark" + else + target=$(cat "$last_path" | tr -d "\n") + fi + fi + if [ "$target" != "dark" ] && [ "$target" != "light" ]; then + echo "invalid theme, valid values: [dark, light, restore]" exit 1 fi current="$HOME/.local/state/nix/profiles/home-manager" @@ -52,7 +63,9 @@ exit 1 fi - "$cached/specialisation/$1/activate" + "$cached/specialisation/$target/activate" + + echo "$target" > "$last_path" '')]; }; } From f6cc66d75ce098086c0096eefbf6f76d70253d1d Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 19 Mar 2025 13:53:06 +1100 Subject: [PATCH 017/403] user/catppuccin: remove kvantum --- modules/user/catppuccin.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/modules/user/catppuccin.nix b/modules/user/catppuccin.nix index 9cbac38..3679328 100644 --- a/modules/user/catppuccin.nix +++ b/modules/user/catppuccin.nix @@ -19,14 +19,8 @@ kitty.enable = true; gtk.enable = true; hyprlock.enable = true; - kvantum.enable = true; nvim.enable = true; }; - qt = { - enable = true; - style.name = "kvantum"; - platformTheme.name = "kvantum"; - }; specialisation = { light.configuration.catppuccin.flavor = "latte"; From 8cd8e9e3dd5a270847d5c19bf3a7e28ba565adb0 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 19 Mar 2025 14:06:32 +1100 Subject: [PATCH 018/403] user/catppuccin: add get_last to theme script --- modules/user/catppuccin.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/user/catppuccin.nix b/modules/user/catppuccin.nix index 3679328..ece7f62 100644 --- a/modules/user/catppuccin.nix +++ b/modules/user/catppuccin.nix @@ -30,10 +30,20 @@ home.packages = [(pkgs.writeShellScriptBin "theme" '' last_path="$HOME/.local/state/last-theme" target="$1" + if [ "$target" == "get_last" ]; then + if [ ! -e "$last_path" ]; then + echo "no last theme found; assuming dark" >&2 + target="dark" + else + target=$(cat "$last_path" | tr -d "\n") + fi + echo "$target" + exit 0 + fi if [ "$target" == "restore" ]; then echo "restoring theme" if [ ! -e "$last_path" ]; then - echo "no last theme found; assuming dark" + echo "no last theme found; assuming dark" >&2 target="dark" else target=$(cat "$last_path" | tr -d "\n") From 54e802548851797b7a254aa9caacdf07948ebe03 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 19 Mar 2025 15:32:29 +1100 Subject: [PATCH 019/403] user/kitty: set window margin to 5 --- modules/user/kitty.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/user/kitty.nix b/modules/user/kitty.nix index 1ae7970..3018c85 100644 --- a/modules/user/kitty.nix +++ b/modules/user/kitty.nix @@ -11,6 +11,7 @@ enable_audio_bell = false; color5 = config.catppuccin.hexcolors.mauve; color13 = config.catppuccin.hexcolors.mauve; + window_margin_width = 5; }; }; } From 5f1b9b17ecf886af26d81c639f57486e1d674ac5 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Thu, 20 Mar 2025 21:54:10 +1100 Subject: [PATCH 020/403] user/spicetify: add custom css for nowplaying menu --- modules/user/spicetify.nix | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/modules/user/spicetify.nix b/modules/user/spicetify.nix index 998f9f6..f917968 100644 --- a/modules/user/spicetify.nix +++ b/modules/user/spicetify.nix @@ -8,7 +8,25 @@ in programs.spicetify = { enable = true; alwaysEnableDevTools = true; - theme = spicePkgs.themes.catppuccin; + theme = spicePkgs.themes.catppuccin // { + additionalCss = '' + /* Removes "About the artist" text in now playing menu */ + .main-nowPlayingView-sectionHeaderText { + display: none; + } + + /* Removes gradient in now playing menu */ + .main-nowPlayingView-contextItemInfo:before { + background: none; + } + + /* Removes gradient above artist image */ + /* https://stackoverflow.com/a/77015731 < this is so smart */ + .main-nowPlayingView-aboutArtistV2ImageContainer.main-nowPlayingView-aboutArtistV2Image { + background-size: 0% 0%, cover; + } + ''; + }; colorScheme = config.catppuccin.flavor; enabledSnippets = with spicePkgs.snippets; [ From 30a59b4be03472d20f1e21986b0f0478d28a274e Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Thu, 20 Mar 2025 22:28:12 +1100 Subject: [PATCH 021/403] user/spicetify: link spicetify to .local/bin when switching themes using home-manager specialisations, the user environment in /etc/profiles/per-user is not updated (managed by nixos), so we create a symlink here to force it to use the current hm config's spicetify (.local/bin has higher priority) this is a workaround at best, a hack at worst. should probably somehow make /etc/profiles irrelevant and use something else user-managed. --- modules/user/spicetify.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/user/spicetify.nix b/modules/user/spicetify.nix index f917968..6249895 100644 --- a/modules/user/spicetify.nix +++ b/modules/user/spicetify.nix @@ -1,4 +1,4 @@ -{ config, inputs, pkgs, ... }: +{ config, inputs, lib, pkgs, ... }: let spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; in @@ -46,4 +46,6 @@ in volumePercentage ]; }; + + home.file.".local/bin/spotify".source = lib.getExe config.programs.spicetify.spicedSpotify; } From 94d72b25f01273cc8f2bd8410e0b17faba46bd11 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Fri, 21 Mar 2025 21:14:21 +1100 Subject: [PATCH 022/403] rin/packages: remove discord-canary --- users/rin/packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/users/rin/packages.nix b/users/rin/packages.nix index 31454a5..163df9f 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -26,7 +26,6 @@ in { nodePackages_latest.pnpm ] ++ lib.optionals enableGUI [ - discord-canary drawio element-desktop eww From b89253931d3b16f04151f46f9c0b532a1e57aba7 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 23 Mar 2025 11:12:55 +1100 Subject: [PATCH 023/403] user/kitty: add scrollback pager --- modules/user/kitty.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/user/kitty.nix b/modules/user/kitty.nix index 3018c85..ddc189a 100644 --- a/modules/user/kitty.nix +++ b/modules/user/kitty.nix @@ -12,6 +12,8 @@ color5 = config.catppuccin.hexcolors.mauve; color13 = config.catppuccin.hexcolors.mauve; window_margin_width = 5; + scrollback_pager = ''nvim --noplugin -c "set signcolumn=no showtabline=0" -c "silent write! /tmp/kitty_scrollback_buffer | te cat /tmp/kitty_scrollback_buffer - " -c "autocmd VimEnter * normal G"''; + scrollback_pager_history_size = 2; }; }; } From 46c30b9d5d6737648ed839750878b14129881d44 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 23 Mar 2025 00:23:58 +1100 Subject: [PATCH 024/403] treewide: prune out xorg --- hosts/hyacinth/default.nix | 2 -- hosts/hyacinth/kernel.nix | 8 ----- modules/default.nix | 4 --- modules/system/greetd_wayland.nix | 7 +--- modules/system/greetd_xorg.nix | 16 --------- modules/system/input.nix | 7 ---- modules/user/eww.nix | 8 ----- modules/user/rofi.nix | 7 ---- modules/user/sessionVariables.nix | 1 - modules/user/xorg.nix | 51 --------------------------- overlays/default.nix | 1 - overlays/patches/startx.patch | 13 ------- overlays/xinit.nix | 10 ------ scripts/xinitrc | 11 ------ users/rin/packages.nix | 2 -- users/rin/xorg.nix | 58 ------------------------------- 16 files changed, 1 insertion(+), 205 deletions(-) delete mode 100644 modules/system/greetd_xorg.nix delete mode 100644 modules/user/eww.nix delete mode 100644 modules/user/rofi.nix delete mode 100644 modules/user/xorg.nix delete mode 100644 overlays/patches/startx.patch delete mode 100644 overlays/xinit.nix delete mode 100755 scripts/xinitrc delete mode 100644 users/rin/xorg.nix diff --git a/hosts/hyacinth/default.nix b/hosts/hyacinth/default.nix index 9584f3a..ae0364a 100644 --- a/hosts/hyacinth/default.nix +++ b/hosts/hyacinth/default.nix @@ -20,7 +20,6 @@ ccache corectrl flatpak - #greetd_xorg greetd_wayland gui input @@ -39,7 +38,6 @@ ./networking.nix ./packages.nix - #../../users/rin/xorg.nix ../../users/rin/wayland.nix ]; services.postgresql.ensureDatabases = [ "barista" "barista-dev" ]; diff --git a/hosts/hyacinth/kernel.nix b/hosts/hyacinth/kernel.nix index 7ce4a16..3e2d8d1 100644 --- a/hosts/hyacinth/kernel.nix +++ b/hosts/hyacinth/kernel.nix @@ -13,12 +13,4 @@ ]; kernelPackages = lib.mkForce (pkgs.linuxPackagesFor pkgs.me.linux-lava); }; - services.xserver.xrandrHeads = [{ - output = "DP-1"; - primary = true; - monitorConfig = '' - Modeline "2560x1440_144.00" 808.75 2560 2792 3072 3584 1440 1443 1448 1568 -hsync +vsync - Option "PreferredMode" "2560x1440_144.00" - ''; - }]; } diff --git a/modules/default.nix b/modules/default.nix index 295a8db..36b8adc 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -33,7 +33,6 @@ in { ./system/corectrl.nix ./system/flatpak.nix ./system/greetd_wayland.nix - ./system/greetd_xorg.nix ./system/gui.nix ./system/home-manager.nix ./system/input.nix @@ -54,7 +53,6 @@ in { ./user/direnv.nix ./user/dunst.nix ./user/eww.nix - ./user/eww-wayland.nix ./user/git.nix ./user/gpg.nix ./user/hypridle.nix @@ -70,13 +68,11 @@ in { ./user/picom.nix ./user/polybar.nix ./user/rofi.nix - ./user/rofi-wayland.nix ./user/sessionVariables.nix ./user/spicetify.nix ./user/sxhkd.nix ./user/theming.nix ./user/xdg.nix - ./user/xorg.nix ./user/zsh.nix ]; } diff --git a/modules/system/greetd_wayland.nix b/modules/system/greetd_wayland.nix index 367e74f..ad4a2d6 100644 --- a/modules/system/greetd_wayland.nix +++ b/modules/system/greetd_wayland.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: { +{ pkgs, ... }: { services.greetd = { enable = true; settings = { @@ -15,9 +15,4 @@ }; }; }; - - services.xserver = { - autorun = false; - displayManager.startx.enable = true; - }; } diff --git a/modules/system/greetd_xorg.nix b/modules/system/greetd_xorg.nix deleted file mode 100644 index 2958926..0000000 --- a/modules/system/greetd_xorg.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ pkgs, lib, ... }: { - services.greetd = { - enable = true; - settings = { - default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --remember --asterisks --time --cmd 'zsh -c \"source $HOME/.config/zsh/.zshrc && startx\"'"; - user = "greeter"; - }; - }; - }; - - services.xserver = { - autorun = false; - displayManager.startx.enable = true; - }; -} diff --git a/modules/system/input.nix b/modules/system/input.nix index 6eaf550..2ef1eab 100644 --- a/modules/system/input.nix +++ b/modules/system/input.nix @@ -8,12 +8,5 @@ }; xkb.options = "caps:escape"; }; - services.libinput = { - enable = true; - mouse = { - accelSpeed = "0"; - accelProfile = "flat"; - }; - }; console.useXkbConfig = true; } diff --git a/modules/user/eww.nix b/modules/user/eww.nix deleted file mode 100644 index b0a8099..0000000 --- a/modules/user/eww.nix +++ /dev/null @@ -1,8 +0,0 @@ -# Depends on bspwm -{ pkgs, ... }: { - home.packages = with pkgs; [ xtitle ]; - programs.eww = { - enable = true; - configDir = ../../res/eww; - }; -} diff --git a/modules/user/rofi.nix b/modules/user/rofi.nix deleted file mode 100644 index 45fcc4d..0000000 --- a/modules/user/rofi.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, inputs, ... }: { - programs.rofi = { - enable = true; - theme = "theme"; - }; - xdg.configFile."rofi/theme.rasi".source = ../../res/theme.rasi; -} diff --git a/modules/user/sessionVariables.nix b/modules/user/sessionVariables.nix index ef9caab..60d8a81 100644 --- a/modules/user/sessionVariables.nix +++ b/modules/user/sessionVariables.nix @@ -22,7 +22,6 @@ NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc"; PUB_CACHE = "${config.xdg.cacheHome}/dart"; WGETRC = "${config.xdg.configHome}/wgetrc"; - XINITRC = "${config.xdg.configHome}/xorg/xinitrc"; WINEPREFIX = "${config.xdg.dataHome}/wine64"; WINEARCH = "win64"; diff --git a/modules/user/xorg.nix b/modules/user/xorg.nix deleted file mode 100644 index b8ba9da..0000000 --- a/modules/user/xorg.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ config, ... }: { - - xsession = { - enable = true; - profilePath = ".config/xorg/xprofile"; - scriptPath = ".config/xorg/xsession"; - }; - - xdg.configFile."xorg/xinitrc".source = ../../scripts/xinitrc; - xresources = { - path = "${config.xdg.configHome}/xorg/xresources"; - properties = { - # special - "*.foreground" = "#c5c8c6"; - "*.background" = "#1d1f21"; - "*.cursorColor" = "#c5c8c6"; - - # black - "*.color0" = "#1d1f21"; - "*.color8" = "#969896"; - - # red - "*.color1" = "#cc342b"; - "*.color9" = "#cc342b"; - - # green - "*.color2" = "#198844"; - "*.color10" = "#198844"; - - # yellow - "*.color3" = "#fba922"; - "*.color11" = "#fba922"; - - # blue - "*.color4" = "#3971ed"; - "*.color12" = "#3971ed"; - - # magenta - "*.color5" = "#a36ac7"; - "*.color13" = "#a36ac7"; - - # cyan - "*.color6" = "#3971ed"; - "*.color14" = "#3971ed"; - - # white - "*.color7" = "#c5c8c6"; - "*.color15" = "#ffffff"; - }; - }; -} diff --git a/overlays/default.nix b/overlays/default.nix index ff5bad1..1f34ee1 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -7,5 +7,4 @@ builtins.map (path: import path) [ ./rofi.nix ./steam.nix ./utillinux.nix - ./xinit.nix ] diff --git a/overlays/patches/startx.patch b/overlays/patches/startx.patch deleted file mode 100644 index aba345e..0000000 --- a/overlays/patches/startx.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/startx.cpp b/startx.cpp -index 125c398..296b29f 100644 ---- a/startx.cpp -+++ b/startx.cpp -@@ -270,7 +270,7 @@ if [ x"$enable_xauth" = x1 ] ; then - dummy=0 - - XCOMM create a file with auth information for the server. ':0' is a dummy. -- xserverauthfile=$HOME/.serverauth.$$ -+ xserverauthfile=$XAUTHORITY - trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP BUS TERM - xauth -q -f "$xserverauthfile" << EOF - add :$dummy . $mcookie diff --git a/overlays/xinit.nix b/overlays/xinit.nix deleted file mode 100644 index 6d0daed..0000000 --- a/overlays/xinit.nix +++ /dev/null @@ -1,10 +0,0 @@ -self: super: { - xorg = super.xorg // { - xinit = super.xorg.xinit.overrideAttrs (old: { - # Some info: - # - Make startx use $XAUTHORITY as server auth files instead of .serverauth.$$ - # - Make startx respect $XINITRC and $XSERVERRC - patches = (old.patches or []) ++ [ ./patches/startx.patch ]; - }); - }; -} diff --git a/scripts/xinitrc b/scripts/xinitrc deleted file mode 100755 index 44caff4..0000000 --- a/scripts/xinitrc +++ /dev/null @@ -1,11 +0,0 @@ -if test -z "$DBUS_SESSION_BUS_ADDRESS"; then - eval $(dbus-launch --exit-with-session --sh-syntax) -fi -systemctl --user import-environment DISPLAY XAUTHORITY - -if command -v dbus-update-activation-environment > /dev/null 2>&1; then - dbus-update-activation-environment DISPLAY XAUTHORITY -fi - -xrdb ${XDG_CONFIG_HOME}/xorg/xresources -exec ${XDG_CONFIG_HOME}/xorg/xsession diff --git a/users/rin/packages.nix b/users/rin/packages.nix index 163df9f..31e2213 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -58,8 +58,6 @@ in { vesktop virt-manager winetricks - xclip - xorg.xgamma zathura zenity diff --git a/users/rin/xorg.nix b/users/rin/xorg.nix deleted file mode 100644 index 8a6b604..0000000 --- a/users/rin/xorg.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ config, lib, modules, pkgs, ... }: { - programs.zsh.enable = true; - users.users.rin = { - isNormalUser = true; - extraGroups = [ "adbusers" "audio" "corectrl" "libvirtd" "networkmanager" "video" "wheel" ]; - shell = pkgs.zsh; - uid = 1001; - hashedPasswordFile = config.age.secrets.passwd.path; - }; - home-manager.users.rin = { config, enableGUI, lib, pkgs, ... }: { - home = { - username = "rin"; - homeDirectory = "/home/rin"; - stateVersion = "21.05"; - keyboard = null; # see https://github.com/nix-community/home-manager/issues/2219 - }; - - imports = with modules.user; [ - ./packages.nix - sessionVariables - - catppuccin - direnv - git - gpg - neovim - npm - pass - zsh - ] ++ lib.optionals enableGUI [ - theming - xdg - - kitty - mpv - obs - rofi - - picom - bspwm - sxhkd - xorg - dunst - eww - ]; - - services.mpris-proxy.enable = true; - - home.file.".local/bin/ipc-bridge.exe".source = builtins.fetchurl { - url = "https://github.com/0e4ef622/wine-discord-ipc-bridge/releases/download/v0.0.1/winediscordipcbridge.exe"; - sha256 = "1swn9spxpq6blm74kjmfz4ipq6a8qjzccvb2msb25pf5b1z7jnns"; - }; - home.file.".local/bin/osu" = { - executable = true; - source = ../../scripts/osu; - }; - }; -} From 2e74aa5f00f0b914f73b7177e57df81a6d84151d Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 23 Mar 2025 00:29:58 +1100 Subject: [PATCH 025/403] treewide: prune more old xorg configs, and rename wayland modules --- hosts/anemone/default.nix | 7 +- hosts/hyacinth/default.nix | 5 +- modules/default.nix | 8 +- .../system/{greetd_wayland.nix => greetd.nix} | 0 modules/system/gui.nix | 3 + modules/user/bspwm.nix | 19 -- modules/user/{eww-wayland.nix => eww.nix} | 0 modules/user/pass.nix | 6 - modules/user/picom.nix | 41 ----- modules/user/polybar.nix | 165 ------------------ modules/user/{rofi-wayland.nix => rofi.nix} | 0 modules/user/sessionVariables.nix | 1 - modules/user/sxhkd.nix | 65 ------- scripts/polybar.sh | 4 - users/rin/{wayland.nix => default.nix} | 4 +- 15 files changed, 10 insertions(+), 318 deletions(-) rename modules/system/{greetd_wayland.nix => greetd.nix} (100%) delete mode 100644 modules/user/bspwm.nix rename modules/user/{eww-wayland.nix => eww.nix} (100%) delete mode 100644 modules/user/pass.nix delete mode 100644 modules/user/picom.nix delete mode 100644 modules/user/polybar.nix rename modules/user/{rofi-wayland.nix => rofi.nix} (100%) delete mode 100644 modules/user/sxhkd.nix delete mode 100755 scripts/polybar.sh rename users/rin/{wayland.nix => default.nix} (97%) diff --git a/hosts/anemone/default.nix b/hosts/anemone/default.nix index b29d535..34b1c03 100644 --- a/hosts/anemone/default.nix +++ b/hosts/anemone/default.nix @@ -17,7 +17,7 @@ ccache corectrl flatpak - greetd_wayland + greetd gui input kernel @@ -31,12 +31,9 @@ ./kernel.nix ./networking.nix - ../../users/rin/wayland.nix + ../../users/rin ]; - programs.hyprland.enable = true; - security.pam.services.hyprlock = {}; - # For steam fhs-env nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" diff --git a/hosts/hyacinth/default.nix b/hosts/hyacinth/default.nix index ae0364a..ea385b8 100644 --- a/hosts/hyacinth/default.nix +++ b/hosts/hyacinth/default.nix @@ -20,7 +20,7 @@ ccache corectrl flatpak - greetd_wayland + greetd gui input kernel @@ -38,10 +38,9 @@ ./networking.nix ./packages.nix - ../../users/rin/wayland.nix + ../../users/rin ]; services.postgresql.ensureDatabases = [ "barista" "barista-dev" ]; - programs.hyprland.enable = true; systemd.services.nix-daemon.environment.TMPDIR = "/nix/tmp"; # For steam fhs-env diff --git a/modules/default.nix b/modules/default.nix index 36b8adc..7cd86ec 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -32,7 +32,7 @@ in { ./system/ccache.nix ./system/corectrl.nix ./system/flatpak.nix - ./system/greetd_wayland.nix + ./system/greetd.nix ./system/gui.nix ./system/home-manager.nix ./system/input.nix @@ -48,7 +48,6 @@ in { ./system/wireguard.nix ]; user = mkAttrsFromPaths [ - ./user/bspwm.nix ./user/catppuccin.nix ./user/direnv.nix ./user/dunst.nix @@ -63,14 +62,9 @@ in { ./user/neovim-minimal.nix ./user/npm.nix ./user/obs.nix - ./user/packages-rin.nix - ./user/pass.nix - ./user/picom.nix - ./user/polybar.nix ./user/rofi.nix ./user/sessionVariables.nix ./user/spicetify.nix - ./user/sxhkd.nix ./user/theming.nix ./user/xdg.nix ./user/zsh.nix diff --git a/modules/system/greetd_wayland.nix b/modules/system/greetd.nix similarity index 100% rename from modules/system/greetd_wayland.nix rename to modules/system/greetd.nix diff --git a/modules/system/gui.nix b/modules/system/gui.nix index 128e850..e9443ab 100644 --- a/modules/system/gui.nix +++ b/modules/system/gui.nix @@ -26,4 +26,7 @@ displayManager.lightdm.enable = lib.mkForce false; desktopManager.xterm.enable = false; }; + + programs.hyprland.enable = true; + security.pam.services.hyprlock = {}; } diff --git a/modules/user/bspwm.nix b/modules/user/bspwm.nix deleted file mode 100644 index 13b2941..0000000 --- a/modules/user/bspwm.nix +++ /dev/null @@ -1,19 +0,0 @@ -# Depends on eww -{ config, pkgs, ... }: { - xsession.windowManager.bspwm = { - enable = true; - monitors = { "DP-1" = [ "1" "2" "3" "4" "5" "6" "7" "8" "9" "0"]; }; - settings = { - window_gap = 10; - border_width = 0; - split_ratio = 0.5; - top_padding = 0; - }; - extraConfig = '' - ${pkgs.feh}/bin/feh --no-fehbg --bg-fill ~/Pictures/Wallpapers/current - - ${pkgs.procps}/bin/pkill -SIGINT eww - ${pkgs.eww}/bin/eww open linebar - ''; - }; -} diff --git a/modules/user/eww-wayland.nix b/modules/user/eww.nix similarity index 100% rename from modules/user/eww-wayland.nix rename to modules/user/eww.nix diff --git a/modules/user/pass.nix b/modules/user/pass.nix deleted file mode 100644 index f1d4c3d..0000000 --- a/modules/user/pass.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ pkgs, ... }: { - programs.password-store = { - enable = true; - package = pkgs.pass.withExtensions (exts: with exts; [ pass-import pass-otp ]); - }; -} diff --git a/modules/user/picom.nix b/modules/user/picom.nix deleted file mode 100644 index 7c7d5e7..0000000 --- a/modules/user/picom.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ config, ... }: { - services.picom = { - enable = true; - - # blur = true; - # blurExclude = [ - # (builtins.concatStringsSep " && " [ - # "class_g != 'Alacritty'" - # "class_g != 'kitty'" - # #"class_g != 'Polybar'" - # "class_g != 'URxvt'" - # ]) - # ]; - fade = true; - fadeDelta = 5; - fadeSteps = [ 0.05 0.05 ]; - - opacityRules = [ - "80:class_g = 'Alacritty' && !focused" - "95:class_g = 'kitty' && !focused" - ]; - vSync = true; - - settings = { - glx-no-stencil = true; - glx-copy-from-front = false; - glx-no-rebind-pixmap = true; - # https://github.com/yshui/picom/issues/578 - glx-use-copysubbuffer-mesa = false; - use-damage = true; - - detect-transient = true; - detect-client-leader = true; - detect-client-opacity = true; - detect-rounded-corners = true; - use-ewmh-active-win = true; - mark-wmwin-focused = true; - mark-ovredir-focused = true; - }; - }; -} diff --git a/modules/user/polybar.nix b/modules/user/polybar.nix deleted file mode 100644 index ce71f38..0000000 --- a/modules/user/polybar.nix +++ /dev/null @@ -1,165 +0,0 @@ -{ config, ... }: { - services.polybar = - let - colours = { - background1 = "#1a1b26"; - background2 = "#9d7cd8"; - accent = "#c0caf5"; - foreground2 = "#1a1b26"; - foreground2trans = "#cc1a1b26"; - }; - in { - enable = true; - script = builtins.readFile ../../scripts/polybar.sh; - settings = { - "bar/scroller" = { - monitor = "DP-1"; - width = "100%"; - height = 1; - background = colours.background1; - spacing = 2; - override-redirect = true; - - modules.center = "workspaces-stub"; - scroll = { - up = "#workspaces-stub.prev"; - down = "#workspaces-stub.next"; - }; - }; - - "bar/top" = { - monitor = "DP-1"; - width = "100%"; - height = 29; - background = colours.background1; - foreground = "#fff"; - offset-y = 3; - - spacing = 2; - padding = { - left = 5; - right = 5; - bottom = 5; - }; - override-redirect = true; - wm-restack = "bspwm"; - - font = [ - "NotoSans:style=SemiBold:size=11:antialias=true;2" - "NotoSans:size=11:antialias=true;2" - "MaterialIcons:size=17:antialias=true;6" - "Iosevka:style=Medium:antialias=false:size=19;4" - - "HanaMinA:size=9.8;1" - "HanaMinB:size=9.8;1" - ]; - - modules = { - left = "left workspaces right"; - center = "title"; - right = "left datetime right"; - }; - - enable-ipc = true; - scroll = { - up = "#workspaces.prev"; - down = "#workspaces.next"; - }; - }; - - "module/left" = { - type = "custom/text"; - - content = { - text = "%{T4}"; - background = colours.background1; - foreground = colours.background2; - }; - }; - - "module/right" = { - type = "custom/text"; - - content = { - text = "%{T4}"; - background = colours.background1; - foreground = colours.background2; - }; - }; - - "module/workspaces" = { - type = "internal/bspwm"; - - pin-workspaces = true; - enable-click = true; - enable-scroll = false; - reverse-scroll = false; - - label = { - monitor = ""; - focused = { - text = "%{T3}"; # ef4a - background = colours.background2; - foreground = colours.accent; - }; - occupied = { - text = "%{T3}"; # e837 - background = colours.background2; - foreground = colours.background1; - }; - empty = { - text = "%{T3}"; # ef4a - background = colours.background2; - foreground = colours.background1; - }; - urgent = { - text = "%{T3}"; # e837 - background = colours.background2; - foreground = colours.background1; - }; - - separator = { - text = " "; - background = colours.background2; - padding = "0"; - }; - }; - }; - - "module/workspaces-stub" = { - type = "internal/bspwm"; - pin-workspaces = true; - enable-click = false; - enable-scroll = false; - reverse-scroll = false; - label = { - monitor = ""; - focused = ""; - occupied = ""; - empty = ""; - urgent = ""; - separator = ""; - }; - }; - - "module/title" = { - type = "internal/xwindow"; - format = { - text = "%{T1}