fix:niri_screencast

Version 372 -> 373: firefox: 145.0.1 → 145.0.2, +28.3 KiB firefox-unwrapped: 145.0.1 → 145.0.2, +69.9 KiB gpsd: 3.26.1 → 3.27, +250.2 KiB gui-for-singbox: 1.13.0 → 1.15.1, +40.5 KiB hyprutils: 0.10.2 → 0.10.3, +101.0 KiB initrd-linux: +103.9 KiB librime: 1.14.0 → 1.15.0, +31.3 KiB libtraceevent: 1.8.5 → 1.8.6, +15.2 KiB libwacom: 2.16.1 → 2.17.0, +61.2 KiB linux: 6.17.9-modules → ∅, -2881.9 KiB linux-firmware: 20251111 → 20251125, +13275.6 KiB nixos-rebuild-ng: 25.11 → 26.05 nixos-system-dos: 25.11.20251124.5ae3b07 → 26.05.20251127.2fad6ea onlyoffice-desktopeditors: 9.0.0, 9.0.0-fhsenv → 9.1.0, 9.1.0-fhsenv, +27117.5 KiB ruff: 0.14.5 → 0.14.6, +404.5 KiB source: +22.7 KiB vimplugin-luajit2.1-fzf-lua: 0.0.2308-1-unstable-0.0.2308-1 → 0.0.2311-1-unstable-0.0.2311-1 x86_energy_perf_policy: 6.12.58 → 6.12.59 xdg-desktop-portal-gnome.service: ε → ∅ zed-editor: 0.213.3 → 0.214.5, +2388.5 KiB
2025-12-16 19:22:00 -05:00 · 2025-11-30 14:31:02 +08:00
7 changed files with 45 additions and 56 deletions
--- a/51
+++ b/51
@@ -5,80 +5,79 @@ hostname := `hostname`
 username := `whoami`


-@anywhere input:
+anywhere input:
  # Perform nixos-anywhere install
  nix run github:nix-community/nixos-anywhere -- --generate-hardware-config nixos-generate-config ./hosts/{{input}}/hardware.nix --flake .#{{input}} --target-host root@{{input}}


-@anywhere-lb input:
+anywhere-lb input:
  # Perform nixos-anywhere install (local builder)
  nix run github:nix-community/nixos-anywhere -- --generate-hardware-config nixos-generate-config ./hosts/{{input}}/hardware.nix --flake .#{{input}} --target-host root@{{input}} --build-on local


-@anywhere-vm input:
+anywhere-vm input:
  # Test nixos-anywhere install in vm
  nix run github:nix-community/nixos-anywhere -- --flake .#{{input}} --vm-test


-@build input:
+build input:
  # Build
  sudo nixos-rebuild build --flake .#{{input}} --show-trace -L -v


-@build-vm input:
+build-vm input:
  # Build a vm
  sudo nixos-rebuild build-vm --flake .#{{input}} --show-trace -L -v


-@switch input:
-  # Let system rebuild and switch
-  sudo nixos-rebuild switch --flake .#{{input}} --show-trace -L -v
-
-
-@clean:
+clean:
  # Remove useless nix-channel files
  sudo rm -rf /nix/var/nix/profiles/per-user/root/channels /root/.nix-defexpr/channels


-@gc:
+format:
+  # Use alejandra and deadnix to format code
+  deadnix -e
+  alejandra .
+
+
+gc:
  # Do garbage-clean (remove unused packages, etc)
  sudo nix profile wipe-history --older-than 7d --profile /nix/var/nix/profiles/system
  sudo nix-collect-garbage --delete-old


-@ghc:
+ghc:
  # Generate hardware.nix
  nixos-generate-config --show-hardware-config > ./hosts/{{hostname}}/hardware.nix


-@install:
+install:
  # Install this flake
  bash install.sh


-@cat:
+list:
  # List system packages
  nix-store -qR /run/current-system | cat


-@list:
-  sudo nix-env -p /nix/var/nix/profiles/system --list-generations
+profile:
+  # Show system profile
+  sudo nix profile history --profile /nix/var/nix/profiles/system


-@diff:
-  sudo nix profile diff-closures --profile /nix/var/nix/profiles/system
+switch input:
+  # Let system rebuild and switch
+  sudo nixos-rebuild switch --flake .#{{input}} --show-trace -L -v


-@delete generation:
-  sudo nix-env -p /nix/var/nix/profiles/system --delete-generations {{generation}}
-
-
-@update:
+update:
  # Update flake.lock
  nix flake update --extra-experimental-features flakes --extra-experimental-features nix-command --show-trace


-@upgrade:
+upgrade:
  # Let system totally upgrade
  ## Set hostname and username in flake.nix
  sed -i "/^\s*hostname[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"{{hostname}}\"/" ./flake.nix
@@ -88,7 +87,7 @@ username := `whoami`
  sudo nixos-rebuild switch --flake .#{{hostname}} --show-trace


-@upgrade-debug:
+upgrade-debug:
  # Let system totally upgrade (deBug Mode)
  ## Set hostname and username in flake.nix
  sed -i "/^\s*hostname[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"{{hostname}}\"/" ./flake.nix
--- a/dotfiles/.config/niri/config.kdl
+++ b/dotfiles/.config/niri/config.kdl
@@ -181,8 +181,9 @@ binds {

 environment {
    CURRENT_COMPOSITOR "niri"
-    XDG_CURRENT_DESKTOP "Niri"
-    XDG_SESSION_DESKTOP "Niri"
+    DISPLAY ":0"
+    XDG_CURRENT_DESKTOP "niri"
+    XDG_SESSION_DESKTOP "niri"
 }


@@ -200,7 +201,7 @@ spawn-at-startup "blueman-applet"
 spawn-at-startup "sh" "-c" "dbus-update-activation-environment --systemd --all && systemctl --user stop niri-session.target && systemctl --user start niri-session.target"
 spawn-at-startup "swayosd-server"
 spawn-at-startup "swww-daemon"
-spawn-at-startup "swww" "img" "$HOME/Git/DCGOS/dotfiles/.local/share/wallpapers/yohoho.jpg"
+spawn-at-startup "sh" "-c" "sleep 1 && swww img $HOME/Git/DCGOS/dotfiles/.local/share/wallpapers/yohoho.jpg"
 spawn-at-startup "swww" "restore"
 spawn-at-startup "waybar"
 spawn-at-startup "lxqt-policykit-agent"
--- a/dotfiles/.config/niri/switch_monitors.sh
+++ b/dotfiles/.config/niri/switch_monitors.sh
@@ -48,5 +48,3 @@ echo "$NEXT_MODE" > "$STATE_FILE"
 # 刷新 Niri 布局（防止残影）
 sleep 0.5
 niri msg reload-layout >/dev/null 2>&1 || true
-pkill swayosd-server
-(swayosd-server &>/dev/null &)
--- a/flake.lock
+++ b/flake.lock
@@ -301,11 +301,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1764544324,
-        "narHash": "sha256-GVBGjO7UsmzLrlOJV8NlKSxukHaHencrJqWkCA6FkqI=",
+        "lastModified": 1764361670,
+        "narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "e4e25a8c310fa45f2a8339c7972dc43d2845a612",
+        "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6",
        "type": "github"
      },
      "original": {
@@ -433,11 +433,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1764517877,
-        "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
+        "lastModified": 1764242076,
+        "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
+        "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
        "type": "github"
      },
      "original": {
@@ -473,11 +473,11 @@
        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1764537799,
-        "narHash": "sha256-+FvqJSUI9kNLwnSbEBnvjoNs9uQplNytf5+jYPafsKw=",
+        "lastModified": 1764443358,
+        "narHash": "sha256-bd9I02P/Mp9yYGcSWgLLdI/Zt0JqF8igSTAfUzknVHk=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "aab92fcc99cdfa81c01d754f5a9047414bb6cf32",
+        "rev": "6094d2a4396c0ff4e94b22315cc43f55db626c32",
        "type": "github"
      },
      "original": {
@@ -585,11 +585,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1764550443,
-        "narHash": "sha256-ArO2V1YEHmEILilTj4KPtqF4gqc1q2HBrrrmygQ/UyU=",
+        "lastModified": 1764451865,
+        "narHash": "sha256-d4tfTm3ccp4rx7W1WW1BzSkTgEeMd4cZvhAJ7lP145M=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "794b6e1fa75177ebfeb32967f135858a1ab1ba15",
+        "rev": "8a096ccec828c68bfb870295d186ad994ea0ae2c",
        "type": "github"
      },
      "original": {
--- a/home/wayland/niri.nix
+++ b/home/wayland/niri.nix
@@ -36,5 +36,6 @@ in
          pkgs.xdg-desktop-portal-gtk
          pkgs.xdg-desktop-portal-gnome
        ];
+        configPackages = [pkgs.niri];
      };
    }
--- a/modules/drivers/bluetooth.nix
+++ b/modules/drivers/bluetooth.nix
@@ -9,7 +9,7 @@ in
    config = mkIf Bluetooth {
      hardware.bluetooth = {
        enable = lib.mkDefault true;
-        powerOnBoot = lib.mkDefault false;
+        powerOnBoot = lib.mkDefault true;
      };
      services.blueman.enable = lib.mkDefault true;
    };
--- a/modules/system/bootstrap.nix
+++ b/modules/system/bootstrap.nix
@@ -17,19 +17,9 @@
 in
  with lib; {
    boot = {
-      blacklistedKernelModules = [
-        "iTCO_wdt"
-        "iTCO_vendor_support"
-        "intel_pmc_bxt"
-        "mei"
-        "mei_hdcp"
-        "mei_me"
-        "mei_pxp"
-        "pstore"
-        "sp5100_tco"
-        "wdat_wdt"
-      ];
+      bcache.enable = false;
      consoleLogLevel = 2; # Only errors and warnings are displayed
+      extraModprobeConfig = "blacklist mei mei_hdcp mei_me mei_pxp iTCO_wdt pstore sp5100_tco";
      extraModulePackages = [
        config.boot.kernelPackages.v4l2loopback # v4l2loopback is for OBS Virtual Cam Support
      ];