diff --git a/modules/programs/gnome.nix b/modules/programs/gnome.nix index f60df75..f5cba87 100644 --- a/modules/programs/gnome.nix +++ b/modules/programs/gnome.nix @@ -7,6 +7,13 @@ with lib; let cfg = config.my.programs.gnome; + + extensions = with pkgs.gnomeExtensions; [ + gsconnect + vitals + gtile + blur-my-shell + ]; in { options.my.programs.gnome.enable = mkEnableOption "gnome"; @@ -19,7 +26,6 @@ in }; pulseaudio.enable = false; }; - programs.xwayland.enable = true; services.xserver = { layout = "de"; displayManager = { @@ -32,6 +38,14 @@ in enable = true; desktopManager.gnome.enable = true; }; - environment.systemPackages = with pkgs.gnomeExtensions; [ tray-icons-reloaded gsconnect ]; + environment.systemPackages = extensions; + home-manager.users.moritz.dconf.settings = { + "org/gnome/shell" = { + disable-user-extensions = false; + enabled-extensions = map (p: p.extensionUuid or p.uuid) extensions; + }; + "org/gnome/desktop/interface".enable-hot-corners = false; + "org/gnome/desktop/wm/preferences".focus-mode = "sloppy"; + }; }; } diff --git a/modules/programs/hyprland/default.nix b/modules/programs/hyprland/default.nix index 6e9407a..059c8a4 100644 --- a/modules/programs/hyprland/default.nix +++ b/modules/programs/hyprland/default.nix @@ -75,32 +75,35 @@ in # lock screen after timeout - home-manager.users.moritz.services.swayidle = { - enable = true; - events = [ - { - event = "before-sleep"; - command = "${pkgs.swaylock-effects}/bin/swaylock -fF"; - } - { - event = "lock"; - command = "${pkgs.swaylock-effects}/bin/swaylock -fF"; - } - ]; - timeouts = [ - { - timeout = 300; - command = "${hyprland}/bin/hyprctl dispatch dpms off"; - resumeCommand = "${hyprland}/bin/hyprctl dispatch dpms on"; - } - { - timeout = 310; - command = "${pkgs.systemd}/bin/loginctl lock-session"; - } - ]; + home-manager.users.moritz = { + services.swayidle = { + enable = true; + events = [ + { + event = "before-sleep"; + command = "${pkgs.swaylock-effects}/bin/swaylock -fF"; + } + { + event = "lock"; + command = "${pkgs.swaylock-effects}/bin/swaylock -fF"; + } + ]; + timeouts = [ + { + timeout = 300; + command = "${hyprland}/bin/hyprctl dispatch dpms off"; + resumeCommand = "${hyprland}/bin/hyprctl dispatch dpms on"; + } + { + timeout = 310; + command = "${pkgs.systemd}/bin/loginctl lock-session"; + } + ]; + }; + + # start swayidle as part of hyprland, not sway + systemd.user.services.swayidle.Install.WantedBy = lib.mkForce [ "hyprland-session.target" ]; }; - # start swayidle as part of hyprland, not sway - systemd.user.services.swayidle.Install.WantedBy = lib.mkForce [ "hyprland-session.target" ]; # adds pam module for swaylock security.pam.services.swaylock = { }; @@ -116,7 +119,7 @@ in }; # set hyprpaper conf (for setting initial background) - xdg.configFile."hypr/hyprpaper.conf" = { + home-manager.users.moritz.xdg.configFile."hypr/hyprpaper.conf" = { text = let setWallpaper = wallpaper: ''