diff --git a/configuration.nix b/configuration.nix index 6de9f87..f63d7a6 100644 --- a/configuration.nix +++ b/configuration.nix @@ -53,7 +53,7 @@ gdm.enable = true; gdm.wayland = true; }; - desktopManager.plasma5.enable = true; + desktopManager.plasma5.enable = false; }; }; @@ -104,7 +104,7 @@ lazygit # utility - eww + gnome.nautilus waybar streamlink ranger @@ -117,6 +117,7 @@ virt-manager killall playerctl + drawio # entertainment ani-cli diff --git a/hardware-configuration.nix b/hardware-configuration.nix index a315f12..84a5283 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -23,6 +23,16 @@ fsType = "vfat"; }; + fileSystems."/ssd" = + { device = "/dev/disk/by-uuid/44351feb-6297-47c9-890f-27c9e22a05cb"; + fsType = "ext4"; + }; + fileSystems."/hdd" = + { + device = "/dev/disk/by-uuid/e2e4c4f3-51df-4020-b557-a7cf684de85b"; + fsType = "ext4"; + }; + swapDevices = [ { device = "/dev/disk/by-uuid/a850f552-bf4f-45f9-b123-e924980fd0e6"; } ]; diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix index 9159028..2ed0c17 100644 --- a/modules/hyprland/default.nix +++ b/modules/hyprland/default.nix @@ -8,8 +8,8 @@ let text = '' dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=hyprland - systemctl --user stop pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr - systemctl --user start pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr + systemctl --user stop pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr xdg-desktop-portal-kde + systemctl --user start pipewire wireplumber pipewire-media-session xdg-desktop-portal xdg-desktop-portal-hyprland ''; }; @@ -51,9 +51,9 @@ in xdg.portal = { enable = true; wlr.enable = true; - extraPortals = [ - pkgs.xdg-desktop-portal-gtk - + extraPortals = with pkgs; [ + xdg-desktop-portal-gtk + xdg-desktop-portal-wlr ]; gtkUsePortal = true; }; @@ -79,12 +79,7 @@ in "$HOME/bin/:$PATH" ]; - GTK_THEME = "Catppuccin-Pink-Dark"; - - #SWW - SWWW_TRANSITION_TYPE = ""; - SWWW_TRANSITION_FPS = "60"; - + GTK_THEME = "Catppuccin-Pink-Dark"; };