add w17 ssh_config and cli

This commit is contained in:
Thilo Billerbeck 2024-03-05 23:42:08 +01:00
parent 1abe7e3663
commit e8043fa999
4 changed files with 75 additions and 3 deletions

View file

@ -409,6 +409,19 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_7": {
"locked": {
"lastModified": 1709479366,
"narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=",
"path": "/nix/store/bjvqq8c79dbi59g7xzcc6lhl0f19m3d7-source",
"rev": "b8697e57f10292a6165a20f03d2f42920dfaf973",
"type": "path"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": [
@ -446,7 +459,8 @@
"nix-software-center": "nix-software-center", "nix-software-center": "nix-software-center",
"nixgl": "nixgl", "nixgl": "nixgl",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
"nixpkgs-update": "nixpkgs-update" "nixpkgs-update": "nixpkgs-update",
"w17": "w17"
} }
}, },
"systems": { "systems": {
@ -479,6 +493,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": { "utils": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_2"
@ -496,6 +525,43 @@
"repo": "flake-utils", "repo": "flake-utils",
"type": "github" "type": "github"
} }
},
"utils_2": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1709126324,
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"w17": {
"inputs": {
"nixpkgs": "nixpkgs_7",
"utils": "utils_2"
},
"locked": {
"lastModified": 1709678065,
"narHash": "sha256-AQ4iYxqceBdRNY6qfTJWrWcC/0QIYtexkZ2BVqebTW0=",
"ref": "refs/heads/main",
"rev": "4c67a71dcf4599d8ac1136306d46b299401e1dec",
"revCount": 1,
"type": "git",
"url": "https://git.darmstadt.ccc.de/avocadoom/w17-cli.git"
},
"original": {
"type": "git",
"url": "https://git.darmstadt.ccc.de/avocadoom/w17-cli.git"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -14,9 +14,10 @@
dagger.inputs.nixpkgs.follows = "nixpkgs"; dagger.inputs.nixpkgs.follows = "nixpkgs";
nixgl.url = "github:guibou/nixGL"; nixgl.url = "github:guibou/nixGL";
muse-sounds-manager.url = "github:thilobillerbeck/muse-sounds-manager-nix"; muse-sounds-manager.url = "github:thilobillerbeck/muse-sounds-manager-nix";
w17.url = "git+https://git.darmstadt.ccc.de/avocadoom/w17-cli.git";
}; };
outputs = { nixpkgs, home-manager, nixgl, ... }@inputs: outputs = { nixpkgs, home-manager, nixgl, w17, ... }@inputs:
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { pkgs = import nixpkgs {

View file

@ -82,6 +82,10 @@ Host *.tailscale.net
User thilo User thilo
IdentityFile ~/.ssh/id_tailscale IdentityFile ~/.ssh/id_tailscale
Host *.w17.io
User chaos
IdentityFile ~/.ssh/id_w17
Host digitaltwinservice.de Host digitaltwinservice.de
User tb12zysu User tb12zysu
IdentityFile ~/.ssh/id_digitaltwinservice-de IdentityFile ~/.ssh/id_digitaltwinservice-de
@ -91,4 +95,4 @@ Host thilo-pc
Host *.relaix.net Host *.relaix.net
User tbillerbeck User tbillerbeck
IdentityFile ~/.ssh/id_relaix-net IdentityFile ~/.ssh/id_relaix-net

View file

@ -69,6 +69,7 @@ in {
nil nil
nixd nixd
unrar unrar
inputs.w17.packages.x86_64-linux.default
] ++ (if config.machine.isGraphical then [ ] ++ (if config.machine.isGraphical then [
(pkgs.nerdfonts.override { (pkgs.nerdfonts.override {
fonts = [ "JetBrainsMono" "FiraCode" "FiraMono" ]; fonts = [ "JetBrainsMono" "FiraCode" "FiraMono" ];