From 0395c6654782da84f8e11cf4b7e12283e856fae9 Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Fri, 20 Feb 2026 14:56:55 -0500 Subject: [PATCH 01/19] switch from wpaperd to mpvpaper --- home/tiling/niri.nix | 16 +++++++++++++++- home/tiling/wallpaper.nix | 25 +++++++------------------ 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/home/tiling/niri.nix b/home/tiling/niri.nix index 470b1a2..4d9ba5b 100644 --- a/home/tiling/niri.nix +++ b/home/tiling/niri.nix @@ -138,7 +138,7 @@ bottom-right = 8.0; }; clip-to-geometry = true; - opacity = 1.0; + opacity = 0.975; } { matches = [ @@ -159,9 +159,20 @@ { app-id = "vesktop$"; } + { + app-id = "org.gnome.Nautilus$"; + } ]; block-out-from = "screen-capture"; } + { + matches = [ + { + is-active = false; + } + ]; + opacity = 0.95; + } { matches = [ { @@ -183,6 +194,9 @@ { namespace = "^wpaperd.*"; } + { + namespace = "^mpvpaper"; + } ]; place-within-backdrop = true; } diff --git a/home/tiling/wallpaper.nix b/home/tiling/wallpaper.nix index 47377f7..3b2f783 100644 --- a/home/tiling/wallpaper.nix +++ b/home/tiling/wallpaper.nix @@ -1,24 +1,9 @@ { pkgs, - config, ... }: { - home.packages = with pkgs; [ - wpaperd - ]; - - home.file.".config/wpaperd/config.toml" = { - text = '' - [default] - mode = "center" - [any] - path = "/home/${config.userOptions.username}/.local/share/wallpaper/daily.jpg" - ''; - force = true; - }; - - systemd.user.services.wpaperd = { + systemd.user.services.mpvpaper = { Unit = { Description = "Modern wallpaper daemon for Wayland"; PartOf = [ "niri.service" ]; @@ -26,7 +11,11 @@ After = [ "niri.service" ]; }; Service = { - ExecStart = "${pkgs.wpaperd}/bin/wpaperd"; + ExecStart = '' + ${pkgs.mpvpaper}/bin/mpvpaper '*' \ + '/home/sckova/.local/share/wallpaper/daily.jpg' \ + -o '--keep-open=always --save-position-on-quit' \ + ''; }; Install = { WantedBy = [ "niri.service" ]; @@ -59,7 +48,7 @@ -i preferences-desktop-wallpaper \ "$TITLE" ''; - ExecStartPost = "${pkgs.systemd}/bin/systemctl --user restart wpaperd.service"; + ExecStartPost = "${pkgs.systemd}/bin/systemctl --user restart mpvpaper.service"; }; Install = { WantedBy = [ "niri.service" ]; From 1a0012bbf352aa6c30900513effa9ce3cfb7992b Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Fri, 20 Feb 2026 16:43:31 -0500 Subject: [PATCH 02/19] move searxng to port 5364 --- home/apps/firefox.nix | 4 ++-- system/searxng/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/home/apps/firefox.nix b/home/apps/firefox.nix index 402c099..1a3298c 100644 --- a/home/apps/firefox.nix +++ b/home/apps/firefox.nix @@ -207,7 +207,7 @@ "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; "browser.newtabpage.activity-stream.showWeather" = false; "browser.download.autoHideButton" = false; - "browser.startup.homepage" = "http://localhost:8080/"; + "browser.startup.homepage" = "http://localhost:5364/"; # Disable Firefox's machine learning (AI) features "browser.ml.enable" = false; @@ -369,7 +369,7 @@ searxng = { name = "SearXNG"; - urls = [ { template = "http://localhost:8080/search?q={searchTerms}"; } ]; + urls = [ { template = "http://localhost:5364/search?q={searchTerms}"; } ]; icon = searchIcon; definedAliases = [ "@go" ]; }; diff --git a/system/searxng/default.nix b/system/searxng/default.nix index 75161b5..9aed6d4 100644 --- a/system/searxng/default.nix +++ b/system/searxng/default.nix @@ -16,7 +16,7 @@ pkgs.runCommand "gen-key" { buildInputs = [ pkgs.openssl ]; } "openssl rand -hex 32 > $out" ) ); - port = 8080; + port = 5364; bind_address = "127.0.0.1"; }; From 1b3c7412ae3b5ba6e751fdf3b2d19a316900acbf Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Fri, 20 Feb 2026 16:44:06 -0500 Subject: [PATCH 03/19] add torrenting config --- flake.nix | 1 + home/default.nix | 1 - system/torrenting/default.nix | 53 +++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 system/torrenting/default.nix diff --git a/flake.nix b/flake.nix index c0ea05a..9c71229 100644 --- a/flake.nix +++ b/flake.nix @@ -215,6 +215,7 @@ } ./system ./system/searxng + ./system/torrenting ./system/widevine ./system/shell/fish.nix ./system/tailscale diff --git a/home/default.nix b/home/default.nix index dafbbba..f714d1c 100755 --- a/home/default.nix +++ b/home/default.nix @@ -48,7 +48,6 @@ libreoffice-qt-fresh # nur.repos.forkprince.helium-nightly chromium - qbittorrent nautilus fractal tuba diff --git a/system/torrenting/default.nix b/system/torrenting/default.nix new file mode 100644 index 0000000..5498a13 --- /dev/null +++ b/system/torrenting/default.nix @@ -0,0 +1,53 @@ +{ + lib, + config, + pkgs, + ... +}: +{ + users.users.sckova.extraGroups = [ "qbittorrent" ]; + services = { + qbittorrent = { + enable = true; + serverConfig = { + Preferences = { + Advanced.useSystemIconTheme = true; + General = { + CloseToTray = false; + CloseToTrayNotified = true; + ExitConfirm = false; + Locale = "en"; + }; + WebUI = { + Address = "*"; + Enabled = true; + Port = 9697; + UseUPnP = false; + }; + BitTorrent = { + SessionGlobalDLSpeedLimit = 0; + GlobalUPSpeedLimit = 0; + Port = 42578; + QueueingSystemEnabled = false; + SSL.Port = 63114; + StartPaused = false; + }; + }; + }; + }; + flaresolverr = { + enable = true; + port = 8191; + }; + prowlarr = { + enable = true; + settings = { + server = { + urlbase = "localhost"; + port = 9696; + bindaddress = "*"; + }; + }; + }; + }; +} From 15f796401e080f5a4c23dd2fb7b95a9428651d1b Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Fri, 20 Feb 2026 18:30:49 -0500 Subject: [PATCH 04/19] fix: wallpaper aspect ratio --- home/tiling/wallpaper.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/tiling/wallpaper.nix b/home/tiling/wallpaper.nix index 3b2f783..a48ca38 100644 --- a/home/tiling/wallpaper.nix +++ b/home/tiling/wallpaper.nix @@ -13,8 +13,8 @@ Service = { ExecStart = '' ${pkgs.mpvpaper}/bin/mpvpaper '*' \ - '/home/sckova/.local/share/wallpaper/daily.jpg' \ - -o '--keep-open=always --save-position-on-quit' \ + '/home/sckova/.local/share/wallpaper/daily.jpg' -o \ + '--keep-open=always --save-position-on-quit --panscan=1.0' \ ''; }; Install = { From 118b190abaa6008ccd2f1fcf7ffd7b75d9254a5e Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Fri, 20 Feb 2026 21:56:56 -0500 Subject: [PATCH 05/19] switch from mpvpaper to awww, refactor wallpaper --- flake.lock | 62 +++++++++++++++++++- flake.nix | 7 +++ home/tiling/niri.nix | 11 +++- home/tiling/noctalia.nix | 6 +- home/tiling/wallpaper.nix | 115 ++++++++++++++++++++------------------ 5 files changed, 142 insertions(+), 59 deletions(-) diff --git a/flake.lock b/flake.lock index d7f64b0..0455b04 100644 --- a/flake.lock +++ b/flake.lock @@ -40,6 +40,28 @@ "type": "github" } }, + "awww": { + "inputs": { + "flake-compat": "flake-compat_2", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1770895252, + "narHash": "sha256-TUGZVDcC5xsrWVnpBNosAG1cTy+aWchCWXPyeLZdnGM=", + "ref": "refs/heads/main", + "rev": "2c86d41d07471f518e24f5cd1f586e4d2a32d12c", + "revCount": 1331, + "type": "git", + "url": "https://codeberg.org/LGFae/awww.git" + }, + "original": { + "type": "git", + "url": "https://codeberg.org/LGFae/awww.git" + } + }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -138,6 +160,22 @@ } }, "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1767039857, @@ -331,7 +369,7 @@ "inputs": { "cachyos-kernel": "cachyos-kernel", "cachyos-kernel-patches": "cachyos-kernel-patches", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_2", "nixpkgs": "nixpkgs_2" }, @@ -550,6 +588,7 @@ "inputs": { "aerothemeplasma-nix": "aerothemeplasma-nix", "apple-silicon": "apple-silicon", + "awww": "awww", "base16": "base16", "base16-discord": "base16-discord", "catppuccin-discord": "catppuccin-discord", @@ -570,6 +609,27 @@ "tt-schemes": "tt-schemes" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "awww", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1764038373, + "narHash": "sha256-M6w2wNBRelcavoDAyFL2iO4NeWknD40ASkH1S3C0YGM=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "ab3536fe850211a96673c6ffb2cb88aab8071cc9", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "spicetify-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 9c71229..7ea321f 100644 --- a/flake.nix +++ b/flake.nix @@ -81,6 +81,11 @@ # inputs.nixpkgs.follows = "nixpkgs"; }; + awww = { + url = "git+https://codeberg.org/LGFae/awww.git"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + openmw = { url = "gitlab:OpenMW/openmw"; flake = false; @@ -109,6 +114,7 @@ nur, nixvim, apple-silicon, + awww, openmw, catppuccin-discord, ... @@ -152,6 +158,7 @@ niri.overlays.niri noctalia.overlays.default nur.overlays.default + awww.overlays.default (final: prev: { openmw-git = openmw; catppuccin-discord-git = catppuccin-discord; diff --git a/home/tiling/niri.nix b/home/tiling/niri.nix index 4d9ba5b..c82eeb6 100644 --- a/home/tiling/niri.nix +++ b/home/tiling/niri.nix @@ -29,7 +29,6 @@ input = { focus-follows-mouse.enable = true; focus-follows-mouse.max-scroll-amount = "0%"; - warp-mouse-to-focus.enable = true; mod-key = "Super"; keyboard = { numlock = false; @@ -187,6 +186,14 @@ open-maximized = true; open-focused = true; } + { + matches = [ + { + app-id = "mpv"; + } + ]; + opacity = 1.0; + } ]; layer-rules = [ { @@ -195,7 +202,7 @@ namespace = "^wpaperd.*"; } { - namespace = "^mpvpaper"; + namespace = "^awww-daemon"; } ]; place-within-backdrop = true; diff --git a/home/tiling/noctalia.nix b/home/tiling/noctalia.nix index 719dda0..b930511 100644 --- a/home/tiling/noctalia.nix +++ b/home/tiling/noctalia.nix @@ -63,7 +63,7 @@ bar = { autoHideDelay = 500; autoShowDelay = 150; - backgroundOpacity = 1; + backgroundOpacity = 0.975; monitors = [ ]; showCapsule = true; barType = "simple"; @@ -79,7 +79,7 @@ outerCorners = false; screenOverrides = [ ]; showOutline = false; - useSeparateOpacity = false; + useSeparateOpacity = true; widgets = { center = [ ]; left = [ @@ -206,7 +206,7 @@ deviceNativePath = "__default__"; displayMode = "icon-hover"; hideIfIdle = false; - hideIfNotDetected = false; + hideIfNotDetected = true; id = "Battery"; showNoctaliaPerformance = false; showPowerProfiles = true; diff --git a/home/tiling/wallpaper.nix b/home/tiling/wallpaper.nix index a48ca38..9482de3 100644 --- a/home/tiling/wallpaper.nix +++ b/home/tiling/wallpaper.nix @@ -3,68 +3,77 @@ ... }: { - systemd.user.services.mpvpaper = { - Unit = { - Description = "Modern wallpaper daemon for Wayland"; - PartOf = [ "niri.service" ]; - Requires = [ "niri.service" ]; - After = [ "niri.service" ]; - }; - Service = { - ExecStart = '' - ${pkgs.mpvpaper}/bin/mpvpaper '*' \ - '/home/sckova/.local/share/wallpaper/daily.jpg' -o \ - '--keep-open=always --save-position-on-quit --panscan=1.0' \ - ''; - }; - Install = { - WantedBy = [ "niri.service" ]; - }; + systemd.user.services.awww-daemon = { + Unit.Description = "Wallpaper service using awww (daemon)"; + Service.ExecStart = "${pkgs.awww}/bin/awww-daemon"; + Unit.After = [ "graphical-session.target" ]; + Unit.PartOf = [ "graphical-session.target" ]; + Install.WantedBy = [ "graphical-session.target" ]; + }; + + systemd.user.services.awww-setter = { + Unit.Description = "Wallpaper service using awww (setter)"; + Unit.Requires = [ "awww-daemon.service" ]; + Unit.After = [ "awww-daemon.service" ]; + Service.Type = "oneshot"; + Service.ExecStart = '' + ${pkgs.awww}/bin/awww img \ + %h/.local/share/wallpaper/daily.jpg \ + --transition-step 2 \ + --transition-fps 60 + ''; }; systemd.user.services.bing-wallpaper = { - Unit = { - Description = "Download and set Bing wallpaper of the day"; - After = [ "network-online.target" ]; - Wants = [ "network-online.target" ]; - }; - Service = { - Type = "oneshot"; - ExecStart = pkgs.writeShellScript "bing-wallpaper" '' - OUT="''${XDG_DATA_HOME:-$HOME/.local/share}/wallpaper/daily.jpg" + Unit.Description = "Download and set Bing wallpaper of the day"; + Unit.StartLimitBurst = 5; + Unit.StartLimitIntervalSec = "10m"; + Service.Restart = "on-failure"; + Service.RestartSec = "1m"; + Service.Type = "oneshot"; + Service.ExecStart = pkgs.lib.getExe ( + pkgs.writeShellApplication { + name = "bing-wallpaper"; + runtimeInputs = with pkgs; [ + wget + jq + coreutils + libnotify + ]; + text = '' + set -euo pipefail - API_RESP=$(${pkgs.wget}/bin/wget -qO- "https://www.bing.com/HPImageArchive.aspx?format=js&idx=0&mkt=en-US&n=1") || exit 1 + OUT_DIR="''${XDG_DATA_HOME:-$HOME/.local/share}/wallpaper" + OUT_FILE="$OUT_DIR/daily.jpg" - URL_BASE=$(echo "$API_RESP" | ${pkgs.gnugrep}/bin/grep -oP 'urlbase":"[^"]*' | cut -d '"' -f 3) - TITLE=$(echo "$API_RESP" | ${pkgs.gnugrep}/bin/grep -oP 'title":"[^"]*' | cut -d '"' -f 3) + API_URL="https://www.bing.com/HPImageArchive.aspx?format=js&idx=0&mkt=en-US&n=1" + API_RESP=$(wget -qO- "$API_URL") - ${pkgs.coreutils}/bin/mkdir -p "$(dirname "$OUT")" - ${pkgs.wget}/bin/wget -qO "$OUT" "https://www.bing.com$URL_BASE\_UHD.jpg" || \ - ${pkgs.wget}/bin/wget -qO "$OUT" "https://www.bing.com$(echo "$API_RESP" | ${pkgs.gnugrep}/bin/grep -oP 'url":"[^"]*' | cut -d '"' -f 3)" + URL_BASE=$(echo "$API_RESP" | jq -r '.images[0].urlbase') + URL_FALLBACK=$(echo "$API_RESP" | jq -r '.images[0].url') + TITLE=$(echo "$API_RESP" | jq -r '.images[0].title') - ${pkgs.libnotify}/bin/notify-send \ - -a "Bing Wallpaper Service" \ - -u low \ - -i preferences-desktop-wallpaper \ - "$TITLE" - ''; - ExecStartPost = "${pkgs.systemd}/bin/systemctl --user restart mpvpaper.service"; - }; - Install = { - WantedBy = [ "niri.service" ]; - }; + mkdir -p "$OUT_DIR" + + if ! wget -qO "$OUT_FILE" "https://www.bing.com''${URL_BASE}_UHD.jpg"; then + wget -qO "$OUT_FILE" "https://www.bing.com$URL_FALLBACK" + fi + + notify-send \ + -a "wallpaper of the day" \ + -u low \ + -i preferences-desktop-wallpaper \ + "$TITLE" + ''; + } + ); + Service.ExecStartPost = "${pkgs.systemd}/bin/systemctl --user restart awww-setter.service"; }; systemd.user.timers.bing-wallpaper = { - Unit = { - Description = "Run bing wallpaper retrieval daily"; - }; - Timer = { - OnCalendar = "*-*-* 10:00:00 GMT"; - Persistent = true; - }; - Install = { - WantedBy = [ "timers.target" ]; - }; + Unit.Description = "Run bing wallpaper retrieval daily"; + Timer.OnCalendar = "*-*-* 10:00:00 GMT"; + Timer.Persistent = true; + Install.WantedBy = [ "timers.target" ]; }; } From 9be05afa2da5abf24d1d601e01e6fae965d1eafd Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Fri, 20 Feb 2026 22:01:49 -0500 Subject: [PATCH 06/19] peach: frappe -> mocha --- home/hosts/peach/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/hosts/peach/default.nix b/home/hosts/peach/default.nix index 1415982..8a3327a 100644 --- a/home/hosts/peach/default.nix +++ b/home/hosts/peach/default.nix @@ -6,7 +6,7 @@ }: { colors = { - scheme = "catppuccin-latte"; + scheme = "catppuccin-mocha"; accent = "base09"; }; From 30b103d3492b19321ea6d8ed76d3a7e91eb1c294 Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Sat, 21 Feb 2026 09:48:03 -0500 Subject: [PATCH 07/19] make systemd services more robust --- home/services/systemd.nix | 55 +++------------------------------------ home/tiling/wallpaper.nix | 7 +++-- 2 files changed, 7 insertions(+), 55 deletions(-) diff --git a/home/services/systemd.nix b/home/services/systemd.nix index 5dd3a94..5e1d681 100644 --- a/home/services/systemd.nix +++ b/home/services/systemd.nix @@ -28,16 +28,14 @@ Description = "Mount Synology NAS with Rclone and Home Manager."; After = [ "tailscaled.service" ]; Wants = [ "tailscaled.service" ]; + StartLimitBurst = 5; + StartLimitIntervalSec = "1m"; }; Service = { Type = "simple"; - # ExecStartPre = "${pkgs.writeShellScript "synology-prep" '' - # if mountpoint -q %h/Synology; then - # /run/wrappers/bin/fusermount -uz %h/Synology - # fi - # ${pkgs.coreutils}/bin/mkdir -p %h/Synology - # ''}"; + Restart = "on-failure"; + RestartSec = "1m"; ExecStart = "${pkgs.writeShellScript "synology-mount" '' #!/usr/bin/env bash set -euo pipefail @@ -65,49 +63,4 @@ WantedBy = [ "default.target" ]; }; }; - - # systemd.user.services.synology-prefill = { - # Unit = { - # Description = "Prefill Synology NAS rclone cache"; - # After = [ "synology-mount.service" ]; - # Wants = [ "synology-mount.service" ]; - # }; - - # Service = { - # Type = "simple"; - # ExecStart = "${pkgs.writeShellScript "synology-prefill" '' - # #!/usr/bin/env bash - # set -euo pipefail - # ${pkgs.rclone}/bin/rclone rc vfs/refresh -v --fast-list recursive=true >/dev/null - # ''}"; - # StandardOutput = "journal"; - # StandardError = "journal"; - # Restart = "on-failure"; - # }; - - # Install = { - # WantedBy = [ "default.target" ]; - # }; - # }; - - # systemd.user.services.input-leap = { - # Unit = { - # Description = "Autostart Input Leap"; - # After = [ "graphical-session.target" ]; - # }; - - # Service = { - # Type = "oneshot"; - # RemainAfterExit = true; - # PassEnvironment = "DISPLAY"; - # ExecStart = "${pkgs.writeShellScript "input-leap-start" '' - # sleep 5 - # ${pkgs.input-leap}/bin/input-leap - # ''}"; - # }; - - # Install = { - # WantedBy = [ "graphical-session.target" ]; - # }; - # }; } diff --git a/home/tiling/wallpaper.nix b/home/tiling/wallpaper.nix index 9482de3..2f11288 100644 --- a/home/tiling/wallpaper.nix +++ b/home/tiling/wallpaper.nix @@ -6,8 +6,6 @@ systemd.user.services.awww-daemon = { Unit.Description = "Wallpaper service using awww (daemon)"; Service.ExecStart = "${pkgs.awww}/bin/awww-daemon"; - Unit.After = [ "graphical-session.target" ]; - Unit.PartOf = [ "graphical-session.target" ]; Install.WantedBy = [ "graphical-session.target" ]; }; @@ -26,10 +24,10 @@ systemd.user.services.bing-wallpaper = { Unit.Description = "Download and set Bing wallpaper of the day"; - Unit.StartLimitBurst = 5; + Unit.StartLimitBurst = 6; Unit.StartLimitIntervalSec = "10m"; Service.Restart = "on-failure"; - Service.RestartSec = "1m"; + Service.RestartSec = "10s"; Service.Type = "oneshot"; Service.ExecStart = pkgs.lib.getExe ( pkgs.writeShellApplication { @@ -68,6 +66,7 @@ } ); Service.ExecStartPost = "${pkgs.systemd}/bin/systemctl --user restart awww-setter.service"; + Install.WantedBy = [ "graphical-session.target" ]; }; systemd.user.timers.bing-wallpaper = { From edb0bb4528ddfd1d7229650ac2166ba9999231db Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Sat, 21 Feb 2026 09:58:07 -0500 Subject: [PATCH 08/19] add niri blur --- flake.lock | 50 +++++++++++++------------------ flake.nix | 11 +++++-- home/hosts/peach/default.nix | 5 ---- home/tiling/niri.nix | 58 +++++++++++++++++++++++++++++------- 4 files changed, 76 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index 0455b04..92e79fd 100644 --- a/flake.lock +++ b/flake.lock @@ -307,8 +307,12 @@ }, "niri": { "inputs": { - "niri-stable": "niri-stable", - "niri-unstable": "niri-unstable", + "niri-stable": [ + "niri-blur" + ], + "niri-unstable": [ + "niri-blur" + ], "nixpkgs": [ "nixpkgs" ], @@ -319,48 +323,33 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1771514840, - "narHash": "sha256-t3WbZvwoDj/75YDX/nwkZuxanZLZaWr9meSfKswaN6g=", - "owner": "sodiboo", + "lastModified": 1771682768, + "narHash": "sha256-RJ9RVJSAktCgWiqLDCjYmx9KgMuLaszUrI28k92Pa2I=", + "owner": "sckova", "repo": "niri-flake", - "rev": "4f69ab280e9bb34e2c0b67fdfa6f0978a170ef56", + "rev": "383bd9d32706b163807b05983418069b2e692310", "type": "github" }, "original": { - "owner": "sodiboo", + "owner": "sckova", + "ref": "feat/blur", "repo": "niri-flake", "type": "github" } }, - "niri-stable": { + "niri-blur": { "flake": false, "locked": { - "lastModified": 1756556321, - "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", - "owner": "YaLTeR", + "lastModified": 1771672342, + "narHash": "sha256-52CxMRH2kVGpsPBiZM+996b6i/3XkmOrySm5zqwWc+o=", + "owner": "niri-wm", "repo": "niri", - "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", + "rev": "86f42d1ed9ab787c52ace073e0b3218e26530d25", "type": "github" }, "original": { - "owner": "YaLTeR", - "ref": "v25.08", - "repo": "niri", - "type": "github" - } - }, - "niri-unstable": { - "flake": false, - "locked": { - "lastModified": 1771305475, - "narHash": "sha256-lqweVTwHhYc+9T33cysp38gVwxaibGJHriOPZXWyhCY=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "a2a52911757cb3b497db9407592f9b4c439571ea", - "type": "github" - }, - "original": { - "owner": "YaLTeR", + "owner": "niri-wm", + "ref": "wip/branch", "repo": "niri", "type": "github" } @@ -594,6 +583,7 @@ "catppuccin-discord": "catppuccin-discord", "home-manager": "home-manager", "niri": "niri", + "niri-blur": "niri-blur", "nix-cachyos-kernel": "nix-cachyos-kernel", "nixpkgs": [ "nixpkgs-unstable" diff --git a/flake.nix b/flake.nix index 7ea321f..2311628 100644 --- a/flake.nix +++ b/flake.nix @@ -44,11 +44,16 @@ }; niri = { - url = "github:sodiboo/niri-flake"; + url = "github:sckova/niri-flake/feat/blur"; inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs-stable.follows = "nixpkgs-stable"; - # inputs.niri-stable.follows = "niri-blur"; - # inputs.niri-unstable.follows = "niri-blur"; + inputs.niri-stable.follows = "niri-blur"; + inputs.niri-unstable.follows = "niri-blur"; + }; + + niri-blur = { + url = "github:niri-wm/niri/wip/branch"; + flake = false; }; # niri-blur = { diff --git a/home/hosts/peach/default.nix b/home/hosts/peach/default.nix index 8a3327a..3e0379c 100644 --- a/home/hosts/peach/default.nix +++ b/home/hosts/peach/default.nix @@ -19,11 +19,6 @@ moonlight-qt ]; - # https://github.com/YaLTeR/niri/issues/2330#issuecomment-3256864777 - programs.niri.settings.debug = { - render-drm-device = "/dev/dri/card2"; - }; - programs.noctalia-shell.settings.bar = { position = "top"; density = "spacious"; diff --git a/home/tiling/niri.nix b/home/tiling/niri.nix index c82eeb6..3c29760 100644 --- a/home/tiling/niri.nix +++ b/home/tiling/niri.nix @@ -83,13 +83,11 @@ }; cursor = { hide-when-typing = false; - # hide-after-inactive-ms = 10000; size = config.userOptions.cursor.size; theme = config.userOptions.cursor.name; }; layout = { gaps = 4; - # background-color = base10; background-color = "transparent"; default-column-width = { proportion = 0.5; @@ -121,12 +119,6 @@ softness = 30; color = base11 + "BF"; }; - # blur = { - # enable = true; - # passes = 4; - # radius = 4; - # noise = 0.1; - # }; }; window-rules = [ { @@ -137,7 +129,13 @@ bottom-right = 8.0; }; clip-to-geometry = true; - opacity = 0.975; + opacity = 0.95; + background-effect = { + xray = false; + blur = true; + noise = 0.05; + saturation = 1; + }; } { matches = [ @@ -170,7 +168,7 @@ is-active = false; } ]; - opacity = 0.95; + opacity = 0.925; } { matches = [ @@ -191,11 +189,47 @@ { app-id = "mpv"; } + { + app-id = "firefox"; + title = "Picture-in-Picture"; + } ]; opacity = 1.0; } + { + # Kitty Fastfetch window + matches = [ + { + app-id = "kitty"; + title = "^fastfetch$"; + } + ]; + open-floating = true; + baba-is-float = true; + min-width = 960; + min-height = 480; + max-width = 960; + max-height = 480; + } ]; layer-rules = [ + { + matches = [ { namespace = "noctalia-bar-content-.*"; } ]; + background-effect = { + xray = false; + blur = true; + noise = 0.05; + saturation = 1; + }; + } + { + matches = [ { namespace = "noctalia-bar-exclusion-top-.*"; } ]; + place-within-backdrop = true; + } + { + matches = [ { namespace = "^launcher$"; } ]; + opacity = 0.925; + } { matches = [ { @@ -215,6 +249,10 @@ action.spawn = [ "kitty" ]; hotkey-overlay.title = "Open a Terminal: kitty"; }; + "Mod+Shift+T" = { + action.spawn-sh = [ "kitty --title fastfetch sh -c 'fastfetch; sleep 10'" ]; + hotkey-overlay.title = "Open a Terminal with Fastfetch"; + }; "Mod+Space" = { action.spawn = [ "fuzzel" ]; hotkey-overlay.title = "Run an Application: Noctalia app launcher"; From 7b6e3a2deb48de35aa77784e310834232cc6ecf4 Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Sat, 21 Feb 2026 19:48:59 -0500 Subject: [PATCH 09/19] update system/default.nix --- system/default.nix | 209 +++++++++++++++++++-------------------------- 1 file changed, 89 insertions(+), 120 deletions(-) diff --git a/system/default.nix b/system/default.nix index 5f86afb..5b7bcf4 100755 --- a/system/default.nix +++ b/system/default.nix @@ -2,28 +2,16 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). { + config, pkgs, ... }: { - environment.sessionVariables = { - # this makes electron apps work per the wiki - NIXOS_OZONE_WL = "1"; - }; - boot = { - plymouth = { - enable = true; - logo = "${pkgs.nixos-icons}/share/icons/hicolor/64x64/apps/nix-snowflake-white.png"; - }; - + plymouth.enable = true; + plymouth.logo = "${pkgs.nixos-icons}/share/icons/hicolor/64x64/apps/nix-snowflake-white.png"; loader = { timeout = 3; - # systemd-boot = { - # enable = true; - # consoleMode = lib.mkForce "auto"; - # configurationLimit = 10; - # }; limine = { enable = true; maxGenerations = 10; @@ -40,7 +28,6 @@ }; }; }; - # efi.canTouchEfiVariables = true; }; kernelParams = [ "quiet" @@ -55,9 +42,93 @@ initrd.verbose = false; }; - networking.networkmanager.enable = true; - hardware.bluetooth.enable = true; + programs = { + gnupg.agent = { + enable = true; + enableSSHSupport = true; + pinentryPackage = pkgs.pinentry-curses; + }; + niri.enable = true; + niri.package = pkgs.niri-unstable; + dconf.enable = true; + dconf.profiles.user = { + databases = [ + { + # breaks user-level indirect config of dconf + # lockAll = true; + settings = { + "org/gnome/desktop/interface" = { + color-scheme = "prefer-dark"; + clock-format = "12h"; + clock-show-weekday = true; + }; + "org/gnome/desktop/wm/preferences" = { + button-layout = ":"; + action-double-click-titlebar = "'none'"; + }; + "org/gnome/desktop/media-handling" = { + automount = false; + automount-open = false; + autorun-never = true; + }; + "org/gnome/settings-daemon/plugins/power" = { + sleep-inactive-ac-type = "nothing"; + }; + "org/gnome/mutter" = { + edge-tiling = true; + dynamic-workspaces = true; + experimental-features = [ "variable-refresh-rate" ]; + }; + }; + } + ]; + }; + }; + + # aerothemeplasma = { + # enable = true; + # plasma.enable = true; + # fonts.enable = false; + # plymouth.enable = false; + # sddm.enable = true; + # }; + + services = { + desktopManager.plasma6.enable = true; + displayManager = { + sddm.enable = true; + sddm.wayland.enable = true; + defaultSession = "niri"; + }; + gnome.gnome-keyring.enable = true; + libinput.enable = true; + printing.enable = true; + pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + udisks2.enable = true; + gvfs.enable = true; + upower.enable = true; + power-profiles-daemon.enable = true; + openssh.enable = true; + }; + + environment.systemPackages = with pkgs; [ + git + firefoxpwa + ]; + + security.pam.services.niri.enableGnomeKeyring = config.services.gnome.gnome-keyring.enable; + networking.firewall.enable = false; + networking.networkmanager.enable = true; + documentation.man.enable = true; + documentation.man.generateCaches = false; + hardware.graphics.enable = true; + hardware.bluetooth.enable = true; time.timeZone = "America/New_York"; i18n.defaultLocale = "en_US.UTF-8"; i18n.extraLocaleSettings = { @@ -72,108 +143,6 @@ LC_TIME = "en_US.UTF-8"; }; - # Enable OpenGL - hardware.graphics = { - enable = true; - }; - - programs.niri = { - enable = true; - package = pkgs.niri-unstable; - }; - services.gnome.gnome-keyring.enable = true; - security.pam.services.niri.enableGnomeKeyring = true; - programs.dconf.enable = true; - - programs.dconf.profiles.user = { - databases = [ - { - # breaks user-level indirect config of dconf - # lockAll = true; - settings = { - "org/gnome/desktop/interface" = { - color-scheme = "prefer-dark"; - clock-format = "12h"; - clock-show-weekday = true; - }; - "org/gnome/desktop/wm/preferences" = { - button-layout = ":"; - action-double-click-titlebar = "'none'"; - }; - "org/gnome/desktop/media-handling" = { - automount = false; - automount-open = false; - autorun-never = true; - }; - "org/gnome/settings-daemon/plugins/power" = { - sleep-inactive-ac-type = "nothing"; - }; - "org/gnome/mutter" = { - edge-tiling = true; - dynamic-workspaces = true; - experimental-features = [ "variable-refresh-rate" ]; - }; - }; - } - ]; - }; - - aerothemeplasma = { - enable = true; - plasma.enable = true; - fonts.enable = false; - plymouth.enable = false; - sddm.enable = true; - }; - - services = { - # displayManager = { - # gdm.enable = true; - # defaultSession = "niri"; - # }; - desktopManager.plasma6.enable = true; - displayManager = { - sddm.enable = true; - defaultSession = "aerothemeplasma"; - }; - - libinput.enable = true; - printing.enable = true; - pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - udisks2.enable = true; - gvfs.enable = true; - - upower.enable = true; - power-profiles-daemon.enable = true; - }; - - environment = { - systemPackages = with pkgs; [ - git - firefoxpwa - distrobox - ]; - }; - - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - pinentryPackage = pkgs.pinentry-curses; - }; - networking.firewall.enable = false; - - documentation.man = { - enable = true; - generateCaches = false; - }; - - services.openssh.enable = true; - # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave From 46cd9eec3066ee3b84060d3af247b7b88cdf5232 Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Sat, 21 Feb 2026 20:00:16 -0500 Subject: [PATCH 10/19] refactor session vars --- home/games/morrowind.nix | 9 ++------- home/services/default.nix | 2 ++ home/terminal/neovim.nix | 5 ++--- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/home/games/morrowind.nix b/home/games/morrowind.nix index be92688..ff85bab 100644 --- a/home/games/morrowind.nix +++ b/home/games/morrowind.nix @@ -1,15 +1,10 @@ { - config, pkgs, ... }: { - home = { - packages = with pkgs; [ openmw ]; - sessionVariables = { - SDL_VIDEO_DRIVER = "wayland"; - }; - }; + home.packages = with pkgs; [ openmw ]; + home.sessionVariables.SDL_VIDEO_DRIVER = "wayland"; programs.firefox.profiles.default.search.engines.uesp = { name = "Unofficial Elder Scrolls Pages"; diff --git a/home/services/default.nix b/home/services/default.nix index d38c136..a0ff910 100644 --- a/home/services/default.nix +++ b/home/services/default.nix @@ -31,6 +31,8 @@ home.sessionVariables = { QT_QPA_PLATFORMTHEME = "qt6ct"; + # this makes electron apps work per the wiki + NIXOS_OZONE_WL = "1"; }; gtk = { diff --git a/home/terminal/neovim.nix b/home/terminal/neovim.nix index 65ace66..f45e453 100644 --- a/home/terminal/neovim.nix +++ b/home/terminal/neovim.nix @@ -1,12 +1,11 @@ { pkgs, config, + lib, ... }: { - home.sessionVariables = { - EDITOR = "nvim"; - }; + home.sessionVariables.EDITOR = lib.mkForce "kitty nvim"; home.packages = with pkgs; [ kdePackages.qtdeclarative From a112c46355332783a95a21beac354f10e1b2f5b3 Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Sun, 22 Feb 2026 11:48:53 -0500 Subject: [PATCH 11/19] wallpaper updates in prep to switch to wbg --- home/tiling/wallpaper.nix | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/home/tiling/wallpaper.nix b/home/tiling/wallpaper.nix index 2f11288..e3e8bad 100644 --- a/home/tiling/wallpaper.nix +++ b/home/tiling/wallpaper.nix @@ -6,7 +6,7 @@ systemd.user.services.awww-daemon = { Unit.Description = "Wallpaper service using awww (daemon)"; Service.ExecStart = "${pkgs.awww}/bin/awww-daemon"; - Install.WantedBy = [ "graphical-session.target" ]; + Install.WantedBy = [ "niri.service" ]; }; systemd.user.services.awww-setter = { @@ -39,26 +39,16 @@ libnotify ]; text = '' - set -euo pipefail + OUT="$HOME/.local/share/wallpaper/daily.jpg" + API=$(wget -qO- "https://www.bing.com/HPImageArchive.aspx?format=js&idx=0&mkt=en-US&n=1") + BASE=$(echo "$API" | jq -r '.images[0].urlbase') + TITLE=$(echo "$API" | jq -r '.images[0].title') - OUT_DIR="''${XDG_DATA_HOME:-$HOME/.local/share}/wallpaper" - OUT_FILE="$OUT_DIR/daily.jpg" - - API_URL="https://www.bing.com/HPImageArchive.aspx?format=js&idx=0&mkt=en-US&n=1" - API_RESP=$(wget -qO- "$API_URL") - - URL_BASE=$(echo "$API_RESP" | jq -r '.images[0].urlbase') - URL_FALLBACK=$(echo "$API_RESP" | jq -r '.images[0].url') - TITLE=$(echo "$API_RESP" | jq -r '.images[0].title') - - mkdir -p "$OUT_DIR" - - if ! wget -qO "$OUT_FILE" "https://www.bing.com''${URL_BASE}_UHD.jpg"; then - wget -qO "$OUT_FILE" "https://www.bing.com$URL_FALLBACK" - fi + mkdir -p "$HOME/.local/share/wallpaper" + wget -qO "$OUT" "https://www.bing.com''${BASE}_UHD.jpg" notify-send \ - -a "wallpaper of the day" \ + -a "Wallpaper of the day" \ -u low \ -i preferences-desktop-wallpaper \ "$TITLE" @@ -66,7 +56,7 @@ } ); Service.ExecStartPost = "${pkgs.systemd}/bin/systemctl --user restart awww-setter.service"; - Install.WantedBy = [ "graphical-session.target" ]; + Install.WantedBy = [ "niri.service" ]; }; systemd.user.timers.bing-wallpaper = { From b3e6f7f1758303e2ee46164fe23f76e22e11d736 Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Sun, 22 Feb 2026 11:49:11 -0500 Subject: [PATCH 12/19] reformat niri --- home/tiling/niri.nix | 65 ++++++++++++---------------------------- home/tiling/noctalia.nix | 4 +-- 2 files changed, 20 insertions(+), 49 deletions(-) diff --git a/home/tiling/niri.nix b/home/tiling/niri.nix index 3c29760..d9c07fe 100644 --- a/home/tiling/niri.nix +++ b/home/tiling/niri.nix @@ -1,6 +1,5 @@ { config, - pkgs, ... }: { @@ -181,7 +180,7 @@ title = "Minecraft"; } ]; - open-maximized = true; + open-maximized-to-edges = true; open-focused = true; } { @@ -214,7 +213,7 @@ ]; layer-rules = [ { - matches = [ { namespace = "noctalia-bar-content-.*"; } ]; + matches = [ { namespace = "noctalia-bar-content-.*$"; } ]; background-effect = { xray = false; blur = true; @@ -223,21 +222,23 @@ }; } { - matches = [ { namespace = "noctalia-bar-exclusion-top-.*"; } ]; + matches = [ { namespace = "noctalia-bar-exclusion-top-.*$"; } ]; place-within-backdrop = true; } { matches = [ { namespace = "^launcher$"; } ]; opacity = 0.925; + background-effect = { + xray = false; + blur = true; + noise = 0.05; + saturation = 1; + }; } { matches = [ - { - namespace = "^wpaperd.*"; - } - { - namespace = "^awww-daemon"; - } + { namespace = "^wpaperd.*"; } + { namespace = "^awww-daemon"; } ]; place-within-backdrop = true; } @@ -401,29 +402,13 @@ allow-when-locked = true; }; - "XF86Sleep" = { - action.power-off-monitors = { }; - }; + "XF86Sleep".action.power-off-monitors = { }; - "XF86Search" = { - action.spawn = [ - "noctalia-shell" - "ipc" - "call" - "launcher" - "toggle" - ]; - allow-when-locked = true; - }; + "XF86Search".action.spawn = [ "fuzzel" ]; "XF86LaunchA" = { - action.spawn = [ - "niri" - "msg" - "action" - "toggle-overview" - ]; - allow-when-locked = true; + action.toggle-overview = { }; + repeat = false; }; "Mod+O" = { @@ -551,18 +536,14 @@ "Mod+Ctrl+Shift+F".action.fullscreen-window = { }; "Mod+C".action.center-column = { }; - "Mod+Ctrl+C".action.center-visible-columns = { }; "Mod+Minus".action.set-column-width = "-10%"; "Mod+Equal".action.set-column-width = "+10%"; - "Mod+Shift+Minus".action.set-window-height = "-10%"; "Mod+Shift+Equal".action.set-window-height = "+10%"; - "Mod+Ctrl+Minus".action.set-column-width = "-0.25%"; "Mod+Ctrl+Equal".action.set-column-width = "+0.25%"; - "Mod+Ctrl+Shift+Minus".action.set-window-height = "-0.25%"; "Mod+Ctrl+Shift+Equal".action.set-window-height = "+0.25%"; @@ -571,18 +552,10 @@ "Mod+W".action.toggle-column-tabbed-display = { }; - "Print".action.screenshot = { - show-pointer = false; - }; - "Mod+Shift+S".action.screenshot = { - show-pointer = false; - }; - "Ctrl+Print".action.screenshot-screen = { - show-pointer = false; - }; - "Alt+Print".action.screenshot-window = { - show-pointer = false; - }; + "Print".action.screenshot.show-pointer = false; + "Mod+Shift+S".action.screenshot.show-pointer = false; + "Ctrl+Print".action.screenshot-screen.show-pointer = false; + "Alt+Print".action.screenshot-window.show-pointer = false; "Mod+Escape" = { action.toggle-keyboard-shortcuts-inhibit = { }; diff --git a/home/tiling/noctalia.nix b/home/tiling/noctalia.nix index b930511..367a7c6 100644 --- a/home/tiling/noctalia.nix +++ b/home/tiling/noctalia.nix @@ -613,8 +613,6 @@ ]; }; - Install = { - WantedBy = [ "niri.service" ]; - }; + Install.WantedBy = [ "niri.service" ]; }; } From 9403b9875469d0e83d37602b4d88bc377acb801e Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Sun, 22 Feb 2026 11:54:32 -0500 Subject: [PATCH 13/19] switch from awww to wbg, fight over? --- flake.lock | 62 +-------------------------------------- flake.nix | 7 ----- home/tiling/niri.nix | 5 +--- home/tiling/wallpaper.nix | 22 ++++---------- 4 files changed, 8 insertions(+), 88 deletions(-) diff --git a/flake.lock b/flake.lock index 92e79fd..ea99fbb 100644 --- a/flake.lock +++ b/flake.lock @@ -40,28 +40,6 @@ "type": "github" } }, - "awww": { - "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1770895252, - "narHash": "sha256-TUGZVDcC5xsrWVnpBNosAG1cTy+aWchCWXPyeLZdnGM=", - "ref": "refs/heads/main", - "rev": "2c86d41d07471f518e24f5cd1f586e4d2a32d12c", - "revCount": 1331, - "type": "git", - "url": "https://codeberg.org/LGFae/awww.git" - }, - "original": { - "type": "git", - "url": "https://codeberg.org/LGFae/awww.git" - } - }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -160,22 +138,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1767039857, @@ -358,7 +320,7 @@ "inputs": { "cachyos-kernel": "cachyos-kernel", "cachyos-kernel-patches": "cachyos-kernel-patches", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", "nixpkgs": "nixpkgs_2" }, @@ -577,7 +539,6 @@ "inputs": { "aerothemeplasma-nix": "aerothemeplasma-nix", "apple-silicon": "apple-silicon", - "awww": "awww", "base16": "base16", "base16-discord": "base16-discord", "catppuccin-discord": "catppuccin-discord", @@ -599,27 +560,6 @@ "tt-schemes": "tt-schemes" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "awww", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1764038373, - "narHash": "sha256-M6w2wNBRelcavoDAyFL2iO4NeWknD40ASkH1S3C0YGM=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "ab3536fe850211a96673c6ffb2cb88aab8071cc9", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "spicetify-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 2311628..8384109 100644 --- a/flake.nix +++ b/flake.nix @@ -86,11 +86,6 @@ # inputs.nixpkgs.follows = "nixpkgs"; }; - awww = { - url = "git+https://codeberg.org/LGFae/awww.git"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - openmw = { url = "gitlab:OpenMW/openmw"; flake = false; @@ -119,7 +114,6 @@ nur, nixvim, apple-silicon, - awww, openmw, catppuccin-discord, ... @@ -163,7 +157,6 @@ niri.overlays.niri noctalia.overlays.default nur.overlays.default - awww.overlays.default (final: prev: { openmw-git = openmw; catppuccin-discord-git = catppuccin-discord; diff --git a/home/tiling/niri.nix b/home/tiling/niri.nix index d9c07fe..653ac7e 100644 --- a/home/tiling/niri.nix +++ b/home/tiling/niri.nix @@ -236,10 +236,7 @@ }; } { - matches = [ - { namespace = "^wpaperd.*"; } - { namespace = "^awww-daemon"; } - ]; + matches = [ { namespace = "^wallpaper$"; } ]; place-within-backdrop = true; } ]; diff --git a/home/tiling/wallpaper.nix b/home/tiling/wallpaper.nix index e3e8bad..76d65a7 100644 --- a/home/tiling/wallpaper.nix +++ b/home/tiling/wallpaper.nix @@ -3,23 +3,13 @@ ... }: { - systemd.user.services.awww-daemon = { - Unit.Description = "Wallpaper service using awww (daemon)"; - Service.ExecStart = "${pkgs.awww}/bin/awww-daemon"; - Install.WantedBy = [ "niri.service" ]; - }; - - systemd.user.services.awww-setter = { - Unit.Description = "Wallpaper service using awww (setter)"; - Unit.Requires = [ "awww-daemon.service" ]; - Unit.After = [ "awww-daemon.service" ]; - Service.Type = "oneshot"; + systemd.user.services.wbg-daemon = { + Unit.Description = "Wallpaper service using wbg (daemon)"; Service.ExecStart = '' - ${pkgs.awww}/bin/awww img \ - %h/.local/share/wallpaper/daily.jpg \ - --transition-step 2 \ - --transition-fps 60 + ${pkgs.wbg}/bin/wbg -s \ + %h/.local/share/wallpaper/daily.jpg ''; + Install.WantedBy = [ "niri.service" ]; }; systemd.user.services.bing-wallpaper = { @@ -55,7 +45,7 @@ ''; } ); - Service.ExecStartPost = "${pkgs.systemd}/bin/systemctl --user restart awww-setter.service"; + Service.ExecStartPost = "${pkgs.systemd}/bin/systemctl --user restart wbg-daemon.service"; Install.WantedBy = [ "niri.service" ]; }; From c4eae904f3d0e4195a397704586d18f991d2b799 Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Sun, 22 Feb 2026 12:17:46 -0500 Subject: [PATCH 14/19] colorize wallpaper --- home/tiling/wallpaper.nix | 53 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/home/tiling/wallpaper.nix b/home/tiling/wallpaper.nix index 76d65a7..958cb97 100644 --- a/home/tiling/wallpaper.nix +++ b/home/tiling/wallpaper.nix @@ -1,5 +1,6 @@ { pkgs, + config, ... }: { @@ -7,7 +8,7 @@ Unit.Description = "Wallpaper service using wbg (daemon)"; Service.ExecStart = '' ${pkgs.wbg}/bin/wbg -s \ - %h/.local/share/wallpaper/daily.jpg + %h/.local/share/wallpaper/daily-colored.jpg ''; Install.WantedBy = [ "niri.service" ]; }; @@ -45,7 +46,7 @@ ''; } ); - Service.ExecStartPost = "${pkgs.systemd}/bin/systemctl --user restart wbg-daemon.service"; + Service.ExecStartPost = "${pkgs.systemd}/bin/systemctl --user start gowall-convert.service"; Install.WantedBy = [ "niri.service" ]; }; @@ -55,4 +56,52 @@ Timer.Persistent = true; Install.WantedBy = [ "timers.target" ]; }; + + systemd.user.services.gowall-convert = { + Unit.Description = "Convert a wallpaper to the system color scheme"; + Unit.StartLimitBurst = 6; + Unit.StartLimitIntervalSec = "10m"; + Service.Restart = "on-failure"; + Service.RestartSec = "10s"; + Service.Type = "oneshot"; + Service.ExecStart = '' + ${pkgs.gowall}/bin/gowall convert \ + %h/.local/share/wallpaper/daily.jpg \ + --output %h/.local/share/wallpaper/daily-colored.jpg \ + -t nix + ''; + Service.ExecStartPost = "${pkgs.systemd}/bin/systemctl --user restart wbg-daemon.service"; + }; + + home.file.".config/gowall/config.yml".text = with config.scheme.withHashtag; '' + themes: + - name: "nix" + colors: + - "${base06}" + - "${base0F}" + - "${base17}" + - "${base0E}" + - "${base08}" + - "${base12}" + - "${base09}" + - "${base0A}" + - "${base0B}" + - "${base0C}" + - "${base15}" + - "${base16}" + - "${base0D}" + - "${base07}" + - "${base05}" + - "${base07}" + - "${base0D}" + - "${base0D}" + - "${base04}" + - "${base04}" + - "${base04}" + - "${base03}" + - "${base02}" + - "${base00}" + - "${base01}" + - "${base11}" + ''; } From c5dcfce75fb235f87b94f9d331c97c6aa6f9e4c3 Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Sun, 22 Feb 2026 13:02:46 -0500 Subject: [PATCH 15/19] fix VM --- flake.nix | 32 ++++++++++++++--------------- system/hosts/vm-generic/default.nix | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.nix b/flake.nix index 8384109..e1733a6 100644 --- a/flake.nix +++ b/flake.nix @@ -312,23 +312,23 @@ { nixpkgs.overlays = [ apple-silicon.overlays.apple-silicon-overlay ]; } ]; }; - - alien = - mkNixosSystem { - hostname = "alien"; - system = "x86_64-linux"; - extraModules = [ - { nixpkgs.overlays = [ nix-cachyos-kernel.overlays.pinned ]; } - ]; - } - // nixpkgs.lib.genAttrs supportedSystems ( - system: - mkNixosSystem { - hostname = "vm-generic"; - inherit system; + alien = mkNixosSystem { + hostname = "alien"; + system = "x86_64-linux"; + extraModules = [ + { + nixpkgs.overlays = [ nix-cachyos-kernel.overlays.pinned ]; } - ); - }; + ]; + }; + } + // nixpkgs.lib.genAttrs supportedSystems ( + system: + mkNixosSystem { + hostname = "vm-generic"; + inherit system; + } + ); homeConfigurations = { peach = mkHomeConfig { diff --git a/system/hosts/vm-generic/default.nix b/system/hosts/vm-generic/default.nix index b2183eb..ef46a45 100644 --- a/system/hosts/vm-generic/default.nix +++ b/system/hosts/vm-generic/default.nix @@ -1,7 +1,7 @@ -{ catppuccin, ... }: +{ ... }: { home-manager.users.sckova = { - imports = [ catppuccin.homeModules.catppuccin ]; + imports = [ ]; }; services.spice-vdagentd.enable = true; From a2a60cc81c127f101697b9667cd100fc612c12a2 Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Sun, 22 Feb 2026 16:27:15 -0500 Subject: [PATCH 16/19] change niri and noctalia opacities --- home/tiling/niri.nix | 16 ++++++++-------- home/tiling/noctalia.nix | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/home/tiling/niri.nix b/home/tiling/niri.nix index 653ac7e..63a1fe0 100644 --- a/home/tiling/niri.nix +++ b/home/tiling/niri.nix @@ -99,16 +99,16 @@ border = { enable = true; width = 2; - active.color = config.scheme.withHashtag.${config.colors.accent}; - inactive.color = base01; - urgent.color = base12; + active.color = config.scheme.withHashtag.${config.colors.accent} + "E6"; + inactive.color = base01 + "E6"; + urgent.color = base12 + "E6"; }; focus-ring = { enable = false; width = 2; - active.color = config.scheme.withHashtag.${config.colors.accent}; - inactive.color = base01; - urgent.color = base12; + active.color = config.scheme.withHashtag.${config.colors.accent} + "E6"; + inactive.color = base01 + "E6"; + urgent.color = base12 + "E6"; }; shadow = { enable = true; @@ -128,7 +128,7 @@ bottom-right = 8.0; }; clip-to-geometry = true; - opacity = 0.95; + opacity = 0.90; background-effect = { xray = false; blur = true; @@ -167,7 +167,7 @@ is-active = false; } ]; - opacity = 0.925; + opacity = 0.875; } { matches = [ diff --git a/home/tiling/noctalia.nix b/home/tiling/noctalia.nix index 367a7c6..85a915f 100644 --- a/home/tiling/noctalia.nix +++ b/home/tiling/noctalia.nix @@ -63,7 +63,7 @@ bar = { autoHideDelay = 500; autoShowDelay = 150; - backgroundOpacity = 0.975; + backgroundOpacity = 0.90; monitors = [ ]; showCapsule = true; barType = "simple"; From 578f23fea0656165097bd6a89adfad4c12a381e9 Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Mon, 23 Feb 2026 16:30:44 -0500 Subject: [PATCH 17/19] peach -> hopscotch theme --- home/hosts/peach/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/home/hosts/peach/default.nix b/home/hosts/peach/default.nix index 3e0379c..be271f2 100644 --- a/home/hosts/peach/default.nix +++ b/home/hosts/peach/default.nix @@ -1,12 +1,11 @@ { pkgs, - config, lib, ... }: { colors = { - scheme = "catppuccin-mocha"; + scheme = "hopscotch"; accent = "base09"; }; From f31403df4073d6848074a5f883a37874db28ac0f Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Mon, 23 Feb 2026 18:43:22 -0500 Subject: [PATCH 18/19] changes to niri & firefox --- home/apps/firefox_css/theme/hide.css | 4 ++-- home/tiling/niri.nix | 17 ++++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/home/apps/firefox_css/theme/hide.css b/home/apps/firefox_css/theme/hide.css index ba0975a..7d7386d 100644 --- a/home/apps/firefox_css/theme/hide.css +++ b/home/apps/firefox_css/theme/hide.css @@ -14,7 +14,7 @@ visibility: hidden !important; } -.browserContainer { +/*.browserContainer { border-radius: 8px !important; margin: 6px !important; background-color: transparent !important; @@ -22,4 +22,4 @@ browser { border-radius: 8px !important; -} +}*/ diff --git a/home/tiling/niri.nix b/home/tiling/niri.nix index 63a1fe0..3f10058 100644 --- a/home/tiling/niri.nix +++ b/home/tiling/niri.nix @@ -16,7 +16,7 @@ XCURSOR_THEME = config.userOptions.cursor.name; XCURSOR_SIZE = toString config.userOptions.cursor.size; }; - screenshot-path = "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"; + screenshot-path = "~/Pictures/Screenshots/%a %b %e %Y @%l:%M %p.png"; hotkey-overlay.skip-at-startup = true; prefer-no-csd = true; gestures.hot-corners.enable = false; @@ -88,9 +88,7 @@ layout = { gaps = 4; background-color = "transparent"; - default-column-width = { - proportion = 0.5; - }; + default-column-width.proportion = 0.5; preset-column-widths = [ { proportion = 4.0 / 12.0; } { proportion = 6.0 / 12.0; } @@ -167,7 +165,7 @@ is-active = false; } ]; - opacity = 0.875; + opacity = 0.90; } { matches = [ @@ -182,6 +180,7 @@ ]; open-maximized-to-edges = true; open-focused = true; + opacity = 1.00; } { matches = [ @@ -227,7 +226,7 @@ } { matches = [ { namespace = "^launcher$"; } ]; - opacity = 0.925; + opacity = 0.90; background-effect = { xray = false; blur = true; @@ -539,6 +538,7 @@ "Mod+Equal".action.set-column-width = "+10%"; "Mod+Shift+Minus".action.set-window-height = "-10%"; "Mod+Shift+Equal".action.set-window-height = "+10%"; + "Mod+Ctrl+Minus".action.set-column-width = "-0.25%"; "Mod+Ctrl+Equal".action.set-column-width = "+0.25%"; "Mod+Ctrl+Shift+Minus".action.set-window-height = "-0.25%"; @@ -549,10 +549,9 @@ "Mod+W".action.toggle-column-tabbed-display = { }; - "Print".action.screenshot.show-pointer = false; "Mod+Shift+S".action.screenshot.show-pointer = false; - "Ctrl+Print".action.screenshot-screen.show-pointer = false; - "Alt+Print".action.screenshot-window.show-pointer = false; + "Ctrl+Shift+S".action.screenshot-screen.show-pointer = false; + "Alt+Shift+S".action.screenshot-window.show-pointer = false; "Mod+Escape" = { action.toggle-keyboard-shortcuts-inhibit = { }; From ef743497fd8306a96f15ce0d8dfa1cfc54f60e3d Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Tue, 24 Feb 2026 11:16:50 -0500 Subject: [PATCH 19/19] move macbook display to its home/hosts --- home/hosts/peach/default.nix | 57 +++++++++++++++++++++++------------- home/tiling/niri.nix | 8 +---- 2 files changed, 37 insertions(+), 28 deletions(-) diff --git a/home/hosts/peach/default.nix b/home/hosts/peach/default.nix index be271f2..a85a6bd 100644 --- a/home/hosts/peach/default.nix +++ b/home/hosts/peach/default.nix @@ -5,7 +5,7 @@ }: { colors = { - scheme = "hopscotch"; + scheme = "pnevma"; accent = "base09"; }; @@ -18,28 +18,43 @@ moonlight-qt ]; - programs.noctalia-shell.settings.bar = { - position = "top"; - density = "spacious"; - }; + programs = { + noctalia-shell.settings.bar = { + position = "top"; + density = "spacious"; + }; - programs.plasma = lib.mkDefault { - input.touchpads = [ - { - name = "Apple MTP multi-touch"; - vendorId = "05ac"; - productId = "0352"; - disableWhileTyping = false; - enable = true; - tapToClick = false; - naturalScroll = true; - accelerationProfile = "default"; - } - ]; + niri.settings.outputs."eDP-1" = { + scale = 1.5; + mode = { + width = 3024; + height = 1964; + refresh = 60.000; + }; + position = { + x = 272; + y = 1440; + }; + }; - shortcuts = { - # this is really annoying on apple laptops - org_kde_powerdevil.Sleep = [ ]; + plasma = lib.mkDefault { + input.touchpads = [ + { + name = "Apple MTP multi-touch"; + vendorId = "05ac"; + productId = "0352"; + disableWhileTyping = false; + enable = true; + tapToClick = false; + naturalScroll = true; + accelerationProfile = "default"; + } + ]; + + shortcuts = { + # this is really annoying on apple laptops + org_kde_powerdevil.Sleep = [ ]; + }; }; }; } diff --git a/home/tiling/niri.nix b/home/tiling/niri.nix index 3f10058..245ef15 100644 --- a/home/tiling/niri.nix +++ b/home/tiling/niri.nix @@ -48,13 +48,6 @@ }; }; outputs = { - "eDP-1" = { - scale = 1.5; - position = { - x = 272; - y = 1440; - }; - }; "HDMI-A-1" = { mode = { width = 3840; @@ -133,6 +126,7 @@ noise = 0.05; saturation = 1; }; + draw-border-with-background = false; } { matches = [