diff --git a/flake.lock b/flake.lock index e30e2f50..242dc9bf 100644 --- a/flake.lock +++ b/flake.lock @@ -9,16 +9,15 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1758386048, - "narHash": "sha256-xgzC5C+ZXTxGLJFe4sAx2bUjQNNHcDUO0ES3eDy0qHk=", + "lastModified": 1758557465, + "narHash": "sha256-SeDqOZQoARl/xxEMdej09IScCf77SEQfRAjED7lBgMY=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "8387778adde8625dcb8f2d4da87e7dcf16f53b4f", + "rev": "944f9903859ad16db762fbe573fb6f05f7367e16", "type": "github" }, "original": { "owner": "ezKEa", - "ref": "release-25.05", "repo": "aagl-gtk-on-nix", "type": "github" } diff --git a/flake.nix b/flake.nix index e2bb9338..c9222999 100644 --- a/flake.nix +++ b/flake.nix @@ -27,7 +27,7 @@ }; catppuccin = { url = "github:catppuccin/nix"; inputs.nixpkgs.follows = "nixpkgs"; }; bscpkgs = { url = "github:CHN-beta/bscpkgs"; inputs.nixpkgs.follows = "nixpkgs"; }; - aagl = { url = "github:ezKEa/aagl-gtk-on-nix/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; + aagl = { url = "github:ezKEa/aagl-gtk-on-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; winapps = { url = "github:winapps-org/winapps/feat-nix-packaging"; inputs.nixpkgs.follows = "nixpkgs"; }; nixvirt = { url = "github:CHN-beta/NixVirt"; inputs.nixpkgs.follows = "nixpkgs"; }; buildproxy = { url = "github:polygon/nix-buildproxy"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/packages/desktop.nix b/modules/packages/desktop.nix index 0a6d6368..2ab07a68 100644 --- a/modules/packages/desktop.nix +++ b/modules/packages/desktop.nix @@ -42,7 +42,7 @@ inputs: # editor typora standardnotes # news - fluent-reader rssguard newsflash newsboat follow + fluent-reader rssguard newsflash newsboat folo # nix tools nixpkgs-fmt appimage-run nixd nix-serve node2nix nix-prefetch-github prefetch-npm-deps nix-prefetch-docker nix-template nil bundix diff --git a/modules/packages/ssh.nix b/modules/packages/ssh.nix index 3dde6d8b..824c4125 100644 --- a/modules/packages/ssh.nix +++ b/modules/packages/ssh.nix @@ -37,9 +37,7 @@ inputs: config.programs.ssh = { enable = true; - controlMaster = "auto"; - controlPersist = "1m"; - compression = true; + enableDefaultConfig = false; matchBlocks = builtins.listToAttrs (builtins.map (host: { @@ -64,6 +62,7 @@ inputs: extraOptions.AddKeysToAgent = "yes"; }; "wg0.jykang" = jykang // { host = "wg0.jykang"; proxyJump = "wg0.srv2"; }; + "*" = { controlMaster = "auto"; controlPersist = "1m"; compression = true; }; }; }; })]; diff --git a/modules/system/gui.nix b/modules/system/gui.nix index 59aa9ef1..2b504ba0 100644 --- a/modules/system/gui.nix +++ b/modules/system/gui.nix @@ -19,7 +19,7 @@ inputs: let sessionData = "${inputs.config.services.displayManager.sessionData.desktops}/share"; in builtins.concatStringsSep " " [ - "${inputs.pkgs.greetd.tuigreet}/bin/tuigreet" + "${inputs.pkgs.tuigreet}/bin/tuigreet" "--sessions ${sessionData}/wayland-sessions --xsessions ${sessionData}/xsessions" "--time --asterisks --remember --remember-user-session" (inputs.lib.optionalString (gui.implementation == "kde") "--cmd startplasma-wayland")