Compare commits

..

17 commits

Author SHA1 Message Date
c49b8019a1 home packages: install rsync to override openrsync shipped with macOS
On NixOS systems, it comes from the system packages anyways.
2025-06-06 11:58:09 +02:00
b924ec905b home: install vlc-bin on darwin 2025-06-05 00:52:43 +02:00
d6b3f85c3b fixup! flake, darwin: nixpkgs patching not required anymore with 25.05 2025-06-03 22:00:20 +02:00
f309196693 keepassxc: fix build on darwin
Pulling in a temporary patch for nixpkgs from an open PR.
2025-06-03 21:59:56 +02:00
c118bebe15 backintime: uninstall
not really used anymore
2025-06-03 21:09:29 +02:00
9a29b0411a flake.lock: Update
Flake lock file updates:

• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/daa628a725ab4948e0e2b795e8fb6f4c3e289a7a' (2025-05-30)
  → 'github:NixOS/nixos-hardware/fc7c4714125cfaa19b048e8aaf86b9c53e04d853' (2025-06-03)
• Updated input 'nixos-unstable':
    'github:NixOS/nixpkgs/96ec055edbe5ee227f28cdbc3f1ddf1df5965102' (2025-05-28)
  → 'github:NixOS/nixpkgs/910796cabe436259a29a72e8d3f5e180fc6dfacc' (2025-05-31)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/7282cb574e0607e65224d33be8241eae7cfe0979' (2025-05-28)
  → 'github:NixOS/nixpkgs/10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922' (2025-06-02)
• Updated input 'nur':
    'github:nix-community/NUR/84d20e10373136d5741ff7d53fcf2b5a831518a0' (2025-05-31)
  → 'github:nix-community/NUR/90add46380908ba4395f5f1dfec84224a3b0d4b9' (2025-06-03)
• Updated input 'nur/nixpkgs':
    'github:nixos/nixpkgs/96ec055edbe5ee227f28cdbc3f1ddf1df5965102' (2025-05-28)
  → 'github:nixos/nixpkgs/910796cabe436259a29a72e8d3f5e180fc6dfacc' (2025-05-31)
2025-06-03 20:51:16 +02:00
718ca8c60b framenix: switch to LTS kernel
Hopefully the hardware is old enough now to work with LTS kernels. This
way we avoid build failures with 3rd party kernel modules (e.g.
virtualbox) that are not adapted yet.
2025-05-31 18:23:07 +02:00
afddb44d9c flake.lock: Update
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/83665c39fa688bd6a1f7c43cf7997a70f6a109f9' (2025-05-26)
  → 'github:nix-community/home-manager/282e1e029cb6ab4811114fc85110613d72771dea' (2025-05-31)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/11f2d9ea49c3e964315215d6baa73a8d42672f06' (2025-05-22)
  → 'github:NixOS/nixos-hardware/daa628a725ab4948e0e2b795e8fb6f4c3e289a7a' (2025-05-30)
• Updated input 'nixos-unstable':
    'github:NixOS/nixpkgs/62b852f6c6742134ade1abdd2a21685fd617a291' (2025-05-25)
  → 'github:NixOS/nixpkgs/96ec055edbe5ee227f28cdbc3f1ddf1df5965102' (2025-05-28)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/7c43f080a7f28b2774f3b3f43234ca11661bf334' (2025-05-25)
  → 'github:NixOS/nixpkgs/7282cb574e0607e65224d33be8241eae7cfe0979' (2025-05-28)
• Updated input 'nur':
    'github:nix-community/NUR/86cc4fe96799d2415a824daf0cfcdfc7205e7fca' (2025-05-28)
  → 'github:nix-community/NUR/84d20e10373136d5741ff7d53fcf2b5a831518a0' (2025-05-31)
• Updated input 'nur/nixpkgs':
    'github:nixos/nixpkgs/62b852f6c6742134ade1abdd2a21685fd617a291' (2025-05-25)
  → 'github:nixos/nixpkgs/96ec055edbe5ee227f28cdbc3f1ddf1df5965102' (2025-05-28)
2025-05-31 15:52:16 +02:00
a81f00bc83 flake.lock: Update
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/d0bbd221482c2713cccb80220f3c9d16a6e20a33' (2025-05-18)
  → 'github:nix-community/home-manager/83665c39fa688bd6a1f7c43cf7997a70f6a109f9' (2025-05-26)
• Updated input 'nix-darwin':
    'github:LnL7/nix-darwin/2456ff5c95edfc3b197cb012b947012faed77591' (2025-05-23)
  → 'github:LnL7/nix-darwin/75b99daa12b1fffd646d6c3cf13b06f1fa5cef63' (2025-05-27)
• Updated input 'nixos-unstable':
    'github:NixOS/nixpkgs/063f43f2dbdef86376cc29ad646c45c46e93234c' (2025-05-23)
  → 'github:NixOS/nixpkgs/62b852f6c6742134ade1abdd2a21685fd617a291' (2025-05-25)
• Updated input 'nur':
    'github:nix-community/NUR/1fddc69b73b54110650213d13f363227da765237' (2025-05-25)
  → 'github:nix-community/NUR/86cc4fe96799d2415a824daf0cfcdfc7205e7fca' (2025-05-28)
• Updated input 'nur/nixpkgs':
    'github:nixos/nixpkgs/063f43f2dbdef86376cc29ad646c45c46e93234c' (2025-05-23)
  → 'github:nixos/nixpkgs/62b852f6c6742134ade1abdd2a21685fd617a291' (2025-05-25)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/020cb423808365fa3f10ff4cb8c0a25df35065a3' (2025-05-22)
  → 'github:numtide/treefmt-nix/1f3f7b784643d488ba4bf315638b2b0a4c5fb007' (2025-05-26)
2025-05-28 03:48:48 +02:00
3c18ec5d0a flake.lock: Update
Flake lock file updates:

• Updated input 'nix-darwin':
    'github:LnL7/nix-darwin/74ecd01d2c122f8a4a48066ab1d48f3e01671671' (2025-05-20)
  → 'github:LnL7/nix-darwin/2456ff5c95edfc3b197cb012b947012faed77591' (2025-05-23)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282' (2025-05-20)
  → 'github:NixOS/nixos-hardware/11f2d9ea49c3e964315215d6baa73a8d42672f06' (2025-05-22)
• Updated input 'nixos-unstable':
    'github:NixOS/nixpkgs/292fa7d4f6519c074f0a50394dbbe69859bb6043' (2025-05-18)
  → 'github:NixOS/nixpkgs/063f43f2dbdef86376cc29ad646c45c46e93234c' (2025-05-23)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/ca49c4304acf0973078db0a9d200fd2bae75676d' (2025-05-18)
  → 'github:NixOS/nixpkgs/7c43f080a7f28b2774f3b3f43234ca11661bf334' (2025-05-25)
• Updated input 'nur':
    'github:nix-community/NUR/e52a85ce10a990ac6d7356f3a753fde0860426a8' (2025-05-20)
  → 'github:nix-community/NUR/1fddc69b73b54110650213d13f363227da765237' (2025-05-25)
• Updated input 'nur/nixpkgs':
    'github:nixos/nixpkgs/292fa7d4f6519c074f0a50394dbbe69859bb6043' (2025-05-18)
  → 'github:nixos/nixpkgs/063f43f2dbdef86376cc29ad646c45c46e93234c' (2025-05-23)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/ab0378b61b0d85e73a8ab05d5c6029b5bd58c9fb' (2025-05-17)
  → 'github:numtide/treefmt-nix/020cb423808365fa3f10ff4cb8c0a25df35065a3' (2025-05-22)
2025-05-25 19:17:53 +02:00
226cb11480 vscodium: use ruff for python formatting instead of black 2025-05-21 16:14:09 +02:00
603411fa64 thinknix: do not use powersave CPU governor
powersave turns out to be rather slow on today's software stacks
2025-05-21 00:13:09 +02:00
f03e5ae52c darwin: build adjustments for 25.05 2025-05-21 00:08:45 +02:00
2b06c59dd8 flake, darwin: nixpkgs patching not required anymore with 25.05
keeping the architecture for doing so available for future needs though.
2025-05-20 23:11:00 +02:00
c0db186d73 Merge branch 'upgrade-25.05' into mainline 2025-05-20 23:09:29 +02:00
82b0a6cab1 Adjustments for 24.11 -> 25.05
package replacements, warnings, deprecations
2025-05-20 23:08:03 +02:00
d95c277383 flake: nixpkgs 24.11 -> 25.05, relock all inputs
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/b4bbdc6fde16fc2051fcde232f6e288cd22007ca' (2025-05-12)
  → 'github:nix-community/home-manager/d0bbd221482c2713cccb80220f3c9d16a6e20a33' (2025-05-18)
• Updated input 'nix-darwin':
    'github:LnL7/nix-darwin/fc843893cecc1838a59713ee3e50e9e7edc6207c' (2025-03-28)
  → 'github:LnL7/nix-darwin/74ecd01d2c122f8a4a48066ab1d48f3e01671671' (2025-05-20)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/e81fd167b33121269149c57806599045fd33eeed' (2025-05-13)
  → 'github:NixOS/nixos-hardware/6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282' (2025-05-20)
• Updated input 'nixos-unstable':
    'github:NixOS/nixpkgs/d89fc19e405cb2d55ce7cc114356846a0ee5e956' (2025-05-10)
  → 'github:NixOS/nixpkgs/292fa7d4f6519c074f0a50394dbbe69859bb6043' (2025-05-18)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/a39ed32a651fdee6842ec930761e31d1f242cb94' (2025-05-11)
  → 'github:NixOS/nixpkgs/ca49c4304acf0973078db0a9d200fd2bae75676d' (2025-05-18)
• Updated input 'nur':
    'github:nix-community/NUR/e29c558fa4174da179e2e7f9a41c34466a200fda' (2025-05-14)
  → 'github:nix-community/NUR/e52a85ce10a990ac6d7356f3a753fde0860426a8' (2025-05-20)
• Updated input 'nur/nixpkgs':
    'github:nixos/nixpkgs/d89fc19e405cb2d55ce7cc114356846a0ee5e956' (2025-05-10)
  → 'github:nixos/nixpkgs/292fa7d4f6519c074f0a50394dbbe69859bb6043' (2025-05-18)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/29ec5026372e0dec56f890e50dbe4f45930320fd' (2025-05-02)
  → 'github:numtide/treefmt-nix/ab0378b61b0d85e73a8ab05d5c6029b5bd58c9fb' (2025-05-17)
2025-05-20 18:55:22 +02:00
16 changed files with 185 additions and 192 deletions

View file

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

View file

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

View file

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

View file

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

54
flake.lock generated
View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -11,112 +11,110 @@
enable = true;
package = pkgs.vscodium;
mutableExtensionsDir = true;
extensions =
with pkgs.vscode-extensions;
[
ms-python.python
vscodevim.vim
yzhang.markdown-all-in-one
bungcip.better-toml
eamodio.gitlens
jnoortheen.nix-ide
mkhl.direnv
editorconfig.editorconfig
]
++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
profiles.default = {
extensions =
with pkgs.vscode-extensions;
[
ms-python.python
charliermarsh.ruff
vscodevim.vim
yzhang.markdown-all-in-one
bungcip.better-toml
eamodio.gitlens
jnoortheen.nix-ide
mkhl.direnv
editorconfig.editorconfig
]
++ 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
{
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 = "black-formatter";
publisher = "ms-python";
version = "2023.5.12771008";
sha256 = "sha256-lJG0RRUUMhQGs2a6oBtoqt+uY1kSJ0+cbmaP07hNh2o=";
}
{
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;
"editor.accessibilitySupport" = false; # prevent asking
"editor.cursorBlinking" = "phase";
"editor.stickyScroll.enabled" = true;
"workbench.editor.highlightModifiedTabs" = true;
"window.autoDetectColorScheme" = true;
"workbench.preferredDarkColorTheme" = "Default Dark Modern";
"workbench.preferredLightColorTheme" = "Default Light Modern";
"[nix]" = {
"editor.insertSpaces" = true;
"editor.tabSize" = 2;
# for now, disable automatic formatting to prevent disruption of existing code bases
"editor.formatOnPaste" = false;
"editor.formatOnSave" = false;
"editor.formatOnType" = false;
"editor.fontLigatures" = true;
"editor.accessibilitySupport" = false; # prevent asking
"editor.cursorBlinking" = "phase";
"editor.stickyScroll.enabled" = true;
"workbench.editor.highlightModifiedTabs" = true;
"window.autoDetectColorScheme" = true;
"workbench.preferredDarkColorTheme" = "Default Dark Modern";
"workbench.preferredLightColorTheme" = "Default Light Modern";
"[nix]" = {
"editor.insertSpaces" = true;
"editor.tabSize" = 2;
# for now, disable automatic formatting to prevent disruption of existing code bases
"editor.formatOnPaste" = false;
"editor.formatOnSave" = false;
"editor.formatOnType" = false;
};
"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" = "charliermarsh.ruff";
"editor.formatOnSave" = true;
};
"python.experiments.enabled" = false;
"python.languageServer" = "Jedi"; # don't use proprietary pylance server
"python.defaultInterpreterPath" = "${defaultPython}/bin/python";
"mypy-type-checker.path" = [ "${pkgs.python3Packages.mypy}/bin/mypy" ];
"mypy-type-checker.importStrategy" = "fromEnvironment";
"mypy-type-checker.args" = [ "--ignore-missing-imports" ];
"ruff.path" = [ (lib.getExe pkgs.ruff) ];
"ruff.importStrategy" = "fromEnvironment";
"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;
};
"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;
};
};
};
}

View file

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

View file

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

View file

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

1
nixremotebuildermachines Normal file
View file

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

View file

@ -0,0 +1,26 @@
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

View file

@ -1,26 +0,0 @@
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;
}