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

Compare commits

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

No commits in common. "mainline" and "upgrade-25.11" have entirely different histories.
mainline ... upgrade-25

9 changed files with 29 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/default.nix
View file

@ -160,12 +160,6 @@ in
kontact = true; kontact = true;
merkuro = true; merkuro = true;
}; };
# additional standalone versions of kontact components
environment.systemPackages = with pkgs.kdePackages; [
korganizer
kaddressbook
pkgs.ktimetracker
];
programs.kdeconnect.enable = true; programs.kdeconnect.enable = true;
# enable wayland for Chromium and Electron # enable wayland for Chromium and Electron
environment.sessionVariables.NIXOS_OZONE_WL = "1"; environment.sessionVariables.NIXOS_OZONE_WL = "1";

2
common/nix-settings.nix
View file

@ -31,7 +31,7 @@ in
cores = 0; 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 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 # 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) # permissions: needs to be readable by the user invoking nix and root (for nix daemon)
nix.extraOptions = '' nix.extraOptions = ''

36
flake.lock generated
View file

@ -102,11 +102,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765384171, "lastModified": 1764613336,
"narHash": "sha256-FuFtkJrW1Z7u+3lhzPRau69E0CNjADku1mLQQflUORo=", "narHash": "sha256-L979az28t/+SXvYw9qhOno5HLlDwkZOpz6LzCLnjmRM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "44777152652bc9eacf8876976fa72cc77ca8b9d8", "rev": "f3902b5d8767985680875ad86d028371100faeb3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -163,11 +163,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765066094, "lastModified": 1764161084,
"narHash": "sha256-0YSU35gfRFJzx/lTGgOt6ubP8K6LeW0vaywzNNqxkl4=", "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "688427b1aab9afb478ca07989dc754fa543e03d5", "rev": "e95de00a471d07435e0527ff4db092c84998698e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -195,11 +195,11 @@
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1765186076, "lastModified": 1764517877,
"narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -227,11 +227,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1765311797, "lastModified": 1764522689,
"narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=", "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b", "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -243,11 +243,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1764950072, "lastModified": 1764517877,
"narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f61125a668a320878494449750330ca58b78c557", "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -263,11 +263,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1765105806, "lastModified": 1764629053,
"narHash": "sha256-drH4w3MzlQXDtseWX82n3nkuXAuDN/uJdTP5KOc2Tlo=", "narHash": "sha256-RcxVqrd5i70Tk4ydefdwf8DFJc41KA4wxLLrMsnnBjE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "902c2223fc433b82d7149a33e1bb729fdba1a898", "rev": "d5697e876963198dd304489e88cff538d6c5b2e7",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
home/desktop.nix
View file

@ -76,7 +76,6 @@
programs.ssh = { programs.ssh = {
enable = true; enable = true;
package = pkgs.openssh;
# ssh host config # ssh host config
matchBlocks = (import "${inputs.mysecrets}/ssh_hosts.nix").privateHosts; matchBlocks = (import "${inputs.mysecrets}/ssh_hosts.nix").privateHosts;
}; };

9
home/modules/packages.nix
View file

@ -104,7 +104,14 @@ let
ripgrep ripgrep
fd fd
pre-commit 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 # Haskell
ghc ghc

2
home/scripts/reporsync.nix
View file

@ -10,7 +10,7 @@
# reset pre-defined variables that are read and manipulated throughout this function # reset pre-defined variables that are read and manipulated throughout this function
unset JUMPHOST unset JUMPHOST
# arrays are bash or zsh specific # 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 while getopts ':Jj:' OPT; do
case $OPT in case $OPT in

9
home/scripts/ssh-loop-fc.nix
View file

@ -8,15 +8,6 @@
for x in $1; do echo $x; ${pkgs.openssh}/bin/ssh $x.fcio.net -o StrictHostKeyChecking=no -C "$2"; done 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 () { ssh-loop-parallel () {
setopt shwordsplit setopt shwordsplit
local hosts=$1 local hosts=$1

3
home/workmac.nix
View file

@ -22,7 +22,7 @@ in
pythonTools = true; pythonTools = true;
}; };
targets.darwin = { targets.darwin = {
linkApps.enable = false; # spotlight ignores symlinks linkApps.enable = false; # spotlight ignores symlinks
copyApps.enable = true; copyApps.enable = true;
}; };
@ -38,7 +38,6 @@ in
programs.ssh = { programs.ssh = {
enable = true; enable = true;
package = pkgs.openssh;
# defaults in bottom match block "*" # defaults in bottom match block "*"
# TODO: common config for desktop as well # TODO: common config for desktop as well
serverAliveInterval = 10; serverAliveInterval = 10;

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

@ -32,5 +32,4 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.framework.enableKmod = false; # should work with upstream kernel >= 6.12
} }