diff --git a/common/development-machine.nix b/common/development-machine.nix index 62a5c31..87b8dfc 100644 --- a/common/development-machine.nix +++ b/common/development-machine.nix @@ -21,8 +21,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 59e53c6..0c9d0de 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1765703544, - "narHash": "sha256-n+CdKyWCRo0PgRtD9vzUZvTGqysvdKz63foTShSMvzI=", + "lastModified": 1765729484, + "narHash": "sha256-exsMvinnpTWm+lZiq8RucYejmS605EP8uny/32KzlE8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "6348314e322d12487f3abb6282d4612fe8d93fe4", + "rev": "60f44dfc7fedf818666436d3b341858a400e31e0", "type": "github" }, "original": { @@ -63,16 +63,16 @@ ] }, "locked": { - "lastModified": 1753592768, - "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", + "lastModified": 1765605144, + "narHash": "sha256-RM2xs+1HdHxesjOelxoA3eSvXShC8pmBvtyTke4Ango=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc3add429f21450359369af74c2375cb34a2d204", + "rev": "90b62096f099b73043a747348c11dbfcfbdea949", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -117,17 +117,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717179513, - "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", + "lastModified": 1765608474, + "narHash": "sha256-9Wx53UK0z8Di5iesJID0tS1dRKwGxI4i7tsSanOHhF0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", + "rev": "28bb483c11a1214a73f9fd2d9928a6e2ea86ec71", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-25.11", "repo": "nixpkgs", - "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", "type": "github" } }, @@ -142,7 +142,7 @@ }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -176,11 +176,11 @@ }, "unstable": { "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", + "lastModified": 1765472234, + "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", + "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", "type": "github" }, "original": { @@ -192,16 +192,16 @@ }, "update": { "locked": { - "lastModified": 1754767907, - "narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=", + "lastModified": 1765608474, + "narHash": "sha256-9Wx53UK0z8Di5iesJID0tS1dRKwGxI4i7tsSanOHhF0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c5f08b62ed75415439d48152c2a784e36909b1bc", + "rev": "28bb483c11a1214a73f9fd2d9928a6e2ea86ec71", "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..c1fb219 100644 --- a/home/users/benson.nix +++ b/home/users/benson.nix @@ -107,6 +107,8 @@ passwordCommand = ''${pkgs.myEmacs}/bin/emacsclient -e '(get-authinfo "imap.fastmail.com" "993" "bensonchu457@fastmail.com")' | ${pkgs.coreutils}/bin/tr -d '"' ''; mu.enable = true; + + mujmap.enable = true; }; }; diff --git a/hosts/NixDawn/configuration.nix b/hosts/NixDawn/configuration.nix index 04fbe5b..fd518ab 100644 --- a/hosts/NixDawn/configuration.nix +++ b/hosts/NixDawn/configuration.nix @@ -8,7 +8,8 @@ ../../common/configuration.nix ../../common/user-facing.nix ../../common/development-machine.nix - ../../common/lxd-setup.nix + # Unmaintained + # ../../common/lxd-setup.nix ../../common/moms-house # Include the results of the hardware scan. ./hardware-configuration.nix @@ -78,10 +79,12 @@ fwupd.enable = true; logind = { - extraConfig = '' - IdleAction=hybrid-sleep - IdleActionSec=30min - ''; + settings = { + Login = { + IdleAction = "hybrid-sleep"; + IdleActionSec = "30min"; + }; + }; }; apcupsd = { @@ -142,7 +145,7 @@ # unstable.rustdesk tarsnap # (pkgs.callPackage /home/benson/workspace/peter-nixos/mfcl2690dw/default.nix { } ) - clasp + clasp-common-lisp leiningen supercollider-with-sc3-plugins ];