diff --git a/flake.lock b/flake.lock index fb30067..e972eea 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1775213373, - "narHash": "sha256-wJHsijC2l/E+ovmlpPGha8pXA6RHSwHWmBV97gvkmyI=", + "lastModified": 1777505151, + "narHash": "sha256-ul1iRBfVX2vc971tHHhVtxX2hycU3nVwgO005OcOKnw=", "owner": "catppuccin", "repo": "nix", - "rev": "ba73719e673e7c2d89ac2f8df0bc0d48983e4907", + "rev": "e82c195f2276825b0a08024fdaff80f965edcd69", "type": "github" }, "original": { @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1775622785, - "narHash": "sha256-/yFxO+7oS1SymDfJ2iVO7K5vJKcYfe9XGIJ+quLqz0Q=", + "lastModified": 1777518431, + "narHash": "sha256-SwgiG2T5pbyo33Vz7/vUCAhEMgwCK8Pa2nDSx5a6/WE=", "owner": "nix-community", "repo": "home-manager", - "rev": "527e47b78fe67213072f706bf933a9705a8c4974", + "rev": "2e54a938cdd4c8e414b2518edc3d82308027c670", "type": "github" }, "original": { @@ -78,11 +78,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "lastModified": 1776548001, + "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", "type": "github" }, "original": { @@ -109,11 +109,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1775423009, - "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", + "lastModified": 1777268161, + "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", + "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8130e57..0c8d584 100644 --- a/flake.nix +++ b/flake.nix @@ -6,18 +6,18 @@ url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; - + gl.url = "github:nix-community/nixGL"; ctp.url = "github:catppuccin/nix"; }; - outputs = inputs: let + outputs = inputs: let pkgs = import inputs.nixpkgs { system = "x86_64-linux"; overlays = [ inputs.gl.overlay ]; config = { allowUnfree = true; - permittedInsecurePackages = [ "ventoy-qt5-1.1.10" ]; + permittedInsecurePackages = [ "ventoy-qt5-1.1.12" ]; }; }; args = { @@ -32,7 +32,7 @@ inputs.ctp.nixosModules.catppuccin ]; }; - + nixosConfigWithHome = host: inputs.nixpkgs.lib.nixosSystem { inherit pkgs; specialArgs = args // { hostname = host; }; @@ -50,7 +50,7 @@ } ]; }; - + homeConfig = host: inputs.hm.lib.homeManagerConfiguration { extraSpecialArgs = args // { hostname = host; }; inherit pkgs; diff --git a/modules/hardware/homelab.nix b/modules/hardware/homelab.nix index ba76f66..906b24b 100644 --- a/modules/hardware/homelab.nix +++ b/modules/hardware/homelab.nix @@ -1,8 +1,8 @@ { ... }: { imports = [ - ./misc/cpu-hotplug.nix - ./misc/serial.nix - ./misc/qemu-virtio.nix + # ./misc/cpu-hotplug.nix + # ./misc/serial.nix + # ./misc/qemu-virtio.nix # ^^ only used if vm ./core/firmware.nix diff --git a/modules/scans/homelab.nix b/modules/scans/homelab.nix index ae9dcbc..97b2ba6 100644 --- a/modules/scans/homelab.nix +++ b/modules/scans/homelab.nix @@ -5,26 +5,35 @@ { imports = - [ (modulesPath + "/profiles/qemu-guest.nix") + [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "uas" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/e33ab472-e518-4b4d-89d1-d75cfecb9f06"; + { device = "/dev/disk/by-uuid/e5a7d45d-b9e9-43e7-ba5f-f4e67821bd0b"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/880C-9F0A"; + { device = "/dev/disk/by-uuid/EC01-36B5"; fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; + options = [ "fmask=0022" "dmask=0022" ]; }; swapDevices = [ ]; + # 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.enp2s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -} \ No newline at end of file + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} \ No newline at end of file diff --git a/modules/system/homelab/docs.nix b/modules/system/homelab/docs.nix index a8126b0..58784a3 100644 --- a/modules/system/homelab/docs.nix +++ b/modules/system/homelab/docs.nix @@ -19,5 +19,6 @@ in { device = "/mnt/data/apps/cryptpad"; depends = [ "/mnt/data" ]; options = [ "bind" "nofail" ]; + fsType = "none"; }; } diff --git a/modules/system/homelab/pass.nix b/modules/system/homelab/pass.nix index ec2c43c..85b22e2 100644 --- a/modules/system/homelab/pass.nix +++ b/modules/system/homelab/pass.nix @@ -15,5 +15,6 @@ device = "/mnt/data/apps/vaultwarden/data"; depends = [ "/mnt/data" ]; options = [ "bind" "nofail" ]; + fsType = "none"; }; } \ No newline at end of file diff --git a/modules/system/homelab/proxy.nix b/modules/system/homelab/proxy.nix index 446197e..d977892 100644 --- a/modules/system/homelab/proxy.nix +++ b/modules/system/homelab/proxy.nix @@ -31,6 +31,7 @@ in { device = "/mnt/data/apps/acme/${homelab.proxy.base}"; depends = [ "/mnt/data" ]; options = [ "bind" "nofail" ]; + fsType = "none"; }; services = { diff --git a/modules/system/server.nix b/modules/system/server.nix index 7df13d2..019d474 100644 --- a/modules/system/server.nix +++ b/modules/system/server.nix @@ -2,7 +2,7 @@ ts-flags = [ "--advertise-exit-node" "--advertise-routes=10.3.14.0/24,192.168.1.0/24" - "--ssh" "--webclient" + "--ssh" ]; in { imports = [