diff --git a/modules/features/desktop/binds.nix b/modules/features/desktop/binds.nix index 96c520e..83d8aeb 100755 --- a/modules/features/desktop/binds.nix +++ b/modules/features/desktop/binds.nix @@ -1,55 +1,8 @@ -{ - self, - inputs, - config, - pkgs, - lib, - ... -}: - -let - - widthDivisions = [ - 1.0 - 2.0 - 3.0 - 4.0 - ]; - heightDivisions = [ - 1.0 - 2.0 - 3.0 - 4.0 - ]; - - # black magic, expected output: - # [ { proportion = 1.0 / 1.0 } - # { proportion = 1.0 / 2.0 } - # ... - # { proportion = 2.0 / 1.0 } - # { proportion = 2.0 / 3.0 } - # ... - # { proportion = 4.0 / 4.0 } ] - getProportions = - divisions: - lib.lists.unique ( - lib.lists.flatten ( - # TODO: make this a callable function - map (x: map (y: { proportion = x / y; }) divisions) divisions - ) - ); - - # then get all the unique outputs (removing double ups of 0.5 or others) - # just getting all the values below 1 - columnWidths = getProportions widthDivisions; - columnWidthsFiltered = builtins.filter (x: builtins.lessThan x.proportion 1.0) columnWidths; - windowHeights = getProportions heightDivisions; - windowHeightsFiltered = builtins.filter (x: builtins.lessThan x.proportion 1.0) windowHeights; - -in +{ self, inputs, ... }: { + # niri keybinds module declaration flake.nixosModules.niri-binds = { config, @@ -57,6 +10,48 @@ in lib, ... }: + + let + + widthDivisions = [ + 1.0 + 2.0 + 3.0 + 4.0 + ]; + heightDivisions = [ + 1.0 + 2.0 + 3.0 + 4.0 + ]; + + # black magic, expected output: + # [ { proportion = 1.0 / 1.0 } + # { proportion = 1.0 / 2.0 } + # ... + # { proportion = 2.0 / 1.0 } + # { proportion = 2.0 / 3.0 } + # ... + # { proportion = 4.0 / 4.0 } ] + getProportions = + divisions: + lib.lists.unique ( + lib.lists.flatten ( + # TODO: make this a callable function + map (x: map (y: { proportion = x / y; }) divisions) divisions + ) + ); + + # then get all the unique outputs (removing double ups of 0.5 or others) + # just getting all the values below 1 + columnWidths = getProportions widthDivisions; + columnWidthsFiltered = builtins.filter (x: builtins.lessThan x.proportion 1.0) columnWidths; + windowHeights = getProportions heightDivisions; + windowHeightsFiltered = builtins.filter (x: builtins.lessThan x.proportion 1.0) windowHeights; + + in + { # for home manager functionality diff --git a/modules/features/desktop/window-rules.nix b/modules/features/desktop/window-rules.nix index 0b1614f..faaa5be 100755 --- a/modules/features/desktop/window-rules.nix +++ b/modules/features/desktop/window-rules.nix @@ -1,70 +1,77 @@ { self, inputs, ... }: -let +{ - windowRules = [ - { - geometry-corner-radius = - let - radius = 16.0; - in + # niri window rules module declaration + flake.nixosModules.niri-window-rules = + { pkgs, ... }: + + let + + windowRules = [ { - bottom-left = radius; - bottom-right = radius; - top-left = radius; - top-right = radius; - }; - clip-to-geometry = true; - draw-border-with-background = false; - } - { - matches = [ { app-id = "kitty"; } ]; - opacity = 0.95; - } - { - matches = [ { is-floating = true; } ]; - default-floating-position = { - relative-to = "top-left"; - x = 1720; - y = 720; - }; - max-height = 720; - max-width = 1720; - opacity = 0.95; - shadow.enable = true; - } - { - matches = [ + geometry-corner-radius = + let + radius = 16.0; + in + { + bottom-left = radius; + bottom-right = radius; + top-left = radius; + top-right = radius; + }; + clip-to-geometry = true; + draw-border-with-background = false; + } { - at-startup = true; - title = "btop"; + matches = [ { app-id = "kitty"; } ]; + opacity = 0.95; + } + { + matches = [ { is-floating = true; } ]; + default-floating-position = { + relative-to = "top-left"; + x = 1720; + y = 720; + }; + max-height = 720; + max-width = 1720; + opacity = 0.95; + shadow.enable = true; + } + { + matches = [ + { + at-startup = true; + title = "btop"; + } + ]; + open-on-output = "DP-4"; + open-on-workspace = "System"; + open-maximized = true; + } + { + matches = [ { title = "calculator"; } ]; + open-floating = true; + open-focused = true; } ]; - open-on-output = "DP-4"; - open-on-workspace = "System"; - open-maximized = true; - } + + in + { - matches = [ { title = "calculator"; } ]; - open-floating = true; - open-focused = true; - } - ]; -in + # for home manager functionality + imports = [ inputs.home-manager.nixosModules.home-manager ]; -{ - flake.nixosModules.niri-window-rules = { pkgs, ... }: { - - # for home manager functionality - imports = [ inputs.home-manager.nixosModules.home-manager ]; - - home-manager.users.serenity = { - programs.niri.settings = { + # using the home manager module to assign binds + home-manager.users.serenity.programs.niri.settings = { + # grabs assigned rules from let bindings above window-rules = windowRules; layout = { background-color = "transparent"; }; + # pushes wallpaper set by noctalia to the lowest layer layer-rules = [ { matches = [ { namespace = "^noctalia-wallpaper*"; } ]; @@ -73,5 +80,4 @@ in ]; }; }; - }; }