diff --git a/modules/core/default.nix b/modules/core/default.nix index 849878a..3f53b87 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -20,5 +20,6 @@ ++ [(import ./system.nix)] ++ [(import ./user.nix)] ++ [(import ./wayland.nix)] + ++ [(import ./variables.nix)] ++ [(import ./virtualisation.nix)]; } diff --git a/modules/core/programs.nix b/modules/core/programs.nix index 07b9407..8d3ec88 100644 --- a/modules/core/programs.nix +++ b/modules/core/programs.nix @@ -13,5 +13,4 @@ programs.nix-ld.enable = true; programs.nix-ld.libraries = with pkgs; []; programs.adb.enable = true; - programs.kdeconnect.enable = true; } diff --git a/modules/core/variables.nix b/modules/core/variables.nix new file mode 100644 index 0000000..8dbaeef --- /dev/null +++ b/modules/core/variables.nix @@ -0,0 +1,4 @@ +{...}: { + environment.sessionVariables.NIXOS_OZONE_WL = "1"; + environment.sessionVariables.XKB_DEFAULT_LAYOUT = "es"; +} diff --git a/modules/core/wayland.nix b/modules/core/wayland.nix index a0bc9f4..beb5b28 100644 --- a/modules/core/wayland.nix +++ b/modules/core/wayland.nix @@ -22,13 +22,7 @@ programs.regreet = { enable = true; settings = { - background = { - path = pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath; - fit = "Cover"; - }; + background.path = pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath; }; - cageArgs = ["-s" "-m" "last"]; # Only show on the last monitor }; - - environment.sessionVariables.XKB_DEFAULT_LAYOUT = "es"; } diff --git a/modules/home/default.nix b/modules/home/default.nix index 9a2ce67..5ea8ae1 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -15,7 +15,6 @@ ++ [(import ./git.nix)] # version control ++ [(import ./gtk.nix)] # gtk theme ++ [(import ./hyprland)] # window manager - ++ [(import ./kdeconnect.nix)] ++ [(import ./kitty.nix)] # terminal ++ [(import ./swaync/swaync.nix)] # notification deamon ++ [(import ./nextcloud.nix)] # nextcloud client @@ -25,7 +24,6 @@ ++ [(import ./scripts/scripts.nix)] # personal scripts ++ [(import ./spotify.nix)] ++ [(import ./starship.nix)] # shell prompt - ++ [(import ./qt.nix)] ++ [(import ./vscodium.nix)] # vscode forck ++ [(import ./waybar)] # status bar ++ [(import ./zsh.nix)]; # shell diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix index cd7f3d8..06ad500 100644 --- a/modules/home/hyprland/config.nix +++ b/modules/home/hyprland/config.nix @@ -3,6 +3,9 @@ settings = { # autostart exec-once = [ + "systemctl --user import-environment &" + "hash dbus-update-activation-environment 2>/dev/null &" + "dbus-update-activation-environment --systemd --all &" "nm-applet &" "wl-clip-persist --clipboard both &" "bash -c 'if [ ! -f ~/.config/hypr/wallpaper.png ]; then wall-change ~/.config/hypr/default_wallpaper.png; fi'" @@ -82,7 +85,7 @@ ignore_opacity = true; noise = 0; new_optimizations = true; - xray = false; + xray = true; }; drop_shadow = true; diff --git a/modules/home/hyprland/variables.nix b/modules/home/hyprland/variables.nix index 7c22466..4b73662 100644 --- a/modules/home/hyprland/variables.nix +++ b/modules/home/hyprland/variables.nix @@ -1,8 +1,4 @@ -{ - lib, - config, - ... -}: { +{...}: { home.sessionVariables = { NIXOS_OZONE_WL = "1"; ELECTRON_OZONE_PLATFORM_HINT = "auto"; @@ -17,18 +13,16 @@ WLR_DRM_NO_ATOMIC = "1"; QT_AUTO_SCREEN_SCALE_FACTOR = "1"; QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; - QT_QPA_PLATFORM = "wayland"; + QT_QPA_PLATFORM = "xcb"; QT_QPA_PLATFORMTHEME = "qt5ct"; QT_STYLE_OVERRIDE = "kvantum"; MOZ_ENABLE_WAYLAND = "1"; WLR_BACKEND = "vulkan"; + WLR_RENDERER = "vulkan"; WLR_NO_HARDWARE_CURSORS = "1"; XDG_SESSION_TYPE = "wayland"; SDL_VIDEODRIVER = "wayland"; CLUTTER_BACKEND = "wayland"; GTK_THEME = "Dracula"; }; - - wayland.windowManager.hyprland.systemd.variables = ["--all"]; - wayland.windowManager.hyprland.settings.env = lib.attrsets.mapAttrsToList (name: value: "${name},${builtins.toString value}") config.home.sessionVariables; } diff --git a/modules/home/kdeconnect.nix b/modules/home/kdeconnect.nix deleted file mode 100644 index 338f2b5..0000000 --- a/modules/home/kdeconnect.nix +++ /dev/null @@ -1,6 +0,0 @@ -{pkgs, ...}: { - services.kdeconnect = { - enable = true; - indicator = true; - }; -} diff --git a/modules/home/qt.nix b/modules/home/qt.nix deleted file mode 100644 index 69c5c59..0000000 --- a/modules/home/qt.nix +++ /dev/null @@ -1,17 +0,0 @@ -{pkgs, ...}: { - qt.enable = true; - qt.platformTheme.name = "qtct"; - qt.style.name = "kvantum"; - - home.packages = with pkgs; [ - libsForQt5.qtstyleplugin-kvantum - ]; - - xdg.configFile."Kvantum/kvantum.kvconfig".source = (pkgs.formats.ini {}).generate "kvantum.kvconfig" { - General.theme = "Catppuccin-Mocha-Lavender"; - }; - xdg.configFile."Kvantum/Catppuccin-Mocha-Lavender".source = "${(pkgs.catppuccin-kvantum.override { - accent = "Lavender"; - variant = "Mocha"; - })}/share/Kvantum/Catppuccin-Mocha-Lavender"; -}