diff --git a/flake.lock b/flake.lock index fe8eedc..02f797e 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, @@ -369,7 +331,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" }, @@ -589,7 +551,6 @@ "inputs": { "aerothemeplasma-nix": "aerothemeplasma-nix", "apple-silicon": "apple-silicon", - "awww": "awww", "base16": "base16", "base16-discord": "base16-discord", "catppuccin-discord": "catppuccin-discord", @@ -610,27 +571,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 0670de7..cfaa1e2 100644 --- a/flake.nix +++ b/flake.nix @@ -81,11 +81,6 @@ # inputs.nixpkgs.follows = "nixpkgs"; }; - awww = { - url = "git+https://codeberg.org/LGFae/awww.git"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - openmw = { url = "gitlab:OpenMW/openmw/01bcd6a6369fe461caaf900354967b4751aede7a"; flake = false; @@ -114,7 +109,6 @@ nur, nixvim, apple-silicon, - awww, openmw, catppuccin-discord, ... @@ -158,7 +152,6 @@ niri.overlays.niri noctalia.overlays.default nur.overlays.default - awww.overlays.default (final: prev: { openmw-git = openmw; catppuccin-discord-git = catppuccin-discord; @@ -222,7 +215,6 @@ } ./system ./system/searxng - ./system/torrenting ./system/widevine ./system/shell/fish.nix ./system/tailscale diff --git a/home/apps/firefox.nix b/home/apps/firefox.nix index 1a3298c..402c099 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:5364/"; + "browser.startup.homepage" = "http://localhost:8080/"; # Disable Firefox's machine learning (AI) features "browser.ml.enable" = false; @@ -369,7 +369,7 @@ searxng = { name = "SearXNG"; - urls = [ { template = "http://localhost:5364/search?q={searchTerms}"; } ]; + urls = [ { template = "http://localhost:8080/search?q={searchTerms}"; } ]; icon = searchIcon; definedAliases = [ "@go" ]; }; diff --git a/home/default.nix b/home/default.nix index dffbadd..53fa623 100755 --- a/home/default.nix +++ b/home/default.nix @@ -48,6 +48,7 @@ libreoffice-qt-fresh # nur.repos.forkprince.helium-nightly chromium + qbittorrent nautilus fractal tuba diff --git a/home/hosts/peach/default.nix b/home/hosts/peach/default.nix index 8a3327a..1415982 100644 --- a/home/hosts/peach/default.nix +++ b/home/hosts/peach/default.nix @@ -6,7 +6,7 @@ }: { colors = { - scheme = "catppuccin-mocha"; + scheme = "catppuccin-latte"; accent = "base09"; }; diff --git a/home/tiling/niri.nix b/home/tiling/niri.nix index c82eeb6..4d9ba5b 100644 --- a/home/tiling/niri.nix +++ b/home/tiling/niri.nix @@ -29,6 +29,7 @@ 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; @@ -186,14 +187,6 @@ open-maximized = true; open-focused = true; } - { - matches = [ - { - app-id = "mpv"; - } - ]; - opacity = 1.0; - } ]; layer-rules = [ { @@ -202,7 +195,7 @@ namespace = "^wpaperd.*"; } { - namespace = "^awww-daemon"; + namespace = "^mpvpaper"; } ]; place-within-backdrop = true; diff --git a/home/tiling/noctalia.nix b/home/tiling/noctalia.nix index b930511..719dda0 100644 --- a/home/tiling/noctalia.nix +++ b/home/tiling/noctalia.nix @@ -63,7 +63,7 @@ bar = { autoHideDelay = 500; autoShowDelay = 150; - backgroundOpacity = 0.975; + backgroundOpacity = 1; monitors = [ ]; showCapsule = true; barType = "simple"; @@ -79,7 +79,7 @@ outerCorners = false; screenOverrides = [ ]; showOutline = false; - useSeparateOpacity = true; + useSeparateOpacity = false; widgets = { center = [ ]; left = [ @@ -206,7 +206,7 @@ deviceNativePath = "__default__"; displayMode = "icon-hover"; hideIfIdle = false; - hideIfNotDetected = true; + hideIfNotDetected = false; id = "Battery"; showNoctaliaPerformance = false; showPowerProfiles = true; diff --git a/home/tiling/wallpaper.nix b/home/tiling/wallpaper.nix index 9482de3..3b2f783 100644 --- a/home/tiling/wallpaper.nix +++ b/home/tiling/wallpaper.nix @@ -3,77 +3,68 @@ ... }: { - 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.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' \ + ''; + }; + Install = { + WantedBy = [ "niri.service" ]; + }; }; systemd.user.services.bing-wallpaper = { - 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 + 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" - OUT_DIR="''${XDG_DATA_HOME:-$HOME/.local/share}/wallpaper" - OUT_FILE="$OUT_DIR/daily.jpg" + API_RESP=$(${pkgs.wget}/bin/wget -qO- "https://www.bing.com/HPImageArchive.aspx?format=js&idx=0&mkt=en-US&n=1") || exit 1 - 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" | ${pkgs.gnugrep}/bin/grep -oP 'urlbase":"[^"]*' | cut -d '"' -f 3) + TITLE=$(echo "$API_RESP" | ${pkgs.gnugrep}/bin/grep -oP 'title":"[^"]*' | 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.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)" - 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"; + ${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" ]; + }; }; systemd.user.timers.bing-wallpaper = { - Unit.Description = "Run bing wallpaper retrieval daily"; - Timer.OnCalendar = "*-*-* 10:00:00 GMT"; - Timer.Persistent = true; - Install.WantedBy = [ "timers.target" ]; + Unit = { + Description = "Run bing wallpaper retrieval daily"; + }; + Timer = { + OnCalendar = "*-*-* 10:00:00 GMT"; + Persistent = true; + }; + Install = { + WantedBy = [ "timers.target" ]; + }; }; } diff --git a/system/searxng/default.nix b/system/searxng/default.nix index 9aed6d4..75161b5 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 = 5364; + port = 8080; bind_address = "127.0.0.1"; }; diff --git a/system/torrenting/default.nix b/system/torrenting/default.nix deleted file mode 100644 index 5498a13..0000000 --- a/system/torrenting/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - 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 = "*"; - }; - }; - }; - }; -}