schmittlauch/nixconfigs
2
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Compare commits

base: schmittlauch:mainline
Branches Tags
schmittlauch:mainline
schmittlauch:darwin-patch-nodejs_20
schmittlauch:workmac
schmittlauch:amd-pmf-debugging
schmittlauch:modularise-config
schmittlauch:flake-conversion
..
compare: schmittlauch:darwin-patch-nodejs_20
Branches Tags
schmittlauch:mainline
schmittlauch:darwin-patch-nodejs_20
schmittlauch:workmac
schmittlauch:amd-pmf-debugging
schmittlauch:modularise-config
schmittlauch:flake-conversion

No commits in common. "mainline" and "darwin-patch-nodejs_20" have entirely different histories.
mainline ... darwin-pat

16 changed files with 192 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/default.nix
View file

@ -181,7 +181,7 @@ in
# Flatpak support # Flatpak support
services.flatpak.enable = true; services.flatpak.enable = true;
xdg.portal.extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ]; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ];
# Define a user account. Don't forget to set a password with `passwd`. # Define a user account. Don't forget to set a password with `passwd`.
users.users.spiollinux = { users.users.spiollinux = {

2
common/packages.nix
View file

@ -40,7 +40,7 @@
exfat exfat
iotop iotop
cifs-utils cifs-utils
dool dstat
lsof lsof
macchanger macchanger
borgbackup borgbackup

2
common/pulseaudio.nix
View file

@ -1,7 +1,7 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
# Enable sound. # Enable sound.
services.pulseaudio = { hardware.pulseaudio = {
enable = true; enable = true;
package = pkgs.pulseaudioFull; package = pkgs.pulseaudioFull;
# decouple pulseaudio application and sink volumes # decouple pulseaudio application and sink volumes

5
darwin/configuration.nix
View file

@ -4,6 +4,7 @@
imports = [ ../common/nix-settings.nix ]; imports = [ ../common/nix-settings.nix ];
nix = { nix = {
enable = true; enable = true;
package = pkgs.nixVersions.nix_2_25;
settings = { settings = {
trusted-users = [ trusted-users = [
"os" "os"
@ -20,6 +21,9 @@
}; };
}; };
# Auto upgrade nix package and the daemon service.
services.nix-daemon.enable = true;
# List packages installed in system profile. To search by name, run: # List packages installed in system profile. To search by name, run:
# $ nix-env -qaP | grep wget # $ nix-env -qaP | grep wget
environment.systemPackages = [ pkgs.vim ]; environment.systemPackages = [ pkgs.vim ];
@ -34,7 +38,6 @@
# system-wide SSH configuration, used by nix-daemon for remote builders # system-wide SSH configuration, used by nix-daemon for remote builders
# show hidden files # show hidden files
system.primaryUser = "os";
system.defaults.NSGlobalDomain.AppleShowAllFiles = true; system.defaults.NSGlobalDomain.AppleShowAllFiles = true;
# Used for backwards compatibility, please read the changelog before changing. # Used for backwards compatibility, please read the changelog before changing.

54
flake.lock generated
View file

@ -102,16 +102,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1748665073, "lastModified": 1747020534,
"narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=", "narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "282e1e029cb6ab4811114fc85110613d72771dea", "rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.05", "ref": "release-24.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -163,27 +163,27 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1748373722, "lastModified": 1743127615,
"narHash": "sha256-qi6aDGP2W6GyAUNEhg+slQWEpUiJ8LNIrQkmxHpzadI=", "narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "75b99daa12b1fffd646d6c3cf13b06f1fa5cef63", "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "LnL7", "owner": "LnL7",
"ref": "nix-darwin-25.05", "ref": "nix-darwin-24.11",
"repo": "nix-darwin", "repo": "nix-darwin",
"type": "github" "type": "github"
} }
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1748942041, "lastModified": 1747129300,
"narHash": "sha256-HEu2gTct7nY0tAPRgBtqYepallryBKR1U8B4v2zEEqA=", "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "fc7c4714125cfaa19b048e8aaf86b9c53e04d853", "rev": "e81fd167b33121269149c57806599045fd33eeed",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -195,11 +195,11 @@
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1748693115, "lastModified": 1746904237,
"narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -243,27 +243,27 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1748889542, "lastModified": 1746957726,
"narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=", "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922", "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-25.05", "ref": "nixos-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1748693115, "lastModified": 1746904237,
"narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -280,11 +280,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1748973087, "lastModified": 1747261242,
"narHash": "sha256-ZN0XKKdCBC9eLeog7qYhfGPbajkPtQPdlxp/dhwONw4=", "narHash": "sha256-6p8kO62jbk+LUrDrLT23XbClNRyosnlfh/KCbE5fwnQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "90add46380908ba4395f5f1dfec84224a3b0d4b9", "rev": "e29c558fa4174da179e2e7f9a41c34466a200fda",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -398,11 +398,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1748243702, "lastModified": 1746216483,
"narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=", "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007", "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
flake.nix
View file

@ -2,11 +2,11 @@
description = "NixOS system flake"; description = "NixOS system flake";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
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-24.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
lanzaboote = { lanzaboote = {
@ -19,7 +19,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-darwin = { nix-darwin = {
url = "github:LnL7/nix-darwin/nix-darwin-25.05"; url = "github:LnL7/nix-darwin/nix-darwin-24.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -53,7 +53,7 @@
(import nixpkgs { inherit system; }).applyPatches { (import nixpkgs { inherit system; }).applyPatches {
name = "nixpkgs-patched"; name = "nixpkgs-patched";
src = nixpkgs; src = nixpkgs;
patches = [ ./patches/keepassxc-fix-darwin-build.patch ]; patches = [ ./patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch ];
}; };
# necessary to make the top-level inputs available to system configuration # necessary to make the top-level inputs available to system configuration

6
home/common.nix
View file

@ -51,7 +51,9 @@
merge.tool = "vimdiff"; merge.tool = "vimdiff";
# provide `git mergetool -t nixfmt` # provide `git mergetool -t nixfmt`
mergetool.nixfmt = { mergetool.nixfmt = {
cmd = "${lib.getExe pkgs.nixfmt-rfc-style} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\""; cmd = "${
lib.getExe inputs.nixos-unstable.legacyPackages.${system}.nixfmt-rfc-style
} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
trustExitCode = true; trustExitCode = true;
}; };
core.excludesfile = toString ( core.excludesfile = toString (
@ -103,7 +105,7 @@
enable = true; enable = true;
syntaxHighlighting.enable = true; syntaxHighlighting.enable = true;
history.ignoreSpace = true; history.ignoreSpace = true;
initContent = '' initExtra = ''
# Uncomment following line if you want red dots to be displayed while waiting for completion # Uncomment following line if you want red dots to be displayed while waiting for completion
COMPLETION_WAITING_DOTS="true" COMPLETION_WAITING_DOTS="true"
### Fix slowness of pastes with zsh-syntax-highlighting.zsh ### Fix slowness of pastes with zsh-syntax-highlighting.zsh

2
home/desktop.nix
View file

@ -72,7 +72,7 @@
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;
#enableSshSupport = true; #enableSshSupport = true;
pinentry.package = pkgs.pinentry-qt; pinentryPackage = pkgs.pinentry-qt;
}; };
programs.ssh = { programs.ssh = {

29
home/modules/packages.nix
View file

@ -17,19 +17,16 @@ let
inkscape inkscape
darktable darktable
exiftool exiftool
gimp
] ]
++ (with gimp3Plugins; [ ++ (with gimpPlugins; [
#fourier # broken fourier
#lqrPlugin # broken lqrPlugin
]) ])
++ lib.optionals pkgs.stdenv.isLinux [ ++ lib.optionals pkgs.stdenv.isLinux [
gimp3
hugin hugin
#luminanceHDR # FIXME, build failure luminanceHDR
xournalpp xournal
]
++ lib.optionals pkgs.stdenv.isDarwin [
gimp
]; ];
multimediaApps = multimediaApps =
@ -37,12 +34,11 @@ let
mpv mpv
yt-dlp yt-dlp
] ]
++ lib.optionals pkgs.stdenv.isDarwin [ vlc-bin ]
++ lib.optionals pkgs.stdenv.isLinux [ ++ lib.optionals pkgs.stdenv.isLinux [
vlc vlc
amarok amarok
clementine clementine
kdePackages.elisa elisa
musescore musescore
tenacity tenacity
soundkonverter soundkonverter
@ -56,7 +52,6 @@ let
htop htop
tmux tmux
httpie httpie
rsync
ponysay ponysay
gti gti
tree tree
@ -127,7 +122,7 @@ let
]; ];
pythonTools = with python3Packages; [ pythonTools = with python3Packages; [
python # to shadow old macOS python python3 # to shadow old macOS python
ipython ipython
uv uv
pip pip
@ -147,12 +142,13 @@ let
desktopCommon = [ desktopCommon = [
keepassxc keepassxc
tigervnc
]; ];
desktopLinux = [ desktopLinux = [
firefox firefox
chromium chromium
kdePackages.falkon falkon
thunderbird thunderbird
calibre calibre
dino dino
@ -168,14 +164,15 @@ let
seafile-client seafile-client
alacritty alacritty
libreoffice-qt6 # still with KDE integration libreoffice-qt6 # still with KDE integration
backintime-common
anki anki
signal-desktop signal-desktop
(tor-browser-bundle-bin.override { (tor-browser-bundle-bin.override {
mediaSupport = true; mediaSupport = true;
pulseaudioSupport = pkgs.stdenv.isLinux; pulseaudioSupport = pkgs.stdenv.isLinux;
}) })
tigervnc
pdfpc pdfpc
quaternion
nheko nheko
gpxsee gpxsee
subsurface subsurface
@ -186,7 +183,7 @@ let
#(pkgs.pidgin-with-plugins.override { #(pkgs.pidgin-with-plugins.override {
# plugins = [ pkgs.pidginotr ];}) # plugins = [ pkgs.pidginotr ];})
logseq unstable.logseq
# for Hibiscus banking software # for Hibiscus banking software
jameica jameica

208
home/modules/vscodium.nix
View file

@ -11,110 +11,112 @@
enable = true; enable = true;
package = pkgs.vscodium; package = pkgs.vscodium;
mutableExtensionsDir = true; mutableExtensionsDir = true;
profiles.default = { extensions =
extensions = with pkgs.vscode-extensions;
with pkgs.vscode-extensions; [
[ ms-python.python
ms-python.python vscodevim.vim
charliermarsh.ruff yzhang.markdown-all-in-one
vscodevim.vim bungcip.better-toml
yzhang.markdown-all-in-one eamodio.gitlens
bungcip.better-toml jnoortheen.nix-ide
eamodio.gitlens mkhl.direnv
jnoortheen.nix-ide editorconfig.editorconfig
mkhl.direnv ]
editorconfig.editorconfig ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
]
++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
{
name = "Sync-Rsync";
publisher = "vscode-ext";
version = "0.36.0";
sha256 = "sha256-0b/OHLZfXo0NAVAVkzZSqMGDzF0uvPRoiqsZtW1iOdA";
}
# TODO: probably available in nixpkgs soonish?
{
name = "mypy-type-checker";
publisher = "ms-python";
version = "2023.3.12681020";
sha256 = "sha256-rhed7CQlvxksVCGc9nPU2oYQWtXcAV5TzuG63e8Y3zM=";
}
{
name = "vscode-pets";
publisher = "tonybaloney";
version = "1.25.1";
sha256 = "sha256-as3e2LzKBSsiGs/UGIZ06XqbLh37irDUaCzslqITEJQ=";
}
];
userSettings =
let
defaultPython = pkgs.python3.withPackages (ps: [
ps.jedi
ps.jedi-language-server
ps.pip
ps.setuptools # for pkg_resources
ps.black
ps.mypy
]);
in
{ {
"editor.fontLigatures" = true; name = "Sync-Rsync";
"editor.accessibilitySupport" = false; # prevent asking publisher = "vscode-ext";
"editor.cursorBlinking" = "phase"; version = "0.36.0";
"editor.stickyScroll.enabled" = true; sha256 = "sha256-0b/OHLZfXo0NAVAVkzZSqMGDzF0uvPRoiqsZtW1iOdA";
"workbench.editor.highlightModifiedTabs" = true; }
"window.autoDetectColorScheme" = true; # TODO: probably available in nixpkgs soonish?
"workbench.preferredDarkColorTheme" = "Default Dark Modern"; {
"workbench.preferredLightColorTheme" = "Default Light Modern"; name = "mypy-type-checker";
"[nix]" = { publisher = "ms-python";
"editor.insertSpaces" = true; version = "2023.3.12681020";
"editor.tabSize" = 2; sha256 = "sha256-rhed7CQlvxksVCGc9nPU2oYQWtXcAV5TzuG63e8Y3zM=";
# for now, disable automatic formatting to prevent disruption of existing code bases }
"editor.formatOnPaste" = false; {
"editor.formatOnSave" = false; name = "black-formatter";
"editor.formatOnType" = false; publisher = "ms-python";
}; version = "2023.5.12771008";
"nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style; sha256 = "sha256-lJG0RRUUMhQGs2a6oBtoqt+uY1kSJ0+cbmaP07hNh2o=";
"nix.enableLanguageServer" = true; }
"nix.serverPath" = lib.getExe pkgs.nixd; {
"nix.serverSettings" = { }; name = "vscode-pets";
"editor.fontSize" = 13; publisher = "tonybaloney";
"editor.fontWeight" = "normal"; version = "1.25.1";
"git.detectSubmodulesLimit" = 30; sha256 = "sha256-as3e2LzKBSsiGs/UGIZ06XqbLh37irDUaCzslqITEJQ=";
"[python]" = { }
"breadcrumbs.showClasses" = true; ];
"breadcrumbs.showFunctions" = true; userSettings =
"gitlens.codeLens.symbolScopes" = [ "!Module" ]; let
"editor.defaultFormatter" = "charliermarsh.ruff"; defaultPython = pkgs.python3.withPackages (ps: [
"editor.formatOnSave" = true; ps.jedi
}; ps.jedi-language-server
"python.experiments.enabled" = false; ps.pip
"python.languageServer" = "Jedi"; # don't use proprietary pylance server ps.setuptools # for pkg_resources
"python.defaultInterpreterPath" = "${defaultPython}/bin/python"; ps.black
"mypy-type-checker.path" = [ "${pkgs.python3Packages.mypy}/bin/mypy" ]; ps.mypy
"mypy-type-checker.importStrategy" = "fromEnvironment"; ]);
"mypy-type-checker.args" = [ "--ignore-missing-imports" ]; in
"ruff.path" = [ (lib.getExe pkgs.ruff) ]; {
"ruff.importStrategy" = "fromEnvironment"; "editor.fontLigatures" = true;
"gitlens.telemetry.enabled" = false; "editor.accessibilitySupport" = false; # prevent asking
"vim.highlightedyank.enable" = true; "editor.cursorBlinking" = "phase";
"vim.history" = 500; "editor.stickyScroll.enabled" = true;
"vim.neovimUseConfigFile" = true; "workbench.editor.highlightModifiedTabs" = true;
"vim.enableNeovim" = true; "window.autoDetectColorScheme" = true;
"git.suggestSmartCommit" = false; "workbench.preferredDarkColorTheme" = "Default Dark Modern";
"editor.rulers" = [ 79 ]; "workbench.preferredLightColorTheme" = "Default Light Modern";
"vim.useSystemClipboard" = true; "[nix]" = {
"vim.smartRelativeLine" = true; "editor.insertSpaces" = true;
"diffEditor.ignoreTrimWhitespace" = false; "editor.tabSize" = 2;
"files.associations" = { # for now, disable automatic formatting to prevent disruption of existing code bases
"*.py" = "python"; "editor.formatOnPaste" = false;
}; "editor.formatOnSave" = false;
"editor.renderWhitespace" = "all"; "editor.formatOnType" = false;
"editor.fontFamily" = "Iosevka Curly Slab, Menlo, Monaco, 'Courier New', monospace";
"vim.neovimPath" = lib.getExe pkgs.myVim;
"sync-rsync.options" = [ ];
"direnv.path.executable" = lib.getExe pkgs.direnv;
}; };
}; "nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style;
"nix.enableLanguageServer" = true;
"nix.serverPath" = lib.getExe pkgs.nixd;
"nix.serverSettings" = { };
"editor.fontSize" = 13;
"editor.fontWeight" = "normal";
"git.detectSubmodulesLimit" = 30;
"[python]" = {
"breadcrumbs.showClasses" = true;
"breadcrumbs.showFunctions" = true;
"gitlens.codeLens.symbolScopes" = [ "!Module" ];
"editor.defaultFormatter" = "ms-python.black-formatter";
"editor.formatOnSave" = true;
};
"python.languageServer" = "Jedi"; # don't use proprietary pylance server
"python.defaultInterpreterPath" = "${defaultPython}/bin/python";
"black-formatter.path" = [ "${pkgs.python3Packages.black}/bin/black" ];
"black-formatter.importStrategy" = "fromEnvironment";
"mypy-type-checker.path" = [ "${pkgs.python3Packages.mypy}/bin/mypy" ];
"mypy-type-checker.importStrategy" = "fromEnvironment";
"mypy-type-checker.args" = [ "--ignore-missing-imports" ];
"gitlens.telemetry.enabled" = false;
"vim.highlightedyank.enable" = true;
"vim.history" = 500;
"vim.neovimUseConfigFile" = true;
"vim.enableNeovim" = true;
"git.suggestSmartCommit" = false;
"editor.rulers" = [ 79 ];
"vim.useSystemClipboard" = true;
"vim.smartRelativeLine" = true;
"diffEditor.ignoreTrimWhitespace" = false;
"files.associations" = {
"*.py" = "python";
};
"editor.renderWhitespace" = "all";
"editor.fontFamily" = "Iosevka Curly Slab, Menlo, Monaco, 'Courier New', monospace";
"vim.neovimPath" = lib.getExe pkgs.myVim;
"sync-rsync.options" = [ ];
"direnv.path.executable" = lib.getExe pkgs.direnv;
};
}; };
} }

2
home/workmac.nix
View file

@ -89,7 +89,7 @@ in
}; };
# some extra shell scripts # some extra shell scripts
programs.zsh.initContent = lib.mkAfter ( programs.zsh.initExtra = lib.mkAfter (
import ./scripts/reporsync.nix { inherit pkgs lib; } import ./scripts/reporsync.nix { inherit pkgs lib; }
+ import ./scripts/ssh-loop-fc.nix { inherit pkgs lib; } + import ./scripts/ssh-loop-fc.nix { inherit pkgs lib; }
); );

3
hosts/framenix/default.nix
View file

@ -23,6 +23,9 @@ in
# override tmpdir for daemon # override tmpdir for daemon
systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp"; systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp";
# try newer kernels
boot.kernelPackages = pkgs.linuxPackages_latest;
boot.kernelParams = [ boot.kernelParams = [
# powersave # powersave
"amd_pstate=active" "amd_pstate=active"

1
hosts/thinknix/hardware-configuration.nix
View file

@ -21,6 +21,7 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
nix.settings.max-jobs = lib.mkDefault 4; nix.settings.max-jobs = lib.mkDefault 4;
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
# modesetting is always better than intel (legacy) # modesetting is always better than intel (legacy)
services.xserver.videoDrivers = [ "modesetting" ]; services.xserver.videoDrivers = [ "modesetting" ];

1
nixremotebuildermachines
View file

@ -1 +0,0 @@
ssh-ng://schmittlauch@build01.nix-community.org x86_64-linux /root/.ssh/remote_builder_key 64 1 big-parallel,kvm,nixos-test -

26
patches/keepassxc-fix-darwin-build.patch
View file

@ -1,26 +0,0 @@
From 49b7ae226cedb0adb403758e0c63d09762297a22 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Wed, 28 May 2025 14:06:23 -0300
Subject: [PATCH] keepassxc: remove unecessary dependency
KIO no longer seems necessary for KeePassXC, so removing it should
decrease the closure size significantly.
Reported-by: chopper2000uk <>
Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
pkgs/by-name/ke/keepassxc/package.nix | 1 -
1 file changed, 1 deletion(-)
diff --git a/pkgs/by-name/ke/keepassxc/package.nix b/pkgs/by-name/ke/keepassxc/package.nix
index 170cc7bfe8e384..40b6dc15170f5b 100644
--- a/pkgs/by-name/ke/keepassxc/package.nix
+++ b/pkgs/by-name/ke/keepassxc/package.nix
@@ -142,7 +142,6 @@ stdenv.mkDerivation (finalAttrs: {
libXi
libXtst
libargon2
- libsForQt5.kio
libsForQt5.qtbase
libsForQt5.qtsvg
minizip

26
patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch Normal file
View file

@ -0,0 +1,26 @@
From 362c2bc76d359b908ad1389ee28c23ee0e862324 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Mon, 7 Apr 2025 21:03:09 -0400
Subject: [PATCH] nodejs_20: fix test failure on darwin on latest MacOS 15.4
Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
(cherry picked from commit 9674c1f688d12b99fbde26e6068ab62609fef3b1)
---
pkgs/development/web/nodejs/v20.nix | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
index b9c9345c441afa..20cceb5b5d1cda 100644
--- a/pkgs/development/web/nodejs/v20.nix
+++ b/pkgs/development/web/nodejs/v20.nix
@@ -50,5 +50,10 @@ buildNodejs {
stripLen = 1;
hash = "sha256-6y3aEqxNC4iTQEv1oewodJrhOHxjp5xZMq1P1QL94Rg=";
})
+ # fix test failure on macos 15.4
+ (fetchpatch2 {
+ url = "https://github.com/nodejs/node/commit/33f6e1ea296cd20366ab94e666b03899a081af94.patch?full_index=1";
+ hash = "sha256-aVBMcQlhQeviUQpMIfC988jjDB2BgYzlMYsq+w16mzU=";
+ })
] ++ gypPatches;
}