diff --git a/homes/x86_64-linux/christopher@cobalt/config/dev.nix b/homes/x86_64-linux/christopher@cobalt/config/dev.nix index 482d6ba..a5d18a9 100644 --- a/homes/x86_64-linux/christopher@cobalt/config/dev.nix +++ b/homes/x86_64-linux/christopher@cobalt/config/dev.nix @@ -2,6 +2,7 @@ home.packages = with pkgs; [ zx # Tool for writing better scripts trurl # Parsing and manipulating URLs via CLI + dig # DNS onefetch # Git information tool tokei # Like cloc zeal # Offline documentation browser diff --git a/homes/x86_64-linux/christopher@cobalt/config/eww/eww.yuck b/homes/x86_64-linux/christopher@cobalt/config/eww/eww.yuck index 4656b37..0d7f002 100644 --- a/homes/x86_64-linux/christopher@cobalt/config/eww/eww.yuck +++ b/homes/x86_64-linux/christopher@cobalt/config/eww/eww.yuck @@ -87,7 +87,7 @@ (right))) (defwindow spraggins - :monitor 0 + :monitor 1 :stacking "bg" :windowtype "normal" :wm-ignore true diff --git a/homes/x86_64-linux/christopher@cobalt/config/wayland.nix b/homes/x86_64-linux/christopher@cobalt/config/wayland.nix index a990944..86bbc11 100644 --- a/homes/x86_64-linux/christopher@cobalt/config/wayland.nix +++ b/homes/x86_64-linux/christopher@cobalt/config/wayland.nix @@ -31,18 +31,18 @@ in { extraConfig = '' # See https://wiki.hyprland.org/Configuring/Monitors monitor=desc:Samsung Electric Company C49HG9x HTRJ901269, 3840x1080, 0x0, 1 # Left - monitor=desc:Ancor Communications Inc ASUS VE278 C5LMTF047320, 1920x1080, 3840x-550, 1, transform, 1 # Right + monitor=desc:Ancor Communications Inc ASUS VE278 C5LMTF047320, 1920x1080, 3840x-610, 1, transform, 1 # Right # Any other random monitor monitor=,preferred,auto,1 # Gaps for eww - monitor=DP-2,addreserved,40,0,0,0 + monitor=DP-3,addreserved,40,0,0,0 # monitor=,addreserved,40,0,0,0 # Single tiled windows in a workspace on my main monitor # should be displayed with a padding on both sides - workspace=w[t1] m[0],gapsout:15 840 15 840 + workspace=w[t1] m[1],gapsout:15 840 15 840 # See https://wiki.hyprland.org/Configuring/Keywords/ for more @@ -67,8 +67,8 @@ in { env = HYPRCURSOR_SIZE,28 # env = WLR_NO_HARDWARE_CURSORS,1 env = NIXOS_OZONE_WL,1 - env = LIBVA_DRIVER_NAME,nvidia - env = __GLX_VENDOR_LIBRARY_NAME,nvidia + env = LIBVA_DRIVER_NAME,radeonsi + env = __GLX_VENDOR_LIBRARY_NAME,radeonsi env = NVD_BACKEND,direct debug { diff --git a/homes/x86_64-linux/christopher@cobalt/misc/everything.nix b/homes/x86_64-linux/christopher@cobalt/misc/everything.nix index 788eca0..6617bea 100644 --- a/homes/x86_64-linux/christopher@cobalt/misc/everything.nix +++ b/homes/x86_64-linux/christopher@cobalt/misc/everything.nix @@ -29,6 +29,8 @@ vesktop # Discord Messenger obs-studio # OBS Studio wasistlos # WhatsApp client + signal-desktop # Messaging + zulip # Self-hosted slack alternative libreoffice # Productivity Suite (like Microsoft Office) onlyoffice-bin # libreoffice alternative cider # Apple Music player diff --git a/homes/x86_64-linux/christopher@cobalt/misc/launcher.nix b/homes/x86_64-linux/christopher@cobalt/misc/launcher.nix index 62472bb..134a739 100644 --- a/homes/x86_64-linux/christopher@cobalt/misc/launcher.nix +++ b/homes/x86_64-linux/christopher@cobalt/misc/launcher.nix @@ -4,10 +4,16 @@ ... }: { home.packages = with pkgs; [ - tofi fuzzel ]; + programs.tofi = { + enable = true; + settings = { + font = "JetBrains Mono"; + }; + }; + # Clear the tofi cache after each activation so that newly installed packages # are immediately available using tofi-drun. home.activation.cleanTofiCache = lib.hm.dag.entryAfter ["writeBoundary"] '' diff --git a/packages/scripts/generate-wallpaper/default.nix b/packages/scripts/generate-wallpaper/default.nix index 15abdfe..70662d1 100644 --- a/packages/scripts/generate-wallpaper/default.nix +++ b/packages/scripts/generate-wallpaper/default.nix @@ -47,7 +47,7 @@ in npx themer -t wallpaper-circuits -o "$WALLPAPER_ROOT" --color-set "$THEME_JSON_PATH" -s 3840x1080 -s 1080x1920 find "$WALLPAPER_DIR" -type f -iname '*.svg' | sed 'p;s/\.svg/\.png/' | sed 's/.*/"&"/' | xargs -n2 magick - hyprctl hyprpaper reload DP-2,"$WALLPAPER_FILE-3840x1080.png" - hyprctl hyprpaper reload DP-4,"$WALLPAPER_FILE-1080x1920.png" + hyprctl hyprpaper reload DP-3,"$WALLPAPER_FILE-3840x1080.png" + hyprctl hyprpaper reload DP-1,"$WALLPAPER_FILE-1080x1920.png" ''; } diff --git a/secrets/rekeyed/europium/7557b7278f290608722bc80adb2f95e0-compose.age b/secrets/rekeyed/europium/7557b7278f290608722bc80adb2f95e0-compose.age new file mode 100644 index 0000000..9fb701a Binary files /dev/null and b/secrets/rekeyed/europium/7557b7278f290608722bc80adb2f95e0-compose.age differ diff --git a/secrets/rekeyed/europium/e1589cf3d3e5c6744872c8713659453f-compose.age b/secrets/rekeyed/europium/e1589cf3d3e5c6744872c8713659453f-compose.age deleted file mode 100644 index 32cf844..0000000 Binary files a/secrets/rekeyed/europium/e1589cf3d3e5c6744872c8713659453f-compose.age and /dev/null differ diff --git a/secrets/stalwart-compose.yaml.age b/secrets/stalwart-compose.yaml.age index 999699b..baa3c17 100644 Binary files a/secrets/stalwart-compose.yaml.age and b/secrets/stalwart-compose.yaml.age differ diff --git a/systems/x86_64-linux/cobalt/default.nix b/systems/x86_64-linux/cobalt/default.nix index 5249282..4eef1b8 100644 --- a/systems/x86_64-linux/cobalt/default.nix +++ b/systems/x86_64-linux/cobalt/default.nix @@ -221,20 +221,11 @@ with lib._elements; { systemd.services.lactd.wantedBy = ["multi-user.target"]; hardware = { - nvidia = { - modesetting.enable = true; - powerManagement.enable = false; - powerManagement.finegrained = false; - open = true; - nvidiaSettings = true; - package = config.boot.kernelPackages.nvidiaPackages.stable; + amdgpu = { + opencl.enable = true; + overdrive.enable = true; }; - # amdgpu = { - # opencl.enable = true; - # overdrive.enable = true; - # }; - bluetooth = { enable = true; powerOnBoot = true; diff --git a/systems/x86_64-linux/cobalt/hardware.nix b/systems/x86_64-linux/cobalt/hardware.nix index 2be6652..663ddc5 100644 --- a/systems/x86_64-linux/cobalt/hardware.nix +++ b/systems/x86_64-linux/cobalt/hardware.nix @@ -13,9 +13,8 @@ ]; boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"]; - boot.initrd.kernelModules = ["uinput"]; # nvidia - # boot.initrd.kernelModules = ["amdgpu"]; - # boot.kernelModules = ["kvm-amd" "uinput"]; + boot.initrd.kernelModules = ["amdgpu" "uinput"]; + boot.kernelModules = ["kvm-amd" "uinput"]; boot.supportedFilesystems = ["ntfs"]; fileSystems."/mnt/games/ssd" = {