diff --git a/users/modules/user/default.nix b/users/modules/user/default.nix index 86a920c..173f040 100644 --- a/users/modules/user/default.nix +++ b/users/modules/user/default.nix @@ -2,7 +2,7 @@ { imports = [ - ./hyprland.nix + # ./hyprland.nix ./programs.nix ]; } diff --git a/users/modules/user/hyprland.nix b/users/modules/user/hyprland.nix index 686c062..17f6996 100644 --- a/users/modules/user/hyprland.nix +++ b/users/modules/user/hyprland.nix @@ -52,7 +52,7 @@ in ################ ### MONITORS ### ################ - monitor=,preferred,auto,auto + monitor=,preferred,auto,1 ################# ### AUTOSTART ### @@ -281,39 +281,6 @@ in clipman.enable = true; }; - systemd.user.services.ulauncher = { - Unit = { - "Description" = "Ulauncher Application Launcher"; - "PartOf" = [ "graphical-session.target" ]; - }; - Install.WantedBy = [ "graphical-session.target" ]; - Service = { - Type = "simple"; - Environment = - let - pydeps = pkgs.python3.withPackages ( - pp: with pp; [ - parsedatetime # https://github.com/tchar/ulauncher-albert-calculate-anything - pint # https://github.com/tchar/ulauncher-albert-calculate-anything - pydbus - pygobject3 - pytz # https://github.com/tchar/ulauncher-albert-calculate-anything - requests # https://github.com/tchar/ulauncher-albert-calculate-anything - simpleeval # https://github.com/tchar/ulauncher-albert-calculate-anything - ] - ); - in - [ - "PYTHONPATH=${pydeps}/${pydeps.sitePackages}" - ]; - ExecStart = pkgs.writeShellScript "ulauncher-env-wrapper.sh" '' - export PATH="''${XDG_BIN_HOME}:$HOME/.nix-profile/bin:/etc/profiles/per-user/$USER/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin" - export GDK_BACKEND=wayland - exec ${pkgs.ulauncher}/bin/ulauncher --hide-window - ''; - }; - }; - programs = { hyprlock.enable = true; }; diff --git a/users/modules/user/programs.nix b/users/modules/user/programs.nix index 04ad1c2..c8216ec 100644 --- a/users/modules/user/programs.nix +++ b/users/modules/user/programs.nix @@ -143,6 +143,38 @@ }; }; + systemd.user.services.ulauncher = { + Unit = { + "Description" = "Ulauncher Application Launcher"; + "PartOf" = [ "graphical-session.target" ]; + }; + Install.WantedBy = [ "graphical-session.target" ]; + Service = { + Type = "simple"; + Environment = + let + pydeps = pkgs.python3.withPackages ( + pp: with pp; [ + # https://github.com/tchar/ulauncher-albert-calculate-anything + parsedatetime + pint + pytz + requests + simpleeval + ] + ); + in + [ + "PYTHONPATH=${pydeps}/${pydeps.sitePackages}" + ]; + ExecStart = pkgs.writeShellScript "ulauncher-env-wrapper.sh" '' + export PATH="''${XDG_BIN_HOME}:$HOME/.nix-profile/bin:/etc/profiles/per-user/$USER/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin" + export GDK_BACKEND=wayland + exec ${pkgs.ulauncher}/bin/ulauncher --hide-window + ''; + }; + }; + }) ]; }