diff options
| -rw-r--r-- | common/home/default.nix | 1 | ||||
| -rw-r--r-- | common/home/hyprland/default.nix | 10 | ||||
| -rw-r--r-- | common/home/services/nextcloud-client/default.nix | 4 | ||||
| -rw-r--r-- | common/services/default.nix | 1 | ||||
| -rw-r--r-- | common/services/waydroid-container.nix | 4 | ||||
| -rw-r--r-- | hosts/workstation/default.nix | 7 |
6 files changed, 19 insertions, 8 deletions
diff --git a/common/home/default.nix b/common/home/default.nix index fbd3204..524c295 100644 --- a/common/home/default.nix +++ b/common/home/default.nix @@ -67,6 +67,7 @@ packages = [ pkgs.unstable.supertuxkart pkgs.krita pkgs.uxplay + pkgs.waydroid-helper ]; in { diff --git a/common/home/hyprland/default.nix b/common/home/hyprland/default.nix index 983ba21..ff31c54 100644 --- a/common/home/hyprland/default.nix +++ b/common/home/hyprland/default.nix @@ -21,10 +21,12 @@ "$mod+Ctrl, S, togglesplit," "$mod, Escape, exec, hyprlock" - "$mod, Space, exec, wofi --show run" + "$mod, Space, exec, wofi --show drun" + "$mod, Shift+Space, exec, wofi --show run" "$mod, O, exec, openproject" "$mod, V, exec, openproject -e nvim" "$mod, B, exec, bluemenu" + "$mod, P, pseudo" "$mod+Alt, S, exec, loadconfig" @@ -163,7 +165,7 @@ animate_manual_resizes = true; }; - windowrulev2 = [ + windowrule = [ "pin,class:^(Hyprland::WinClass::Floating)$" "float,class:^(Hyprland::WinClass::Floating)$" "center,class:^(Hyprland::WinClass::Floating)$" @@ -180,6 +182,10 @@ "pin, title: KDE Connect Daemon" "move 0 0, title: KDE Connect Daemon" "size 1920 1080, title: KDE Connect Daemon" + + # Waydroid + "float, size 500 900, class:^(waydroid\\..*)$" + "float, size 500 900, class:^(Waydroid)$" ]; ecosystem = { diff --git a/common/home/services/nextcloud-client/default.nix b/common/home/services/nextcloud-client/default.nix new file mode 100644 index 0000000..b5234ab --- /dev/null +++ b/common/home/services/nextcloud-client/default.nix @@ -0,0 +1,4 @@ +{ ... }: { + enable = true; + startInBackground = true; +} diff --git a/common/services/default.nix b/common/services/default.nix index 381a06b..81b9554 100644 --- a/common/services/default.nix +++ b/common/services/default.nix @@ -3,7 +3,6 @@ let services = [ "pipewire" "greetd" - "waydroid-container" ]; in builtins.listToAttrs ( diff --git a/common/services/waydroid-container.nix b/common/services/waydroid-container.nix deleted file mode 100644 index a8321f2..0000000 --- a/common/services/waydroid-container.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ ... }: -{ - enable = true; -} diff --git a/hosts/workstation/default.nix b/hosts/workstation/default.nix index 28f92a6..2a26646 100644 --- a/hosts/workstation/default.nix +++ b/hosts/workstation/default.nix @@ -107,7 +107,12 @@ }; }; - systemd.tmpfiles.rules = [ "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" ]; + systemd ={ + tmpfiles.rules = [ "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" ]; + services = { + waydroid-container.enable = true; + }; + }; services.printing.drivers = [ pkgs.epson-escpr2 pkgs.epson-escpr ]; environment.systemPackages = with pkgs; [ clinfo ]; |