diff --git a/flake.lock b/flake.lock index e69014b..fe8eedc 100644 --- a/flake.lock +++ b/flake.lock @@ -307,12 +307,8 @@ }, "niri": { "inputs": { - "niri-stable": [ - "niri-blur" - ], - "niri-unstable": [ - "niri-blur" - ], + "niri-stable": "niri-stable", + "niri-unstable": "niri-unstable", "nixpkgs": [ "nixpkgs" ], @@ -323,33 +319,48 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1771682768, - "narHash": "sha256-RJ9RVJSAktCgWiqLDCjYmx9KgMuLaszUrI28k92Pa2I=", - "owner": "sckova", + "lastModified": 1771514840, + "narHash": "sha256-t3WbZvwoDj/75YDX/nwkZuxanZLZaWr9meSfKswaN6g=", + "owner": "sodiboo", "repo": "niri-flake", - "rev": "383bd9d32706b163807b05983418069b2e692310", + "rev": "4f69ab280e9bb34e2c0b67fdfa6f0978a170ef56", "type": "github" }, "original": { - "owner": "sckova", - "ref": "feat/blur", + "owner": "sodiboo", "repo": "niri-flake", "type": "github" } }, - "niri-blur": { + "niri-stable": { "flake": false, "locked": { - "lastModified": 1771672342, - "narHash": "sha256-52CxMRH2kVGpsPBiZM+996b6i/3XkmOrySm5zqwWc+o=", - "owner": "niri-wm", + "lastModified": 1756556321, + "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", + "owner": "YaLTeR", "repo": "niri", - "rev": "86f42d1ed9ab787c52ace073e0b3218e26530d25", + "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", "type": "github" }, "original": { - "owner": "niri-wm", - "ref": "wip/branch", + "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", "repo": "niri", "type": "github" } @@ -584,7 +595,6 @@ "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 b95f95c..0670de7 100644 --- a/flake.nix +++ b/flake.nix @@ -44,16 +44,11 @@ }; niri = { - url = "github:sckova/niri-flake/feat/blur"; + url = "github:sodiboo/niri-flake"; inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs-stable.follows = "nixpkgs-stable"; - inputs.niri-stable.follows = "niri-blur"; - inputs.niri-unstable.follows = "niri-blur"; - }; - - niri-blur = { - url = "github:niri-wm/niri/wip/branch"; - flake = false; + # inputs.niri-stable.follows = "niri-blur"; + # inputs.niri-unstable.follows = "niri-blur"; }; # niri-blur = { diff --git a/home/hosts/peach/default.nix b/home/hosts/peach/default.nix index 3e0379c..8a3327a 100644 --- a/home/hosts/peach/default.nix +++ b/home/hosts/peach/default.nix @@ -19,6 +19,11 @@ 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/services/systemd.nix b/home/services/systemd.nix index 5e1d681..5dd3a94 100644 --- a/home/services/systemd.nix +++ b/home/services/systemd.nix @@ -28,14 +28,16 @@ Description = "Mount Synology NAS with Rclone and Home Manager."; After = [ "tailscaled.service" ]; Wants = [ "tailscaled.service" ]; - StartLimitBurst = 5; - StartLimitIntervalSec = "1m"; }; Service = { Type = "simple"; - Restart = "on-failure"; - RestartSec = "1m"; + # 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 + # ''}"; ExecStart = "${pkgs.writeShellScript "synology-mount" '' #!/usr/bin/env bash set -euo pipefail @@ -63,4 +65,49 @@ 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/niri.nix b/home/tiling/niri.nix index 26dff3b..c82eeb6 100644 --- a/home/tiling/niri.nix +++ b/home/tiling/niri.nix @@ -83,11 +83,13 @@ }; 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; @@ -119,6 +121,12 @@ softness = 30; color = base11 + "BF"; }; + # blur = { + # enable = true; + # passes = 4; + # radius = 4; + # noise = 0.1; + # }; }; window-rules = [ { @@ -129,13 +137,7 @@ bottom-right = 8.0; }; clip-to-geometry = true; - opacity = 0.95; - background-effect = { - xray = false; - blur = true; - noise = 0.05; - saturation = 1; - }; + opacity = 0.975; } { matches = [ @@ -168,7 +170,7 @@ is-active = false; } ]; - opacity = 0.925; + opacity = 0.95; } { matches = [ @@ -189,10 +191,6 @@ { app-id = "mpv"; } - { - app-id = "firefox"; - title = "Picture-in-Picture"; - } ]; opacity = 1.0; } diff --git a/home/tiling/wallpaper.nix b/home/tiling/wallpaper.nix index 095c163..9482de3 100644 --- a/home/tiling/wallpaper.nix +++ b/home/tiling/wallpaper.nix @@ -26,10 +26,10 @@ systemd.user.services.bing-wallpaper = { Unit.Description = "Download and set Bing wallpaper of the day"; - Unit.StartLimitBurst = 6; + Unit.StartLimitBurst = 5; Unit.StartLimitIntervalSec = "10m"; Service.Restart = "on-failure"; - Service.RestartSec = "10s"; + Service.RestartSec = "1m"; Service.Type = "oneshot"; Service.ExecStart = pkgs.lib.getExe ( pkgs.writeShellApplication { @@ -68,7 +68,6 @@ } ); Service.ExecStartPost = "${pkgs.systemd}/bin/systemctl --user restart awww-setter.service"; - Install.WantedBy = [ "graphical-session.target" ]; }; systemd.user.timers.bing-wallpaper = {