diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index fb0fda0..5eb0f31 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -13,16 +13,10 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - boot.kernelPatches = [ - { - name = "amdgpu-ignore-ctx-privileges"; - patch = pkgs.fetchpatch { - name = "cap_sys_nice_begone.patch"; - url = "https://github.com/Frogging-Family/community-patches/raw/master/linux61-tkg/cap_sys_nice_begone.mypatch"; - hash = "sha256-Y3a0+x2xvHsfLax/uwycdJf3xLxvVfkfDVqjkxNaYEo="; - }; - } - ]; + + hardware.amdgpu.opencl.enable = true; + boot.kernelParams = [ "amdgpu.ppfeaturemask=0xfff7ffff" "amdgpu.gpu_recovery=1" ]; + services.openssh = {enable = true;}; networking = { @@ -55,7 +49,7 @@ enable = true; displayManager.gdm.enable = true; desktopManager.gnome.enable = true; - } + }; }; stylix = { @@ -107,9 +101,9 @@ }; }; - hardware = { - graphics.enable32Bit = true; - }; + #hardware = { + # graphics.enable32Bit = true; + #}; programs = { zsh.enable = true; diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix index ff5f606..c522464 100644 --- a/hosts/desktop/hardware-configuration.nix +++ b/hosts/desktop/hardware-configuration.nix @@ -1,34 +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, ... }: + { - 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" "usbhid" "usb_storage" "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-label/nixos"; + 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/BB87-CC45"; + fsType = "vfat"; + }; - 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 dd59911..17626dc 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -4,7 +4,7 @@ inputs, ... }: { - imports = [../home/home_common.nix ../home/gnone.nix]; + imports = [../home/home_common.nix]; nixpkgs.config.allowUnfree = true; home = { packages = with pkgs; [