Compare commits
No commits in common. "3194d89812a1fdfd584638a31fbe46abd865ae21" and "f74758c82deaba1c91fe8887dd7caf40988d1ec3" have entirely different histories.
3194d89812
...
f74758c82d
72
flake.lock
72
flake.lock
|
@ -81,15 +81,15 @@
|
||||||
},
|
},
|
||||||
"catppuccin": {
|
"catppuccin": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718339789,
|
"lastModified": 1718475615,
|
||||||
"narHash": "sha256-Q3fgY7huFE+uaw7BNsAl1x+FvjDAi3EDWPnlALJt5pM=",
|
"narHash": "sha256-sFrx1xlce6uaCLVtrTm4PH4PESXBpCd9vTqjXKhFZCg=",
|
||||||
"owner": "catppuccin",
|
"owner": "Laurent2916",
|
||||||
"repo": "nix",
|
"repo": "nix",
|
||||||
"rev": "73e06d5bd7ed34bdd0168030893ef8364fdc1d4a",
|
"rev": "e632faeda1ca013e983e45f78cff13a36ca64b1e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "catppuccin",
|
"owner": "Laurent2916",
|
||||||
"repo": "nix",
|
"repo": "nix",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -102,11 +102,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718474113,
|
"lastModified": 1718078026,
|
||||||
"narHash": "sha256-UKrfy/46YF2TRnxTtKCYzqf2f5ZPRRWwKCCJb7O5X8U=",
|
"narHash": "sha256-LbQabH6h86ZzTvDnaZHmMwedRZNB2jYtUQzmoqWQoJ8=",
|
||||||
"owner": "ipetkov",
|
"owner": "ipetkov",
|
||||||
"repo": "crane",
|
"repo": "crane",
|
||||||
"rev": "0095fd8ea00ae0a9e6014f39c375e40c2fbd3386",
|
"rev": "a3f0c63eed74a516298932b9b1627dd80b9c3892",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -144,11 +144,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718588625,
|
"lastModified": 1718242063,
|
||||||
"narHash": "sha256-8ZbrJq1jcmyzJ4SDkvd8JOZD4/fNUHpL4cpqVe4w3CU=",
|
"narHash": "sha256-n3AWItJ4a94GT0cray/eUV7tt3mulQ52L+lWJN9d1E8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "8262659fc990cecdf6a8de74c3de7b6ec58c2276",
|
"rev": "832a9f2c81ff3485404bd63952eadc17bf7ccef2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -299,11 +299,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718526747,
|
"lastModified": 1718243258,
|
||||||
"narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=",
|
"narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792",
|
"rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -352,11 +352,11 @@
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718639631,
|
"lastModified": 1718468441,
|
||||||
"narHash": "sha256-N8bT29SDZUAQcLQsEvUeCFOvV2R69j/dTQtOj5DSgRg=",
|
"narHash": "sha256-yLoQC4IaaM3xijxoGMkyPgwKKr3xYLdToA7j3zNRn7A=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "d1340bd1d8eedd274283e0cb2568a3ed67b58c81",
|
"rev": "91fe58f8f278d126852877eadc87c50ca7b9b78d",
|
||||||
"revCount": 4858,
|
"revCount": 4836,
|
||||||
"submodules": true,
|
"submodules": true,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/hyprwm/Hyprland"
|
"url": "https://github.com/hyprwm/Hyprland"
|
||||||
|
@ -499,11 +499,11 @@
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718626451,
|
"lastModified": 1718218065,
|
||||||
"narHash": "sha256-KEM9FwTX4XvWzn/wKcbhS/xI7z3oU89XBfG8WnlHE88=",
|
"narHash": "sha256-fKC7Ryg3AYykDrS2ilS1VqA8/9B2m3yFZcshK+7tIEc=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "lanzaboote",
|
"repo": "lanzaboote",
|
||||||
"rev": "93dd69a5b683deb8ab7d6dbb91771a2487745e8c",
|
"rev": "7cb05fab896bd542c0ca4260d74d9d664cd7b56e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -526,11 +526,11 @@
|
||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718625083,
|
"lastModified": 1718020342,
|
||||||
"narHash": "sha256-0xv6VvK5wc1cqjx8KihufiIbQ5MiChiBiSr+ud+z7Zg=",
|
"narHash": "sha256-uFPCjTnwFcgxte/k+TsAcZAJigIUnrzpH9OXqot/q84=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixos-anywhere",
|
"repo": "nixos-anywhere",
|
||||||
"rev": "3b3c6008375e5cca2bfdefe23eaf1e1fae875f28",
|
"rev": "46dc28f4f89b747084c7dd6d273b1278142220ce",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -541,11 +541,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718548414,
|
"lastModified": 1718459188,
|
||||||
"narHash": "sha256-1obyIuQPR/Kq1j5/i/5EuAfQrDwjYnjCDG8iLtXmBhQ=",
|
"narHash": "sha256-umwY+ivE98n/6EwEtobOlqf1t9VddhPIIZ6rVmFXlHg=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "cde8f7e11f036160b0fd6a9e07dc4c8e4061cf06",
|
"rev": "0cd562157274df3783840bdcb0ce6d9c4cf4aa29",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -629,11 +629,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718541509,
|
"lastModified": 1717794163,
|
||||||
"narHash": "sha256-TmC5TxW5WPAfmovDzi1hLe1i4qqND79s9SH9UOKcSvo=",
|
"narHash": "sha256-Ch6ZpFPVvi7Bb6gmmuufpTEFkXqa43pC94XMfU5FEt0=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ba06293cdba1c94af9710024abf3b94cf8d76349",
|
"rev": "121f68ed7c6c32de5a8ce91a08ef25713d1c4755",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -908,11 +908,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718504420,
|
"lastModified": 1717813066,
|
||||||
"narHash": "sha256-F2HT/abCfr0CDpkvXwYCscJyD66XDTLMVfdrIMRp2ck=",
|
"narHash": "sha256-wqbRwq3i7g5EHIui0bIi84mdqZ/It1AXBSLJ5tafD28=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "0043c3f92304823cc2c0a4354b0feaa61dfb4cd9",
|
"rev": "6dc3e45fe4aee36efeed24d64fc68b1f989d5465",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -994,11 +994,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718522839,
|
"lastModified": 1718271476,
|
||||||
"narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=",
|
"narHash": "sha256-35hUMmFesmchb+u7heKHLG5B6c8fBOcSYo0jj0CHLes=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81",
|
"rev": "e75ba0a6bb562d2ce275db28f6a36a2e4fd81391",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -65,7 +65,7 @@
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
catppuccin = {
|
catppuccin = {
|
||||||
url = "github:catppuccin/nix";
|
url = "github:Laurent2916/nix";
|
||||||
};
|
};
|
||||||
|
|
||||||
# cesium nginx sites
|
# cesium nginx sites
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
./exa.nix
|
./exa.nix
|
||||||
./git.nix
|
./git.nix
|
||||||
./micro.nix
|
./micro.nix
|
||||||
./ssh.nix
|
# ./ssh.nix
|
||||||
./mpv.nix
|
./mpv.nix
|
||||||
./tmux.nix
|
./tmux.nix
|
||||||
./fish.nix
|
./fish.nix
|
||||||
|
|
|
@ -1,67 +1,8 @@
|
||||||
{
|
{...}: {
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
gcpHost = {
|
|
||||||
hostname,
|
|
||||||
project,
|
|
||||||
zone,
|
|
||||||
forwardAgent ? false,
|
|
||||||
}: {
|
|
||||||
proxyCommand = "${lib.getExe pkgs.python3} -S ${pkgs.google-cloud-sdk}/google-cloud-sdk/lib/gcloud.py compute start-iap-tunnel ${hostname} %p --listen-on-stdin --project ${project} --zone ${zone} --verbosity warning";
|
|
||||||
forwardAgent = forwardAgent;
|
|
||||||
checkHostIP = false;
|
|
||||||
identitiesOnly = true;
|
|
||||||
extraOptions = {
|
|
||||||
StrictHostKeyChecking = "no";
|
|
||||||
ProxyUseFdpass = "no";
|
|
||||||
UserKnownHostsFile = "~/.ssh/google_compute_known_hosts";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
programs.ssh = {
|
programs.ssh = {
|
||||||
enable = true;
|
enable = false;
|
||||||
|
|
||||||
compression = true;
|
compression = true;
|
||||||
addKeysToAgent = "ask";
|
addKeysToAgent = "ask";
|
||||||
|
|
||||||
matchBlocks = {
|
|
||||||
"cesium git.fainsin.bzh" = {
|
|
||||||
hostname = "fainsin.bzh";
|
|
||||||
user = "root";
|
|
||||||
port = 624;
|
|
||||||
};
|
|
||||||
"nicole" = {
|
|
||||||
hostname = "3.tcp.eu.ngrok.io";
|
|
||||||
user = "laurent";
|
|
||||||
port = 25077;
|
|
||||||
forwardAgent = true;
|
|
||||||
};
|
|
||||||
"dataverse51" = gcpHost {
|
|
||||||
hostname = "dataverse51";
|
|
||||||
project = "genie-training";
|
|
||||||
zone = "europe-west1-d";
|
|
||||||
forwardAgent = true;
|
|
||||||
};
|
|
||||||
"laurent-dev-hdd" = gcpHost {
|
|
||||||
hostname = "laurent-dev-hdd";
|
|
||||||
project = "genie-training";
|
|
||||||
zone = "europe-west1-b";
|
|
||||||
forwardAgent = true;
|
|
||||||
};
|
|
||||||
"laurent-dev-l4" = gcpHost {
|
|
||||||
hostname = "laurent-dev-l4";
|
|
||||||
project = "genie-training";
|
|
||||||
zone = "europe-west1-b";
|
|
||||||
forwardAgent = true;
|
|
||||||
};
|
|
||||||
"laurent-dev-a100" = gcpHost {
|
|
||||||
hostname = "laurent-dev-a100";
|
|
||||||
project = "genie-training";
|
|
||||||
zone = "europe-west4-a";
|
|
||||||
forwardAgent = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue