pestctrl/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 25.11

Browse source
This commit is contained in:
Benson Chu 2025-12-14 10:51:24 -06:00
parent dd0de6c7b6
commit 547606ec39
6 changed files with 39 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/development-machine.nix
View file

@ -21,8 +21,8 @@
lldb lldb
mold mold
lld lld
clang-tools_16 # clangd, clang-format clang-tools # clangd, clang-format
llvmPackages_16.libllvm llvmPackages.libllvm
bear bear
rr rr
valgrind valgrind

3
common/user-facing.nix
View file

@ -58,7 +58,6 @@
packages = with pkgs; [ packages = with pkgs; [
roboto-mono roboto-mono
noto-fonts noto-fonts
noto-fonts-extra
noto-fonts-cjk-sans noto-fonts-cjk-sans
noto-fonts-cjk-serif noto-fonts-cjk-serif
commit-mono commit-mono
@ -68,7 +67,7 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
update.firefox update.firefox
update.google-chrome update.google-chrome
bitwarden bitwarden-desktop
vlc vlc
mpv mpv
obs-studio obs-studio

44
flake.lock
View file

@ -8,11 +8,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1754929898, "lastModified": 1765729484,
"narHash": "sha256-QkKnm58KMyb0ki5F+hdPC9SP18Q2t9It58xRgBFrLdE=", "narHash": "sha256-exsMvinnpTWm+lZiq8RucYejmS605EP8uny/32KzlE8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "6d0695fbc0800c0d9073db9cf52294179ee2aa3c", "rev": "60f44dfc7fedf818666436d3b341858a400e31e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -63,16 +63,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753592768, "lastModified": 1765605144,
"narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", "narHash": "sha256-RM2xs+1HdHxesjOelxoA3eSvXShC8pmBvtyTke4Ango=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "fc3add429f21450359369af74c2375cb34a2d204", "rev": "90b62096f099b73043a747348c11dbfcfbdea949",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.05", "ref": "release-25.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -117,32 +117,32 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1754767907, "lastModified": 1765608474,
"narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=", "narHash": "sha256-9Wx53UK0z8Di5iesJID0tS1dRKwGxI4i7tsSanOHhF0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c5f08b62ed75415439d48152c2a784e36909b1bc", "rev": "28bb483c11a1214a73f9fd2d9928a6e2ea86ec71",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1750330365, "lastModified": 1765363881,
"narHash": "sha256-hJ7XMNVsTnnbV2NPmStCC07gvv5l2x7+Skb7hyUzazg=", "narHash": "sha256-3C3xWn8/2Zzr7sxVBmpc1H1QfxjNfta5IMFe3O9ZEPw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d883b6213afa179b58ba8bace834f1419707d0ad", "rev": "d2b1213bf5ec5e62d96b003ab4b5cbc42abfc0d0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.11", "ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -176,11 +176,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1763966396, "lastModified": 1765472234,
"narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -192,16 +192,16 @@
}, },
"update": { "update": {
"locked": { "locked": {
"lastModified": 1754767907, "lastModified": 1765608474,
"narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=", "narHash": "sha256-9Wx53UK0z8Di5iesJID0tS1dRKwGxI4i7tsSanOHhF0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c5f08b62ed75415439d48152c2a784e36909b1bc", "rev": "28bb483c11a1214a73f9fd2d9928a6e2ea86ec71",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

6
flake.nix
View file

@ -1,14 +1,14 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
update.url = "github:nixos/nixpkgs/nixos-25.05"; update.url = "github:nixos/nixpkgs/nixos-25.11";
unstable.url = "github:nixos/nixpkgs/nixos-unstable"; unstable.url = "github:nixos/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.05"; url = "github:nix-community/home-manager/release-25.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
emacs-overlay = { emacs-overlay = {

2
home/users/benson.nix
View file

@ -107,6 +107,8 @@
passwordCommand = ''${pkgs.myEmacs}/bin/emacsclient -e '(get-authinfo "imap.fastmail.com" "993" "bensonchu457@fastmail.com")' | ${pkgs.coreutils}/bin/tr -d '"' ''; passwordCommand = ''${pkgs.myEmacs}/bin/emacsclient -e '(get-authinfo "imap.fastmail.com" "993" "bensonchu457@fastmail.com")' | ${pkgs.coreutils}/bin/tr -d '"' '';
mu.enable = true; mu.enable = true;
mujmap.enable = true;
}; };
}; };

15
hosts/NixDawn/configuration.nix
View file

@ -8,7 +8,8 @@
../../common/configuration.nix ../../common/configuration.nix
../../common/user-facing.nix ../../common/user-facing.nix
../../common/development-machine.nix ../../common/development-machine.nix
../../common/lxd-setup.nix # Unmaintained
# ../../common/lxd-setup.nix
../../common/moms-house ../../common/moms-house
# Include the results of the hardware scan. # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
@ -78,10 +79,12 @@
fwupd.enable = true; fwupd.enable = true;
logind = { logind = {
extraConfig = '' settings = {
IdleAction=hybrid-sleep Login = {
IdleActionSec=30min IdleAction = "hybrid-sleep";
''; IdleActionSec = "30min";
};
};
}; };
apcupsd = { apcupsd = {
@ -142,7 +145,7 @@
# unstable.rustdesk # unstable.rustdesk
tarsnap tarsnap
# (pkgs.callPackage /home/benson/workspace/peter-nixos/mfcl2690dw/default.nix { } ) # (pkgs.callPackage /home/benson/workspace/peter-nixos/mfcl2690dw/default.nix { } )
clasp clasp-common-lisp
leiningen leiningen
supercollider-with-sc3-plugins supercollider-with-sc3-plugins
]; ];