diff --git a/flake.lock b/flake.lock index 667a96d..ca6badf 100644 --- a/flake.lock +++ b/flake.lock @@ -21,29 +21,10 @@ "type": "github" } }, - "airi": { - "inputs": { - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1773288751, - "narHash": "sha256-834juj/zqf7W0fHHXknsoCZjeDXtKYiU0gOKHBtlS48=", - "owner": "github:moeru-ai", - "repo": "airi", - "rev": "41ce282e955c66b71317ffa597308008aaa084e9", - "type": "github" - }, - "original": { - "owner": "github:moeru-ai", - "repo": "airi", - "rev": "41ce282e955c66b71317ffa597308008aaa084e9", - "type": "github" - } - }, "awww": { "inputs": { "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay" }, "locked": { @@ -131,7 +112,7 @@ "caelestia-cli": { "inputs": { "caelestia-shell": "caelestia-shell", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1771641231, @@ -199,7 +180,7 @@ "caelestia-shell_2": { "inputs": { "caelestia-cli": "caelestia-cli_2", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "quickshell": [ "quickshell" ] @@ -220,7 +201,7 @@ }, "dank-material-shell": { "inputs": { - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "quickshell": "quickshell_2" }, "locked": { @@ -562,7 +543,7 @@ "inputs": { "flake-compat": "flake-compat_2", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "zig": "zig", "zon2nix": "zon2nix" }, @@ -601,7 +582,7 @@ }, "hexecute": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1765826167, @@ -689,7 +670,7 @@ }, "kimi-cli": { "inputs": { - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "pyproject-build-systems": "pyproject-build-systems", "pyproject-nix": "pyproject-nix", "systems": "systems_3", @@ -731,7 +712,7 @@ "mangowc": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_10", "scenefx": "scenefx" }, "locked": { @@ -750,7 +731,7 @@ }, "nh": { "inputs": { - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1771418104, @@ -792,7 +773,7 @@ "niri-unstable": [ "niri-unstable" ], - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_12", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" @@ -869,7 +850,7 @@ "nixGL": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1762090880, @@ -1033,7 +1014,7 @@ "inputs": { "flake-compat": "flake-compat_4", "lib-aggregate": "lib-aggregate", - "nixpkgs": "nixpkgs_16" + "nixpkgs": "nixpkgs_15" }, "locked": { "lastModified": 1764210015, @@ -1050,22 +1031,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1766532406, - "narHash": "sha256-acLU/ag9VEoKkzOD202QASX25nG1eArXg5A0mHjKgxM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "8142186f001295e5a3239f485c8a49bf2de2695a", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1750386251, "narHash": "sha256-1ovgdmuDYVo5OUC5NzdF+V4zx2uT8RtsgZahxidBTyw=", @@ -1081,7 +1046,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1769318308, "narHash": "sha256-Mjx6p96Pkefks3+aA+72lu1xVehb6mv2yTUUqmSet6Q=", @@ -1097,7 +1062,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1771369470, "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", @@ -1113,7 +1078,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1746378225, "narHash": "sha256-OeRSuL8PUjIfL3Q0fTbNJD/fmv1R+K2JAOqWJd3Oceg=", @@ -1128,13 +1093,13 @@ "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_14": { "locked": { - "lastModified": 1772963539, - "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", + "lastModified": 1774235121, + "narHash": "sha256-CzpSER+YKq4yD+RPom6Su9c/4FutF+sD4rEnls+4MyM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9dcb002ca1690658be4a04645215baea8b95f31d", + "rev": "1116aed2cee959f7d054a462458513ad323b710a", "type": "github" }, "original": { @@ -1144,7 +1109,7 @@ "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_15": { "locked": { "lastModified": 1763966396, "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", @@ -1160,7 +1125,7 @@ "type": "github" } }, - "nixpkgs_17": { + "nixpkgs_16": { "locked": { "lastModified": 1771574726, "narHash": "sha256-D1PA3xQv/s4W3lnR9yJFSld8UOLr0a/cBWMQMXS+1Qg=", @@ -1176,13 +1141,29 @@ "type": "github" } }, - "nixpkgs_18": { + "nixpkgs_17": { "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", + "lastModified": 1770107345, + "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", + "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_18": { + "locked": { + "lastModified": 1773821835, + "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", "type": "github" }, "original": { @@ -1209,22 +1190,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1763934636, "narHash": "sha256-9glbI7f1uU+yzQCq5LwLgdZqx6svOhZWkd4JRY265fc=", @@ -1240,7 +1205,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1771369470, "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", @@ -1256,7 +1221,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1763678758, "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", @@ -1272,7 +1237,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1769018530, "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", @@ -1288,7 +1253,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 315532800, "narHash": "sha256-sV6pJNzFkiPc6j9Bi9JuHBnWdVhtKB/mHgVmMPvDFlk=", @@ -1301,7 +1266,7 @@ "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1758360447, "narHash": "sha256-XDY3A83bclygHDtesRoaRTafUd80Q30D/Daf9KSG6bs=", @@ -1314,7 +1279,7 @@ "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1759831965, "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=", @@ -1330,10 +1295,26 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1766532406, + "narHash": "sha256-acLU/ag9VEoKkzOD202QASX25nG1eArXg5A0mHjKgxM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "8142186f001295e5a3239f485c8a49bf2de2695a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_17", + "nixpkgs": "nixpkgs_16", "nuschtosSearch": "nuschtosSearch", "systems": "systems_7" }, @@ -1358,14 +1339,15 @@ "noctalia-shell", "nixpkgs" ], - "systems": "systems_8" + "systems": "systems_8", + "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1773175685, - "narHash": "sha256-YOkWzVq7opym1ovJvSCvqpG6OCDGJwPo/EPeRxcGay4=", + "lastModified": 1774202718, + "narHash": "sha256-YueGGmJMHvGZfgQytc2Kbl9aJ31NSHG5nMpY4S1i+r4=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "6b9eceefde3d47ca83c544b54bcdd358be4cbd2f", + "rev": "807e330f5a42856f07e72197c4d4c22d7855b6c4", "type": "github" }, "original": { @@ -1382,11 +1364,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1773310206, - "narHash": "sha256-x6CUlroNSUxigmvpz3kQj0drc7ibSPtuLbXx/GCShNM=", + "lastModified": 1774228269, + "narHash": "sha256-AfkJgTRKv/SGD+XTdeLHlWRNlUmA9nhdM/F/Tlde13k=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "ba03e4c3f7340a958d23a186576052fbdea79193", + "rev": "3eb0fe56080777f3d74b66da08e6d9cf69361ad6", "type": "github" }, "original": { @@ -1401,11 +1383,11 @@ "nixpkgs": "nixpkgs_18" }, "locked": { - "lastModified": 1764248576, - "narHash": "sha256-T7O9x/4mv6bcgfkzrcRKY7T2+XLDd/PGmT4eVwYQIMM=", + "lastModified": 1774246799, + "narHash": "sha256-iJUH7N/spe6sAwr70qabMm/DmlhaPQMa4rnSEDcl6B8=", "owner": "nix-community", "repo": "NUR", - "rev": "84e86b793022890fbd8f2580d60b387922244b9b", + "rev": "b4b3db8a7af9465830c952e085d90cf7b05a480b", "type": "github" }, "original": { @@ -1579,7 +1561,6 @@ "root": { "inputs": { "agenix": "agenix", - "airi": "airi", "awww": "awww", "caelestia-cli": "caelestia-cli", "caelestia-shell": "caelestia-shell_2", @@ -1597,7 +1578,7 @@ "nix-matlab": "nix-matlab", "nixGL": "nixGL", "nixd": "nixd", - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_14", "nixpkgs-r": "nixpkgs-r", "nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-wayland": "nixpkgs-wayland", @@ -1606,7 +1587,7 @@ "nur": "nur", "quickshell": "quickshell_3", "stylix": "stylix", - "treefmt-nix": "treefmt-nix_2" + "treefmt-nix": "treefmt-nix_3" } }, "rust-overlay": { @@ -1923,6 +1904,24 @@ } }, "treefmt-nix_2": { + "inputs": { + "nixpkgs": "nixpkgs_17" + }, + "locked": { + "lastModified": 1772660329, + "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "3710e0e1218041bbad640352a0440114b1e10428", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_3": { "inputs": { "nixpkgs": "nixpkgs_19" }, @@ -2029,7 +2028,7 @@ }, "zon2nix": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1758405547, diff --git a/flake.nix b/flake.nix index b74d1b5..51b32ad 100644 --- a/flake.nix +++ b/flake.nix @@ -104,6 +104,5 @@ hexecute.url = "github:ThatOtherAndrew/Hexecute"; kimi-cli.url = "github:MoonshotAI/kimi-cli"; awww.url = "git+https://codeberg.org/LGFae/awww"; - airi.url = "github:github:moeru-ai/airi/41ce282e955c66b71317ffa597308008aaa084e9"; }; } diff --git a/home/programs/desktop/niri/override-config.nix b/home/programs/desktop/niri/override-config.nix index 4452969..9086732 100644 --- a/home/programs/desktop/niri/override-config.nix +++ b/home/programs/desktop/niri/override-config.nix @@ -44,11 +44,7 @@ let } } layer-rule { - match namespace="noctalia-*" - exclude namespace="noctalia-bar-exclusion*" - exclude namespace="noctalia-desktop*" - exclude namespace="noctalia-osd*" - exclude namespace="noctalia-notifications*" + match namespace="^noctalia-(background|launcher-overlay|dock)-.*$" background-effect { xray false blur true diff --git a/home/programs/desktop/noctalia.nix b/home/programs/desktop/noctalia.nix index 318d491..e08d504 100644 --- a/home/programs/desktop/noctalia.nix +++ b/home/programs/desktop/noctalia.nix @@ -30,9 +30,11 @@ setupCompleted = true; bar = { density = "comfortable"; - floating = false; + floating = true; showCapsule = true; outerCorners = true; + marginVertical = 6; + marginHorizontal = 6; widgets = { center = [ { @@ -92,14 +94,47 @@ ]; }; }; + controlCenter.cards = [ + { + enabled = true; + id = "profile-card"; + } + { + enabled = true; + id = "shortcuts-card"; + } + { + enabled = true; + id = "audio-card"; + } + { + enabled = true; + id = "brightness-card"; + } + { + enabled = true; + id = "weather-card"; + } + { + enabled = true; + id = "media-sysmon-card"; + } + ]; + idle = { + enabled = true; + screenOffTimeout = 500; + lockTimeout = 560; + suspendTimeout = 1800; + fadeDuration = 10; + }; colorSchemes = { generateTemplatesForPredefined = false; useWallpaperColors = false; }; general = { avatarImage = "/home/${user}/.face"; - forceBlackScreenCorners = true; - showScreenCorners = true; + forceBlackScreenCorners = false; + showScreenCorners = false; }; location = { name = "西湖"; diff --git a/home/programs/network/zjuconnect.nix b/home/programs/network/zjuconnect.nix index f773872..57d2f5c 100644 --- a/home/programs/network/zjuconnect.nix +++ b/home/programs/network/zjuconnect.nix @@ -1,7 +1,7 @@ { pkgs, config, ... }: let - zju-connect = pkgs.callPackage ../../../pkgs/zju-connect.nix { }; - zjuconnect = pkgs.writeShellScriptBin "zjuconnect" ''exec ${zju-connect}/bin/zju-connect --username 3220101015 --password $(cat ${config.age.secrets.zjuconnect_password.path})''; + zju-connect = pkgs.nur.repos.hhr2020.zju-connect; + zjuconnect = pkgs.writeShellScriptBin "zjuconnect" "exec ${zju-connect}/bin/zju-connect --username 3220101015 --password $(cat ${config.age.secrets.zjuconnect_password.path})"; in { home.packages = [ diff --git a/home/programs/shell/fish.nix b/home/programs/shell/fish.nix index c3ac1da..ae7698f 100644 --- a/home/programs/shell/fish.nix +++ b/home/programs/shell/fish.nix @@ -25,6 +25,7 @@ set -g fish_color_command = blue --italics set -g fish_color_quote = yellow --italics + set -g fish_key_bindings fish_vi_key_bindings ''; plugins = with pkgs.fishPlugins; [ { diff --git a/home/programs/utils/default.nix b/home/programs/utils/default.nix index a02f6fb..10875ba 100644 --- a/home/programs/utils/default.nix +++ b/home/programs/utils/default.nix @@ -49,6 +49,7 @@ gnome-disk-utility upower android-tools + tree-sitter ]; imports = [ ./eye-candy.nix diff --git a/hosts/xiaomi/home.nix b/hosts/xiaomi/home.nix index c65a557..ae30a0c 100644 --- a/hosts/xiaomi/home.nix +++ b/hosts/xiaomi/home.nix @@ -1,3 +1,4 @@ +{ config, ... }: { monitors = { "eDP-1" = { @@ -42,5 +43,9 @@ rotation = 90; }; }; + programs.niri.settings = { + input.touch.enable = true; + input.touch.map-to-output = config.lib.monitors.mainMonitorName; + }; home.stateVersion = "26.05"; } diff --git a/os/system/boot.nix b/os/system/boot.nix index be6c298..8d8ef05 100644 --- a/os/system/boot.nix +++ b/os/system/boot.nix @@ -3,7 +3,7 @@ boot = { kernelPackages = # inputs.nixpkgs-stable.legacyPackages.${pkgs.stdenv.hostPlatform.system}.linuxPackages_zen; - pkgs.linuxPackages_latest; + pkgs.linuxPackages_testing; kernelParams = [ "loglevel=3" "quiet" diff --git a/os/system/configuration.nix b/os/system/configuration.nix index abe9018..31e6306 100644 --- a/os/system/configuration.nix +++ b/os/system/configuration.nix @@ -73,6 +73,8 @@ upower.enable = true; udisks2.enable = true; + + power-profiles-daemon.enable = true; }; security = { diff --git a/pkgs/default.nix b/pkgs/default.nix index 6d62d50..aab6270 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,6 +1,5 @@ { pkgs, ... }: { - zju-connect = pkgs.callPackage ./zju-connect.nix { }; swhkd = pkgs.callPackage ./swhkd.nix { }; kose-font = pkgs.callPackage ./fonts/kose.nix { }; hugmetight-font = pkgs.callPackage ./fonts/hugmetight.nix { }; diff --git a/pkgs/zju-connect.nix b/pkgs/zju-connect.nix deleted file mode 100644 index f17d72a..0000000 --- a/pkgs/zju-connect.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: - -buildGoModule rec { - pname = "zju-connect"; - version = "0.9.0"; - - src = fetchFromGitHub { - owner = "Mythologyli"; - repo = "zju-connect"; - rev = "v${version}"; - hash = "sha256-LrupxRFobVzzOiQCznnaIH17sTsnzjiMVnWDMyN0dwY="; - }; - - vendorHash = "sha256-G+glwXw3zDA4XYWUnrkyG55PicHDutXRe7ZzdJGirZA="; - - ldflags = [ - "-s" - "-w" - ]; - - meta = { - description = "ZJU RVPN client implemented in GO"; - homepage = "https://github.com/Mythologyli/zju-connect"; - license = lib.licenses.agpl3Only; - mainProgram = "zju-connect"; - }; -}