diff --git a/common/default.nix b/common/default.nix index b672069..4616f93 100644 --- a/common/default.nix +++ b/common/default.nix @@ -109,9 +109,6 @@ in }; }; }; - plugins = with pkgs; [ - networkmanager-openvpn - ]; }; services.avahi.enable = true; diff --git a/common/nix-settings.nix b/common/nix-settings.nix index beb5ca0..eb32daf 100644 --- a/common/nix-settings.nix +++ b/common/nix-settings.nix @@ -29,9 +29,8 @@ in ]; # use all cores for building cores = 0; - #auto-optimise-store = true; + auto-optimise-store = true; }; - nix.optimise.automatic = true; # temporary workaround until Lix/ Nix bug is fixed https://github.com/nix-darwin/nix-darwin/blob/e95de00a471d07435e0527ff4db092c84998698e/modules/nix/default.nix#L817C39-L817C78 # TODO: manage access token with sops instead of manual deployment # permissions: needs to be readable by the user invoking nix and root (for nix daemon) nix.extraOptions = '' diff --git a/flake.lock b/flake.lock index fa233a0..c30c713 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1754269165, - "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", + "lastModified": 1731098351, + "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", "owner": "ipetkov", "repo": "crane", - "rev": "444e81206df3f7d92780680e45858e31d2f07a08", + "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", "type": "github" }, "original": { @@ -18,11 +18,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -39,11 +39,11 @@ ] }, "locked": { - "lastModified": 1754091436, - "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -102,16 +102,16 @@ ] }, "locked": { - "lastModified": 1764613336, - "narHash": "sha256-L979az28t/+SXvYw9qhOno5HLlDwkZOpz6LzCLnjmRM=", + "lastModified": 1758463745, + "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "owner": "nix-community", "repo": "home-manager", - "rev": "f3902b5d8767985680875ad86d028371100faeb3", + "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -126,16 +126,16 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1762205063, - "narHash": "sha256-If6vQ+KvtKs3ARBO9G3l+4wFSCYtRBrwX1z+I+B61wQ=", + "lastModified": 1737639419, + "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "88b8a563ff5704f4e8d8e5118fb911fa2110ca05", + "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v0.4.3", + "ref": "v0.4.2", "repo": "lanzaboote", "type": "github" } @@ -163,27 +163,27 @@ ] }, "locked": { - "lastModified": 1764161084, - "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=", + "lastModified": 1762912391, + "narHash": "sha256-4hpBE7bGd24SfD28rzMdUGXsLsNEYxCCrTipFdoqoNM=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "e95de00a471d07435e0527ff4db092c84998698e", + "rev": "d76299b2cd01837c4c271a7b5186e3d5d8ebd126", "type": "github" }, "original": { "owner": "LnL7", - "ref": "nix-darwin-25.11", + "ref": "nix-darwin-25.05", "repo": "nix-darwin", "type": "github" } }, "nixos-hardware": { "locked": { - "lastModified": 1764440730, - "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", + "lastModified": 1762847253, + "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", + "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1763678758, + "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", "type": "github" }, "original": { @@ -211,11 +211,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754243818, - "narHash": "sha256-sEPw2W01UPf0xNGnMGNZIaE1XHkk7O+lLLetYEXVZHk=", + "lastModified": 1731919951, + "narHash": "sha256-vOM6ETpl1yu9KLi/icTmLJIPbbdJCdAVYUXZceO/Ce4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c460617dfb709a67d18bb31e15e455390ee4ee1c", + "rev": "04386ac325a813047fc314d4b4d838a5b1e3c7fe", "type": "github" }, "original": { @@ -225,29 +225,45 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs-stable": { "locked": { - "lastModified": 1764522689, - "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1763622513, + "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1763678758, + "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", "type": "github" }, "original": { @@ -263,11 +279,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1764629053, - "narHash": "sha256-RcxVqrd5i70Tk4ydefdwf8DFJc41KA4wxLLrMsnnBjE=", + "lastModified": 1763926732, + "narHash": "sha256-oC8EjqK7nnvJL/uRLMXBw5hOmopypGzF9bZHEnv00q4=", "owner": "nix-community", "repo": "NUR", - "rev": "d5697e876963198dd304489e88cff538d6c5b2e7", + "rev": "0912016ed69160333b4fe1ed61eb6cfd196578c1", "type": "github" }, "original": { @@ -286,14 +302,15 @@ "nixpkgs": [ "lanzaboote", "nixpkgs" - ] + ], + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -324,11 +341,11 @@ ] }, "locked": { - "lastModified": 1761791894, - "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", + "lastModified": 1731897198, + "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "59c45eb69d9222a4362673141e00ff77842cd219", + "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", "type": "github" }, "original": { @@ -359,11 +376,11 @@ ] }, "locked": { - "lastModified": 1762938485, - "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", + "lastModified": 1748243702, + "narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", + "rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0241e2d..cb177ff 100644 --- a/flake.nix +++ b/flake.nix @@ -2,15 +2,15 @@ description = "NixOS system flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.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-25.11"; + url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; lanzaboote = { - url = "github:nix-community/lanzaboote/v0.4.3"; + url = "github:nix-community/lanzaboote/v0.4.2"; # deliberately do _not_ follow the nixpkgs input here, because paranoia and test coverage }; utils.url = "github:numtide/flake-utils"; @@ -19,7 +19,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nix-darwin = { - url = "github:LnL7/nix-darwin/nix-darwin-25.11"; + url = "github:LnL7/nix-darwin/nix-darwin-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/common.nix b/home/common.nix index afeadbf..3a631e8 100644 --- a/home/common.nix +++ b/home/common.nix @@ -43,7 +43,7 @@ programs.git = { enable = true; - settings = { + extraConfig = { credential.helper = "cache"; push.default = "simple"; push.forceIfIncludes = true; # avoid accidental force overrides when remote is autofetched in background @@ -75,14 +75,13 @@ rerere.enabled = true; }; lfs.enable = true; - }; - programs.delta = { - enable = true; - enableGitIntegration = true; - options = { - line-numbers = true; - side-by-side = true; - #dark = true; + delta = { + enable = true; + options = { + line-numbers = true; + side-by-side = true; + #dark = true; + }; }; }; programs.lazygit = { @@ -123,6 +122,8 @@ # automatic rehash of path completion zstyle ':completion:*' rehash true + eval "$(${pkgs.thefuck}/bin/thefuck --alias)" + ## helper functions nixify() { if [ ! -e ./.envrc ]; then diff --git a/home/modules/fonts.nix b/home/modules/fonts.nix index 5bcdf53..6ce1185 100644 --- a/home/modules/fonts.nix +++ b/home/modules/fonts.nix @@ -11,7 +11,7 @@ source-sans-pro source-code-pro source-serif-pro - ubuntu-classic + ubuntu_font_family twemoji-color-font open-sans (iosevka-bin.override { variant = "CurlySlab"; }) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 6ff5bed..32b6ce9 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -14,6 +14,7 @@ let graphicsApps = [ inkscape + darktable exiftool ] ++ (with gimp3Plugins; [ @@ -21,14 +22,13 @@ let #lqrPlugin # broken ]) ++ lib.optionals pkgs.stdenv.isLinux [ - darktable gimp3 hugin #luminanceHDR # FIXME, build failure xournalpp ] ++ lib.optionals pkgs.stdenv.isDarwin [ - gimp2 + gimp ]; multimediaApps = [ @@ -42,6 +42,7 @@ let kdePackages.elisa musescore tenacity + soundkonverter #nur.repos.fooker.studio-link ]; @@ -61,6 +62,7 @@ let sshfs-fuse sshuttle cryfs + thefuck gnupg unar lzop @@ -103,15 +105,9 @@ let mtr ripgrep fd + gitui pre-commit - (scriv.overridePythonAttrs (old: { - patches = old.patches or [ ] ++ [ - (fetchpatch { - url = "https://github.com/nedbat/scriv/commit/04ac45da9e1adb24a95ad9643099fe537b3790fd.diff"; - hash = "sha256-Gle3zWC/WypGHsKmVlqedRAZVWsBjGpzMq3uKuG9+SY="; - }) - ]; - })) + scriv # Haskell ghc @@ -169,7 +165,7 @@ let libreoffice-qt6 # still with KDE integration anki signal-desktop - (tor-browser.override { + (tor-browser-bundle-bin.override { mediaSupport = true; pulseaudioSupport = pkgs.stdenv.isLinux; }) @@ -189,7 +185,7 @@ let logseq # for Hibiscus banking software - jameica + unstable.jameica #ToDo: which of these drivers is actually used? geckodriver chromedriver diff --git a/home/workmac.nix b/home/workmac.nix index 3845488..bf2ae5c 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -21,10 +21,8 @@ in devTools = true; pythonTools = true; }; - targets.darwin = { - linkApps.enable = false; # spotlight ignores symlinks - copyApps.enable = true; - }; + # TODO: enable when on 25.11 + #targets.darwin.copyApps.enable = true; home.packages = [ wireshark # on NixOS systems enabled via system config