desktop: adjustments after first install

This commit is contained in:
Kabbone 2022-11-05 14:50:15 +01:00
parent 7dab8bff86
commit 74f47b8dd3
Signed by: Kabbone
SSH Key Fingerprint: SHA256:iDfA/JbfNCsPT5EOvS1y+ZKaiXstaTWgm/6oQPn6LYg
3 changed files with 11 additions and 16 deletions

View File

@ -27,7 +27,7 @@ in
{ {
desktop = lib.nixosSystem { # Desktop profile desktop = lib.nixosSystem { # Desktop profile
inherit system; inherit system;
specialArgs = { inherit inputs user locationhyprland nixos-hardware nur; }; specialArgs = { inherit inputs user location hyprland nixos-hardware nur; };
modules = [ modules = [
nur.nixosModules.nur nur.nixosModules.nur
#hyprland.nixosModules.default #hyprland.nixosModules.default

View File

@ -17,37 +17,31 @@
[ (modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" "rtsx_usb_sdmmc" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" "vfio_virqfd" ]; boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" "vfio_virqfd" ];
boot.kernelModules = [ "kvm" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-label/ROOT"; { device = "/dev/disk/by-label/NIXROOT";
fsType = "btrfs"; fsType = "btrfs";
options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@" ]; options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@" ];
}; };
fileSystems."/home" = fileSystems."/home" =
{ device = "/dev/disk/by-label/ROOT"; { device = "/dev/disk/by-label/NIXROOT";
fsType = "btrfs"; fsType = "btrfs";
options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@home" ]; options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@home" ];
}; };
fileSystems."/opt" =
{ device = "/dev/disk/by-label/ROOT";
fsType = "btrfs";
options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@opt" ];
};
fileSystems."/srv" = fileSystems."/srv" =
{ device = "/dev/disk/by-label/ROOT"; { device = "/dev/disk/by-label/NIXROOT";
fsType = "btrfs"; fsType = "btrfs";
options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv" ]; options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv" ];
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-label/BOOT"; { device = "/dev/disk/by-label/NIXBOOT";
fsType = "vfat"; fsType = "vfat";
}; };
@ -73,7 +67,7 @@
enable = true; enable = true;
}; };
interfaces = { interfaces = {
eth0 = { enp34s0 = {
useDHCP = true; # For versatility sake, manually edit IP on nm-applet. useDHCP = true; # For versatility sake, manually edit IP on nm-applet.
#ipv4.addresses = [ { #ipv4.addresses = [ {
# address = "192.168.0.51"; # address = "192.168.0.51";
@ -90,7 +84,7 @@
#}; #};
}; };
#hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
# high-resolution display # high-resolution display
hardware.video.hidpi.enable = lib.mkDefault true; hardware.video.hidpi.enable = lib.mkDefault true;
} }

View File

@ -13,8 +13,9 @@
signing = { signing = {
key = "/home/${user}/.ssh/id_ed25519_sk_rk_yubiC"; key = "/home/${user}/.ssh/id_ed25519_sk_rk_yubiC";
signByDefault = true; signByDefault = true;
};
extraConfig = { extraConfig = {
gpg = { format = ssh; }; gpg = { format = "ssh"; };
}; };
}; };
}; };