diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 897e9d3..9bd2083 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -42,8 +42,8 @@ defaultRuntime = true; autoStart = true; }; - xserver.enable = true; - displayManager.sddm.enable = true; + xserver.enable = true; + displayManager.sddm.enable = true; desktopManager.plasma6.enable = true; }; @@ -68,12 +68,12 @@ package = pkgs.nerdfonts; name = "Iosevka NF"; }; - + sansSerif = { package = pkgs.nerdfonts; name = "Iosevka NF"; }; - + monospace = { package = pkgs.nerdfonts; name = "Iosevka NFM"; @@ -120,7 +120,7 @@ backupFileExtension = "bk"; users = {"k" = import ./home.nix;}; }; - + # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix index ff5f606..aa24003 100644 --- a/hosts/desktop/hardware-configuration.nix +++ b/hosts/desktop/hardware-configuration.nix @@ -1,34 +1,30 @@ # 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, ... }: + { - config, - lib, - pkgs, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-amd"]; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/aace1ae9-2a8f-4a90-9e0b-cb21779636d2"; - fsType = "btrfs"; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/aace1ae9-2a8f-4a90-9e0b-cb21779636d2"; + fsType = "btrfs"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/8D75-F095"; - fsType = "vfat"; - options = ["fmask=0022" "dmask=0022"]; - }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/8D75-F095"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; - swapDevices = []; + 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 diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index 17626dc..82a1bd8 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -21,27 +21,27 @@ khronos-ocl-icd-loader ]; }; + +# For WiVRn: +xdg.configFile."openxr/1/active_runtime.json".source = "${pkgs.wivrn}/share/openxr/1/openxr_wivrn.json"; - # For WiVRn: - xdg.configFile."openxr/1/active_runtime.json".source = "${pkgs.wivrn}/share/openxr/1/openxr_wivrn.json"; - - xdg.configFile."openvr/openvrpaths.vrpath".text = '' - { - "config" : - [ - "${config.xdg.dataHome}/Steam/config" - ], - "external_drivers" : null, - "jsonid" : "vrpathreg", - "log" : - [ - "${config.xdg.dataHome}/Steam/logs" - ], - "runtime" : - [ - "${pkgs.opencomposite}/lib/opencomposite" - ], - "version" : 1 - } - ''; +xdg.configFile."openvr/openvrpaths.vrpath".text = '' + { + "config" : + [ + "${config.xdg.dataHome}/Steam/config" + ], + "external_drivers" : null, + "jsonid" : "vrpathreg", + "log" : + [ + "${config.xdg.dataHome}/Steam/logs" + ], + "runtime" : + [ + "${pkgs.opencomposite}/lib/opencomposite" + ], + "version" : 1 + } +''; } diff --git a/hosts/home/home_common.nix b/hosts/home/home_common.nix index 77f9f1e..1ec3761 100644 --- a/hosts/home/home_common.nix +++ b/hosts/home/home_common.nix @@ -23,10 +23,10 @@ cat = "bat"; }; extraConfig = '' - $env.config = { - show_banner: false, - } - ''; + $env.config = { + show_banner: false, + } + ''; }; carapace = { enable = true; diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix index f804482..b660076 100644 --- a/hosts/server/configuration.nix +++ b/hosts/server/configuration.nix @@ -35,7 +35,7 @@ k = { isNormalUser = true; description = "k"; - extraGroups = ["networkmanager" "wheel" "libvirtd"]; + extraGroups = ["networkmanager" "wheel"]; openssh.authorizedKeys.keys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPKbKVe6gneJ9ghFih3bOeL++iDNPJNIMoZSdNMOsD0I k@laptop"]; packages = with pkgs; [zsh]; shell = pkgs.zsh; diff --git a/hosts/server/service.nix b/hosts/server/service.nix index 21c62a3..55fc65c 100644 --- a/hosts/server/service.nix +++ b/hosts/server/service.nix @@ -14,10 +14,7 @@ defaults.email = "markers711@gmail.com"; }; - virtualisation = { - docker = {enable = true;}; - libvirtd = {enable = true;}; - }; + virtualisation.docker = {enable = true;}; services = { openssh = {enable = true;};