From d95c277383bededf6c19bb3b713f3964373a5794 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 20 May 2025 17:28:48 +0200 Subject: [PATCH 01/16] flake: nixpkgs 24.11 -> 25.05, relock all inputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- flake.nix | 6 +++--- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 8ee8ebd..36ef547 100644 --- a/flake.lock +++ b/flake.lock @@ -102,16 +102,16 @@ ] }, "locked": { - "lastModified": 1747020534, - "narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=", + "lastModified": 1747556831, + "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca", + "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", "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": 1747752302, + "narHash": "sha256-XqNAcEFfe5tJZGlx+Su0G67ZwRwZmHNWwiMK0fji0Hw=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c", + "rev": "74ecd01d2c122f8a4a48066ab1d48f3e01671671", "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": 1747723695, + "narHash": "sha256-lSXzv33yv1O9r9Ai1MtYFDX3OKhWsZMn/5FFb4Rni/k=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e81fd167b33121269149c57806599045fd33eeed", + "rev": "6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1746904237, - "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", + "lastModified": 1747542820, + "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", + "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "type": "github" }, "original": { @@ -243,27 +243,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746957726, - "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", + "lastModified": 1747610100, + "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", + "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", "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": 1747542820, + "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", + "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1747261242, - "narHash": "sha256-6p8kO62jbk+LUrDrLT23XbClNRyosnlfh/KCbE5fwnQ=", + "lastModified": 1747753144, + "narHash": "sha256-yCkh/1/NMrvXP0Ddqo4kX7rqLrn6euLkmP2RTvyLims=", "owner": "nix-community", "repo": "NUR", - "rev": "e29c558fa4174da179e2e7f9a41c34466a200fda", + "rev": "e52a85ce10a990ac6d7356f3a753fde0860426a8", "type": "github" }, "original": { @@ -398,11 +398,11 @@ ] }, "locked": { - "lastModified": 1746216483, - "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=", + "lastModified": 1747469671, + "narHash": "sha256-bo1ptiFoNqm6m1B2iAhJmWCBmqveLVvxom6xKmtuzjg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd", + "rev": "ab0378b61b0d85e73a8ab05d5c6029b5bd58c9fb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0f89e9b..68fb4e6 100644 --- a/flake.nix +++ b/flake.nix @@ -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"; }; From 82b0a6cab18327859033a135432bf5b5eb6bac02 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 20 May 2025 18:55:08 +0200 Subject: [PATCH 02/16] Adjustments for 24.11 -> 25.05 package replacements, warnings, deprecations --- common/default.nix | 2 +- common/packages.nix | 2 +- common/pulseaudio.nix | 2 +- home/common.nix | 6 +- home/desktop.nix | 2 +- home/modules/packages.nix | 21 ++-- home/modules/vscodium.nix | 212 +++++++++++++++++++------------------- home/workmac.nix | 2 +- 8 files changed, 124 insertions(+), 125 deletions(-) diff --git a/common/default.nix b/common/default.nix index a600ff3..5fbf46a 100644 --- a/common/default.nix +++ b/common/default.nix @@ -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 = { diff --git a/common/packages.nix b/common/packages.nix index 9634e2a..ec4f22b 100644 --- a/common/packages.nix +++ b/common/packages.nix @@ -40,7 +40,7 @@ exfat iotop cifs-utils - dstat + dool lsof macchanger borgbackup diff --git a/common/pulseaudio.nix b/common/pulseaudio.nix index ed94170..7323b57 100644 --- a/common/pulseaudio.nix +++ b/common/pulseaudio.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { # Enable sound. - hardware.pulseaudio = { + services.pulseaudio = { enable = true; package = pkgs.pulseaudioFull; # decouple pulseaudio application and sink volumes diff --git a/home/common.nix b/home/common.nix index 9cb8df9..c2c5264 100644 --- a/home/common.nix +++ b/home/common.nix @@ -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 diff --git a/home/desktop.nix b/home/desktop.nix index 212debf..1e089e7 100644 --- a/home/desktop.nix +++ b/home/desktop.nix @@ -72,7 +72,7 @@ services.gpg-agent = { enable = true; #enableSshSupport = true; - pinentryPackage = pkgs.pinentry-qt; + pinentry.package = pkgs.pinentry-qt; }; programs.ssh = { diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 79052c5..1544646 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -17,16 +17,16 @@ let inkscape darktable exiftool - gimp + gimp3 ] - ++ (with gimpPlugins; [ - fourier - lqrPlugin + ++ (with gimp3Plugins; [ + #fourier # broken + #lqrPlugin # broken ]) ++ lib.optionals pkgs.stdenv.isLinux [ hugin - luminanceHDR - xournal + #luminanceHDR # FIXME, build failure + xournalpp ]; multimediaApps = @@ -38,7 +38,7 @@ let vlc amarok clementine - elisa + kdePackages.elisa musescore tenacity soundkonverter @@ -122,7 +122,7 @@ let ]; pythonTools = with python3Packages; [ - python3 # to shadow old macOS python + python # to shadow old macOS python ipython uv pip @@ -148,7 +148,7 @@ let desktopLinux = [ firefox chromium - falkon + kdePackages.falkon thunderbird calibre dino @@ -172,7 +172,6 @@ let pulseaudioSupport = pkgs.stdenv.isLinux; }) pdfpc - quaternion nheko gpxsee subsurface @@ -183,7 +182,7 @@ let #(pkgs.pidgin-with-plugins.override { # plugins = [ pkgs.pidginotr ];}) - unstable.logseq + logseq # for Hibiscus banking software jameica diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index 76b4c8d..9678dce 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -11,112 +11,114 @@ 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 + 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 = "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 { - 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" = "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; }; - "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; - }; + }; }; } diff --git a/home/workmac.nix b/home/workmac.nix index f2b7969..5227db0 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -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; } ); From 2b06c59dd8438fbe18b528f1cf4d5a9cf8b610ea Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 20 May 2025 23:11:00 +0200 Subject: [PATCH 03/16] flake, darwin: nixpkgs patching not required anymore with 25.05 keeping the architecture for doing so available for future needs though. --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index fc9cdaf..f12afde 100644 --- a/flake.nix +++ b/flake.nix @@ -53,7 +53,7 @@ (import nixpkgs { inherit system; }).applyPatches { name = "nixpkgs-patched"; src = nixpkgs; - patches = [ ./patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch ]; + patches = [ ]; }; # necessary to make the top-level inputs available to system configuration From f03e5ae52caf38cb8a070177f56fc372c276e829 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 20 May 2025 23:35:11 +0200 Subject: [PATCH 04/16] darwin: build adjustments for 25.05 --- darwin/configuration.nix | 5 +---- home/modules/packages.nix | 7 +++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/darwin/configuration.nix b/darwin/configuration.nix index fc577ec..307836f 100644 --- a/darwin/configuration.nix +++ b/darwin/configuration.nix @@ -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. diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 1544646..e32b0e1 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -17,16 +17,19 @@ let inkscape darktable exiftool - gimp3 ] ++ (with gimp3Plugins; [ #fourier # broken #lqrPlugin # broken ]) ++ lib.optionals pkgs.stdenv.isLinux [ + gimp3 hugin #luminanceHDR # FIXME, build failure xournalpp + ] + ++ lib.optionals pkgs.stdenv.isDarwin [ + gimp ]; multimediaApps = @@ -142,7 +145,6 @@ let desktopCommon = [ keepassxc - tigervnc ]; desktopLinux = [ @@ -171,6 +173,7 @@ let mediaSupport = true; pulseaudioSupport = pkgs.stdenv.isLinux; }) + tigervnc pdfpc nheko gpxsee From 603411fa64eabe351279ea210aec2e2d03977105 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 20 May 2025 23:56:37 +0200 Subject: [PATCH 05/16] thinknix: do not use powersave CPU governor powersave turns out to be rather slow on today's software stacks --- hosts/thinknix/hardware-configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/thinknix/hardware-configuration.nix b/hosts/thinknix/hardware-configuration.nix index e60ac46..74708b5 100644 --- a/hosts/thinknix/hardware-configuration.nix +++ b/hosts/thinknix/hardware-configuration.nix @@ -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" ]; From 226cb11480eafbd79c49751b830a2f12dbc4d039 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 21 May 2025 16:14:09 +0200 Subject: [PATCH 06/16] vscodium: use ruff for python formatting instead of black --- home/modules/vscodium.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index 9678dce..a42b7ec 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -16,6 +16,7 @@ with pkgs.vscode-extensions; [ ms-python.python + charliermarsh.ruff vscodevim.vim yzhang.markdown-all-in-one bungcip.better-toml @@ -38,12 +39,6 @@ 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"; @@ -90,16 +85,17 @@ "breadcrumbs.showClasses" = true; "breadcrumbs.showFunctions" = true; "gitlens.codeLens.symbolScopes" = [ "!Module" ]; - "editor.defaultFormatter" = "ms-python.black-formatter"; + "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"; - "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" ]; + "ruff.path" = [ (lib.getExe pkgs.ruff) ]; + "ruff.importStrategy" = "fromEnvironment"; "gitlens.telemetry.enabled" = false; "vim.highlightedyank.enable" = true; "vim.history" = 500; From 3c18ec5d0a2b7b1ed91ffa5723752dc9b9d525d1 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 25 May 2025 19:17:53 +0200 Subject: [PATCH 07/16] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 36ef547..98d969a 100644 --- a/flake.lock +++ b/flake.lock @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1747752302, - "narHash": "sha256-XqNAcEFfe5tJZGlx+Su0G67ZwRwZmHNWwiMK0fji0Hw=", + "lastModified": 1748044287, + "narHash": "sha256-9bJzyUX5+HXYmI60WMGYXXDdhGbSh1Le6yBM4og3K7E=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "74ecd01d2c122f8a4a48066ab1d48f3e01671671", + "rev": "2456ff5c95edfc3b197cb012b947012faed77591", "type": "github" }, "original": { @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747723695, - "narHash": "sha256-lSXzv33yv1O9r9Ai1MtYFDX3OKhWsZMn/5FFb4Rni/k=", + "lastModified": 1747900541, + "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282", + "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1747542820, - "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1747610100, - "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", + "lastModified": 1748162331, + "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", + "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1747542820, - "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1747753144, - "narHash": "sha256-yCkh/1/NMrvXP0Ddqo4kX7rqLrn6euLkmP2RTvyLims=", + "lastModified": 1748190776, + "narHash": "sha256-t734cEJ3zKUEUdlIWVPiy9WxU66WhXqg9XQwoDhLMeA=", "owner": "nix-community", "repo": "NUR", - "rev": "e52a85ce10a990ac6d7356f3a753fde0860426a8", + "rev": "1fddc69b73b54110650213d13f363227da765237", "type": "github" }, "original": { @@ -398,11 +398,11 @@ ] }, "locked": { - "lastModified": 1747469671, - "narHash": "sha256-bo1ptiFoNqm6m1B2iAhJmWCBmqveLVvxom6xKmtuzjg=", + "lastModified": 1747912973, + "narHash": "sha256-XgxghfND8TDypxsMTPU2GQdtBEsHTEc3qWE6RVEk8O0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "ab0378b61b0d85e73a8ab05d5c6029b5bd58c9fb", + "rev": "020cb423808365fa3f10ff4cb8c0a25df35065a3", "type": "github" }, "original": { From a81f00bc832bfba8338852ca6d02760463f81891 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 28 May 2025 03:48:48 +0200 Subject: [PATCH 08/16] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 98d969a..ed613c9 100644 --- a/flake.lock +++ b/flake.lock @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1747556831, - "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", + "lastModified": 1748226808, + "narHash": "sha256-GaBRgxjWO1bAQa8P2+FDxG4ANBVhjnSjBms096qQdxo=", "owner": "nix-community", "repo": "home-manager", - "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", + "rev": "83665c39fa688bd6a1f7c43cf7997a70f6a109f9", "type": "github" }, "original": { @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1748044287, - "narHash": "sha256-9bJzyUX5+HXYmI60WMGYXXDdhGbSh1Le6yBM4og3K7E=", + "lastModified": 1748373722, + "narHash": "sha256-qi6aDGP2W6GyAUNEhg+slQWEpUiJ8LNIrQkmxHpzadI=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "2456ff5c95edfc3b197cb012b947012faed77591", + "rev": "75b99daa12b1fffd646d6c3cf13b06f1fa5cef63", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1748026106, - "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1748026106, - "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1748190776, - "narHash": "sha256-t734cEJ3zKUEUdlIWVPiy9WxU66WhXqg9XQwoDhLMeA=", + "lastModified": 1748393063, + "narHash": "sha256-G7xbGhrSZqlMYrrjqe6HOG/yQldfnCaa7ZuPVteiIOE=", "owner": "nix-community", "repo": "NUR", - "rev": "1fddc69b73b54110650213d13f363227da765237", + "rev": "86cc4fe96799d2415a824daf0cfcdfc7205e7fca", "type": "github" }, "original": { @@ -398,11 +398,11 @@ ] }, "locked": { - "lastModified": 1747912973, - "narHash": "sha256-XgxghfND8TDypxsMTPU2GQdtBEsHTEc3qWE6RVEk8O0=", + "lastModified": 1748243702, + "narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "020cb423808365fa3f10ff4cb8c0a25df35065a3", + "rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007", "type": "github" }, "original": { From afddb44d9cc0f2339a470d307a2d29f610fe2cec Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 31 May 2025 15:52:16 +0200 Subject: [PATCH 09/16] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index ed613c9..f00c594 100644 --- a/flake.lock +++ b/flake.lock @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1748226808, - "narHash": "sha256-GaBRgxjWO1bAQa8P2+FDxG4ANBVhjnSjBms096qQdxo=", + "lastModified": 1748665073, + "narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=", "owner": "nix-community", "repo": "home-manager", - "rev": "83665c39fa688bd6a1f7c43cf7997a70f6a109f9", + "rev": "282e1e029cb6ab4811114fc85110613d72771dea", "type": "github" }, "original": { @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747900541, - "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", + "lastModified": 1748634340, + "narHash": "sha256-pZH4bqbOd8S+si6UcfjHovWDiWKiIGRNRMpmRWaDIms=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", + "rev": "daa628a725ab4948e0e2b795e8fb6f4c3e289a7a", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "lastModified": 1748460289, + "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748162331, - "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", + "lastModified": 1748437600, + "narHash": "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", + "rev": "7282cb574e0607e65224d33be8241eae7cfe0979", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "lastModified": 1748460289, + "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1748393063, - "narHash": "sha256-G7xbGhrSZqlMYrrjqe6HOG/yQldfnCaa7ZuPVteiIOE=", + "lastModified": 1748693932, + "narHash": "sha256-yvoVbPJzm230Q0lwJeuO/Ou4SVv9wXtlzMD1apKpZOo=", "owner": "nix-community", "repo": "NUR", - "rev": "86cc4fe96799d2415a824daf0cfcdfc7205e7fca", + "rev": "84d20e10373136d5741ff7d53fcf2b5a831518a0", "type": "github" }, "original": { From 718ca8c60b5f393277928a4cb3b681f93f36bc49 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 31 May 2025 18:23:07 +0200 Subject: [PATCH 10/16] 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. --- hosts/framenix/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index 166f4ee..f1e62cd 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -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" From 9a29b0411aa557a6921c0c1d7490aeb4646222a3 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 3 Jun 2025 20:51:16 +0200 Subject: [PATCH 11/16] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index f00c594..57216c2 100644 --- a/flake.lock +++ b/flake.lock @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1748634340, - "narHash": "sha256-pZH4bqbOd8S+si6UcfjHovWDiWKiIGRNRMpmRWaDIms=", + "lastModified": 1748942041, + "narHash": "sha256-HEu2gTct7nY0tAPRgBtqYepallryBKR1U8B4v2zEEqA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "daa628a725ab4948e0e2b795e8fb6f4c3e289a7a", + "rev": "fc7c4714125cfaa19b048e8aaf86b9c53e04d853", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1748460289, - "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748437600, - "narHash": "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04=", + "lastModified": 1748889542, + "narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7282cb574e0607e65224d33be8241eae7cfe0979", + "rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1748460289, - "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1748693932, - "narHash": "sha256-yvoVbPJzm230Q0lwJeuO/Ou4SVv9wXtlzMD1apKpZOo=", + "lastModified": 1748973087, + "narHash": "sha256-ZN0XKKdCBC9eLeog7qYhfGPbajkPtQPdlxp/dhwONw4=", "owner": "nix-community", "repo": "NUR", - "rev": "84d20e10373136d5741ff7d53fcf2b5a831518a0", + "rev": "90add46380908ba4395f5f1dfec84224a3b0d4b9", "type": "github" }, "original": { From c118bebe15d2c54db57f9aeab9ada92f631745cf Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 3 Jun 2025 21:09:29 +0200 Subject: [PATCH 12/16] backintime: uninstall not really used anymore --- home/modules/packages.nix | 1 - nixremotebuildermachines | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 nixremotebuildermachines diff --git a/home/modules/packages.nix b/home/modules/packages.nix index e32b0e1..cd8391a 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -166,7 +166,6 @@ let seafile-client alacritty libreoffice-qt6 # still with KDE integration - backintime-common anki signal-desktop (tor-browser-bundle-bin.override { diff --git a/nixremotebuildermachines b/nixremotebuildermachines new file mode 100644 index 0000000..82800d1 --- /dev/null +++ b/nixremotebuildermachines @@ -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 - From f30919669353bb32f4703f8d8ffb2a9c6d69833e Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 3 Jun 2025 21:59:56 +0200 Subject: [PATCH 13/16] keepassxc: fix build on darwin Pulling in a temporary patch for nixpkgs from an open PR. --- flake.nix | 2 +- patches/keepassxc-fix-darwin-build.patch | 26 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 patches/keepassxc-fix-darwin-build.patch diff --git a/flake.nix b/flake.nix index f12afde..20809d2 100644 --- a/flake.nix +++ b/flake.nix @@ -53,7 +53,7 @@ (import nixpkgs { inherit system; }).applyPatches { name = "nixpkgs-patched"; src = nixpkgs; - patches = [ ]; + patches = [ ./patches/keepassxc-fix-darwin-build.patch ]; }; # necessary to make the top-level inputs available to system configuration diff --git a/patches/keepassxc-fix-darwin-build.patch b/patches/keepassxc-fix-darwin-build.patch new file mode 100644 index 0000000..3684a24 --- /dev/null +++ b/patches/keepassxc-fix-darwin-build.patch @@ -0,0 +1,26 @@ +From 49b7ae226cedb0adb403758e0c63d09762297a22 Mon Sep 17 00:00:00 2001 +From: Fernando Rodrigues +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 +--- + 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 From d6b3f85c3b0e9a34b327f9c02b50870d23cbe4f7 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 3 Jun 2025 22:00:20 +0200 Subject: [PATCH 14/16] fixup! flake, darwin: nixpkgs patching not required anymore with 25.05 --- ...2bc76d359b908ad1389ee28c23ee0e862324.patch | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch diff --git a/patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch b/patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch deleted file mode 100644 index dbaf9ee..0000000 --- a/patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 362c2bc76d359b908ad1389ee28c23ee0e862324 Mon Sep 17 00:00:00 2001 -From: Ihar Hrachyshka -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 -(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; - } From b924ec905b7d0144a6d40cb404ec4ec795748557 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 5 Jun 2025 00:52:43 +0200 Subject: [PATCH 15/16] home: install vlc-bin on darwin --- home/modules/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index cd8391a..0b3f0ab 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -37,6 +37,7 @@ let mpv yt-dlp ] + ++ lib.optionals pkgs.stdenv.isDarwin [ vlc-bin ] ++ lib.optionals pkgs.stdenv.isLinux [ vlc amarok From c49b8019a1890b463eefa4c74cff0e6111f3e96d Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 6 Jun 2025 11:58:09 +0200 Subject: [PATCH 16/16] home packages: install rsync to override openrsync shipped with macOS On NixOS systems, it comes from the system packages anyways. --- home/modules/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 0b3f0ab..c44170e 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -56,6 +56,7 @@ let htop tmux httpie + rsync ponysay gti tree