Upgrading to 25.11
This commit is contained in:
parent
6bddbdfcba
commit
eec77c7a3d
6 changed files with 35 additions and 36 deletions
|
|
@ -23,8 +23,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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
38
flake.lock
38
flake.lock
|
|
@ -8,11 +8,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1754929898,
|
"lastModified": 1770053181,
|
||||||
"narHash": "sha256-QkKnm58KMyb0ki5F+hdPC9SP18Q2t9It58xRgBFrLdE=",
|
"narHash": "sha256-YxLkG+tzWSX98pRt+4frXkZHPrHpu7afZXe9gCJ+aEo=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "6d0695fbc0800c0d9073db9cf52294179ee2aa3c",
|
"rev": "a4a3e2816dc1adff3fa15fcf01dd95bf556ec96f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -63,16 +63,16 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1753592768,
|
"lastModified": 1769580047,
|
||||||
"narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
|
"narHash": "sha256-tNqCP/+2+peAXXQ2V8RwsBkenlfWMERb+Uy6xmevyhM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "fc3add429f21450359369af74c2375cb34a2d204",
|
"rev": "366d78c2856de6ab3411c15c1cb4fb4c2bf5c826",
|
||||||
"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": 1769900590,
|
||||||
"narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=",
|
"narHash": "sha256-I7Lmgj3owOTBGuauy9FL6qdpeK2umDoe07lM4V+PnyA=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c5f08b62ed75415439d48152c2a784e36909b1bc",
|
"rev": "41e216c0ca66c83b12ab7a98cc326b5db01db646",
|
||||||
"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": 1767313136,
|
||||||
"narHash": "sha256-hJ7XMNVsTnnbV2NPmStCC07gvv5l2x7+Skb7hyUzazg=",
|
"narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "d883b6213afa179b58ba8bace834f1419707d0ad",
|
"rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
|
||||||
"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"
|
||||||
}
|
}
|
||||||
|
|
@ -192,16 +192,16 @@
|
||||||
},
|
},
|
||||||
"update": {
|
"update": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1754767907,
|
"lastModified": 1769900590,
|
||||||
"narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=",
|
"narHash": "sha256-I7Lmgj3owOTBGuauy9FL6qdpeK2umDoe07lM4V+PnyA=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c5f08b62ed75415439d48152c2a784e36909b1bc",
|
"rev": "41e216c0ca66c83b12ab7a98cc326b5db01db646",
|
||||||
"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"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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 = {
|
||||||
|
|
|
||||||
|
|
@ -115,9 +115,11 @@
|
||||||
home-manager.enable = true;
|
home-manager.enable = true;
|
||||||
git = {
|
git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
userName = "Benson Chu";
|
settings = {
|
||||||
userEmail = "dev@mail.pestctrl.io";
|
user = {
|
||||||
extraConfig = {
|
name = "Benson Chu";
|
||||||
|
email = "dev@mail.pestctrl.io";
|
||||||
|
};
|
||||||
core = {
|
core = {
|
||||||
editor = "emacsclient";
|
editor = "emacsclient";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
../../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
|
# ../../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
|
||||||
|
|
@ -77,11 +77,9 @@
|
||||||
tumbler.enable = true;
|
tumbler.enable = true;
|
||||||
fwupd.enable = true;
|
fwupd.enable = true;
|
||||||
|
|
||||||
logind = {
|
logind.settings.Login = {
|
||||||
extraConfig = ''
|
IdleAction="hybrid-sleep";
|
||||||
IdleAction=hybrid-sleep
|
IdleActionSec="30min";
|
||||||
IdleActionSec=30min
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
|
|
||||||
apcupsd = {
|
apcupsd = {
|
||||||
|
|
@ -142,7 +140,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
|
||||||
];
|
];
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue