upRootNutrition/dotfiles
1
0
Fork 0
mirror of https://gitlab.com/upRootNutrition/dotfiles.git synced 2025-06-15 01:25:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: quick commit don't care lolololol

Browse source
This commit is contained in:
Nick 2025-06-05 15:28:52 -05:00
parent e49994251e
commit bc2d8762c9
10 changed files with 48 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/config/default.nix
View file

@ -96,7 +96,11 @@ let
themesSubmodule = lib.types.submodule {
options = {
currentTheme = genOptions stringType "theme";
wmGaps = intType;
windowManager = {
gaps = intType;
borders = intType;
rounding = intType;
};
fonts = {
names = genOptions stringType "name";
sizes = {

8
modules/config/themes/default.nix
View file

@ -1,5 +1,5 @@
let
currentTheme0 = catppuccin-mocha; # User0 Theme
currentTheme0 = catppuccin-macchiato; # User0 Theme
currentTheme1 = catppuccin-mocha; # User1 Theme
currentTheme2 = catppuccin-mocha; # User2 Theme
@ -24,7 +24,11 @@ let
in
{
themes = {
wmGaps = 6;
windowManager = {
gaps = 6;
borders = 3;
rounding = 20;
};
currentTheme = {
theme0 = currentTheme0; # User0 Theme
theme1 = currentTheme1; # User1 Theme

6
modules/home/gui/desktop/hypr/land/config/decoration.nix
View file

@ -1,8 +1,12 @@
{ flake, ... }:
let
inherit (flake.config.aesthetics.themes) windowManager;
in
{
active_opacity = 0.95;
inactive_opacity = 0.90;
fullscreen_opacity = 1;
rounding = 20;
rounding = windowManager.rounding;
dim_inactive = 1;
dim_strength = 0.05;

12
modules/home/gui/desktop/hypr/land/config/general.nix
View file

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

2
modules/home/gui/desktop/hypr/land/default.nix
View file

@ -12,7 +12,7 @@ let
bindm = import (configPath + /bindm.nix);
binds = import (configPath + /binds.nix);
# bindl = import (configPath + /bindl.nix);
decoration = import (configPath + /decoration.nix);
decoration = import (configPath + /decoration.nix) { inherit flake; };
dwindle = import (configPath + /dwindle.nix);
exec-once = import (configPath + /exec-once.nix);
general = import (configPath + /general.nix) { inherit config flake; };

6
modules/home/gui/desktop/niri/config/layout.nix
View file

@ -1,6 +1,6 @@
{ colourHelpers, flake, ... }:
let
inherit (flake.config.aesthetics.themes) wmGaps;
inherit (flake.config.aesthetics.themes) windowManager;
in
{
layout = {
@ -15,11 +15,11 @@ in
];
border = {
enable = true;
width = 2;
width = windowManager.borders;
active.color = colourHelpers.makeColour colourHelpers.el.base0E;
inactive.color = colourHelpers.makeColour colourHelpers.el.base02;
};
gaps = wmGaps;
gaps = windowManager.gaps;
shadow = {
enable = true;
color = colourHelpers.el.base11;

7
modules/home/gui/desktop/niri/config/windowrules.nix
View file

@ -1,4 +1,7 @@
{ workspaceStrings, ... }:
{ flake, workspaceStrings, ... }:
let
inherit (flake.config.aesthetics.themes) windowManager;
in
{
window-rules = [
{
@ -113,7 +116,7 @@
focus-ring.enable = false;
geometry-corner-radius =
let
radius = 10.0;
radius = windowManager.rounding + 0.0;
in
{
top-left = radius;

2
modules/home/gui/desktop/niri/default.nix
View file

@ -61,7 +61,7 @@ let
};
startup = import (configPath + /startup.nix) { inherit lib pkgs; };
style = import (configPath + /style.nix) { inherit flake; };
windowrules = import (configPath + /windowrules.nix) { inherit workspaceStrings; };
windowrules = import (configPath + /windowrules.nix) { inherit flake workspaceStrings; };
workspaces = import (configPath + /workspaces.nix) { inherit workspaceStrings; };
in
binds // layout // main // outputs // startup // style // windowrules // workspaces;

8
modules/home/gui/desktop/wayland/waybar/config/settings.nix
View file

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

13
modules/home/gui/desktop/wayland/waybar/config/style.nix
View file

@ -5,7 +5,12 @@
}:
let
inherit (flake.config.aesthetics.themes) currentTheme palettes fonts;
inherit (flake.config.aesthetics.themes)
currentTheme
palettes
fonts
windowManager
;
inherit (flake.config.people) user0 user1 user2;
@ -29,6 +34,8 @@ let
font_weight = "bold";
opacityBg = "0.90";
opacityBt = "1";
border = windowManager.borders;
rounding = windowManager.rounding;
text_color = el.base0E;
secondary_accent = el.base07;
tertiary_accent = el.base15;
@ -50,8 +57,8 @@ in
window#waybar {
background: #${custom.background_2};
color: #${custom.text_color};
border: 2px solid;
border-radius: 30px;
border: ${builtins.toString custom.border}px solid;
border-radius: ${builtins.toString custom.rounding}px;
border-color: #${custom.text_color};
opacity: ${custom.opacityBg};
}