diff --git a/common/default.nix b/common/default.nix index 73d5200..b672069 100644 --- a/common/default.nix +++ b/common/default.nix @@ -160,12 +160,6 @@ in kontact = true; merkuro = true; }; - # additional standalone versions of kontact components - environment.systemPackages = with pkgs.kdePackages; [ - korganizer - kaddressbook - pkgs.ktimetracker - ]; programs.kdeconnect.enable = true; # enable wayland for Chromium and Electron environment.sessionVariables.NIXOS_OZONE_WL = "1"; diff --git a/common/nix-settings.nix b/common/nix-settings.nix index 6199694..beb5ca0 100644 --- a/common/nix-settings.nix +++ b/common/nix-settings.nix @@ -31,7 +31,7 @@ in cores = 0; #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 + 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 b9b485a..fa233a0 100644 --- a/flake.lock +++ b/flake.lock @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1765384171, - "narHash": "sha256-FuFtkJrW1Z7u+3lhzPRau69E0CNjADku1mLQQflUORo=", + "lastModified": 1764613336, + "narHash": "sha256-L979az28t/+SXvYw9qhOno5HLlDwkZOpz6LzCLnjmRM=", "owner": "nix-community", "repo": "home-manager", - "rev": "44777152652bc9eacf8876976fa72cc77ca8b9d8", + "rev": "f3902b5d8767985680875ad86d028371100faeb3", "type": "github" }, "original": { @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1765066094, - "narHash": "sha256-0YSU35gfRFJzx/lTGgOt6ubP8K6LeW0vaywzNNqxkl4=", + "lastModified": 1764161084, + "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "688427b1aab9afb478ca07989dc754fa543e03d5", + "rev": "e95de00a471d07435e0527ff4db092c84998698e", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1765186076, - "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", + "lastModified": 1764517877, + "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "type": "github" }, "original": { @@ -227,11 +227,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1765311797, - "narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=", + "lastModified": 1764522689, + "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b", + "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "lastModified": 1764517877, + "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "type": "github" }, "original": { @@ -263,11 +263,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1765105806, - "narHash": "sha256-drH4w3MzlQXDtseWX82n3nkuXAuDN/uJdTP5KOc2Tlo=", + "lastModified": 1764629053, + "narHash": "sha256-RcxVqrd5i70Tk4ydefdwf8DFJc41KA4wxLLrMsnnBjE=", "owner": "nix-community", "repo": "NUR", - "rev": "902c2223fc433b82d7149a33e1bb729fdba1a898", + "rev": "d5697e876963198dd304489e88cff538d6c5b2e7", "type": "github" }, "original": { diff --git a/home/desktop.nix b/home/desktop.nix index 5387fad..7fa7840 100644 --- a/home/desktop.nix +++ b/home/desktop.nix @@ -76,7 +76,6 @@ programs.ssh = { enable = true; - package = pkgs.openssh; # ssh host config matchBlocks = (import "${inputs.mysecrets}/ssh_hosts.nix").privateHosts; }; diff --git a/home/modules/packages.nix b/home/modules/packages.nix index c267b3a..6ff5bed 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -104,7 +104,14 @@ let ripgrep fd pre-commit - scriv + (scriv.overridePythonAttrs (old: { + patches = old.patches or [ ] ++ [ + (fetchpatch { + url = "https://github.com/nedbat/scriv/commit/04ac45da9e1adb24a95ad9643099fe537b3790fd.diff"; + hash = "sha256-Gle3zWC/WypGHsKmVlqedRAZVWsBjGpzMq3uKuG9+SY="; + }) + ]; + })) # Haskell ghc diff --git a/home/scripts/reporsync.nix b/home/scripts/reporsync.nix index cf4ebee..ed2e9f0 100644 --- a/home/scripts/reporsync.nix +++ b/home/scripts/reporsync.nix @@ -10,7 +10,7 @@ # reset pre-defined variables that are read and manipulated throughout this function unset JUMPHOST # arrays are bash or zsh specific - RSYNC_OPTS=("-rlptzv" "--progress" "--delete" "--exclude=.git" "--exclude=.direnv/" "--exclude=.vscode/" "--exclude=result" "--exclude=channels/" "--exclude=.mypy_cache/" "--exclude=__pycache__") + RSYNC_OPTS=("-rlptzv" "--progress" "--delete" "--exclude=.git/" "--exclude=.direnv/" "--exclude=.vscode/" "--exclude=result" "--exclude=channels/" "--exclude=.mypy_cache/" "--exclude=__pycache__") while getopts ':Jj:' OPT; do case $OPT in diff --git a/home/scripts/ssh-loop-fc.nix b/home/scripts/ssh-loop-fc.nix index 2508de6..a632477 100644 --- a/home/scripts/ssh-loop-fc.nix +++ b/home/scripts/ssh-loop-fc.nix @@ -8,15 +8,6 @@ for x in $1; do echo $x; ${pkgs.openssh}/bin/ssh $x.fcio.net -o StrictHostKeyChecking=no -C "$2"; done } - ssh-root-loop () { - setopt shwordsplit - local hosts=$1 - local cmd=$2 - - for x in $1; do echo $x; ${pkgs.openssh}/bin/ssh root@$x.fcio.net -o StrictHostKeyChecking=no -C "$2"; done - } - - ssh-loop-parallel () { setopt shwordsplit local hosts=$1 diff --git a/home/workmac.nix b/home/workmac.nix index 1e50dab..3845488 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -22,7 +22,7 @@ in pythonTools = true; }; targets.darwin = { - linkApps.enable = false; # spotlight ignores symlinks + linkApps.enable = false; # spotlight ignores symlinks copyApps.enable = true; }; @@ -38,7 +38,6 @@ in programs.ssh = { enable = true; - package = pkgs.openssh; # defaults in bottom match block "*" # TODO: common config for desktop as well serverAliveInterval = 10; diff --git a/hosts/framenix/hardware-configuration.nix b/hosts/framenix/hardware-configuration.nix index 7c8d896..868c352 100644 --- a/hosts/framenix/hardware-configuration.nix +++ b/hosts/framenix/hardware-configuration.nix @@ -32,5 +32,4 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - hardware.framework.enableKmod = false; # should work with upstream kernel >= 6.12 }