Compare commits
19
Commits
b58746e679
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
781ea4f7b5 | ||
|
|
734f9db4ba | ||
|
|
3cf8aff4d9 | ||
|
|
56d4fe4a3d | ||
|
|
cb8f7107f5 | ||
|
|
f5991f624a | ||
|
|
54bf93d7a0 | ||
|
|
335a6b3238 | ||
|
|
07531e3691 | ||
|
|
db8c11c83a | ||
|
|
b09bd7f9f8 | ||
|
|
9ced8b9273 | ||
|
|
18fe700d10 | ||
|
|
d8c9cf955e | ||
|
|
815fefbb78 | ||
|
|
e0e857c533 | ||
|
|
53ac05664e | ||
|
|
ced93fa07c | ||
|
|
d8a15c8977 |
+9
-3
@@ -83,6 +83,11 @@
|
|||||||
htop
|
htop
|
||||||
];
|
];
|
||||||
|
|
||||||
|
programs.neovim = {
|
||||||
|
withRuby = false;
|
||||||
|
withPython3 = false;
|
||||||
|
};
|
||||||
|
|
||||||
# Some programs need SUID wrappers, can be configured further or are
|
# Some programs need SUID wrappers, can be configured further or are
|
||||||
# started in user sessions.
|
# started in user sessions.
|
||||||
# programs.mtr.enable = true;
|
# programs.mtr.enable = true;
|
||||||
@@ -98,10 +103,9 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
ports = [ 22 ];
|
ports = [ 22 ];
|
||||||
settings = {
|
settings = {
|
||||||
PasswordAuthentication = true;
|
PasswordAuthentication = false;
|
||||||
KbdInteractiveAuthentication = false;
|
KbdInteractiveAuthentication = false;
|
||||||
# AllowUsers = [ "backup" ];
|
AuthenticationMethods = "publickey";
|
||||||
# UseDns = true;
|
|
||||||
X11Forwarding = false;
|
X11Forwarding = false;
|
||||||
PermitRootLogin = "no";
|
PermitRootLogin = "no";
|
||||||
};
|
};
|
||||||
@@ -133,5 +137,7 @@
|
|||||||
system.stateVersion = "24.11"; # Did you read the comment?
|
system.stateVersion = "24.11"; # Did you read the comment?
|
||||||
|
|
||||||
nix.settings.trusted-users = [ "shatteredmint" ];
|
nix.settings.trusted-users = [ "shatteredmint" ];
|
||||||
|
# if people get to that point we are fucked anyways
|
||||||
|
security.sudo.wheelNeedsPassword = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ "kvm-amd sg" ];
|
boot.kernelModules = [ "kvm-amd sg" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
boot.zfs.forceImportRoot = false;
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
{ device = "NIX_CONV_POOL/root";
|
{ device = "NIX_CONV_POOL/root";
|
||||||
@@ -62,6 +63,8 @@
|
|||||||
# still possible to use this option, but it's recommended to use it in conjunction
|
# still possible to use this option, but it's recommended to use it in conjunction
|
||||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||||
networking.useDHCP = lib.mkDefault true;
|
networking.useDHCP = lib.mkDefault true;
|
||||||
|
# make custom dns work while gracefully falling back on public servers
|
||||||
|
# networking.networkmanager.insertNameservers = [ "192.168.178.108" ];
|
||||||
# networking.interfaces.enp4s0f3u1u4u1.useDHCP = lib.mkDefault true;
|
# networking.interfaces.enp4s0f3u1u4u1.useDHCP = lib.mkDefault true;
|
||||||
# networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
|
# networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
|
|||||||
@@ -14,6 +14,7 @@
|
|||||||
boot.kernelModules = [ "kvm-amd" "sg" ];
|
boot.kernelModules = [ "kvm-amd" "sg" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||||
|
boot.zfs.forceImportRoot = false;
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
{ device = "NIX_DESK_POOL/root";
|
{ device = "NIX_DESK_POOL/root";
|
||||||
@@ -59,4 +60,9 @@
|
|||||||
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
|
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
|
||||||
# required for ZFS
|
# required for ZFS
|
||||||
networking.hostId = "00000001";
|
networking.hostId = "00000001";
|
||||||
|
|
||||||
|
hardware.graphics = {
|
||||||
|
enable = true;
|
||||||
|
enable32Bit = true;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-2
@@ -14,8 +14,6 @@
|
|||||||
boot.kernelModules = [ ];
|
boot.kernelModules = [ ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
security.sudo.wheelNeedsPassword = false;
|
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
{ device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888";
|
{ device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
@@ -25,6 +23,12 @@
|
|||||||
{ device = "/dev/mapper/base--storage-Docker";
|
{ device = "/dev/mapper/base--storage-Docker";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
# bind to give easily accessible space on SSD for configuration
|
||||||
|
fileSystems."/home/shatteredmint/services" = {
|
||||||
|
device = "/srv/docker/services";
|
||||||
|
fsType = "none";
|
||||||
|
options = [ "bind" ];
|
||||||
|
};
|
||||||
|
|
||||||
fileSystems."/srv/private" =
|
fileSystems."/srv/private" =
|
||||||
{ device = "/dev/mapper/base--storage-ShatteredMINT";
|
{ device = "/dev/mapper/base--storage-ShatteredMINT";
|
||||||
|
|||||||
Generated
+9
-9
@@ -27,11 +27,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774875815,
|
"lastModified": 1781365335,
|
||||||
"narHash": "sha256-PzqwM4njoB3aznqwPZUawD4uOcJeu7N6GBTJKg81EQ4=",
|
"narHash": "sha256-zqDBhXMzfbdlO7F2bGHe7MOtB3xngd/+4ieMHDC+ZXo=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "9340f51314713c83360bf72d75c8b404778ab5b1",
|
"rev": "5b6f5733726a1b2ccafb5dec6ac4ca7299fad66c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -42,11 +42,11 @@
|
|||||||
},
|
},
|
||||||
"nix-flatpak": {
|
"nix-flatpak": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768656715,
|
"lastModified": 1780908363,
|
||||||
"narHash": "sha256-Sbh037scxKFm7xL0ahgSCw+X2/5ZKeOwI2clqrYr9j4=",
|
"narHash": "sha256-llGS4y3Qh1eUkli3/Y2VY9FV3GOUKFZR1E2BDftt45Q=",
|
||||||
"owner": "gmodena",
|
"owner": "gmodena",
|
||||||
"repo": "nix-flatpak",
|
"repo": "nix-flatpak",
|
||||||
"rev": "123fe29340a5b8671367055b75a6e7c320d6f89a",
|
"rev": "1df08625f0f8c7d6e300a0e5df7955bbb877d809",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -57,11 +57,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774709303,
|
"lastModified": 1781074563,
|
||||||
"narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=",
|
"narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
|
||||||
"owner": "NixOs",
|
"owner": "NixOs",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685",
|
"rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -26,7 +26,6 @@
|
|||||||
specialArgs = inputs;
|
specialArgs = inputs;
|
||||||
modules = [
|
modules = [
|
||||||
./devices/desk.nix
|
./devices/desk.nix
|
||||||
./hardware/nvidia.nix
|
|
||||||
./hardware/scanner.nix
|
./hardware/scanner.nix
|
||||||
|
|
||||||
./configuration.nix
|
./configuration.nix
|
||||||
@@ -37,7 +36,7 @@
|
|||||||
./backup-target.nix
|
./backup-target.nix
|
||||||
|
|
||||||
./users/shatteredmint.nix
|
./users/shatteredmint.nix
|
||||||
# ./qemu-bridges.nix
|
./qemu-bridges.nix
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -20,18 +20,4 @@
|
|||||||
|
|
||||||
in ["${automount_opts},credentials=/etc/nixos/smb-secrets,uid=${toString config.users.users.shatteredmint.uid},gid=${toString config.users.groups.users.gid}"];
|
in ["${automount_opts},credentials=/etc/nixos/smb-secrets,uid=${toString config.users.users.shatteredmint.uid},gid=${toString config.users.groups.users.gid}"];
|
||||||
};
|
};
|
||||||
|
|
||||||
# # mount network shares
|
|
||||||
# fileSystems."/mnt/nas/private" = {
|
|
||||||
# device = "dashboard.omv:/ShatteredMINT";
|
|
||||||
# fsType = "nfs";
|
|
||||||
# options = [ "x-systemd.automount" "noauto" ];
|
|
||||||
#
|
|
||||||
# };
|
|
||||||
# fileSystems."/mnt/nas/shared" = {
|
|
||||||
# device = "dashboard.omv:/default-nas";
|
|
||||||
# fsType = "nfs";
|
|
||||||
# options = [ "x-systemd.automount" "noauto" ];
|
|
||||||
#
|
|
||||||
# };
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
|
|
||||||
networking.interfaces.virtbr0 = {
|
networking.interfaces.virtbr0 = {
|
||||||
useDHCP = true;
|
useDHCP = true;
|
||||||
|
macAddress = "04:92:26:c3:06:c2";
|
||||||
};
|
};
|
||||||
|
|
||||||
virtualisation.libvirtd = {
|
virtualisation.libvirtd = {
|
||||||
|
|||||||
@@ -18,6 +18,9 @@
|
|||||||
makemkv
|
makemkv
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
programs.kdeconnect.enable = true;
|
||||||
|
|
||||||
# enable flatpak
|
# enable flatpak
|
||||||
services.flatpak.enable = true;
|
services.flatpak.enable = true;
|
||||||
home-manager.users.shatteredmint.imports = [
|
home-manager.users.shatteredmint.imports = [
|
||||||
|
|||||||
@@ -5,16 +5,17 @@
|
|||||||
{ip}: {
|
{ip}: {
|
||||||
networking = {
|
networking = {
|
||||||
firewall.allowedUDPPorts = [56878];
|
firewall.allowedUDPPorts = [56878];
|
||||||
wireguard = {
|
wg-quick = {
|
||||||
enable = true;
|
# enable = true;
|
||||||
interfaces.wg0 = {
|
interfaces.wg0 = {
|
||||||
ips = [ ("192.168.87." + builtins.toString(ip) + "/32")];
|
address = [ ("192.168.87." + builtins.toString(ip) + "/32")];
|
||||||
listenPort = 56878;
|
listenPort = 56878;
|
||||||
privateKeyFile = "/root/wg.keys";
|
privateKeyFile = "/root/wg.keys";
|
||||||
|
dns = [ "192.168.178.108" ];
|
||||||
|
|
||||||
peers = [
|
peers = [
|
||||||
{
|
{
|
||||||
name = "hub";
|
# name = "hub";
|
||||||
publicKey = "XEaJXQW+7llbreoK161NkMhFxlctL1UK8nFiY/GtuC0=";
|
publicKey = "XEaJXQW+7llbreoK161NkMhFxlctL1UK8nFiY/GtuC0=";
|
||||||
allowedIPs = [ "192.168.178.0/24" "192.168.87.127/32" "192.168.87.128/25"];
|
allowedIPs = [ "192.168.178.0/24" "192.168.87.127/32" "192.168.87.128/25"];
|
||||||
endpoint = "173.249.36.74:56878";
|
endpoint = "173.249.36.74:56878";
|
||||||
|
|||||||
@@ -57,13 +57,24 @@
|
|||||||
init.defaultBranch = "main";
|
init.defaultBranch = "main";
|
||||||
pull.rebase = true;
|
pull.rebase = true;
|
||||||
};
|
};
|
||||||
|
signing.format = null;
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.neovim = {
|
programs.neovim = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
|
vimPlugins.lazy-nvim
|
||||||
];
|
];
|
||||||
|
|
||||||
|
withRuby = false;
|
||||||
|
withPython3 = false;
|
||||||
|
|
||||||
|
initLua = ''
|
||||||
|
vim.opt.rtp:prepend("${pkgs.vimPlugins.lazy-nvim.outPath}")
|
||||||
|
require ('config')
|
||||||
|
require ('plugins')
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user