Commit cf6daaa

@@ -1,6 +1,5 @@
 {
   pkgs,
-  pkgs-unstable,
   lib,
   ...
 }: {
@@ -90,7 +89,6 @@
       enableBashIntegration = true;
       enableFishIntegration = true;
       enableNushellIntegration = true;
-      package = pkgs-unstable.atuin;
       settings = {
         sync_address = "https://atuin.hpcesia.com";
         sync_frequency = "10m";

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  pkgs-unstable,
   myvars,
   ...
 }: {
@@ -54,7 +53,6 @@
 
   programs.jujutsu = {
     enable = true;
-    package = pkgs-unstable.jujutsu;
     settings = {
       user = {
         name = myvars.userfullname;

@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs-unstable,
-  ...
-}: let
+{config, ...}: let
   configPath = "${config.home.homeDirectory}/nix-config/home/base/gui/terminals/wezterm/config";
 in {
   xdg.configFile."wezterm".source = config.lib.file.mkOutOfStoreSymlink configPath;
@@ -11,6 +7,5 @@ in {
 
   programs.wezterm = {
     # enable = true;
-    package = pkgs-unstable.wezterm;
   };
 }

@@ -1,11 +1,11 @@
 {
   pkgs,
-  pkgs-unstable,
+  pkgs-stable,
   ...
 }: {
   home.packages = with pkgs; [
-    geogebra
-    pkgs-unstable.readest # ebook reader
+    pkgs-stable.geogebra
+    readest # ebook reader
     rnote
     inkscape
 

@@ -1,12 +1,7 @@
-{
-  lib,
-  pkgs-unstable,
-  ...
-}: {
+{...}: {
   imports = [./languages];
 
   programs.helix = {
-    package = lib.mkDefault pkgs-unstable.helix;
     settings = {
       editor = {
         line-number = "relative";

@@ -2,6 +2,7 @@
   osConfig,
   pkgs,
   pkgs-unstable,
+  pkgs-stable,
   ...
 }: {
   home.packages = let
@@ -50,7 +51,7 @@
       helix-gpt
       # -- C/C++
       cmake
-      cmake-language-server
+      pkgs-stable.cmake-language-server
       gnumake
       checkmake
       xmake

@@ -1,10 +1,6 @@
-{
-  pkgs,
-  pkgs-unstable,
-  ...
-}: {
+{pkgs, ...}: {
   home.packages = with pkgs; [
     age
-    pkgs-unstable.sops
+    sops
   ];
 }

@@ -1,13 +1,12 @@
 {
   pkgs,
-  pkgs-unstable,
   colmena,
   ...
 }: {
   home.packages = with pkgs; [
     # Database
-    pkgs-unstable.mycli
-    pkgs-unstable.pgcli
+    mycli
+    pgcli
     sqlite
 
     colmena.packages.${system}.colmena # nixos's remote deployment tool

@@ -1,9 +1,10 @@
 {...}: {
   programs.ssh = {
     enable = true;
-    addKeysToAgent = "yes";
+    enableDefaultConfig = false;
 
     matchBlocks = {
+      "*".addKeysToAgent = "yes";
       "github.com" = {
         # "Using SSH over the HTTPS port for GitHub"
         # "(port 22 is banned by some proxies / firewalls)"

@@ -1,8 +1,13 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  pkgs-stable,
+  ...
+}: {
   catppuccin.firefox.profiles.default.enable = false;
 
   programs.firefox = {
     enable = true;
+    package = pkgs-stable.firefox;
     languagePacks = ["zh-CN" "en-US"];
     nativeMessagingHosts = with pkgs; [
       kdePackages.plasma-browser-integration

@@ -1,5 +1,6 @@
 {
   pkgs,
+  pkgs-stable,
   config,
   lib,
   myvars,
@@ -9,7 +10,7 @@
     accountId = builtins.hashString "sha256" accountName;
     thunderbirdProfilesPath = ".thunderbird";
   in "${config.home.homeDirectory}/${thunderbirdProfilesPath}/${profileName}/ImapMail/${accountId}";
-  thunderbird-x = pkgs.thunderbird.overrideAttrs (oldAttrs: {
+  thunderbird-x = pkgs-stable.thunderbird.overrideAttrs (oldAttrs: {
     makeWrapperArgs = oldAttrs.makeWrapperArgs ++ ["--set" "MOZ_ENABLE_WAYLAND" "0"];
   });
 in {

@@ -1,8 +1,4 @@
-{
-  pkgs,
-  pkgs-unstable,
-  ...
-}:
+{pkgs, ...}:
 with pkgs.vscode-extensions;
   [
     # Translation
@@ -23,7 +19,7 @@ with pkgs.vscode-extensions;
 
     # LLM
     github.copilot
-    pkgs-unstable.vscode-extensions.github.copilot-chat
+    github.copilot-chat
     rooveterinaryinc.roo-cline
 
     # Nix

@@ -1,8 +1,4 @@
-{
-  pkgs,
-  pkgs-unstable,
-  ...
-}: let
+{pkgs, ...}: let
   lyricbar = pkgs.stdenv.mkDerivation {
     pname = "deadbeef-lyricbar-plugin-modified";
     version = "unstable-2024-10-24";
@@ -25,8 +21,8 @@
 in {
   programs.deadbeef = {
     enable = true;
-    package = pkgs-unstable.deadbeef-with-plugins;
-    plugins = with pkgs-unstable.deadbeefPlugins; [
+    package = pkgs.deadbeef-with-plugins;
+    plugins = with pkgs.deadbeefPlugins; [
       mpris2
       lyricbar
     ];

@@ -4,10 +4,10 @@
   ...
 }: {
   # Lid Settings
-  services.logind = {
-    lidSwitch = "hibernate";
-    lidSwitchExternalPower = "lock";
-    lidSwitchDocked = "ignore";
+  services.logind.settings.Login = {
+    HandleLidSwitch = "hibernate";
+    HandleLidSwitchExternalPower = "lock";
+    HandleLidSwitchDocked = "ignore";
   };
 
   # Fingerprint

@@ -1,8 +1,7 @@
-{pkgs-unstable, ...}: {
+{...}: {
   # Atuin server for shell history sync
   services.atuin = {
     enable = true;
-    package = pkgs-unstable.atuin;
     host = "127.0.0.1";
     port = 10423;
     openRegistration = false;

@@ -1,11 +1,6 @@
-{
-  pkgs-unstable,
-  config,
-  ...
-}: {
+{config, ...}: {
   services.forgejo = {
     enable = true;
-    package = pkgs-unstable.forgejo;
     user = "git";
     group = "forgejo";
     database = {