blake/nix
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: blake/nix:310b332178b7ae7a30335bed6f662c2a7101e85e
Branches Tags
blake/nix:trunk
..
compare: blake/nix:7c58261db85abeff3c3f1f719da884d5fd51936a
Branches Tags
blake/nix:trunk
2 Commits
310b332178 .. 7c58261db8
Author SHA1 Message Date
blake 7c58261db8 fix ssh warning 2026-06-13 19:12:32 -05:00
blake f7fecbe8ad add then disable lan vlan connection 2026-06-13 19:06:28 -05:00
5 changed files with 23 additions and 13 deletions
Expand all files Collapse all files
hosts/nixos/lumiose/configuration.nix
+15 -5
View File
@@ -62,7 +62,7 @@
dnsmasq.enable = true; dnsmasq.enable = true;
# mediastack # mediastack
mediastack.enable = true; mediastack.enable = true;
qbittorrent.vpn_inf = "enp34s0.69"; qbittorrent.vpn_inf = "enp37s0f1.69";
# system # system
backups.enable = true; backups.enable = true;
motd.enable = true; motd.enable = true;
@@ -111,15 +111,25 @@
dns = "systemd-resolved"; # the backup dancer! dns = "systemd-resolved"; # the backup dancer!
ensureProfiles.profiles = { ensureProfiles.profiles = {
vpn = { vpn = {
#ethernet.mac-address = "7a:e4:07:8d:22:76"; ethernet.mac-address = "02:ea:6c:3c:9f:cd";
connection.type = "vlan"; connection.type = "vlan";
connection.id = "vpn"; connection.id = "vpn";
connection.interface-name = "enp34s0.69"; # or just "vpn-vlan" connection.interface-name = "enp37s0f1.69"; # or just "vpn-vlan"
vlan.interface-name = "enp34s0.69"; # or just "vpn-vlan" vlan.interface-name = "enp37s0f1.69"; # or just "vpn-vlan"
vlan.parent = "enp34s0"; vlan.parent = "enp37s0f1";
vlan.id = 69; vlan.id = 69;
#ipv4.dns = "9.9.9.9"; #ipv4.dns = "9.9.9.9";
}; };
# lan = {
# ethernet.mac-address = "02:11:61:c5:31:b6";
# connection.type = "vlan";
# connection.id = "lan";
# connection.interface-name = "enp37s0f1.20"; # or just "vpn-vlan"
# vlan.interface-name = "enp37s0f1.20"; # or just "vpn-vlan"
# vlan.parent = "enp37s0f1";
# vlan.id = 20;
# #ipv4.dns = "9.9.9.9";
# };
}; };
}; };
}; };
users/blake/dots/core/ssh/default.nix
+4 -4
View File
@@ -18,7 +18,7 @@ in {
programs.ssh = { programs.ssh = {
enable = true; enable = true;
enableDefaultConfig = false; enableDefaultConfig = false;
matchBlocks = { settings = {
"*" = { "*" = {
identityFile = "${home_dir}/.ssh/id_blake"; identityFile = "${home_dir}/.ssh/id_blake";
forwardAgent = false; forwardAgent = false;
@@ -36,7 +36,7 @@ in {
user = "gitea"; user = "gitea";
port = 7567; port = 7567;
}; };
"git.snowbelle.lan" = { "git.lumiose.blakedheld.xyz" = {
user = "gitea"; user = "gitea";
port = 7567; port = 7567;
}; };
@@ -53,7 +53,7 @@ in {
hostname = "96.126.127.102"; hostname = "96.126.127.102";
user = "blake"; user = "blake";
}; };
"lumiose" = { "lumiose" = {
hostname = "10.10.0.11"; hostname = "10.10.0.11";
user = "blake"; user = "blake";
identityFile = "${home_dir}/.ssh/id_snowbelle"; identityFile = "${home_dir}/.ssh/id_snowbelle";
@@ -63,7 +63,7 @@ in {
# manage secrets with sops # manage secrets with sops
sops.secrets = { sops.secrets = {
"id_blake" = { "id_blake" = {
mode = "0600"; mode = "0600";
path = "${home_dir}/.ssh/id_blake"; path = "${home_dir}/.ssh/id_blake";
}; };
users/blake/hosts/lumiose.nix
+1 -1
View File
@@ -26,7 +26,7 @@ in {
]; ];
# import snowbelle specific ssh keys # import snowbelle specific ssh keys
programs.ssh.matchBlocks = lib.mkForce { programs.ssh.settings = lib.mkForce {
"git.blakedheld.xyz" = { "git.blakedheld.xyz" = {
user = "gitea"; user = "gitea";
identityFile = "${home_dir}/.ssh/id_snowbelle"; identityFile = "${home_dir}/.ssh/id_snowbelle";
users/blake/hosts/snowbelle.nix
+1 -1
View File
@@ -26,7 +26,7 @@ in {
]; ];
# import snowbelle specific ssh keys # import snowbelle specific ssh keys
programs.ssh.matchBlocks = lib.mkForce { programs.ssh.settings = lib.mkForce {
"git.blakedheld.xyz" = { "git.blakedheld.xyz" = {
user = "gitea"; user = "gitea";
identityFile = "${home_dir}/.ssh/id_snowbelle"; identityFile = "${home_dir}/.ssh/id_snowbelle";
users/blake/hosts/vaniville.nix
+1 -1
View File
@@ -26,7 +26,7 @@ in {
]; ];
# import snowbelle specific ssh keys # import snowbelle specific ssh keys
programs.ssh.matchBlocks = lib.mkForce { programs.ssh.settings = lib.mkForce {
"git.blakedheld.xyz" = { "git.blakedheld.xyz" = {
user = "gitea"; user = "gitea";
identityFile = "${home_dir}/.ssh/id_vaniville"; identityFile = "${home_dir}/.ssh/id_vaniville";