feat: added user2 and refactored to accommodate

This commit is contained in:
Nick 2025-01-28 20:45:11 -06:00
parent c169f84dcc
commit 9cdcf4fec4
97 changed files with 1473 additions and 1052 deletions

View file

@ -0,0 +1,11 @@
{
pkgs,
...
}:
{
home.packages = builtins.attrValues {
inherit (pkgs)
brave
;
};
}

View file

@ -12,21 +12,9 @@ in
programs.firefox =
let
configPath = ./config;
bookmarksPath = import (configPath + /bookmarks) {
inherit
flake
;
};
extensionsPath = import (configPath + /extensions) {
inherit
pkgs
;
};
searchPath = import (configPath + /search) {
inherit
flake
;
};
bookmarksPath = import (configPath + /bookmarks) { inherit flake; };
extensionsPath = import (configPath + /extensions) { inherit pkgs; };
searchPath = import (configPath + /search) { inherit flake; };
settingsPath = import (configPath + /settings);
themesPath = import (configPath + /themes);
in

View file

@ -0,0 +1,11 @@
{
pkgs,
...
}:
{
home.packages = builtins.attrValues {
inherit (pkgs)
firefox
;
};
}

View file

@ -6,7 +6,7 @@
}:
let
inherit (flake.config.aesthetics.themes)
font
fonts
;
in
{
@ -26,9 +26,9 @@ in
"elmLS.disableElmLSDiagnostics" = true;
"elmLS.elmReviewDiagnostics" = "warning";
"editor.wordWrap" = "on";
"editor.fontSize" = font.size.applications;
"editor.fontFamily" = "'${font.name}', 'monospace', monospace";
"terminal.integrated.fontSize" = font.size.applications;
"terminal.integrated.fontFamily" = "'${font.name}', 'monospace', monospace";
"editor.fontSize" = fonts.sizes.applications.size0;
"editor.fontFamily" = "'${fonts.names.name0}', 'monospace', monospace";
"terminal.integrated.fontSize" = fonts.sizes.applications.size0;
"terminal.integrated.fontFamily" = "'${fonts.names.name0}', 'monospace', monospace";
"editor.fontLigatures" = true;
}

View file

@ -1,17 +1,17 @@
{ flake, ... }:
let
inherit (flake.config.aesthetics.themes)
font
fonts
;
in
{
ui_font_family = font.name;
buffer_font_family = font.name;
ui_font_family = fonts.names.name0;
buffer_font_family = fonts.names.name0;
hour_format = "hour12";
vim_mode = false;
show_whitespaces = "none";
ui_font_size = font.size.applications;
buffer_font_size = font.size.applications;
ui_font_size = fonts.sizes.applications.size0;
buffer_font_size = fonts.sizes.applications.size0;
tab_size = 2;
cursor_blink = true;
theme = "Catppuccin Macchiato";

View file

@ -1,7 +1,7 @@
{ flake, ... }:
let
inherit (flake.config.aesthetics.themes)
font
fonts
;
in
{
@ -25,9 +25,9 @@ in
TERM = "ghostty";
};
font_family = font.name;
font_family = fonts.names.name0;
font_features = null;
font_size = font.size.terminal;
font_size = fonts.sizes.terminal.size0;
line_height = "comfortable";
option_as_meta = false;
button = false;

View file

@ -1,11 +1,11 @@
{ flake, ... }:
let
inherit (flake.config.aesthetics.themes)
currentTheme
currentThemes
palettes
;
el = palettes.${currentTheme}.colours;
el = palettes.${currentThemes.theme0}.colours;
in
{
accents = [

View file

@ -6,37 +6,14 @@
}:
let
configPath = ./config;
assistantPath = import (configPath + /assistant) {
inherit
flake
;
};
interfacePath = import (configPath + /interface) {
inherit
flake
;
};
assistantPath = import (configPath + /assistant) { inherit flake; };
interfacePath = import (configPath + /interface) { inherit flake; };
languagesPath = import (configPath + /languages);
lspPath = import (configPath + /lsp);
terminalPath = import (configPath + /terminal) {
inherit
flake
;
};
experimentalPath = import (configPath + /theme) {
inherit
flake
;
};
terminalPath = import (configPath + /terminal) { inherit flake; };
experimentalPath = import (configPath + /theme) { inherit flake; };
gitPath = import (configPath + /git);
miscPath = import (configPath + /misc) {
inherit
lib
pkgs
;
};
miscPath = import (configPath + /misc) { inherit lib pkgs; };
in
{
git = gitPath;

View file

@ -8,18 +8,8 @@ let
configPath = ./config;
extensionsPath = import (configPath + /extensions);
userKeymapsPath = import (configPath + /userKeymaps);
userSettingsPath = import (configPath + /userSettings) {
inherit
flake
lib
pkgs
;
};
extraPackagesPath = import (configPath + /extraPackages) {
inherit
pkgs
;
};
userSettingsPath = import (configPath + /userSettings) { inherit flake lib pkgs; };
extraPackagesPath = import (configPath + /extraPackages) { inherit pkgs; };
packagePath = flake.inputs.zed-editor.packages.${pkgs.system}.default;
in
{

View file

@ -5,14 +5,14 @@
}:
let
inherit (flake.config.aesthetics.themes)
font
fonts
;
in
{
confirm-close-surface = false;
window-decoration = false;
font-size = font.size.terminal;
font-family = font.name;
font-size = fonts.sizes.terminal.size0;
font-family = fonts.names.name0;
window-padding-x = 10;
window-padding-y = 10;
copy-on-select = true;

View file

@ -1,11 +1,11 @@
{ flake, ... }:
let
inherit (flake.config.aesthetics.themes)
currentTheme
currentThemes
palettes
;
el = palettes.${currentTheme}.colours;
el = palettes.${currentThemes.theme0}.colours;
in
{
theme = {

View file

@ -4,15 +4,15 @@
}:
let
inherit (flake.config.aesthetics.themes)
font
fonts
;
in
{
programs.kitty = {
enable = true;
font = {
name = font.name;
size = font.size.terminal;
name = fonts.names.name0;
size = fonts.sizes.terminal.size0;
};
themeFile = "Catppuccin-Macchiato";
};

View file

@ -1,14 +1,14 @@
{ flake, ... }:
let
inherit (flake.config.aesthetics.themes)
font
fonts
;
in
''
return {
color_scheme = "Catppuccin Macchiato",
font_size = ${builtins.toString font.size.terminal},
font = wezterm.font('${font.name}'),
font_size = ${builtins.toString fonts.sizes.terminal.size0},
font = wezterm.font('${fonts.names.name0}'),
enable_tab_bar = false,
window_close_confirmation = 'NeverPrompt',
term = 'wezterm',

View file

@ -0,0 +1,11 @@
{
pkgs,
...
}:
{
home.packages = builtins.attrValues {
inherit (pkgs)
beets
;
};
}

View file

@ -0,0 +1,11 @@
{
pkgs,
...
}:
{
home.packages = builtins.attrValues {
inherit (pkgs)
blender
;
};
}

View file

@ -0,0 +1,11 @@
{
pkgs,
...
}:
{
home.packages = builtins.attrValues {
inherit (pkgs)
darktable
;
};
}

View file

@ -0,0 +1,11 @@
{
pkgs,
...
}:
{
home.packages = builtins.attrValues {
inherit (pkgs)
gimp
;
};
}

View file

@ -0,0 +1,11 @@
{
pkgs,
...
}:
{
home.packages = builtins.attrValues {
inherit (pkgs)
blender
;
};
}

View file

@ -0,0 +1,10 @@
let
content = builtins.readDir ./.;
dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
importList = map (name: ./. + "/${name}") dirContent;
in
{
imports = importList;
}

View file

@ -0,0 +1,11 @@
{
pkgs,
...
}:
{
home.packages = builtins.attrValues {
inherit (pkgs.sweethome3d)
application
;
};
}

View file

@ -7,5 +7,8 @@
inherit (pkgs.kdePackages)
kdenlive
;
inherit (pkgs)
glaxnimate
;
};
}

View file

@ -0,0 +1,11 @@
{
pkgs,
...
}:
{
home.packages = builtins.attrValues {
inherit (pkgs)
tdesktop
;
};
}

View file

@ -0,0 +1,11 @@
{
pkgs,
...
}:
{
home.packages = builtins.attrValues {
inherit (pkgs)
whatsapp-for-linux
;
};
}

View file

@ -0,0 +1,11 @@
{
pkgs,
...
}:
{
home.packages = builtins.attrValues {
inherit (pkgs)
zoom-us
;
};
}

View file

@ -0,0 +1,11 @@
{
pkgs,
...
}:
{
home.packages = builtins.attrValues {
inherit (pkgs)
celeste
;
};
}

View file

@ -0,0 +1,8 @@
{ pkgs, ... }:
{
home.packages = builtins.attrValues {
inherit (pkgs)
droidcam
;
};
}

View file

@ -0,0 +1,12 @@
{
pkgs,
...
}:
{
home.packages = builtins.attrValues {
inherit (pkgs)
openrgb
;
};
}

View file

@ -0,0 +1,12 @@
{
pkgs,
...
}:
{
home.packages = builtins.attrValues {
inherit (pkgs)
opentabletdriver
;
};
}

View file

@ -0,0 +1,11 @@
{
pkgs,
...
}:
{
home.packages = builtins.attrValues {
inherit (pkgs)
synology-drive-client
;
};
}

View file

@ -0,0 +1,11 @@
{
pkgs,
...
}:
{
home.packages = builtins.attrValues {
inherit (pkgs)
virt-manager
;
};
}

View file

@ -0,0 +1,12 @@
{
pkgs,
...
}:
{
home.packages = builtins.attrValues {
inherit (pkgs)
catppuccin
catppuccin-gtk
;
};
}

View file

@ -2,18 +2,18 @@
let
inherit (flake.config.aesthetics.themes)
currentTheme
currentThemes
palettes
font
fonts
;
el = palettes.${currentTheme}.colours;
el = palettes.${currentThemes.theme0}.colours;
makeColor = c: "#" + c;
in
{
global = {
font = "${font.name} ${builtins.toString font.size.popups}";
font = "${fonts.names.name0} ${builtins.toString fonts.sizes.popups.size0}";
background = makeColor el.base01;
frame_color = makeColor el.base0E;
foreground = makeColor el.base05;

View file

@ -21,7 +21,7 @@ in
"flameshot"
"pactl set-default-sink bluez_output.00_16_94_35_0D_5F.1"
"pactl set-default-source alsa_input.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Mic1__source"
"gsettings set org.blueman.plugins.powermanager auto-power-on true"
"bluetoothctl power on"
"gsettings set org.gnome.desktop.interface cursor-theme 'catppuccin-mocha-dark-cursors'"
"gsettings set org.gnome.desktop.interface cursor-size ${builtins.toString cursor.size}"
]

View file

@ -2,11 +2,11 @@
let
inherit (flake.config.aesthetics.themes)
currentTheme
currentThemes
palettes
;
el = palettes.${currentTheme}.colours;
el = palettes.${currentThemes.theme0}.colours;
in
{
gaps_in = 5;

View file

@ -1,16 +1,16 @@
{ flake, ... }:
let
inherit (flake.config.aesthetics.themes)
currentTheme
currentThemes
palettes
font
fonts
;
el = palettes.${currentTheme}.colours;
el = palettes.${currentThemes.theme0}.colours;
in
{
font = font.name;
font-size = font.size.desktop;
font = fonts.names.name0;
font-size = fonts.sizes.desktop.size0;
indicator-idle-visible = true;
indicator-radius = 100;
indicator-thickness = 20;

View file

@ -1,15 +1,15 @@
{ flake, ... }:
let
inherit (flake.config.aesthetics.themes)
currentTheme
currentThemes
palettes
font
fonts
;
el = palettes.${currentTheme}.colours;
el = palettes.${currentThemes.theme0}.colours;
in
{
font-size = font.size.desktop;
font-size = fonts.sizes.desktop.size0;
hint-font = true;
background-color = "#${el.base02}";
outline-color = "#${el.base0E}";

View file

@ -2,16 +2,16 @@
let
inherit (flake.config.aesthetics.themes)
currentTheme
currentThemes
palettes
font
fonts
;
el = palettes.${currentTheme}.colours;
el = palettes.${currentThemes.theme0}.colours;
custom = {
font = font.name;
font_size = "${builtins.toString font.size.desktop}px";
font = fonts.names.name0;
font_size = "${builtins.toString fonts.sizes.desktop.size0}px";
font_weight = "bold";
opacityBg = "0.90";
opacityBt = "1";