diff --git a/flake.lock b/flake.lock index db6d3d6..20e1cd5 100644 --- a/flake.lock +++ b/flake.lock @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1752113600, - "narHash": "sha256-7LYDxKxZgBQ8LZUuolAQ8UkIB+jb4A2UmiR+kzY9CLI=", + "lastModified": 1752541678, + "narHash": "sha256-dyhGzkld6jPqnT/UfGV2oqe7tYn7hppAqFvF3GZTyXY=", "owner": "nix-community", "repo": "disko", - "rev": "79264292b7e3482e5702932949de9cbb69fedf6d", + "rev": "2bf3421f7fed5c84d9392b62dcb9d76ef09796a7", "type": "github" }, "original": { @@ -166,11 +166,11 @@ ] }, "locked": { - "lastModified": 1752093218, - "narHash": "sha256-+3rXu8ewcNDi65/2mKkdSGrivQs5zEZVp5aYszXC0d0=", + "lastModified": 1752467539, + "narHash": "sha256-4kaR+xmng9YPASckfvIgl5flF/1nAZOplM+Wp9I5SMI=", "owner": "nix-community", "repo": "home-manager", - "rev": "206ed3c71418b52e176f16f58805c96e84555320", + "rev": "1e54837569e0b80797c47be4720fab19e0db1616", "type": "github" }, "original": { @@ -265,11 +265,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1752158208, - "narHash": "sha256-XbXYLUtaB/wHvZYefvaDPbo4eYj27kbtowHfww9bqLw=", + "lastModified": 1752546848, + "narHash": "sha256-WzHqmJ1wEZoUGAedomwcVLCuNsiB9bZzZXk7K9ZDBwk=", "owner": "nix-community", "repo": "nixvim", - "rev": "b728cf43d97814df43f5d9bd9dafac9072ccd9e8", + "rev": "1fb1bf8a73ccf207dbe967cdb7f2f4e0122c8bd5", "type": "github" }, "original": { @@ -393,11 +393,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1752450247, - "narHash": "sha256-rn8tN2VaItIFq1EQmP5DhZTEB9ea4cS0ZmclLQ+Rqv0=", + "lastModified": 1752550940, + "narHash": "sha256-7OktlvrLFfKv7h7GQAj0QHLSx5IOmXIWZb7A2IwSj+0=", "ref": "refs/heads/main", - "rev": "9acd92634ea00da1879e01c225b4c52d86e979f3", - "revCount": 1, + "rev": "a5ae2a4d9379092cd126af382667fb54dc5e429d", + "revCount": 3, "type": "git", "url": "https://git.yadunut.dev/yadunut/nix.git" }, diff --git a/flake.nix b/flake.nix index c240eb0..f47a034 100644 --- a/flake.nix +++ b/flake.nix @@ -69,9 +69,9 @@ disko.nixosModules.disko agenix.nixosModules.default ./penguin/disko-config.nix - yadunut.lib.users ./penguin/configuration.nix ./penguin/hardware-configuration.nix + yadunut.lib.users ]; }; "falcon-nixos" = nixpkgs.lib.nixosSystem { diff --git a/penguin/configuration.nix b/penguin/configuration.nix index fcffae9..d2f80e0 100644 --- a/penguin/configuration.nix +++ b/penguin/configuration.nix @@ -12,6 +12,10 @@ }; }; + networking.networkmanager = { + enable = true; + }; + services.openssh = { enable = true; settings.PasswordAuthentication = false; @@ -30,6 +34,5 @@ git neovim ghostty - zen ]; } diff --git a/penguin/disko-config.nix b/penguin/disko-config.nix index 1343f43..813e464 100644 --- a/penguin/disko-config.nix +++ b/penguin/disko-config.nix @@ -22,6 +22,7 @@ content = { type = "luks"; name = "crypt_p1"; + passwordFile = "/tmp/disk.key"; settings = { allowDiscards = true; }; @@ -50,7 +51,7 @@ "-d raid1" "/dev/mapper/crypt_p1" ]; - subVolumes = { + subvolumes = { "@" = { }; "@/root" = { mountpoint = "/"; @@ -74,7 +75,7 @@ ]; }; "@/swap" = { - mountpoint = "./.swapvol"; + mountpoint = "/.swapvol"; swap.swapfile.size = "64G"; mountOptions = [ "noatime" ]; }; diff --git a/penguin/hardware-configuration.nix b/penguin/hardware-configuration.nix new file mode 100644 index 0000000..2dd9b37 --- /dev/null +++ b/penguin/hardware-configuration.nix @@ -0,0 +1,29 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp5s0f0np0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp5s0f1np1.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp6s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +}