diff --git a/flake.lock b/flake.lock old mode 100755 new mode 100644 index 87ce714..6931fa7 --- a/flake.lock +++ b/flake.lock @@ -26,11 +26,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1751705516, - "narHash": "sha256-Y099OGYWYHtpYFP4offuV6rldBnpUv4CYk+HwuaQwLU=", + "lastModified": 1751880463, + "narHash": "sha256-aSQllMKqsTYAUp4yhpspZn0Hj5yIj7Mh4UD5iyk5iMM=", "owner": "catppuccin", "repo": "nix", - "rev": "719bb50ca2c99bc9c077669a48bfd9815493a11d", + "rev": "9474347c69e93e392f194dda7a57c641ba4b998e", "type": "github" }, "original": { @@ -220,7 +220,7 @@ "narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=", "rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz?rev=cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz" }, "original": { "type": "tarball", @@ -299,11 +299,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1751637120, - "narHash": "sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8++xWA8itO4=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5c724ed1388e53cc231ed98330a60eb2f7be4be3", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { @@ -443,11 +443,11 @@ ] }, "locked": { - "lastModified": 1751779188, - "narHash": "sha256-o1PidAPLtSSqI6isos6v/e6s7t3zQ56NBYhXVaUesXc=", + "lastModified": 1751858709, + "narHash": "sha256-xghd1GDPRSa6aD6tEk2JCuQDZWdHITlCA/stwSVoZJQ=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "b3200f40877a3e0a679070d96f8793a06105c06e", + "rev": "216dd333fa41aa013bf8aab9322d7c1a2aee5b4a", "type": "github" }, "original": { diff --git a/hosts/valefar/backup.nix b/hosts/valefar/backup.nix new file mode 100755 index 0000000..b4a5d57 --- /dev/null +++ b/hosts/valefar/backup.nix @@ -0,0 +1,64 @@ +# 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" "ahci" "nvme" "mpt3sas" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/17b399da-2210-4493-9ae3-c65b20b992a0"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/6340-211B"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + +/* fileSystems."/garage" = { + device = "garage"; + fsType = "zfs"; + }; + + fileSystems."/storage" = { + device = "storage"; + fsType = "zfs"; + };*/ + + swapDevices = [ ]; + + # Fan Control + hardware.fancontrol = { + enable = false; + config = '' +INTERVAL=10 +DEVPATH=hwmon1=devices/platform/nct6775.2592 hwmon2=devices/platform/coretemp.0 +DEVNAME=hwmon1=nct6795 hwmon2=coretemp +FCTEMPS=hwmon1/pwm2=hwmon2/temp1_input hwmon1/pwm3=hwmon2/temp1_input +FCFANS=hwmon1/pwm2=hwmon1/fan2_input hwmon1/pwm3=hwmon1/fan3_input +MINTEMP=hwmon1/pwm2=20 hwmon1/pwm3=20 +MAXTEMP=hwmon1/pwm2=65 hwmon1/pwm3=60 +MINSTART=hwmon1/pwm2=38 hwmon1/pwm3=75 +MINSTOP=hwmon1/pwm2=28 hwmon1/pwm3=75 +MINPWM=hwmon1/pwm2=28 hwmon1/pwm3=75 +MAXPWM=hwmon1/pwm2=150 hwmon1/pwm3=105 + ''; + }; + + # 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; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; +} diff --git a/hosts/valefar/hardware.nix b/hosts/valefar/hardware.nix index b4a5d57..bd58a94 100755 --- a/hosts/valefar/hardware.nix +++ b/hosts/valefar/hardware.nix @@ -8,57 +8,33 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "mpt3sas" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "mpt3sas" "nvme" "usbhid" "uas" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/17b399da-2210-4493-9ae3-c65b20b992a0"; - fsType = "ext4"; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/e02d1d07-3bc8-4d1d-a301-6d589f4b4b6d"; + fsType = "ext4"; + }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/6340-211B"; + { device = "/dev/disk/by-uuid/B3DE-0187"; fsType = "vfat"; options = [ "fmask=0022" "dmask=0022" ]; }; -/* fileSystems."/garage" = { - device = "garage"; - fsType = "zfs"; - }; - - fileSystems."/storage" = { - device = "storage"; - fsType = "zfs"; - };*/ - - swapDevices = [ ]; - - # Fan Control - hardware.fancontrol = { - enable = false; - config = '' -INTERVAL=10 -DEVPATH=hwmon1=devices/platform/nct6775.2592 hwmon2=devices/platform/coretemp.0 -DEVNAME=hwmon1=nct6795 hwmon2=coretemp -FCTEMPS=hwmon1/pwm2=hwmon2/temp1_input hwmon1/pwm3=hwmon2/temp1_input -FCFANS=hwmon1/pwm2=hwmon1/fan2_input hwmon1/pwm3=hwmon1/fan3_input -MINTEMP=hwmon1/pwm2=20 hwmon1/pwm3=20 -MAXTEMP=hwmon1/pwm2=65 hwmon1/pwm3=60 -MINSTART=hwmon1/pwm2=38 hwmon1/pwm3=75 -MINSTOP=hwmon1/pwm2=28 hwmon1/pwm3=75 -MINPWM=hwmon1/pwm2=28 hwmon1/pwm3=75 -MAXPWM=hwmon1/pwm2=150 hwmon1/pwm3=105 - ''; - }; + swapDevices = + [ { device = "/dev/disk/by-uuid/c8f24f31-49e0-486c-9f63-1d31b2e36ce9"; } + ]; # 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.enp6s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; }