diff --git a/home/desktops/hyprland/ags/js/settings/hyprland.js b/home/desktops/hyprland/ags/js/settings/hyprland.js index cb311b8..f1743f2 100644 --- a/home/desktops/hyprland/ags/js/settings/hyprland.js +++ b/home/desktops/hyprland/ags/js/settings/hyprland.js @@ -1,7 +1,7 @@ import App from "resource:///com/github/Aylur/ags/app.js"; import Hyprland from "resource:///com/github/Aylur/ags/service/hyprland.js"; import options from "../options.js"; -import { readFile, writeFile } from "resource:///com/github/Aylur/ags/utils.js"; +import * as Utils from "resource:///com/github/Aylur/ags/utils.js"; const noIgnorealpha = ["verification", "powermenu", "lockscreen"]; @@ -39,6 +39,15 @@ export function hyprlandInit() { } export async function setupHyprland() { + /*Hyprland.event("activewindowv2", async (addr) => { + const client = Hyprland.getClient(addr); + if (!client.pinned || !client.floating) return; + const x = client.at[0]; + console.log( + await Utils.execAsync(`hyprctl dispatch moveactive exact ${x} 80`), + ); + });*/ + const wm_gaps = Math.floor( options.hypr.wm_gaps_multiplier.value * options.spacing.value, ); diff --git a/home/desktops/hyprland/ags/js/settings/setup.js b/home/desktops/hyprland/ags/js/settings/setup.js index 46c4033..b0bacfc 100644 --- a/home/desktops/hyprland/ags/js/settings/setup.js +++ b/home/desktops/hyprland/ags/js/settings/setup.js @@ -11,7 +11,6 @@ import { showAbout } from "../about/about.js"; import Gtk from "gi://Gtk"; export function init() { - console.log("init settings"); notificationBlacklist(); warnOnLowBattery(); globals(); @@ -21,7 +20,6 @@ export function init() { gtkFontSettings(); dependandOptions(); - console.log("init scss"); reloadScss(); hyprlandInit(); setupHyprland(); diff --git a/home/desktops/hyprland/ags/js/themes.js b/home/desktops/hyprland/ags/js/themes.js index 9edd765..1ddb8f1 100644 --- a/home/desktops/hyprland/ags/js/themes.js +++ b/home/desktops/hyprland/ags/js/themes.js @@ -9,7 +9,9 @@ export default [ name: "Latte", icon: "󰄛", "desktop.screen_corners": false, - "bar.style": "floating", + "desktop.clock.enable": false, + "bar.style": "separated", + "bar.separators": false, "desktop.wallpaper.img": WP + "Lakeside-2-1.jpg", ...darkColors, }), @@ -17,7 +19,9 @@ export default [ name: "Frappe", icon: "󰄛", "desktop.screen_corners": false, - "bar.style": "floating", + "desktop.clock.enable": false, + "bar.style": "separated", + "bar.separators": false, "desktop.wallpaper.img": WP + "Lakeside-2-10.jpg", ...lightColors, "theme.widget.bg": "$accent", diff --git a/home/desktops/hyprland/default.nix b/home/desktops/hyprland/default.nix index 06249d4..296aa07 100644 --- a/home/desktops/hyprland/default.nix +++ b/home/desktops/hyprland/default.nix @@ -34,13 +34,6 @@ "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1" ]; general = { - gaps_in = 16; - gaps_out = 16; - border_size = 1; - - "col.active_border" = "rgba(0DB7D4FF)"; - "col.inactive_border" = "rgba(31313600)"; - layout = "master"; resize_on_border = true; }; @@ -62,13 +55,27 @@ ]; monitor = [ "DP-1,highrr,0x0,1,bitdepth,10" - "DP-1,addreserved,200,0,0,0" + "DP-1,addreserved,250,0,0,0" "DP-3,highrr,3840x400,1,bitdepth,10" ]; workspace = [ "special:calc,border:false,gapsout:200,on-created-empty:[noanim;silent] kitty -e qalc" ]; - windowrulev2 = [ + windowrulev2 = let + firefoxPip = "class:^(firefox)$,title:^(Picture-in-Picture)$"; + firefoxPipInitial = "class:^(firefox)$,title:^(Firefox)$"; + in [ + "keepaspectratio,${firefoxPip}" + "nofocus,${firefoxPip}" + "noborder,${firefoxPip}" + "float,${firefoxPip}" + "float,${firefoxPipInitial}" + "pin,${firefoxPip}" + "pin,${firefoxPipInitial}" + "fakefullscreen,${firefoxPip}" + "fakefullscreen,${firefoxPipInitial}" + "move 22 72,${firefoxPip}" + "move 22 72,${firefoxPipInitial}" # Games ## AC2 "monitor DP-3,class:^(steam_app_805550)$" @@ -98,8 +105,7 @@ ]; decoration = { drop_shadow = "yes"; - shadow_range = 8; - shadow_render_power = 2; + shadow_range = 16; "col.shadow" = "rgba(00000044)"; dim_inactive = false; @@ -128,6 +134,10 @@ }; }; + services.kdeconnect = { + enable = true; + indicator = true; + }; programs.ags = { enable = true; configDir = ./ags; @@ -143,7 +153,7 @@ Service = { ExecStart = "${pkgs.ags}/bin/ags"; ExecReload = "${pkgs.coreutils}/bin/kill -SIGUSR2 $MAINPID"; - Restart = "on-failure"; + Restart = "always"; KillMode = "mixed"; Environment = "PATH=/run/current-system/sw/bin/:${with pkgs; lib.makeBinPath [ @@ -173,7 +183,6 @@ System = pkgs.System; UserNotifications = pkgs.UserNotifications; }) - libsForQt5.konsole # fonts noto-fonts # essentials diff --git a/hosts/MONSTER/default.nix b/hosts/MONSTER/default.nix index eb82d6d..6606818 100644 --- a/hosts/MONSTER/default.nix +++ b/hosts/MONSTER/default.nix @@ -90,7 +90,10 @@ services.dbus.enable = true; xdg.portal = { enable = true; - extraPortals = [pkgs.xdg-desktop-portal-gtk]; + extraPortals = [ + pkgs.xdg-desktop-portal-gtk + pkgs.xdg-desktop-portal-kde + ]; }; time.timeZone = "Europe/Berlin"; @@ -147,6 +150,7 @@ services.getty.loginOptions = "-p -f -- \\u"; # preserve environment programs.hyprland.enable = true; programs.fish.enable = true; + programs.kdeconnect.enable = true; security.sudo.configFile = '' Defaults env_reset,pwfeedback,passprompt="󰟵 " '';