From d0c16e345aca5936c8e2f27a98b320b86b74d4dc Mon Sep 17 00:00:00 2001 From: dichgrem Date: Thu, 4 Dec 2025 18:47:47 +0800 Subject: [PATCH] fix:switch.sh&&mysql MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit update:flake Version 406 -> 410: bat: 0.26.0 → 0.26.1, +17.6 KiB brave: 1.84.141 → 1.85.111, +2964.5 KiB hyprlang: 0.6.6 → 0.6.7 ipxe: 1.21.1-unstable-2025-11-26 → 1.21.1-unstable-2025-12-03 kazumi: 1.9.0 → 1.9.1, +218.1 KiB libbytesize: 2.11 → 2.12 libvlc: 3.0.21 → 3.0.22, +1912.7 KiB mesa: 25.3.0 → 25.3.1, +52.0 KiB nixos-system-dos: 26.05.20251202.418468a → 26.05.20251205.f61125a scx_full: 1.0.18 → 1.0.19, +27223.4 KiB source: +548.8 KiB xwayland-satellite: 0.7 → 0.8, +891.4 KiB zed-editor: 0.214.7 → 0.215.3, +16693.9 KiB fastfetch: 2.55.1 → 2.56.0, +8.6 KiB firefox: -61.6 KiB firefox-unwrapped: -149.0 KiB gst-plugins-rs: 0.14.2 → 0.14.4, -23465.5 KiB initrd-linux: +8.7 KiB libgit2: 1.9.1 → 1.9.2 linux: 6.18.0-modules → ∅, -2899.5 KiB nix: 2.31.2 → 2.31.2+1 nix-cmd: 2.31.2 → 2.31.2+1 nix-expr: 2.31.2 → 2.31.2+1 nix-fetchers: 2.31.2 → 2.31.2+1 nix-flake: 2.31.2 → 2.31.2+1 nix-main: 2.31.2 → 2.31.2+1 nix-store: 2.31.2 → 2.31.2+1 nix-util: 2.31.2 → 2.31.2+1 nixos-icons: 0-unstable-2024-04-10 → 0-unstable-2025-06-28 nixos-system-dos: 26.05.20251205.f61125a → 26.05.20251208.addf7cf nss: 3.118.1 → 3.119 python3: +216.7 KiB python3.12-python-lsp-server: 1.13.2 → 1.14.0 python3.13-dbus-python: ∅ → 1.4.0, +685.3 KiB readest: 0.9.93 → 0.9.94, +1060.0 KiB ruff: 0.14.7 → 0.14.8, +87.0 KiB samba: 4.22.5 → 4.22.6, +15.4 KiB source: +201.2 KiB unit-script-initrd-nixos-activation: ε → ∅ webkitgtk: 2.50.2+abi=4.1 → 2.50.3+abi=4.1 x86_energy_perf_policy: 6.12.60 → 6.12.61 --- dotfiles/.config/niri/switch_monitors.sh | 2 + flake.lock | 149 +++++------------------ hosts/dos/hardware.nix | 9 +- modules/services/mysql.nix | 5 +- 4 files changed, 39 insertions(+), 126 deletions(-) diff --git a/dotfiles/.config/niri/switch_monitors.sh b/dotfiles/.config/niri/switch_monitors.sh index f78d506..56643a7 100755 --- a/dotfiles/.config/niri/switch_monitors.sh +++ b/dotfiles/.config/niri/switch_monitors.sh @@ -50,3 +50,5 @@ sleep 0.5 niri msg reload-layout >/dev/null 2>&1 || true pkill swayosd-server (swayosd-server &>/dev/null &) +pkill wl-gammarelay-rs +(wl-gammarelay-rs &>/dev/null &) diff --git a/flake.lock b/flake.lock index ae1bd37..700b731 100644 --- a/flake.lock +++ b/flake.lock @@ -77,11 +77,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1764720660, - "narHash": "sha256-zrU6DwLb5zXCg6JxfVJyNCJex0LjuTUXchotq44Vn+w=", + "lastModified": 1765204341, + "narHash": "sha256-7xd45skcuLCu2DHxVvU+W/z+7CUOjyv+QPtT4PLZaIU=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "1739cb8049b3184496279dc6a272b56d466ddd58", + "rev": "aacb796ccd42be1555196c20013b9b674b71df75", "type": "github" }, "original": { @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1764627417, - "narHash": "sha256-D6xc3Rl8Ab6wucJWdvjNsGYGSxNjQHzRc2EZ6eeQ6l4=", + "lastModified": 1765326679, + "narHash": "sha256-fTLX9kDwLr9Y0rH/nG+h1XG5UU+jBcy0PFYn5eneRX8=", "owner": "nix-community", "repo": "disko", - "rev": "5a88a6eceb8fd732b983e72b732f6f4b8269bef3", + "rev": "d64e5cdca35b5fad7c504f615357a7afe6d9c49e", "type": "github" }, "original": { @@ -220,24 +220,6 @@ "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -281,11 +263,11 @@ ] }, "locked": { - "lastModified": 1764636297, - "narHash": "sha256-S41K55kw+hWgDfgKmZ9/fMZ3F0BQDMvqFfE120fMHeE=", + "lastModified": 1764998300, + "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", "owner": "nix-community", "repo": "home-manager", - "rev": "ff067cfc619fdf6f82d50344e7d19ff2323f0827", + "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", "type": "github" }, "original": { @@ -301,11 +283,11 @@ ] }, "locked": { - "lastModified": 1764788330, - "narHash": "sha256-hE/gXK+Z0j654T0tsW+KcndRqsgZXe8HyWchjBJgQpw=", + "lastModified": 1765337252, + "narHash": "sha256-HuWQp8fM25fyWflbuunQkQI62Hg0ecJxWD52FAgmxqY=", "owner": "nix-community", "repo": "home-manager", - "rev": "fca4cba863e76c26cfe48e5903c2ff4bac2b2d5d", + "rev": "13cc1efd78b943b98c08d74c9060a5b59bf86921", "type": "github" }, "original": { @@ -314,34 +296,6 @@ "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754860581, - "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.1.1", - "repo": "ixx", - "type": "github" - } - }, "jovian": { "inputs": { "nix-github-actions": "nix-github-actions", @@ -351,11 +305,11 @@ ] }, "locked": { - "lastModified": 1764655750, - "narHash": "sha256-tBrcUSu/47u+E+81SUVUpXrqhkcM3Xqg/4taWFI/99k=", + "lastModified": 1764922999, + "narHash": "sha256-LSvUxKm6S6ZAd/otQSkAHd3+8KJhi8OwGJGSe0K//B8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "1127a4fc66425cceae683becb93f038819cf2633", + "rev": "9b9ead1b5591b68f4048e7205ba1397bc85ce6c4", "type": "github" }, "original": { @@ -389,11 +343,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { @@ -433,11 +387,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1764667669, - "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", + "lastModified": 1765186076, + "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "418468ac9527e799809c900eda37cbff999199b6", + "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", "type": "github" }, "original": { @@ -469,15 +423,14 @@ "nixpkgs": [ "nixpkgs" ], - "nuschtosSearch": "nuschtosSearch", - "systems": "systems_2" + "systems": "systems" }, "locked": { - "lastModified": 1764803799, - "narHash": "sha256-94SMf4Uw5iSoX37ui6LAdcadCUHUDfrvggGay0uWkis=", + "lastModified": 1765291075, + "narHash": "sha256-tw7+BDZqn2vvpWbT3OYiumPevZP80dCGXpwdyYucoOs=", "owner": "nix-community", "repo": "nixvim", - "rev": "5d1c27e53c96e2c94e69f2e2d083ef147b3a3ccb", + "rev": "ba8f6d40b14e2ca14433334d0f5d23234c2ac025", "type": "github" }, "original": { @@ -511,29 +464,6 @@ "type": "github" } }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils", - "ixx": "ixx", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1761730856, - "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=", - "owner": "NuschtOS", - "repo": "search", - "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "root": { "inputs": { "chaotic": "chaotic", @@ -553,11 +483,11 @@ ] }, "locked": { - "lastModified": 1764643237, - "narHash": "sha256-6Ezx9DqVv5UZ7DBK9rcNwBuQUENFyWPS7M09I+FvNao=", + "lastModified": 1765075567, + "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e66d6b924ac59e6c722f69332f6540ea57c69233", + "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f", "type": "github" }, "original": { @@ -577,7 +507,7 @@ "gnome-shell": "gnome-shell", "nixpkgs": "nixpkgs_4", "nur": "nur", - "systems": "systems_3", + "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -585,11 +515,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1764798099, - "narHash": "sha256-IIwR5ZWo7tjxjRpkz0tViF9KFbQ1YXs9Wkan46WQbfk=", + "lastModified": 1765047449, + "narHash": "sha256-VQcqjJ2g0kT9TW4ENwA2HBQJzfbCUd5s1Wm3K+R2QZY=", "owner": "danth", "repo": "stylix", - "rev": "4b9e0e7ba3cccb86fe2bf0f4a2dd18256bef1cc6", + "rev": "bd00e01aab676aee88e6cc5c9238b4a5a7d6639a", "type": "github" }, "original": { @@ -628,21 +558,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { diff --git a/hosts/dos/hardware.nix b/hosts/dos/hardware.nix index 30c242d..17f42d5 100644 --- a/hosts/dos/hardware.nix +++ b/hosts/dos/hardware.nix @@ -14,7 +14,7 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/67e9d418-8f31-4af7-9178-ae9641099844"; + { device = "/dev/mapper/luks-6647cbcd-ed3a-4205-9a2c-78e337e2f3bf"; fsType = "xfs"; }; @@ -28,13 +28,6 @@ swapDevices = [ ]; - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/modules/services/mysql.nix b/modules/services/mysql.nix index b2769e9..4b3da61 100644 --- a/modules/services/mysql.nix +++ b/modules/services/mysql.nix @@ -9,9 +9,12 @@ in package = pkgs.mysql84; }; + systemd.services.mysql = { + wantedBy = lib.mkForce [ ]; + }; + environment.systemPackages = [ pkgs.dbeaver-bin ]; }; } -