From 10a30e27c5020f9ce2da9a3df178ed43127e6844 Mon Sep 17 00:00:00 2001 From: William Date: Sun, 23 Mar 2025 16:40:58 -0300 Subject: [PATCH] added waydroid, removed hyprland --- hosts/modules/desktop.nix | 2 + hosts/modules/impermanence.nix | 1 + hosts/modules/virtualisation.nix | 1 + users/modules/user/hyprland.nix | 137 +++++++++++++++---------------- 4 files changed, 72 insertions(+), 69 deletions(-) diff --git a/hosts/modules/desktop.nix b/hosts/modules/desktop.nix index 81c25ad..59502ee 100644 --- a/hosts/modules/desktop.nix +++ b/hosts/modules/desktop.nix @@ -36,6 +36,8 @@ }; }; + # programs.hyprland.enable = true; + hardware = { xpadneo.enable = true; bluetooth.enable = true; diff --git a/hosts/modules/impermanence.nix b/hosts/modules/impermanence.nix index 7c5c7d6..8999c9c 100644 --- a/hosts/modules/impermanence.nix +++ b/hosts/modules/impermanence.nix @@ -33,6 +33,7 @@ "/var/lib/systemd/coredump" "/var/lib/systemd/timers" "/var/lib/tailscale" + "/var/lib/waydroid" "/var/log" ]; }; diff --git a/hosts/modules/virtualisation.nix b/hosts/modules/virtualisation.nix index 232459a..fb2c156 100644 --- a/hosts/modules/virtualisation.nix +++ b/hosts/modules/virtualisation.nix @@ -32,6 +32,7 @@ virtualisation = { libvirtd.enable = true; lxd.enable = true; + waydroid.enable = true; }; }) ]; diff --git a/users/modules/user/hyprland.nix b/users/modules/user/hyprland.nix index 17f6996..7477263 100644 --- a/users/modules/user/hyprland.nix +++ b/users/modules/user/hyprland.nix @@ -1,5 +1,4 @@ { - inputs, lib, pkgs, ... @@ -57,9 +56,9 @@ in ################# ### AUTOSTART ### ################# - exec-once = ${pkgs.gnome-settings-daemon}/libexec/gsd-rfkill - exec-once = waybar - exec-once = syshud + # exec-once = ${pkgs.gnome-settings-daemon}/libexec/gsd-rfkill + # exec-once = waybar + # exec-once = syshud exec-once = ${lib.getExe heightfittr} env = XCURSOR_SIZE,24 env = HYPRCURSOR_SIZE,24 @@ -218,72 +217,72 @@ in }; services = { - swaync = { - enable = true; - settings = { - positionX = "left"; - positionY = "top"; - layer = "overlay"; - control-center-layer = "top"; - layer-shell = true; - cssPriority = "application"; - control-center-margin-top = 20; - control-center-margin-bottom = 20; - control-center-margin-right = 20; - control-center-margin-left = 20; - notification-2fa-action = true; - notification-inline-replies = false; - notification-icon-size = 64; - notification-body-image-height = 100; - notification-body-image-width = 200; - timeout = 10; - timeout-low = 5; - timeout-critical = 0; - fit-to-screen = true; - relative-timestamps = true; - control-center-width = 500; - control-center-height = 600; - notification-window-width = 500; - keyboard-shortcuts = true; - image-visibility = "when-available"; - transition-time = 200; - hide-on-clear = false; - hide-on-action = true; - script-fail-notify = true; - widgets = [ - "inhibitors" - "title" - "dnd" - "notifications" - "mpris" - ]; - widget-config = { - inhibitors = { - text = "Inhibitors"; - button-text = "Clear All"; - clear-all-button = true; - }; - title = { - text = "Notifications"; - clear-all-button = true; - button-text = "Clear All"; - }; - dnd = { - text = "Do Not Disturb"; - }; - mpris = { - image-size = 96; - image-radius = 12; - }; - }; - }; - }; - clipman.enable = true; + # swaync = { + # enable = true; + # settings = { + # positionX = "left"; + # positionY = "top"; + # layer = "overlay"; + # control-center-layer = "top"; + # layer-shell = true; + # cssPriority = "application"; + # control-center-margin-top = 20; + # control-center-margin-bottom = 20; + # control-center-margin-right = 20; + # control-center-margin-left = 20; + # notification-2fa-action = true; + # notification-inline-replies = false; + # notification-icon-size = 64; + # notification-body-image-height = 100; + # notification-body-image-width = 200; + # timeout = 10; + # timeout-low = 5; + # timeout-critical = 0; + # fit-to-screen = true; + # relative-timestamps = true; + # control-center-width = 500; + # control-center-height = 600; + # notification-window-width = 500; + # keyboard-shortcuts = true; + # image-visibility = "when-available"; + # transition-time = 200; + # hide-on-clear = false; + # hide-on-action = true; + # script-fail-notify = true; + # widgets = [ + # "inhibitors" + # "title" + # "dnd" + # "notifications" + # "mpris" + # ]; + # widget-config = { + # inhibitors = { + # text = "Inhibitors"; + # button-text = "Clear All"; + # clear-all-button = true; + # }; + # title = { + # text = "Notifications"; + # clear-all-button = true; + # button-text = "Clear All"; + # }; + # dnd = { + # text = "Do Not Disturb"; + # }; + # mpris = { + # image-size = 96; + # image-radius = 12; + # }; + # }; + # }; + # }; + # clipman.enable = true; }; - programs = { - hyprlock.enable = true; - }; + # programs = { + # hyprlock.enable = true; + # }; home.packages = with pkgs; [ brightnessctl @@ -294,6 +293,6 @@ in syshud ulauncher waybar - inputs.mithril.packages.${pkgs.system}.mithril-control-center + # inputs.mithril.packages.${pkgs.system}.mithril-control-center ]; }