diff --git a/hosts/detritus/boot/default.nix b/hosts/detritus/boot/default.nix index 225455a3..e493a266 100644 --- a/hosts/detritus/boot/default.nix +++ b/hosts/detritus/boot/default.nix @@ -3,10 +3,9 @@ boot = { kernelPackages = pkgs.linuxPackages_latest; kernelParams = [ - "amdgpu.cik_support=1" - "radeon.cik_support=0" + "amdgpu.si_support=1" + "radeon.si_support=0" ]; loader.grub.enable = true; - plymouth.enable = true; }; } diff --git a/hosts/detritus/default.nix b/hosts/detritus/default.nix index 261c98a0..04eda225 100644 --- a/hosts/detritus/default.nix +++ b/hosts/detritus/default.nix @@ -15,4 +15,6 @@ desktop.enable = true; stateVersion = "24.11"; }; + + services.xserver.videoDrivers = [ "amdgpu" ]; } diff --git a/hosts/detritus/disko/default.nix b/hosts/detritus/disko/default.nix index b4d328cf..4d195170 100644 --- a/hosts/detritus/disko/default.nix +++ b/hosts/detritus/disko/default.nix @@ -6,7 +6,7 @@ disk = { "${config.networking.hostName}" = { type = "disk"; - device = "/dev/nvme0n1"; + device = "/dev/sda"; content = { type = "gpt"; partitions = { diff --git a/hosts/detritus/hardware/default.nix b/hosts/detritus/hardware/default.nix index 15af2604..7b58ab61 100644 --- a/hosts/detritus/hardware/default.nix +++ b/hosts/detritus/hardware/default.nix @@ -7,9 +7,10 @@ availableKernelModules = [ "ahci" "ehci_pci" - "firewire_ohci" "sd_mod" - "xhci_pci" + "usb_storage" + "usbhid" + "xhci_pci_renesas" ]; kernelModules = [ "dm-snapshot" ]; }; diff --git a/hosts/detritus/id_ed25519.pub b/hosts/detritus/id_ed25519.pub new file mode 100644 index 00000000..c35b9e57 --- /dev/null +++ b/hosts/detritus/id_ed25519.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBQE+a1E88+ELJ5cDOMPlc9lnV1ysVndchgJ4MxCjeWd diff --git a/hosts/detritus/user/default.nix b/hosts/detritus/user/default.nix index 3ca3a690..7db60010 100644 --- a/hosts/detritus/user/default.nix +++ b/hosts/detritus/user/default.nix @@ -1,7 +1,11 @@ { config, lib, ... }: { - home-manager.users."${config.sysusers.main}".home = { - guifull.enable = true; - stateVersion = lib.mkForce config.system.stateVersion; + home-manager.users."${config.sysusers.main}" = { + home = { + guifull.enable = true; + stateVersion = lib.mkForce config.system.stateVersion; + }; + + wayland.windowManager.sway.extraSessionCommands = lib.mkForce "export ELECTRON_OZONE_PLATFORM_HINT=wayland"; }; } diff --git a/modules/home/settings/cursor/default.nix b/modules/home/settings/cursor/default.nix index b6ff65ef..4d547cc2 100644 --- a/modules/home/settings/cursor/default.nix +++ b/modules/home/settings/cursor/default.nix @@ -1,10 +1,11 @@ { config, lib, pkgs, ... }: { home.pointerCursor = lib.mkIf config.home.desktop.enable { - gtk.enable = true; - x11.enable = true; name = "Simp1e-Dark"; package = pkgs.simp1e-cursors; size = 24; + + gtk.enable = true; + x11.enable = true; }; } diff --git a/modules/home/wms/programs/kanshi/default.nix b/modules/home/wms/programs/kanshi/default.nix index 0aeb5e8f..112de47a 100644 --- a/modules/home/wms/programs/kanshi/default.nix +++ b/modules/home/wms/programs/kanshi/default.nix @@ -15,7 +15,7 @@ # Profiles { profile = { - name = "primary"; + name = "tower"; outputs = [ { criteria = config.displays.tower1; @@ -51,10 +51,6 @@ position = "1920,0"; scale = 0.85; } - { - criteria = "eDP-1"; - status = "disable"; - } ]; }; } diff --git a/modules/home/wms/sway/extra/default.nix b/modules/home/wms/sway/extra/default.nix index 9a0ae172..2a879219 100644 --- a/modules/home/wms/sway/extra/default.nix +++ b/modules/home/wms/sway/extra/default.nix @@ -2,6 +2,5 @@ { wayland.windowManager.sway.extraConfig = '' titlebar_padding 10 1 - primary_selection disabled ''; } diff --git a/modules/system/users/main/default.nix b/modules/system/users/main/default.nix index f15624ec..2bb89a17 100644 --- a/modules/system/users/main/default.nix +++ b/modules/system/users/main/default.nix @@ -13,6 +13,7 @@ hashedPassword = config.secrets.accPass.main; openssh.authorizedKeys.keyFiles = [ ../../../../hosts/tower/id_ed25519.pub + ../../../../hosts/detritus/id_ed25519.pub ../../../../hosts/intuos/id_ed25519.pub ../../../../hosts/jupiter/id_ed25519.pub