mrflos/nixos-config
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: mrflos:1c83a4b65c1c77fe8165616cc351430581e64c8c
Branches Tags
mrflos:main
mrflos:macos
...
compare: mrflos:0075a7a3c6357b66f08fa5760e36a7f280421861
Branches Tags
mrflos:main
mrflos:macos

2 commits
1c83a4b65c ... 0075a7a3c6

Author SHA1 Message Date
Florian Schmitt
0075a7a3c6 feat(dragon): no more wireguard 2025-05-08 00:35:26 +03:00
Florian Schmitt
02faf51be7 feat(dragon): no more tailscale and nfs mounts 2025-05-08 00:35:26 +03:00
2 changed files with 78 additions and 78 deletions
Show stats Expand all files Collapse all files

54
machines/dragon/configuration.nix
View file

@ -41,9 +41,9 @@
nvidiaSettings = true; nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.latest; package = config.boot.kernelPackages.nvidiaPackages.latest;
}; };
services.tailscale = { # services.tailscale = {
enable = true; # enable = true;
}; # };
services.syncthing = { services.syncthing = {
enable = true; enable = true;
openDefaultPorts = true; openDefaultPorts = true;
@ -61,22 +61,22 @@
xkb.variant = ""; xkb.variant = "";
}; };
fileSystems."/home/mrflos/Nas-music" = { # fileSystems."/home/mrflos/Nas-music" = {
device = "diskstation.tailed460c.ts.net:/volume1/music"; # device = "diskstation.tailed460c.ts.net:/volume1/music";
options = [ # options = [
#"nfsvers=4.2" # #"nfsvers=4.2"
"x-systemd.automount" # "x-systemd.automount"
"noauto" # "noauto"
#"rw" # #"rw"
#"relatime" # #"relatime"
#"user" # #"user"
#"acl" # #"acl"
#"defaults" # #"defaults"
]; # ];
fsType = "nfs"; # fsType = "nfs";
}; # };
#
services.rpcbind.enable = true; # needed for NFS # services.rpcbind.enable = true; # needed for NFS
#systemd.mounts = [ #systemd.mounts = [
# { # {
# type = "nfs"; # type = "nfs";
@ -99,13 +99,13 @@
#]; #];
services.printing.enable = true; services.printing.enable = true;
security.wrappers."mount.nfs" = { # security.wrappers."mount.nfs" = {
setuid = true; # setuid = true;
owner = "root"; # owner = "root";
group = "root"; # group = "root";
source = "${pkgs.nfs-utils.out}/bin/mount.nfs"; # source = "${pkgs.nfs-utils.out}/bin/mount.nfs";
}; # };
security.rtkit.enable = true; # security.rtkit.enable = true;
services.pipewire = { services.pipewire = {
enable = true; enable = true;
alsa.enable = true; alsa.enable = true;
@ -123,11 +123,11 @@
../../modules/console.nix ../../modules/console.nix
../../modules/desktop.nix ../../modules/desktop.nix
../../modules/fonts.nix ../../modules/fonts.nix
../../modules/home-config.nix
../../modules/local-dev.nix ../../modules/local-dev.nix
../../modules/nixos.nix ../../modules/nixos.nix
../../modules/systemd-unfreeze.nix ../../modules/systemd-unfreeze.nix
../../modules/zen-browser.nix ../../modules/zen-browser.nix
../../users/mrflos.nix
]; ];
#services.ollama = { #services.ollama = {

102
machines/dragon/hardware-configuration.nix
View file

@ -38,57 +38,57 @@
networking = { networking = {
useDHCP = lib.mkDefault true; useDHCP = lib.mkDefault true;
wg-quick.interfaces = { # wg-quick.interfaces = {
wgnixin = { # wgnixin = {
address = [ # address = [
"192.168.12.4/32" # "192.168.12.4/32"
"2a01:4f9:1a:9a05::4/128" # "2a01:4f9:1a:9a05::4/128"
]; # ];
dns = [ # dns = [
"80.67.169.12" # "80.67.169.12"
"80.67.169.40" # "80.67.169.40"
"2001:910:800::12" # "2001:910:800::12"
"2001:910:800::40" # "2001:910:800::40"
]; # ];
privateKeyFile = "/home/mrflos/Nextcloud/Apps/lab12.mrflos.wg-private.key"; # privateKeyFile = "/home/mrflos/Nextcloud/Apps/lab12.mrflos.wg-private.key";
#
peers = [ # peers = [
{ # {
publicKey = "cUmp55I20JEhxr+RMmOsX+6U9kcDiAq3grnvzjQ642w="; # publicKey = "cUmp55I20JEhxr+RMmOsX+6U9kcDiAq3grnvzjQ642w=";
allowedIPs = [ # allowedIPs = [
#"0.0.0.0/0" # #"0.0.0.0/0"
#"::/0" # #"::/0"
"192.168.12.0/24" # "192.168.12.0/24"
"2a01:4f9:1a:9a05::/64" # "2a01:4f9:1a:9a05::/64"
]; # ];
endpoint = "vpn.lab12.fr:51812"; # endpoint = "vpn.lab12.fr:51812";
persistentKeepalive = 25; # persistentKeepalive = 25;
} # }
]; # ];
}; # };
wg34 = { # wg34 = {
address = [ # address = [
"10.34.12.8/24" # "10.34.12.8/24"
]; # ];
dns = [ # dns = [
"80.67.169.12" # "80.67.169.12"
"80.67.169.40" # "80.67.169.40"
# "89.234.152.131" #iloth # # "89.234.152.131" #iloth
]; # ];
privateKeyFile = "/home/mrflos/Nextcloud/Apps/iloth.mrflos.wg-private.key"; # privateKeyFile = "/home/mrflos/Nextcloud/Apps/iloth.mrflos.wg-private.key";
#
peers = [ # peers = [
{ # {
publicKey = "n23gZzugKc68ax6J8LDZ3DG7ECwjXXDi/XTwas6RbAU="; # publicKey = "n23gZzugKc68ax6J8LDZ3DG7ECwjXXDi/XTwas6RbAU=";
allowedIPs = [ # allowedIPs = [
"10.34.0.0/16" # "10.34.0.0/16"
]; # ];
endpoint = "goelland-wan.distrilab.org:51777"; # endpoint = "goelland-wan.distrilab.org:51777";
persistentKeepalive = 25; # persistentKeepalive = 25;
} # }
]; # ];
}; # };
}; # };
}; };
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";