diff --git a/hosts/tuxcomp/kanshi.nix b/hosts/tuxcomp/kanshi.nix index 1e28e20..bc582d1 100644 --- a/hosts/tuxcomp/kanshi.nix +++ b/hosts/tuxcomp/kanshi.nix @@ -6,8 +6,8 @@ settings = [ { profile.name = "default"; profile.exec = [ - /home/djai/.config/hypr/scripts/waybar.sh - /home/djai/.config/hypr/scripts/bg.sh + "/home/djai/.config/hypr/scripts/waybar.sh" + "/home/djai/.config/hypr/scripts/bg.fish" ]; profile.outputs = [ { @@ -19,8 +19,8 @@ } { profile.name = "grun"; profile.exec = [ - /home/djai/.config/hypr/scripts/waybar.sh - /home/djai/.config/hypr/scripts/bg.sh + "/home/djai/.config/hypr/scripts/waybar.sh" + "/home/djai/.config/hypr/scripts/bg.fish" ]; profile.outputs = [ { @@ -37,8 +37,8 @@ } { profile.name = "illo"; profile.exec = [ - /home/djai/.config/hypr/scripts/waybar.sh - /home/djai/.config/hypr/scripts/bg.sh + "/home/djai/.config/hypr/scripts/waybar.sh" + "/home/djai/.config/hypr/scripts/bg.fish" ]; profile.outputs = [ { @@ -55,8 +55,8 @@ } { profile.name = "remi"; profile.exec = [ - /home/djai/.config/hypr/scripts/waybar.sh - /home/djai/.config/hypr/scripts/bg.sh + "/home/djai/.config/hypr/scripts/waybar.sh" + "/home/djai/.config/hypr/scripts/bg.fish" ]; profile.outputs = [ { diff --git a/modules/apps/default.nix b/modules/apps/default.nix index a689d9a..e16d613 100644 --- a/modules/apps/default.nix +++ b/modules/apps/default.nix @@ -87,6 +87,7 @@ ffmpeg gimp kdePackages.kdenlive + gifski krita puddletag diff --git a/modules/desktop/hypr-rules.nix b/modules/desktop/hypr-rules.nix index c33cbea..0605069 100644 --- a/modules/desktop/hypr-rules.nix +++ b/modules/desktop/hypr-rules.nix @@ -29,20 +29,17 @@ { match.class = "^file-png$"; float = true;} { match.class = "^yad$"; float = true;} - # flameshot - { match.class = "^flameshot$"; float = true;} - { match.class = "^flameshot$"; move = "exact 1920 1080";} - { match.class = "^flameshot$"; size = "1920 1080";} + # steam window fixes + { match.class = "^(steam)$"; suppress_event = "activatefocus";} + + { match.title = "^flameshot$"; float = true; move = "exact 1920 1080"; size = "1920 1080";} # move bitwarden login window to center - { match.title = ".*Bitwarden.*"; float = true;} - { match.title = ".*Bitwarden.*"; size = "monitor_w*0.25 monitor_h*0.15";} - { match.title = ".*Bitwarden.*"; center = true;} + { match.title = ".*Bitwarden.*"; float = true; size = "monitor_w*0.25 monitor_h*0.15"; center = true; } # gimp floating windows { match.class = "^gimp$"; match.title = ".*Colour Exchange.*"; move = "100 (monitor_h/2)-(window_h/2)";} - { match.class = "^script-fu$"; float = true;} - { match.class = "^script-fu$"; move = "100 (monitor_h/2)-(window_h/2)";} + { match.class = "^script-fu$"; float = true; move = "100 (monitor_h/2)-(window_h/2)";} # default workspaces { match.class = "Librewolf"; workspace = "1 silent";} @@ -70,12 +67,9 @@ # muted tag { match.tag = "muted"; border_color = { colors = [ - (lib.generators.mkLuaInline "colors.subtext0") # FIXME: stupid hack to use catppuccin-nix colors + (lib.generators.mkLuaInline "colors.subtext0") # stupid hack to use catppuccin-nix colors (lib.generators.mkLuaInline "colors.subtext1") ]; angle = 45;};} - - # steam window fixes - { match.class = "^(steam)$"; suppress_event = "activatefocus";} ]; }; } diff --git a/modules/desktop/hypr-workspaces.nix b/modules/desktop/hypr-workspaces.nix index 7e92b4b..c588727 100644 --- a/modules/desktop/hypr-workspaces.nix +++ b/modules/desktop/hypr-workspaces.nix @@ -15,24 +15,28 @@ in { home-manager.users."djai".wayland.windowManager.hyprland.settings = { bind = [ - (bind "${mainMod} + SHIFT + W" (submap "H") "") # hidden workspaces + (bind "${mainMod} + SHIFT + W" (submap "H") "") ] ++ builtins.concatLists (builtins.genList (i: - let ws = builtins.toJSON (mod i 11); + let + ws = i+1; + k = toString (mod ws 10); in [ - (bind "${mainMod} + ${toString i}" (focusWorkspace ws) "Switch to workspace ${toString i}") - (bind "${mainMod} + SHIFT + ${toString i} " (moveWorkspace ws false) "Move window to workspace ${toString i}") + (bind "${mainMod} +${k}" (focusWorkspace ws) "Switch to workspace ${toString ws}") + (bind "${mainMod} + SHIFT + ${k} " (moveWorkspace ws false) "Move window to workspace ${toString ws}") ] - ) 9); + ) 10); define_submap = [ (makeSubmap "H" ([ ["ESCAPE" (submap "reset")] ] ++ builtins.concatLists (builtins.genList (i: - let ws = i+10; + let + ws = i+11; + k = (mod (i+1) 10); in [ - [(toString i) (muldsp [(focusWorkspace ws) (submap "reset")]) ""] - ["SHIFT + ${toString i}" (moveWorkspace ws false)] - ]) 9)))]; + [(toString k) (muldsp [(focusWorkspace ws) (submap "reset")])] + ["SHIFT + ${toString k}" (moveWorkspace ws false)] + ]) 10)))]; window_rule = [ { match.class = ".*hideme.*"; workspace = "11 silent";} diff --git a/modules/dev/default.nix b/modules/dev/default.nix index 5a1e835..2a5cb96 100644 --- a/modules/dev/default.nix +++ b/modules/dev/default.nix @@ -58,6 +58,7 @@ in python3 rustc uv + stdenv.cc.cc.lib # containers / secrets age