From 1a3b0915886525e6c41a50d071deb68a725d6e46 Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Mon, 28 Jul 2025 09:32:31 -0500 Subject: [PATCH] desktop stuff --- modules/home/desktop/hyprland/options.nix | 6 +- modules/home/programs/waybar/default.nix | 2 +- .../specialisations/hyprland/default.nix | 73 +++++++++---------- .../specialisations/hyprland/home/default.nix | 46 +++++++++++- 4 files changed, 83 insertions(+), 44 deletions(-) diff --git a/modules/home/desktop/hyprland/options.nix b/modules/home/desktop/hyprland/options.nix index ff50c32..02b924f 100644 --- a/modules/home/desktop/hyprland/options.nix +++ b/modules/home/desktop/hyprland/options.nix @@ -132,15 +132,15 @@ with lib; hyprIdle = { lockScreenTimer = mkOption { type = with types; int; - default = 5; + default = 300; }; screenOffTimer = mkOption { type = with types; int; - default = 15; + default = 900; }; suspendTimer = mkOption { type = with types; int; - default = 30; + default = 1500; }; }; }; diff --git a/modules/home/programs/waybar/default.nix b/modules/home/programs/waybar/default.nix index 2df0513..08b6643 100755 --- a/modules/home/programs/waybar/default.nix +++ b/modules/home/programs/waybar/default.nix @@ -373,7 +373,7 @@ in ${defaultBorderRadius} ${defaultCenterOptions} margin-left: 4rem; - margin-right: 400rem; + margin-right: 4rem; } /* make window module transparent when no windows present */ diff --git a/systems/x86_64-linux/desktop/specialisations/hyprland/default.nix b/systems/x86_64-linux/desktop/specialisations/hyprland/default.nix index e28d3cc..377362f 100755 --- a/systems/x86_64-linux/desktop/specialisations/hyprland/default.nix +++ b/systems/x86_64-linux/desktop/specialisations/hyprland/default.nix @@ -1,16 +1,16 @@ { lib, namespace, ... }: let # Displays - displayLeft = { - input = "DP-1"; - resolution = "3840x2160"; - refreshRate = "240.00000"; - }; - displayRight = { - input = "DP-2"; - resolution = "3840x2160"; - refreshRate = "240.00000"; - }; + # displayLeft = { + # input = "DP-1"; + # resolution = "3840x2160"; + # refreshRate = "240.00000"; + # }; + # displayRight = { + # input = "DP-2"; + # resolution = "3840x2160"; + # refreshRate = "240.00000"; + # }; in { specialisation.hyprland.inheritParentConfig = true; @@ -18,38 +18,37 @@ in home-manager.users.matt = import ./home/default.nix; ${namespace} = { desktop = { - hyprland = { - enable = true; - primaryDisplay = "DP-1"; + hyprland.enable = true; + # primaryDisplay = "DP-1"; - wallpaper = [ - "${displayLeft.input}, /run/wallpaper.jpg" - "${displayRight.input}, /run/wallpaper.jpg" - ]; + # wallpaper = [ + # "${displayLeft.input}, /run/wallpaper.jpg" + # "${displayRight.input}, /run/wallpaper.jpg" + # ]; - monitor = [ - "${displayLeft.input},${displayLeft.resolution}@${displayLeft.refreshRate},0x0,1,bitdepth,10,cm,hdr,sdrbrightness,1.2,sdrsaturation,0.98" - "${displayRight.input},${displayRight.resolution}@${displayRight.refreshRate},3840x0,1,bitdepth,10,cm,hdr,sdrbrightness,1.5,sdrsaturation,0.98" - ]; + # monitor = [ + # "${displayLeft.input},${displayLeft.resolution}@${displayLeft.refreshRate},0x0,1,bitdepth,10,cm,hdr,sdrbrightness,1.2,sdrsaturation,0.98" + # "${displayRight.input},${displayRight.resolution}@${displayRight.refreshRate},3840x0,1,bitdepth,10,cm,hdr,sdrbrightness,1.5,sdrsaturation,0.98" + # ]; - workspace = [ - "name:firefox, monitor:${displayRight.input}, default:false, special, class:(.*firefox.*)" - "name:discord, monitor:${displayRight.input}, default:true, special, title:(.*vesktop.*), title:(.*Apple Music.*)" - "name:steam, monitor:${displayLeft.input}, default:false, special, class:(.*[Ss]team.*)" - ]; + # workspace = [ + # "name:firefox, monitor:${displayRight.input}, default:false, special, class:(.*firefox.*)" + # "name:discord, monitor:${displayRight.input}, default:true, special, title:(.*vesktop.*), title:(.*Apple Music.*)" + # "name:steam, monitor:${displayLeft.input}, default:false, special, class:(.*[Ss]team.*)" + # ]; - windowRule = [ - "size 2160 7680, tag:horizonrdp" - ]; + # windowRule = [ + # "size 2160 7680, tag:horizonrdp" + # ]; - extraConfig = '' - exec-once = nm-applet - exec-once = [silent] firefox - exec-once = [silent] vesktop - exec-once = [silent] chromium --app="https://music.apple.com" - exec-once = [silent] steam - ''; - }; + # extraConfig = '' + # exec-once = nm-applet + # exec-once = [silent] firefox + # exec-once = [silent] vesktop + # exec-once = [silent] chromium --app="https://music.apple.com" + # exec-once = [silent] steam + # ''; + # }; gnome.enable = lib.mkForce false; }; }; diff --git a/systems/x86_64-linux/desktop/specialisations/hyprland/home/default.nix b/systems/x86_64-linux/desktop/specialisations/hyprland/home/default.nix index 2cfb04d..cee1dd6 100644 --- a/systems/x86_64-linux/desktop/specialisations/hyprland/home/default.nix +++ b/systems/x86_64-linux/desktop/specialisations/hyprland/home/default.nix @@ -3,11 +3,52 @@ let theme = import (lib.snowfall.fs.get-file "modules/home/desktop/theme/nord.nix"); fontName = "JetBrainsMono NFM"; fontPackage = pkgs.nerd-fonts.jetbrains-mono; + displayLeft = { + input = "DP-1"; + resolution = "3840x2160"; + refreshRate = "240.00000"; + }; + displayRight = { + input = "DP-2"; + resolution = "3840x2160"; + refreshRate = "240.00000"; + }; in { + mjallen = { desktop.hyprland = { enable = true; + primaryDisplay = "DP-1"; + + wallpaper = [ + "${displayLeft.input}, /run/wallpaper.jpg" + "${displayRight.input}, /run/wallpaper.jpg" + ]; + + monitor = [ + "${displayLeft.input},${displayLeft.resolution}@${displayLeft.refreshRate},0x0,1,bitdepth,10,cm,hdr,sdrbrightness,1.2,sdrsaturation,0.98" + "${displayRight.input},${displayRight.resolution}@${displayRight.refreshRate},3840x0,1,bitdepth,10,cm,hdr,sdrbrightness,1.5,sdrsaturation,0.98" + ]; + + workspace = [ + "name:firefox, monitor:${displayRight.input}, default:false, special, class:(.*firefox.*)" + "name:discord, monitor:${displayRight.input}, default:true, special, title:(.*vesktop.*), title:(.*Apple Music.*)" + "name:steam, monitor:${displayLeft.input}, default:false, special, class:(.*[Ss]team.*)" + ]; + + windowRule = [ + "size 2160 7680, tag:horizonrdp" + ]; + + extraConfig = '' + exec-once = nm-applet + exec-once = [silent] firefox + exec-once = [silent] vesktop + exec-once = [silent] chromium --app="https://music.apple.com" + exec-once = [silent] steam + ''; + defaultApps = { browser = pkgs.firefox; }; @@ -36,7 +77,6 @@ in waybar = { enable = true; - networkInterface = "wlp9s0"; layer = "bottom"; modules-right = [ @@ -54,13 +94,13 @@ in "clock" "custom/weather" ]; - + extraModules = { "custom/lights" = { tooltip = false; exec = "waybar-hass --get_light light.living_room_lights"; interval = "once"; - format = "{text}"; # "󱉓"; + format = "{text}";#"󱉓"; on-click = "waybar-hass --toggle_light light.living_room_lights"; return-type = "json"; };