diff options
Diffstat (limited to 'host/Rory-desktop/optional')
-rw-r--r-- | host/Rory-desktop/optional/gui/wayland.nix | 22 | ||||
-rw-r--r-- | host/Rory-desktop/optional/gui/x11.nix | 13 | ||||
-rw-r--r-- | host/Rory-desktop/optional/hardware-specific/amd.nix | 23 | ||||
-rw-r--r-- | host/Rory-desktop/optional/hardware-specific/nvidia.nix | 20 |
4 files changed, 46 insertions, 32 deletions
diff --git a/host/Rory-desktop/optional/gui/wayland.nix b/host/Rory-desktop/optional/gui/wayland.nix index 74cb192..fd0cd90 100644 --- a/host/Rory-desktop/optional/gui/wayland.nix +++ b/host/Rory-desktop/optional/gui/wayland.nix @@ -1,4 +1,9 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: { programs.sway = { @@ -16,15 +21,15 @@ # use this if they aren't displayed properly: export _JAVA_AWT_WM_NONREPARENTING=1 cp ${../../../../modules/users/Rory/wallpaper.webp} ~/.cache/wallpaper.webp - + ''; #( - #sleep 5 - #${pkgs.swaybg}/bin/swaybg -i ${../../../../modules/users/Rory/wallpaper.webp} - #$ {pkgs.swayidle}/bin/swayidle -w timeout 300 'swaylock -f -i ${../../../../modules/users/Rory/wallpaper.webp}' 'swaymsg "output * dpms off"' - #$ {pkgs.swaylock}/bin/swaylock -f -i ${../../../../modules/users/Rory/wallpaper.webp} - #${pkgs.waybar}/bin/waybar - #) & + #sleep 5 + #${pkgs.swaybg}/bin/swaybg -i ${../../../../modules/users/Rory/wallpaper.webp} + #$ {pkgs.swayidle}/bin/swayidle -w timeout 300 'swaylock -f -i ${../../../../modules/users/Rory/wallpaper.webp}' 'swaymsg "output * dpms off"' + #$ {pkgs.swaylock}/bin/swaylock -f -i ${../../../../modules/users/Rory/wallpaper.webp} + #${pkgs.waybar}/bin/waybar + #) & extraPackages = with pkgs; [ swaybg @@ -40,4 +45,3 @@ }; } - diff --git a/host/Rory-desktop/optional/gui/x11.nix b/host/Rory-desktop/optional/gui/x11.nix index 0f55862..9070298 100644 --- a/host/Rory-desktop/optional/gui/x11.nix +++ b/host/Rory-desktop/optional/gui/x11.nix @@ -1,8 +1,14 @@ -{ config, pkgs, lib, nhekoSrc, mtxclientSrc, ... }: +{ + config, + pkgs, + lib, + nhekoSrc, + mtxclientSrc, + ... +}: { - imports = - [ ]; + imports = [ ]; services = { xserver = { @@ -28,4 +34,3 @@ }; } - diff --git a/host/Rory-desktop/optional/hardware-specific/amd.nix b/host/Rory-desktop/optional/hardware-specific/amd.nix index 45bea66..3ae47d2 100644 --- a/host/Rory-desktop/optional/hardware-specific/amd.nix +++ b/host/Rory-desktop/optional/hardware-specific/amd.nix @@ -1,10 +1,16 @@ -{ config, pkgs, lib, nhekoSrc, mtxclientSrc, ... }: +{ + config, + pkgs, + lib, + nhekoSrc, + mtxclientSrc, + ... +}: { - imports = - [ ]; + imports = [ ]; -boot.initrd.kernelModules = [ "amdgpu" ]; + boot.initrd.kernelModules = [ "amdgpu" ]; services = { xserver = { @@ -28,16 +34,11 @@ boot.initrd.kernelModules = [ "amdgpu" ]; rocmPackages.clr.icd amdvlk ]; - extraPackages32 = with pkgs; [ - driversi686Linux.amdvlk - ]; + extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ]; }; }; - systemd.tmpfiles.rules = [ - "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" - ]; + systemd.tmpfiles.rules = [ "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" ]; system.stateVersion = "22.11"; # DO NOT EDIT! } - diff --git a/host/Rory-desktop/optional/hardware-specific/nvidia.nix b/host/Rory-desktop/optional/hardware-specific/nvidia.nix index 66b328f..c146c3a 100644 --- a/host/Rory-desktop/optional/hardware-specific/nvidia.nix +++ b/host/Rory-desktop/optional/hardware-specific/nvidia.nix @@ -1,17 +1,22 @@ -{ config, pkgs, lib, nhekoSrc, mtxclientSrc, ... }: +{ + config, + pkgs, + lib, + nhekoSrc, + mtxclientSrc, + ... +}: { - imports = - [ - - ]; + imports = [ + ]; services = { xserver = { - videoDrivers = ["nvidia"]; + videoDrivers = [ "nvidia" ]; #windowManager.i3.extraSessionCommands = '' - # todo: restore + # todo: restore #''; }; picom.backend = "glx"; @@ -37,4 +42,3 @@ system.stateVersion = "22.11"; # DO NOT EDIT! } - |