mirror of
https://gitlab.com/upRootNutrition/dotfiles.git
synced 2025-06-15 09:35:12 -05:00
feat: abstracted out window manager tile gapp
This commit is contained in:
parent
17d2832b06
commit
93efd494ca
9 changed files with 17 additions and 12 deletions
|
@ -96,6 +96,7 @@ let
|
|||
themesSubmodule = lib.types.submodule {
|
||||
options = {
|
||||
currentTheme = genOptions stringType "theme";
|
||||
wmGaps = intType;
|
||||
fonts = {
|
||||
names = genOptions stringType "name";
|
||||
sizes = {
|
||||
|
|
|
@ -24,6 +24,7 @@ let
|
|||
in
|
||||
{
|
||||
themes = {
|
||||
wmGaps = 6;
|
||||
currentTheme = {
|
||||
theme0 = currentTheme0; # User0 Theme
|
||||
theme1 = currentTheme1; # User1 Theme
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
show_notifications = false;
|
||||
};
|
||||
};
|
||||
|
||||
package = pkgs.espanso-wayland;
|
||||
matches = {
|
||||
base = {
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
}:
|
||||
let
|
||||
|
||||
inherit (flake.config.aesthetics.themes) currentTheme palettes;
|
||||
inherit (flake.config.aesthetics.themes) currentTheme palettes wmGaps;
|
||||
|
||||
inherit (flake.config.people) user0 user1 user2;
|
||||
|
||||
|
@ -24,8 +24,8 @@ let
|
|||
el = palettes.${themeLogic}.colours;
|
||||
in
|
||||
{
|
||||
gaps_in = 2.5;
|
||||
gaps_out = 5;
|
||||
gaps_in = wmGaps / 2;
|
||||
gaps_out = wmGaps;
|
||||
border_size = 2;
|
||||
"col.active_border" = "rgb(${el.base0E})";
|
||||
"col.inactive_border" = "0xff${el.base02}";
|
||||
|
|
|
@ -1,4 +1,7 @@
|
|||
{ colourHelpers, ... }:
|
||||
{ colourHelpers, flake, ... }:
|
||||
let
|
||||
inherit (flake.config.aesthetics.themes) wmGaps;
|
||||
in
|
||||
{
|
||||
layout = {
|
||||
default-column-width = {
|
||||
|
@ -16,7 +19,7 @@
|
|||
active.color = colourHelpers.makeColour colourHelpers.el.base0E;
|
||||
inactive.color = colourHelpers.makeColour colourHelpers.el.base02;
|
||||
};
|
||||
gaps = 5;
|
||||
gaps = wmGaps;
|
||||
shadow = {
|
||||
enable = true;
|
||||
color = colourHelpers.el.base11;
|
||||
|
|
|
@ -50,7 +50,7 @@ let
|
|||
osConfig
|
||||
;
|
||||
};
|
||||
layout = import (configPath + /layout.nix) { inherit colourHelpers; };
|
||||
layout = import (configPath + /layout.nix) { inherit colourHelpers flake; };
|
||||
main = import (configPath + /main.nix);
|
||||
outputs = import (configPath + /outputs.nix) {
|
||||
inherit
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ config, ... }:
|
||||
{ config, flake, ... }:
|
||||
let
|
||||
user = config.home.username;
|
||||
inherit (flake.config.aesthetics.themes) wmGaps;
|
||||
in
|
||||
{
|
||||
mainBar = {
|
||||
|
@ -8,9 +9,9 @@ in
|
|||
layer = "top";
|
||||
height = 5;
|
||||
margin-top = 0;
|
||||
margin-bottom = 5;
|
||||
margin-left = 5;
|
||||
margin-right = 5;
|
||||
margin-bottom = wmGaps;
|
||||
margin-left = wmGaps;
|
||||
margin-right = wmGaps;
|
||||
modules-left = [
|
||||
"custom/launcher"
|
||||
"hyprland/workspaces"
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
}:
|
||||
let
|
||||
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; };
|
||||
in
|
||||
{
|
||||
|
|
0
modules/nixos/services/espanso/default.nix
Normal file → Executable file
0
modules/nixos/services/espanso/default.nix
Normal file → Executable file
Loading…
Add table
Add a link
Reference in a new issue