Compare commits
4 commits
e78c8b10d0
...
1371229109
| Author | SHA1 | Date | |
|---|---|---|---|
| 1371229109 | |||
| 42e61fd75d | |||
| 289eebc1d0 | |||
| 91bfede3cb |
4 changed files with 26 additions and 20 deletions
36
flake.lock
generated
36
flake.lock
generated
|
|
@ -121,11 +121,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768135262,
|
"lastModified": 1775087534,
|
||||||
"narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
|
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
|
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -289,11 +289,11 @@
|
||||||
"treefmt-nix": "treefmt-nix_2"
|
"treefmt-nix": "treefmt-nix_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768704530,
|
"lastModified": 1775358474,
|
||||||
"narHash": "sha256-BASsdRYo8t/himZisgWW524t86pxuC0H3/Dv8sqR8sM=",
|
"narHash": "sha256-gBzsrurmW2RoE+1/HUL8gugw0uMuHc/v8fjJCwHSyq8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-direnv",
|
"repo": "nix-direnv",
|
||||||
"rev": "29bb68202897f6e8653d28f64c5525c2c502f19c",
|
"rev": "ec5502156659be28c741d9419a1bafcb789d5eca",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -320,11 +320,11 @@
|
||||||
},
|
},
|
||||||
"nixos-unstable": {
|
"nixos-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775036866,
|
"lastModified": 1775423009,
|
||||||
"narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=",
|
"narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
|
"rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -352,11 +352,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775305101,
|
"lastModified": 1775595990,
|
||||||
"narHash": "sha256-/74n1oQPtKG52Yw41cbToxspxHbYz6O3vi+XEw16Qe8=",
|
"narHash": "sha256-OEf7YqhF9IjJFYZJyuhAypgU+VsRB5lD4DuiMws5Ltc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "36a601196c4ebf49e035270e10b2d103fe39076b",
|
"rev": "4e92bbcdb030f3b4782be4751dc08e6b6cb6ccf2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -472,11 +472,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775365543,
|
"lastModified": 1775682595,
|
||||||
"narHash": "sha256-f50qrK0WwZ9z5EdaMGWOTtALgSF7yb7XwuE7LjCuDmw=",
|
"narHash": "sha256-0E9PohY/VuESLq0LR4doaH7hTag513sDDW5n5qmHd1Q=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "a4ee2de76efb759fe8d4868c33dec9937897916f",
|
"rev": "d2e8438d5886e92bc5e7c40c035ab6cae0c41f76",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -529,11 +529,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768158989,
|
"lastModified": 1775125835,
|
||||||
"narHash": "sha256-67vyT1+xClLldnumAzCTBvU0jLZ1YBcf4vANRWP3+Ak=",
|
"narHash": "sha256-2qYcPgzFhnQWchHo0SlqLHrXpux5i6ay6UHA+v2iH4U=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca",
|
"rev": "75925962939880974e3ab417879daffcba36c4a3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -35,10 +35,10 @@ let
|
||||||
multimediaApps =
|
multimediaApps =
|
||||||
with pkgs;
|
with pkgs;
|
||||||
[
|
[
|
||||||
mpv
|
|
||||||
]
|
]
|
||||||
++ lib.optionals pkgs.stdenv.isDarwin [ vlc-bin ]
|
++ lib.optionals pkgs.stdenv.isDarwin [ vlc-bin ]
|
||||||
++ lib.optionals pkgs.stdenv.isLinux [
|
++ lib.optionals pkgs.stdenv.isLinux [
|
||||||
|
mpv
|
||||||
vlc
|
vlc
|
||||||
amarok
|
amarok
|
||||||
clementine
|
clementine
|
||||||
|
|
|
||||||
|
|
@ -63,8 +63,11 @@ in
|
||||||
".ssh/controlmasters" = {
|
".ssh/controlmasters" = {
|
||||||
mode = "700";
|
mode = "700";
|
||||||
};
|
};
|
||||||
|
".ssh/mosh-tunnel" = {
|
||||||
|
mode = "700";
|
||||||
};
|
};
|
||||||
home.packages = [ pkgs.fc-scripts.ssh-multi-proxy ];
|
};
|
||||||
|
home.packages = with pkgs.fc-scripts; [ ssh-multi-proxy mosh-tunnel mosh-dualstack-proxy ];
|
||||||
programs.ssh = {
|
programs.ssh = {
|
||||||
enableDefaultConfig = false; # deprecated
|
enableDefaultConfig = false; # deprecated
|
||||||
package = lib.mkDefault pkgs.openssh;
|
package = lib.mkDefault pkgs.openssh;
|
||||||
|
|
|
||||||
|
|
@ -33,4 +33,7 @@ final: prev: {
|
||||||
customRC = builtins.readFile ../home/vimrc;
|
customRC = builtins.readFile ../home/vimrc;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# XXX work around darwin test failures
|
||||||
|
direnv = prev.direnv.overrideAttrs (_: { doCheck = false; });
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue