Compare commits

...

4 commits

Author SHA1 Message Date
eec77c7a3d Upgrading to 25.11 2026-02-02 13:44:15 -06:00
6bddbdfcba Required updates for newer version of beets 2026-01-25 08:56:28 -06:00
aed95eb6c3 godot 2026-01-25 08:56:28 -06:00
b365d28181 Make dolphin usable 2026-01-25 08:56:28 -06:00
8 changed files with 52 additions and 37 deletions

View file

@ -25,6 +25,20 @@ in
config.allowUnfree = true; config.allowUnfree = true;
}; };
}) })
# https://discourse.nixos.org/t/dolphin-does-not-have-mime-associations/48985/14
# https://github.com/rumboon/dolphin-overlay/blob/main/default.nix
(final: prev: {
kdePackages = prev.kdePackages.overrideScope (kfinal: kprev: {
dolphin = kprev.dolphin.overrideAttrs (oldAttrs: {
nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++ [ prev.makeWrapper ];
postInstall = (oldAttrs.postInstall or "") + ''
wrapProgram $out/bin/dolphin \
--set XDG_CONFIG_DIRS "${prev.libsForQt5.kservice}/etc/xdg:$XDG_CONFIG_DIRS" \
--run "${kprev.kservice}/bin/kbuildsycoca6 --noincremental ${prev.libsForQt5.kservice}/etc/xdg/menus/applications.menu"
'';
});
});
})
] ++ import ./overlays.nix inputs ++ [ ] ++ import ./overlays.nix inputs ++ [
inputs.emacs-overlay.overlays.default inputs.emacs-overlay.overlays.default
]; ];

View file

@ -12,6 +12,8 @@
zstd.dev zstd.dev
zstd.out zstd.out
godot
devenv devenv
racket racket
@ -21,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

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

View file

@ -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"
} }

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 = {

View file

@ -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";
}; };

View file

@ -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
]; ];

@ -1 +1 @@
Subproject commit ae7e236072bcc0fc7d7bd3ca58bc0ad5cff0fdd2 Subproject commit 2c8225b986dfd503cc3e5ce82d8105ccd2a57131