Compare commits
11 commits
upgrade-25
...
mainline
| Author | SHA1 | Date | |
|---|---|---|---|
| 09e42caece | |||
| 4e8fb63d81 | |||
| bfdc36458a | |||
| ed13a0fbbf | |||
| 2c0a40c03d | |||
| 3672286b57 | |||
| 0b36532ed3 | |||
| 76d3ffde1c | |||
| 8a08f506ab | |||
| 1e8123fef6 | |||
| d7a12d20f2 |
9 changed files with 40 additions and 29 deletions
|
|
@ -160,6 +160,12 @@ 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";
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
36
flake.lock
generated
36
flake.lock
generated
|
|
@ -102,11 +102,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764613336,
|
||||
"narHash": "sha256-L979az28t/+SXvYw9qhOno5HLlDwkZOpz6LzCLnjmRM=",
|
||||
"lastModified": 1765859973,
|
||||
"narHash": "sha256-LN5O0h9GSgcDE/sz4+sLS3CbQALru1x4lh9hrxpeHwI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "f3902b5d8767985680875ad86d028371100faeb3",
|
||||
"rev": "7df150f0d3857cf68dae443813b27acfb201b2d8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -163,11 +163,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764161084,
|
||||
"narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=",
|
||||
"lastModified": 1765066094,
|
||||
"narHash": "sha256-0YSU35gfRFJzx/lTGgOt6ubP8K6LeW0vaywzNNqxkl4=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "e95de00a471d07435e0527ff4db092c84998698e",
|
||||
"rev": "688427b1aab9afb478ca07989dc754fa543e03d5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -195,11 +195,11 @@
|
|||
},
|
||||
"nixos-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1764517877,
|
||||
"narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
|
||||
"lastModified": 1765779637,
|
||||
"narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
|
||||
"rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -227,11 +227,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1764522689,
|
||||
"narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
|
||||
"lastModified": 1765762245,
|
||||
"narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
|
||||
"rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -243,11 +243,11 @@
|
|||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1764517877,
|
||||
"narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
|
||||
"lastModified": 1764950072,
|
||||
"narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
|
||||
"rev": "f61125a668a320878494449750330ca58b78c557",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -263,11 +263,11 @@
|
|||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764629053,
|
||||
"narHash": "sha256-RcxVqrd5i70Tk4ydefdwf8DFJc41KA4wxLLrMsnnBjE=",
|
||||
"lastModified": 1765105806,
|
||||
"narHash": "sha256-drH4w3MzlQXDtseWX82n3nkuXAuDN/uJdTP5KOc2Tlo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "d5697e876963198dd304489e88cff538d6c5b2e7",
|
||||
"rev": "902c2223fc433b82d7149a33e1bb729fdba1a898",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -76,6 +76,7 @@
|
|||
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
package = pkgs.openssh;
|
||||
# ssh host config
|
||||
matchBlocks = (import "${inputs.mysecrets}/ssh_hosts.nix").privateHosts;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -104,14 +104,7 @@ let
|
|||
ripgrep
|
||||
fd
|
||||
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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -8,6 +8,15 @@
|
|||
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
|
||||
|
|
|
|||
|
|
@ -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,6 +38,7 @@ in
|
|||
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
package = pkgs.openssh;
|
||||
# defaults in bottom match block "*"
|
||||
# TODO: common config for desktop as well
|
||||
serverAliveInterval = 10;
|
||||
|
|
|
|||
|
|
@ -32,4 +32,5 @@
|
|||
|
||||
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
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue