diff --git a/common/development-machine.nix b/common/development-machine.nix index 0e69c94..85791fc 100644 --- a/common/development-machine.nix +++ b/common/development-machine.nix @@ -23,8 +23,8 @@ lldb mold lld - clang-tools_16 # clangd, clang-format - llvmPackages_16.libllvm + clang-tools # clangd, clang-format + llvmPackages.libllvm bear rr valgrind diff --git a/common/user-facing.nix b/common/user-facing.nix index 65e7624..b2775fd 100644 --- a/common/user-facing.nix +++ b/common/user-facing.nix @@ -58,7 +58,6 @@ packages = with pkgs; [ roboto-mono noto-fonts - noto-fonts-extra noto-fonts-cjk-sans noto-fonts-cjk-serif commit-mono @@ -68,7 +67,7 @@ environment.systemPackages = with pkgs; [ update.firefox update.google-chrome - bitwarden + bitwarden-desktop vlc mpv obs-studio diff --git a/flake.lock b/flake.lock index f1e621f..86cc906 100644 --- a/flake.lock +++ b/flake.lock @@ -63,16 +63,16 @@ ] }, "locked": { - "lastModified": 1753592768, - "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", + "lastModified": 1769580047, + "narHash": "sha256-tNqCP/+2+peAXXQ2V8RwsBkenlfWMERb+Uy6xmevyhM=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc3add429f21450359369af74c2375cb34a2d204", + "rev": "366d78c2856de6ab3411c15c1cb4fb4c2bf5c826", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -117,16 +117,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754767907, - "narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=", + "lastModified": 1769900590, + "narHash": "sha256-I7Lmgj3owOTBGuauy9FL6qdpeK2umDoe07lM4V+PnyA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c5f08b62ed75415439d48152c2a784e36909b1bc", + "rev": "41e216c0ca66c83b12ab7a98cc326b5db01db646", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -192,16 +192,16 @@ }, "update": { "locked": { - "lastModified": 1754767907, - "narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=", + "lastModified": 1769900590, + "narHash": "sha256-I7Lmgj3owOTBGuauy9FL6qdpeK2umDoe07lM4V+PnyA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c5f08b62ed75415439d48152c2a784e36909b1bc", + "rev": "41e216c0ca66c83b12ab7a98cc326b5db01db646", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index f689f17..64bb341 100644 --- a/flake.nix +++ b/flake.nix @@ -1,14 +1,14 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; - update.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; + update.url = "github:nixos/nixpkgs/nixos-25.11"; unstable.url = "github:nixos/nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; emacs-overlay = { diff --git a/home/users/benson.nix b/home/users/benson.nix index 0f07bce..f13a159 100644 --- a/home/users/benson.nix +++ b/home/users/benson.nix @@ -115,9 +115,11 @@ home-manager.enable = true; git = { enable = true; - userName = "Benson Chu"; - userEmail = "dev@mail.pestctrl.io"; - extraConfig = { + settings = { + user = { + name = "Benson Chu"; + email = "dev@mail.pestctrl.io"; + }; core = { editor = "emacsclient"; }; diff --git a/hosts/NixDawn/configuration.nix b/hosts/NixDawn/configuration.nix index 04fbe5b..b13b32c 100644 --- a/hosts/NixDawn/configuration.nix +++ b/hosts/NixDawn/configuration.nix @@ -8,7 +8,7 @@ ../../common/configuration.nix ../../common/user-facing.nix ../../common/development-machine.nix - ../../common/lxd-setup.nix + # ../../common/lxd-setup.nix ../../common/moms-house # Include the results of the hardware scan. ./hardware-configuration.nix @@ -77,11 +77,9 @@ tumbler.enable = true; fwupd.enable = true; - logind = { - extraConfig = '' - IdleAction=hybrid-sleep - IdleActionSec=30min - ''; + logind.settings.Login = { + IdleAction="hybrid-sleep"; + IdleActionSec="30min"; }; apcupsd = { @@ -142,7 +140,7 @@ # unstable.rustdesk tarsnap # (pkgs.callPackage /home/benson/workspace/peter-nixos/mfcl2690dw/default.nix { } ) - clasp + clasp-common-lisp leiningen supercollider-with-sc3-plugins ];