diff --git a/aly.nix b/aly.nix index b1c7b891..23dffe0f 100644 --- a/aly.nix +++ b/aly.nix @@ -125,7 +125,7 @@ "workspace 4: work" = [{app_id = "google-chrome";} {app_id = "chromium-browser";}]; "workspace 10: zoom" = [{class = "zoom";} {app_id = "Zoom";}]; }; - + wayland.windowManager.hyprland.extraConfig = '' # Workspace - Browser workspace = 1,defaultName:web diff --git a/nixosModules/desktop/default.nix b/nixosModules/desktop/default.nix index aa2f4ddd..8a36601b 100644 --- a/nixosModules/desktop/default.nix +++ b/nixosModules/desktop/default.nix @@ -21,6 +21,8 @@ }; config = lib.mkIf config.alyraffauf.desktop.enable { + environment.sessionVariables.NIXOS_OZONE_WL = "1"; + services = { gnome.gnome-keyring.enable = true; gvfs.enable = true; # Mount, trash, etc. diff --git a/nixosModules/desktop/hyprland/default.nix b/nixosModules/desktop/hyprland/default.nix index 0c9b6e74..a95300e0 100644 --- a/nixosModules/desktop/hyprland/default.nix +++ b/nixosModules/desktop/hyprland/default.nix @@ -7,7 +7,7 @@ }: { options = { alyraffauf.desktop.hyprland.enable = - lib.mkEnableOption "Enable hyprland wayland compositor."; + lib.mkEnableOption "Hyprland wayland compositor."; }; config = lib.mkIf config.alyraffauf.desktop.hyprland.enable { @@ -30,7 +30,5 @@ enable = true; }; }; - - environment.sessionVariables.NIXOS_OZONE_WL = "1"; }; } diff --git a/nixosModules/desktop/lightdm/default.nix b/nixosModules/desktop/lightdm/default.nix index 00350f32..28ac7296 100644 --- a/nixosModules/desktop/lightdm/default.nix +++ b/nixosModules/desktop/lightdm/default.nix @@ -32,7 +32,7 @@ accent = "mauve"; }; - font.name = "NotoSansNerdFont-Regular"; + font.name = "NotoSans Nerd Font Regular"; font.package = pkgs.nerdfonts.override {fonts = ["Noto"];}; cursorTheme.package = pkgs.catppuccin-cursors.frappeDark; diff --git a/nixosModules/desktop/plasma/default.nix b/nixosModules/desktop/plasma/default.nix index 200e74d7..9c1fc88b 100644 --- a/nixosModules/desktop/plasma/default.nix +++ b/nixosModules/desktop/plasma/default.nix @@ -29,8 +29,6 @@ maliit-keyboard ]; - environment.sessionVariables.NIXOS_OZONE_WL = "1"; - programs.kdeconnect.enable = true; # nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true; # nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-features=WaylandWindowDecorations --ozone-platform-hint=auto"; diff --git a/nixosModules/desktop/sway/default.nix b/nixosModules/desktop/sway/default.nix index 4d2e822b..aa2d6fd6 100644 --- a/nixosModules/desktop/sway/default.nix +++ b/nixosModules/desktop/sway/default.nix @@ -7,7 +7,7 @@ }: { options = { alyraffauf.desktop.sway.enable = - lib.mkEnableOption "Enable sway wayland compositor."; + lib.mkEnableOption "Sway wayland compositor."; }; config = lib.mkIf config.alyraffauf.desktop.sway.enable { @@ -31,7 +31,5 @@ package = pkgs.swayfx; }; }; - - environment.sessionVariables.NIXOS_OZONE_WL = "1"; }; }