feat: abstracted out window manager tile gapp

This commit is contained in:
Nick 2025-05-18 16:53:29 -05:00
parent 17d2832b06
commit 93efd494ca
9 changed files with 17 additions and 12 deletions

View file

@ -96,6 +96,7 @@ let
themesSubmodule = lib.types.submodule { themesSubmodule = lib.types.submodule {
options = { options = {
currentTheme = genOptions stringType "theme"; currentTheme = genOptions stringType "theme";
wmGaps = intType;
fonts = { fonts = {
names = genOptions stringType "name"; names = genOptions stringType "name";
sizes = { sizes = {

View file

@ -24,6 +24,7 @@ let
in in
{ {
themes = { themes = {
wmGaps = 6;
currentTheme = { currentTheme = {
theme0 = currentTheme0; # User0 Theme theme0 = currentTheme0; # User0 Theme
theme1 = currentTheme1; # User1 Theme theme1 = currentTheme1; # User1 Theme

View file

@ -11,7 +11,6 @@
show_notifications = false; show_notifications = false;
}; };
}; };
package = pkgs.espanso-wayland; package = pkgs.espanso-wayland;
matches = { matches = {
base = { base = {

View file

@ -5,7 +5,7 @@
}: }:
let let
inherit (flake.config.aesthetics.themes) currentTheme palettes; inherit (flake.config.aesthetics.themes) currentTheme palettes wmGaps;
inherit (flake.config.people) user0 user1 user2; inherit (flake.config.people) user0 user1 user2;
@ -24,8 +24,8 @@ let
el = palettes.${themeLogic}.colours; el = palettes.${themeLogic}.colours;
in in
{ {
gaps_in = 2.5; gaps_in = wmGaps / 2;
gaps_out = 5; gaps_out = wmGaps;
border_size = 2; border_size = 2;
"col.active_border" = "rgb(${el.base0E})"; "col.active_border" = "rgb(${el.base0E})";
"col.inactive_border" = "0xff${el.base02}"; "col.inactive_border" = "0xff${el.base02}";

View file

@ -1,4 +1,7 @@
{ colourHelpers, ... }: { colourHelpers, flake, ... }:
let
inherit (flake.config.aesthetics.themes) wmGaps;
in
{ {
layout = { layout = {
default-column-width = { default-column-width = {
@ -16,7 +19,7 @@
active.color = colourHelpers.makeColour colourHelpers.el.base0E; active.color = colourHelpers.makeColour colourHelpers.el.base0E;
inactive.color = colourHelpers.makeColour colourHelpers.el.base02; inactive.color = colourHelpers.makeColour colourHelpers.el.base02;
}; };
gaps = 5; gaps = wmGaps;
shadow = { shadow = {
enable = true; enable = true;
color = colourHelpers.el.base11; color = colourHelpers.el.base11;

View file

@ -50,7 +50,7 @@ let
osConfig osConfig
; ;
}; };
layout = import (configPath + /layout.nix) { inherit colourHelpers; }; layout = import (configPath + /layout.nix) { inherit colourHelpers flake; };
main = import (configPath + /main.nix); main = import (configPath + /main.nix);
outputs = import (configPath + /outputs.nix) { outputs = import (configPath + /outputs.nix) {
inherit inherit

View file

@ -1,6 +1,7 @@
{ config, ... }: { config, flake, ... }:
let let
user = config.home.username; user = config.home.username;
inherit (flake.config.aesthetics.themes) wmGaps;
in in
{ {
mainBar = { mainBar = {
@ -8,9 +9,9 @@ in
layer = "top"; layer = "top";
height = 5; height = 5;
margin-top = 0; margin-top = 0;
margin-bottom = 5; margin-bottom = wmGaps;
margin-left = 5; margin-left = wmGaps;
margin-right = 5; margin-right = wmGaps;
modules-left = [ modules-left = [
"custom/launcher" "custom/launcher"
"hyprland/workspaces" "hyprland/workspaces"

View file

@ -6,7 +6,7 @@
}: }:
let let
configPath = ./config; configPath = ./config;
settingsPath = import (configPath + /settings.nix) { inherit config; }; settingsPath = import (configPath + /settings.nix) { inherit config flake; };
stylePath = import (configPath + /style.nix) { inherit config flake; }; stylePath = import (configPath + /style.nix) { inherit config flake; };
in in
{ {

0
modules/nixos/services/espanso/default.nix Normal file → Executable file
View file