diff --git a/configs/dms-desktop/settings.json b/configs/dms-desktop/settings.json index 64a8714..44400a6 100644 --- a/configs/dms-desktop/settings.json +++ b/configs/dms-desktop/settings.json @@ -150,7 +150,7 @@ "soundNewNotification": true, "soundVolumeChanged": true, "soundPluggedIn": true, - "acMonitorTimeout": 900, + "acMonitorTimeout": 1800, "acLockTimeout": 300, "acSuspendTimeout": 1800, "acSuspendBehavior": 0, @@ -183,7 +183,7 @@ "dankBarSpacing": 3, "dankBarBottomGap": 0, "dankBarInnerPadding": 4, - "dankBarPosition": 2, + "dankBarPosition": 3, "dankBarSquareCorners": false, "dankBarNoBackground": false, "dankBarGothCornersEnabled": false, diff --git a/configs/hypr-desktop/hypr-monitors.conf b/configs/hypr-desktop/hypr-monitors.conf index 63ef290..649e58b 100644 --- a/configs/hypr-desktop/hypr-monitors.conf +++ b/configs/hypr-desktop/hypr-monitors.conf @@ -1,6 +1,6 @@ # Monitors - monitor=DP-1,2560x1440@143.97Hz,0x0,1 - monitor=HDMI-A-1,preferred,2560x180,1 + monitor=DP-1,2560x1440@300,0x0,1 + monitor=HDMI-A-2,2560x1440@100,-1440x-480,1, transform, 1 monitor=,preferred,auto,1 # in case of hotplugging or new monitors @@ -8,8 +8,8 @@ # Rule :: Workspace Monitor Linking workspace = $ws_game, monitor:DP-1 - workspace = $ws_web, monitor:HDMI-A-1, default:true - workspace = $ws_chat, monitor:HDMI-A-1 + workspace = $ws_web, monitor:HDMI-A-2, default:true + workspace = $ws_chat, monitor:HDMI-A-2 workspace = $ws_video, monitor:DP-1 workspace = $ws_program, monitor:DP-1, default:true workspace = $ws_extra, monitor:DP-1 diff --git a/configs/hypr/hyprland.conf b/configs/hypr/hyprland.conf index 9b0e56f..9c08833 100644 --- a/configs/hypr/hyprland.conf +++ b/configs/hypr/hyprland.conf @@ -128,49 +128,50 @@ $idleInhibFs = idleinhibit fullscreen $idleInhibFo = idleinhibit focus $ws = workspace -# windowrule = $idleInhibFs, class:^(floorp)$ -# windowrule = $idleInhibFs, class:^(firefox)$ -# windowrule = $idleInhibFs, class:^(ghostty)$ -# windowrule = $idleInhibFs, class:^(brave-browser)$ -# -# windowrule = $idleInhibFo, class:^(mpv)$ -# windowrule = $idleInhibFo, class:^(firefox)$ -# windowrule = $idleInhibFo, class:^(floorp)$ -# windowrule = $idleInhibFo, class:^(spotify)$ -# windowrule = $idleInhibFo, class:^(Emacs|emacs)$ -# windowrule = $idleInhibFo, class:^(brave-browser)$ -# windowrule = $idleInhibFo, class:^(Discord|discord)$ -# -# windowrule = opacity 0.98 0.90, class:^(Discord|discord)$ -# windowrule = opacity 0.96 0.90, class:^(Emacs|emacs)$ -# -# windowrule = float, class:^(.*desktop-portal.*)$ -# windowrule = float, class:^(polkit.*agent.*)$ -# windowrule = float, class:^(praat)$ -# windowrule = float, class:^(network)$ -# windowrule = float, class:^(nm-)$ -# windowrule = float, class:^(Network)$ -# windowrule = float, class:^(Rofi)$ -# windowrule = float, class:^(Gimp)$ -# windowrule = float, class:^(thunar)$ -# windowrule = float, class:^(Nautilus)$ -# windowrule = float, title:^(LmDev-.*)$ -# windowrule = float, class:^(notification)$ -# windowrule = float, class:^(Genymotion Player)$ -# windowrule = float, class:^(launcher)$ -# -# windowrule = tile, class:^(Spotify)$ -# windowrule = tile, title:^(Minecraft)$ -# -# windowrule = $ws $ws_shell, class:^(KeePassXC)$ -# windowrule = $ws $ws_web, class:^(firefox)$ -# windowrule = $ws $ws_web, class:^(floorp)$ -# windowrule = $ws $ws_web, class:^(brave-browser)$ -# windowrule = $ws $ws_music, class:^(Spotify)$ -# windowrule = $ws $ws_chat, class:^(discord)$ -# windowrule = $ws $ws_chat, class:^(signal)$, title:^(Signal)$ -# windowrule = $ws $ws_video, class:^(.*obs.*)$ -# windowrule = $ws $ws_game, title:^(Minecraft)$ + windowrule = $idleInhibFs, class:^(floorp)$ + windowrule = $idleInhibFs, class:^(firefox)$ + windowrule = $idleInhibFs, class:^(ghostty)$ + windowrule = $idleInhibFs, class:^(brave-browser)$ + + windowrule = $idleInhibFo, class:^(mpv)$ + windowrule = $idleInhibFo, class:^(firefox)$ + windowrule = $idleInhibFo, class:^(floorp)$ + windowrule = $idleInhibFo, class:^(spotify)$ + windowrule = $idleInhibFo, class:^(Emacs|emacs)$ + windowrule = $idleInhibFo, class:^(brave-browser)$ + windowrule = $idleInhibFo, class:^(Discord|discord)$ + + windowrule = opacity 0.98 0.90, class:^(Discord|discord)$ + windowrule = opacity 0.96 0.90, class:^(Emacs|emacs)$ + + windowrule = float, class:^(.*desktop-portal.*)$ + windowrule = float, class:^(polkit.*agent.*)$ + windowrule = float, class:^(praat)$ + windowrule = float, class:^(network)$ + windowrule = float, class:^(nm-)$ + windowrule = float, class:^(Network)$ + windowrule = float, class:^(Rofi)$ + windowrule = float, class:^(Gimp)$ + windowrule = float, class:^(thunar)$ + windowrule = float, class:^(Nautilus)$ + windowrule = float, title:^(LmDev-.*)$ + windowrule = float, class:^(notification)$ + windowrule = float, class:^(Genymotion Player)$ + windowrule = float, class:^(launcher)$ + windowrule = float, class:steam, title:^(Friends List)$ + + windowrule = tile, class:^(Spotify)$ + windowrule = tile, title:^(Minecraft)$ + + windowrule = $ws $ws_shell, class:^(KeePassXC)$ + windowrule = $ws $ws_web, class:^(firefox)$ + windowrule = $ws $ws_web, class:^(floorp)$ + windowrule = $ws $ws_web, class:^(brave-browser)$ + windowrule = $ws $ws_music, class:^(Spotify)$ + windowrule = $ws $ws_chat, class:^(discord)$ + windowrule = $ws $ws_chat, class:^(signal)$, title:^(Signal)$ + windowrule = $ws $ws_video, class:^(.*obs.*)$ + windowrule = $ws $ws_game, title:^(Minecraft)$ # Commands # :Alias: :Command: diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 557266e..e935a24 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -20,13 +20,16 @@ modesetting.enable = true; powerManagement.enable = true; - open = false; + open = true; nvidiaSettings = true; package = config.boot.kernelPackages.nvidiaPackages.latest; }; }; - boot.kernelPackages = pkgs.linuxPackages_latest; + boot = { + kernelPackages = pkgs.linuxPackages_latest; + }; + services = { thermald.enable = true; diff --git a/hosts/graphical/configuration.nix b/hosts/graphical/configuration.nix index cf75d13..30850ea 100644 --- a/hosts/graphical/configuration.nix +++ b/hosts/graphical/configuration.nix @@ -62,12 +62,23 @@ }; }; + udev = { + packages = with pkgs; [ + qmk-udev-rules + ]; + extraRules = '' + # Explicit Vial rule – this is the only one that reliably works + KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{serial}=="*vial:f64c2b3c*", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl" + ''; + }; + libinput.enable = true; blueman.enable = true; gvfs.enable = true; pulseaudio.enable = false; upower.enable = true; + }; security.pam.services.hyprlock = {}; @@ -170,11 +181,13 @@ libnotify mesa neovim + qmk ripgrep spotify unzip usbutils uxplay + vial vim waypipe wget