Back to 23.05 & remove unneeded dhcp conf

Signed-off-by: Tristan Druyen <tristan@vault81.de>
This commit is contained in:
Tristan D. 2023-09-18 14:04:36 +02:00
parent 657277cd32
commit 20741967ef
Signed by: tristan
SSH key fingerprint: SHA256:U7y6eMb7CQDaTHv9XoX6/BaQnPqyxxKc+Xnfcefi6rY
5 changed files with 33 additions and 9 deletions

View file

@ -27,7 +27,7 @@
boot.initrd.luks.devices."luks-fa1e760a-71a3-4a79-a791-684cd82d9c3c".device = "/dev/disk/by-uuid/fa1e760a-71a3-4a79-a791-684cd82d9c3c"; boot.initrd.luks.devices."luks-fa1e760a-71a3-4a79-a791-684cd82d9c3c".device = "/dev/disk/by-uuid/fa1e760a-71a3-4a79-a791-684cd82d9c3c";
boot.initrd.luks.devices."luks-fa1e760a-71a3-4a79-a791-684cd82d9c3c".keyFile = "/crypto_keyfile.bin"; boot.initrd.luks.devices."luks-fa1e760a-71a3-4a79-a791-684cd82d9c3c".keyFile = "/crypto_keyfile.bin";
fonts.packages = with pkgs; [ fonts.fonts = with pkgs; [
noto-fonts noto-fonts
noto-fonts-cjk noto-fonts-cjk
noto-fonts-emoji noto-fonts-emoji

29
flake.lock generated
View file

@ -1,5 +1,25 @@
{ {
"nodes": { "nodes": {
"disko": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1695000028,
"narHash": "sha256-PAZl5eDhj44b7+1JOdT+BGGK1UsCHWKG+v8tw/Gmy34=",
"owner": "nix-community",
"repo": "disko",
"rev": "7548ad94698adb90ee17ff62581f2b2457faaedd",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "disko",
"type": "github"
}
},
"emacs-overlay": { "emacs-overlay": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
@ -79,16 +99,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1694593561, "lastModified": 1694937365,
"narHash": "sha256-WSaIQZ5s9N9bDFkEMTw6P9eaZ9bv39ZhsiW12GtTNM0=", "narHash": "sha256-iHZSGrb9gVpZRR4B2ishUN/1LRKWtSHZNO37C8z1SmA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1697b7d480449b01111e352021f46e5879e47643", "rev": "5d017a8822e0907fb96f7700a319f9fe2434de02",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixpkgs-unstable", "ref": "nixos-23.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -127,6 +147,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"disko": "disko",
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",

View file

@ -4,7 +4,7 @@
inputs = { inputs = {
nixpkgs = { nixpkgs = {
url = "github:NixOS/nixpkgs/nixpkgs-unstable"; url = "github:NixOS/nixpkgs/nixos-23.05";
}; };
tuxedo-nixos = { tuxedo-nixos = {
url = "github:blitz/tuxedo-nixos"; url = "github:blitz/tuxedo-nixos";
@ -17,6 +17,10 @@
url = "github:nix-community/emacs-overlay"; url = "github:nix-community/emacs-overlay";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
disko = {
url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { outputs = {
@ -25,6 +29,7 @@
nixpkgs, nixpkgs,
tuxedo-nixos, tuxedo-nixos,
emacs-overlay, emacs-overlay,
disko,
}: { }: {
formatter = { formatter = {
x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra; x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra;

View file

@ -41,8 +41,6 @@
networking = { networking = {
useDHCP = lib.mkDefault true; useDHCP = lib.mkDefault true;
interfaces = { interfaces = {
enp1s0.useDHCP = lib.mkDefault true;
wlp3s0.useDHCP = lib.mkDefault true;
enp5s0f4u1u1c2 = { enp5s0f4u1u1c2 = {
useDHCP = false; useDHCP = false;
ipv4.addresses = [ ipv4.addresses = [

View file

@ -1,5 +1,5 @@
{pkgs, ...}: { {pkgs, ...}: {
fonts.packages = [pkgs.emacs-all-the-icons-fonts]; fonts.fonts = [pkgs.emacs-all-the-icons-fonts];
users.users.tristand = { users.users.tristand = {
isNormalUser = true; isNormalUser = true;