Fixed: Network configuration; Switched to dhcp
This commit is contained in:
145
flake.lock
generated
145
flake.lock
generated
@@ -1,38 +1,6 @@
|
||||
{
|
||||
"nodes": {
|
||||
"flake-compat": {
|
||||
"locked": {
|
||||
"lastModified": 1733328505,
|
||||
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
|
||||
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
|
||||
"revCount": 69,
|
||||
"type": "tarball",
|
||||
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769996383,
|
||||
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_2": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"nixvim",
|
||||
@@ -74,58 +42,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixcord": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1770971055,
|
||||
"narHash": "sha256-XYFbDiNsfUKduV0DgV8UYSRey9t9vz/A4ppmzwBW+vQ=",
|
||||
"owner": "kaylorben",
|
||||
"repo": "nixcord",
|
||||
"rev": "77e0320dd37093da79e4f146659c66bb7ae692cc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "kaylorben",
|
||||
"repo": "nixcord",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1770617025,
|
||||
"narHash": "sha256-1jZvgZoAagZZB6NwGRv2T2ezPy+X6EFDsJm+YSlsvEs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2db38e08fdadcc0ce3232f7279bab59a15b94482",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1769909678,
|
||||
"narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "72716169fe93074c333e8d0173151350670b824c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1770843696,
|
||||
"narHash": "sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8=",
|
||||
@@ -141,7 +58,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1770380644,
|
||||
"narHash": "sha256-P7dWMHRUWG5m4G+06jDyThXO7kwSk46C1kgjEWcybkE=",
|
||||
@@ -157,26 +74,10 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1770197578,
|
||||
"narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixvim": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_2",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
@@ -196,29 +97,8 @@
|
||||
"root": {
|
||||
"inputs": {
|
||||
"home-manager": "home-manager",
|
||||
"nixcord": "nixcord",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixvim": "nixvim",
|
||||
"spicetify-nix": "spicetify-nix"
|
||||
}
|
||||
},
|
||||
"spicetify-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1770846656,
|
||||
"narHash": "sha256-wdYpo8++TqKp3GdRgLFykjuIVW1m9GlUnxID2FG74cE=",
|
||||
"owner": "Gerg-L",
|
||||
"repo": "spicetify-nix",
|
||||
"rev": "40e65cfc4608402674e1efaac3fccce20d2a72d3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Gerg-L",
|
||||
"repo": "spicetify-nix",
|
||||
"type": "github"
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixvim": "nixvim"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
@@ -235,21 +115,6 @@
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_2": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
||||
@@ -16,8 +16,6 @@
|
||||
home-manager.url = "github:nix-community/home-manager/master";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
nixvim.url = "github:nix-community/nixvim";
|
||||
nixcord.url = "github:kaylorben/nixcord";
|
||||
spicetify-nix.url = "github:Gerg-L/spicetify-nix";
|
||||
};
|
||||
|
||||
outputs =
|
||||
@@ -38,6 +36,7 @@
|
||||
modules = [
|
||||
./nixos/default.nix
|
||||
./nixos/hardware.nix
|
||||
./hosts/cyper-pi-1/configuration.nix
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager = {
|
||||
|
||||
@@ -7,18 +7,15 @@
|
||||
# Any RPi 4 specific customizations go here
|
||||
networking = {
|
||||
hostName = lib.mkForce "cyper-pi-1";
|
||||
interfaces.end0 = {
|
||||
useDHCP = false;
|
||||
ipv4.addresses = [
|
||||
{
|
||||
address = "192.168.2.41";
|
||||
prefixLength = 24;
|
||||
}
|
||||
];
|
||||
};
|
||||
# interfaces.end0.ipv4.addresses = [
|
||||
# {
|
||||
# address = "192.168.2.41";
|
||||
# prefixLength = 24;
|
||||
# }
|
||||
# ];
|
||||
|
||||
firewall = {
|
||||
enable = false;
|
||||
};
|
||||
# firewall = {
|
||||
# enable = false;
|
||||
# };
|
||||
};
|
||||
}
|
||||
|
||||
@@ -14,7 +14,16 @@
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
# Speeding up builds
|
||||
documentation.enable = false;
|
||||
documentation = {
|
||||
enable = false;
|
||||
man = {
|
||||
enable = false;
|
||||
generateCaches = false;
|
||||
};
|
||||
doc.enable = false;
|
||||
info.enable = false;
|
||||
nixos.enable = false;
|
||||
};
|
||||
|
||||
# Override python-lsp-server to skip tests (flaky tests cause timeout)
|
||||
nixpkgs.config.packageOverrides = pkgs: {
|
||||
@@ -27,24 +36,45 @@
|
||||
};
|
||||
};
|
||||
|
||||
#networking = {
|
||||
# hostName = "cyper-pi";
|
||||
|
||||
#useDHCP = true;
|
||||
|
||||
# networkmanager = {
|
||||
# enable = true;
|
||||
# unmanaged = [
|
||||
# "*"
|
||||
# "except:type:wwan"
|
||||
# "except:type:gsm"
|
||||
# ];
|
||||
# };
|
||||
|
||||
# defaultGateway = "192.168.2.1";
|
||||
# nameservers = [
|
||||
# "192.168.2.2"
|
||||
# "8.8.8.8"
|
||||
# "1.1.1.1"
|
||||
# ];
|
||||
|
||||
#wireless = {
|
||||
# enable = true;
|
||||
# networks = {
|
||||
# LANFRED = {
|
||||
# pskRaw = "36e2b41b51328800a9582be1a05f13f796f943569610ccdb61304803b86ce3da";
|
||||
# };
|
||||
# };
|
||||
#};
|
||||
|
||||
#enableIPv6 = false;
|
||||
#};
|
||||
|
||||
networking = {
|
||||
hostName = "cyper-pi";
|
||||
|
||||
useDHCP = false;
|
||||
dhcpcd.enable = false;
|
||||
networkmanager.enable = false;
|
||||
|
||||
defaultGateway = "192.168.2.1";
|
||||
nameservers = [
|
||||
"192.168.2.2"
|
||||
"8.8.8.8"
|
||||
"1.1.1.1"
|
||||
];
|
||||
|
||||
interfaces.wlan0 = {
|
||||
useDHCP = true;
|
||||
};
|
||||
|
||||
networkmanager.enable = false;
|
||||
enableIPv6 = false;
|
||||
firewall.enable = false;
|
||||
wireless = {
|
||||
enable = true;
|
||||
networks = {
|
||||
@@ -54,7 +84,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
enableIPv6 = false;
|
||||
};
|
||||
|
||||
# SSH configuration
|
||||
@@ -69,6 +98,7 @@
|
||||
isNormalUser = true;
|
||||
home = "/home/${primaryUser}";
|
||||
description = "Phil";
|
||||
hashedPassword = "$6$TqAclAMz/DFP90Ve$HEN4t1pqK36rACeWctJOmLArkTWb/rIBYamu4sY8bPuDnqkVVyfOLqXKkgX8zBf9LKz02.mo4EKFRnYWIzcAX1";
|
||||
extraGroups = [
|
||||
"wheel"
|
||||
"networkmanager"
|
||||
|
||||
Reference in New Issue
Block a user