mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update nas

Browse Source
This commit is contained in:
mjallen18
2024-09-26 15:29:56 -05:00
parent 215c9864d1
commit 09fe0be337
4 changed files with 81 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

184
flake.lock generated
View File

@@ -51,11 +51,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1726576520, "lastModified": 1727291377,
"narHash": "sha256-qkaiUpE3qRXunKbUzMaTGTMzF8nv534oglJY4a2hxNY=", "narHash": "sha256-T5IM821Hihqb9BLaM549jHryQAq8s0cgESLnqnbORkE=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "4409a04839fc8c911ef3e461bb5f422ae1d03a85", "rev": "2afbe1f10e114de095806d1cbe9b5cdcc9b3b6bf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -68,7 +68,6 @@
"cosmic": { "cosmic": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"nix-update": "nix-update",
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs-unstable"
], ],
@@ -76,11 +75,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1726623342, "lastModified": 1727275359,
"narHash": "sha256-LdXem2W/QJD5MKnhH/BO63kKSVgiu5y6181NVPshtec=", "narHash": "sha256-tuFqE+hNU0hjfbsKN5aCL3AslyKh0/CSyw+SfjlM29Y=",
"owner": "lilyinstarlight", "owner": "lilyinstarlight",
"repo": "nixos-cosmic", "repo": "nixos-cosmic",
"rev": "5137d4608a7225cc90a31aad8d5c37234cb18dca", "rev": "5fbd6d812159f1cd89f72b586fbb97a8ca808d19",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -119,11 +118,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1726468443, "lastModified": 1726900127,
"narHash": "sha256-O1VcbVBrqIf58U05yFXl9+J7XM2qh0I+7vqMbNwZPq0=", "narHash": "sha256-v3r7yJY8YE4HAzD5DXOxLkzj8YZKQ0xuccp9yppGW1U=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "effac20e9560aab202e82b6d833f685163a9c138", "rev": "18eefba7fd0bf03e115785948758a44125a9fd68",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -230,28 +229,6 @@
} }
}, },
"flake-parts_2": { "flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"cosmic",
"nix-update",
"nixpkgs"
]
},
"locked": {
"lastModified": 1719994518,
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_3": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"lanzaboote", "lanzaboote",
@@ -333,11 +310,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1725513492, "lastModified": 1726745158,
"narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=", "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "7570de7b9b504cfe92025dd1be797bf546f66528", "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -397,11 +374,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726440980, "lastModified": 1726902823,
"narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=", "narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff", "rev": "14929f7089268481d86b83ed31ffd88713dcd415",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -417,11 +394,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726611255, "lastModified": 1727246346,
"narHash": "sha256-/bxaYvIK6/d3zqpW26QFS0rqfd0cO4qreSNWvYLTl/w=", "narHash": "sha256-TcUaKtya339Asu+g6KTJ8h7KiKcKXKp2V+At+7tksyY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d2493de5cd1da06b6a4c3e97f4e7d5dd791df457", "rev": "1e22ef1518fb175d762006f9cae7f6312b8caedb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -432,11 +409,11 @@
}, },
"impermanence": { "impermanence": {
"locked": { "locked": {
"lastModified": 1725690722, "lastModified": 1727198257,
"narHash": "sha256-4qWg9sNh5g1qPGO6d/GV2ktY+eDikkBTbWSg5/iD2nY=", "narHash": "sha256-/qMVI+SG9zvhLbQFOnqb4y4BH6DdK3DQHZU5qGptehc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "63f4d0443e32b0dd7189001ee1894066765d18a5", "rev": "8514fff0f048557723021ffeb31ca55f69b67de3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -454,11 +431,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726115155, "lastModified": 1726902390,
"narHash": "sha256-VDylz5VX4JD4/TZv6xUJDwuvNdgLRGoOpue1dlZGdIQ=", "narHash": "sha256-ESAD6AkxsQdV/j5ZBcO4Vg94J7Xd0nfpiEZpJtwSEhg=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "02cf60ce20b6034fc0459e5116cec7016aaff6e4", "rev": "faf4c746c068dd8e41b1fa5f18beeabd34d4064c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -471,7 +448,7 @@
"inputs": { "inputs": {
"crane": "crane", "crane": "crane",
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_4",
"flake-parts": "flake-parts_3", "flake-parts": "flake-parts_2",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs-unstable"
@@ -525,11 +502,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1726616680, "lastModified": 1727003835,
"narHash": "sha256-i0h300W3t7Q7PltJPmucj+ub45SE/bNQ+pf83tasYAQ=", "narHash": "sha256-Cfllbt/ADfO8oxbT984MhPHR6FJBaglsr1SxtDGbpec=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "6374cd7e50aa057a688142eed2345083047ad884", "rev": "bd7d1e3912d40f799c5c0f7e5820ec950f1e0b3d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -583,29 +560,6 @@
"type": "github" "type": "github"
} }
}, },
"nix-update": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": [
"cosmic",
"nixpkgs"
],
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1726468554,
"narHash": "sha256-Vyumyd9Qqh6n0hdfqOftDVbPuMJ5H+7Pp3w5/FDZ6gQ=",
"owner": "Mic92",
"repo": "nix-update",
"rev": "b28bb46366ee32440cc525d18b71bac98a6925a2",
"type": "github"
},
"original": {
"owner": "Mic92",
"repo": "nix-update",
"type": "github"
}
},
"nixos-apple-silicon": { "nixos-apple-silicon": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_5", "flake-compat": "flake-compat_5",
@@ -613,11 +567,11 @@
"rust-overlay": "rust-overlay_3" "rust-overlay": "rust-overlay_3"
}, },
"locked": { "locked": {
"lastModified": 1724346840, "lastModified": 1727213444,
"narHash": "sha256-nLaw2AFhDdBmbuWICe983Pbiq+GyNMPJMpSLWV6vVZA=", "narHash": "sha256-XmTIRSSgef9MfdIgAOegXo0svPwiLZKr+zyoMw/Ypt4=",
"owner": "mjallen18", "owner": "mjallen18",
"repo": "nixos-apple-silicon", "repo": "nixos-apple-silicon",
"rev": "77b99b63b125d85693934c83b04e1797cbf7afe7", "rev": "a110149cb7bebeec23dc8b27be15bf7dbff742fb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -628,11 +582,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1726650330, "lastModified": 1727040444,
"narHash": "sha256-UbHzmaOQ18O/kCizipU70N0UQVFIfv8AiFKXw07oZ9Y=", "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "abb448608a56a60075468e90d8acec2a7cb689b1", "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -672,11 +626,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1726447378, "lastModified": 1726969270,
"narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", "narHash": "sha256-8fnFlXBgM/uSvBlLWjZ0Z0sOdRBesyNdH0+esxqizGc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", "rev": "23cbb250f3bf4f516a2d0bf03c51a30900848075",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -720,11 +674,11 @@
}, },
"nixpkgs-stable_4": { "nixpkgs-stable_4": {
"locked": { "locked": {
"lastModified": 1726447378, "lastModified": 1727129439,
"narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", "narHash": "sha256-nPyrcFm6FSk7CxzVW4x2hu62aLDghNcv9dX6DF3dXw8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", "rev": "babc25a577c3310cce57c72d5bed70f4c3c3843a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -752,11 +706,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1726463316, "lastModified": 1726937504,
"narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", "rev": "9357f4f23713673f310988025d9dc261c20e70c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -768,11 +722,11 @@
}, },
"nixpkgs-unstable-small": { "nixpkgs-unstable-small": {
"locked": { "locked": {
"lastModified": 1726658796, "lastModified": 1727278276,
"narHash": "sha256-SiiWCVg/W8i6jvpgQj3NNd3YtV+jfnn/t3Za7hfn1iE=", "narHash": "sha256-G89VIJCi7af1Tqn+knFo1Yy/uRKjNTYoE1xN83Twqn0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "75ac2a58e988a346960938ab16cea903a3cb053a", "rev": "ed3371c607057a1fa61fd4f3ab71e9e355f296d1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -784,11 +738,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1726463316, "lastModified": 1726937504,
"narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", "rev": "9357f4f23713673f310988025d9dc261c20e70c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -830,11 +784,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1724224976, "lastModified": 1726937504,
"narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", "rev": "9357f4f23713673f310988025d9dc261c20e70c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -961,11 +915,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726539203, "lastModified": 1727144949,
"narHash": "sha256-u1tAteb4qkH2gGjDY3mN/4Qxa6y798t4G0jNKDyTwv8=", "narHash": "sha256-uMZMjoCS2nf40TAE1686SJl3OXWfdfM+BDEfRdr+uLc=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "20c8461785d8f5af32d8d4d5c128589e23d7f033", "rev": "2e19799819104b46019d339e78d21c14372d3666",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1002,11 +956,11 @@
"rust-overlay_3": { "rust-overlay_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1724293269, "lastModified": 1727144949,
"narHash": "sha256-x/XhOAszT/ejditCHUtGOjQcVg2AQhrC/QVew3i7kTI=", "narHash": "sha256-uMZMjoCS2nf40TAE1686SJl3OXWfdfM+BDEfRdr+uLc=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "6dc6d34a3a217457d7044dcce32b6d537480a6a1", "rev": "2e19799819104b46019d339e78d21c14372d3666",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1085,28 +1039,6 @@
"repo": "treefmt-nix", "repo": "treefmt-nix",
"type": "github" "type": "github"
} }
},
"treefmt-nix_2": {
"inputs": {
"nixpkgs": [
"cosmic",
"nix-update",
"nixpkgs"
]
},
"locked": {
"lastModified": 1719887753,
"narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

6
hosts/default.nix
View File

@@ -27,7 +27,7 @@ in
# Configure nixpkgs # Configure nixpkgs
# Enable non free # Enable non free
nixpkgs.config.allowUnfree = lib.mkDefault true; nixpkgs.config.allowUnfree = lib.mkForce true;
# Hardware configs # Hardware configs
hardware = { hardware = {
@@ -35,7 +35,7 @@ in
bluetooth.enable = lib.mkDefault true; bluetooth.enable = lib.mkDefault true;
# Enable all firmware # Enable all firmware
enableAllFirmware = lib.mkDefault true; enableAllFirmware = lib.mkForce true;
# Disable pulse audio in favor of pipewire # Disable pulse audio in favor of pipewire
pulseaudio.enable = false; pulseaudio.enable = false;
@@ -46,7 +46,7 @@ in
openssh.enable = lib.mkDefault true; openssh.enable = lib.mkDefault true;
# Enable firmware updates # Enable firmware updates
fwupd.enable = lib.mkDefault true; fwupd.enable = lib.mkForce true;
fstrim.enable = lib.mkDefault true; fstrim.enable = lib.mkDefault true;

33
hosts/nas/networking.nix
View File

@@ -26,7 +26,7 @@ in
interfaces = { interfaces = {
wlp6s0 = { wlp6s0 = {
useDHCP = false; useDHCP = true;
ipv4.addresses = [ ipv4.addresses = [
{ {
address = ipAddress; address = ipAddress;
@@ -35,16 +35,6 @@ in
]; ];
}; };
wlp7s0 = {
useDHCP = false;
ipv4.addresses = [
{
address = ipAddress2;
prefixLength = 24;
}
];
};
# br0 = { # br0 = {
# useDHCP = false; # useDHCP = false;
# ipv4.addresses = [ # ipv4.addresses = [
@@ -67,15 +57,26 @@ in
wireless = { wireless = {
enable = true; enable = true;
userControlled.enable = true;
secretsFile = config.sops.secrets."wifi".path; secretsFile = config.sops.secrets."wifi".path;
allowAuxiliaryImperativeNetworks = true;
interfaces = [
"wlp6s0"
];
networks = { networks = {
"Joey's Jungle 5G" = {
pskRaw = "ext:PSK";
};
"Joey's Jungle 6G" = { "Joey's Jungle 6G" = {
pskRaw = "ext:PSK"; # pskRaw = "ext:PSK";
priority = 1000; # priority = 1000;
psk = "kR8v&3Qd";
extraConfig = ''
key_mgmt=SAE
ieee80211w=2
'';
}; };
# "Joey's Jungle 5G" = {
# pskRaw = "ext:PSK";
# priority = 1;
# };
}; };
}; };

6
hosts/nas/services.nix
View File

@@ -28,7 +28,7 @@ in
}; };
adguardhome = { adguardhome = {
enable = true; enable = false;
allowDHCP = true; allowDHCP = true;
port = 1880; port = 1880;
openFirewall = true; openFirewall = true;
@@ -65,7 +65,7 @@ in
}; };
dhcp = { dhcp = {
enabled = true; enabled = true;
interface_name = "wlp7s0"; interface_name = "wlp6s0";
dhcpv4 = { dhcpv4 = {
gateway_ip = "10.0.1.1"; gateway_ip = "10.0.1.1";
subnet_mask = "255.255.255.0"; subnet_mask = "255.255.255.0";
@@ -133,7 +133,7 @@ in
}; };
tailscale = { tailscale = {
enable = true; enable = false;
openFirewall = true; openFirewall = true;
useRoutingFeatures = "client"; useRoutingFeatures = "client";
extraUpFlags = [ "--advertise-exit-node" ]; extraUpFlags = [ "--advertise-exit-node" ];