Compare commits

...

4 Commits

Author SHA1 Message Date
madmin 584b840bba feat(systems theme): add stylix, nix-colors 2024-07-18 20:01:21 +02:00
madmin 3160709949 feat(foot.nix): add nix-colors theming 2024-07-18 19:50:58 +02:00
madmin 87ef2b9a02 fix(gitui): delete package default 2024-07-18 15:55:12 +02:00
madmin 4da7c24b0e fix(fonts): delete unpatched nerdfonts 2024-07-18 15:54:13 +02:00
6 changed files with 87 additions and 33 deletions

View File

@ -65,10 +65,15 @@
# -------------------------- Nix-Colors --------------------------- # # -------------------------- Nix-Colors --------------------------- #
# TODO # TODO
# https://github.com/Misterio77/nix-colors # https://github.com/Misterio77/nix-colors
#nix-colors = { nix-colors = {
# url = "github:misterio77/nix-colors"; url = "github:misterio77/nix-colors";
# inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
#}; };
# ---------------------------- Stylix ----------------------------- #
stylix = {
url = "github:danth/stylix";
};
# ====================== Personal Repositories ====================== # # ====================== Personal Repositories ====================== #
# Private secrets repo. See ./docs/secretsmgmt.md # Private secrets repo. See ./docs/secretsmgmt.md

View File

@ -6,7 +6,7 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
pkgs.noto-fonts pkgs.noto-fonts
# pkgs.nerdfonts # => loads the complete collection. # pkgs.nerdfonts # => loads the complete collection.
(nerdfonts.override { fonts = [ "FiraCode" "GeistMono" "DroidSansMono" "FontAwesome" "MaterialDesignIcons"]; }) (nerdfonts.override { fonts = [ "FiraCode" "GeistMono" "SourceCodePro" "DroidSansMono"]; })
]; ];
} }

View File

@ -1,9 +1,9 @@
{ pkgs, ... }:
{ {
programs.gitui = { programs.gitui = {
enable = true; enable = true;
# Config and theme must be in RON file format # Config and theme must be in RON file format
# keyConfig = '' ''; # keyConfig = '' '';
package = "pkgs.gitui";
theme = ''( theme = ''(
selected_tab: Reset, selected_tab: Reset,
command_fg: White, command_fg: White,

View File

@ -1,6 +1,6 @@
{ {
pkgs, pkgs,
theme, config,
... ...
}: { }: {
home.packages = with pkgs; [ home.packages = with pkgs; [
@ -30,6 +30,8 @@
cursor = { cursor = {
style = "beam"; style = "beam";
beam-thickness = 2; beam-thickness = 2;
blink = "no";
unfocused-style = "hollow";
}; };
scrollback = { scrollback = {
lines = 10000; lines = 10000;
@ -39,6 +41,7 @@
bell = { bell = {
urgent = "yes"; urgent = "yes";
notify = "yes"; notify = "yes";
visual = "no";
command = "notify-send bell"; command = "notify-send bell";
command-focused = "no"; command-focused = "no";
}; };
@ -50,28 +53,27 @@
uri-characters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+=\"'()[]"; uri-characters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+=\"'()[]";
}; };
colors = with theme.colors; { colors = with config.colorScheme.palette; {
alpha = "0.75"; foreground = base04;
foreground = text; background = base00;
background = base;
regular0 = surface1; regular0 = base00;
regular1 = red; regular1 = base08;
regular2 = green; regular2 = base0B;
regular3 = yellow; regular3 = base0A;
regular4 = blue; regular4 = base0D;
regular5 = pink; regular5 = base0E;
regular6 = teal; regular6 = base0C;
regular7 = subtext1; regular7 = base05;
bright0 = surface2; bright0 = base03;
bright1 = red; bright1 = base08;
bright2 = green; bright2 = base0B;
bright3 = yellow; bright3 = base0A;
bright4 = blue; bright4 = base07;
bright5 = pink; bright5 = base0E;
bright6 = teal; bright6 = base07;
bright7 = subtext0; bright7 = base06;
}; };
mouse = { mouse = {
hide-when-typing = "yes"; hide-when-typing = "yes";

View File

@ -0,0 +1,40 @@
{ pkgs, inputs, configLib, ... }:
{
stylix = {
enable = true;
polarity = "dark"; # TODO: light
image = ( configLib.relativeToRoot "assets/worm.png" );
base16Scheme = inputs.nix-colors.colorSchemes.atelier-dune; #TODO: atelier-dune-light
cursor = {
package = pkgs.bibata-cursors;
name = "Bibata-Modern-Ice"; #TODO: light - Modern-Classic
size = 24;
};
fonts = {
monospace = {
package = pkgs.nerdfonts.override {fonts = ["GeistMono"];};
name = "Geist Mono Vercel Nerd Font Mono";
};
sansSerif = {
package = pkgs.liberation_ttf;
name = "Liberation Sans";
};
serif = {
package = pkgs.eb-garamond;
name = "EB Garamond Regular";
};
sizes = {
applications = 12;
terminal = 14;
desktop = 12;
popups = 10;
};
};
opacity = {
applications = 1.0;
terminal = 0.8;
desktop = 1.0;
popups = 1.0;
};
};
}

View File

@ -10,15 +10,15 @@
{ inputs, configLib, ... }: { inputs, configLib, ... }:
{ {
imports = [ imports = [
#################### Every Host Needs This #################### # ================= Every Host Needs This ==================== #
./hardware-configuration.nix ./hardware-configuration.nix
#################### Hardware Modules #################### # ==================== Hardware Modules ====================== #
inputs.hardware.nixosModules.common-cpu-amd inputs.hardware.nixosModules.common-cpu-amd
inputs.hardware.nixosModules.common-gpu-amd inputs.hardware.nixosModules.common-gpu-amd
inputs.hardware.nixosModules.common-pc-ssd inputs.hardware.nixosModules.common-pc-ssd
#################### Disk Layout #################### # ====================== Disk Layout ========================= #
inputs.disko.nixosModules.disko inputs.disko.nixosModules.disko
( configLib.relativeToRoot "systems/common/disks/jeroboam.nix") ( configLib.relativeToRoot "systems/common/disks/jeroboam.nix")
{ {
@ -28,12 +28,15 @@
swapSize = "16"; swapSize = "16";
}; };
} }
# ======================= Themeing ========================== #
inputs.stylix.nixosModules.stylix
] ]
++ (map configLib.relativeToRoot [ ++ (map configLib.relativeToRoot [
# = Required Configs #################### # = Required Configs ####################
"systems/common/core" "systems/common/core"
#################### Host-specific Configs #################### # --------------- Host-specific Configs -------------------- #
#"systems/common/optional/services/clamav.nix" # depends on optional/msmtp.nix #"systems/common/optional/services/clamav.nix" # depends on optional/msmtp.nix
#"systems/common/optional/msmtp.nix" # required for emailing clamav alerts #"systems/common/optional/msmtp.nix" # required for emailing clamav alerts
#"systems/common/optional/services/openssh.nix" # allow remote ssh #"systems/common/optional/services/openssh.nix" # allow remote ssh
@ -42,13 +45,17 @@
"systems/common/optional/boot/loud_boot.nix" # for testing, otherwise quiet_boot.nix "systems/common/optional/boot/loud_boot.nix" # for testing, otherwise quiet_boot.nix
#"systems/common/optional/boot/quiet_boot.nix" # with plymouth pretty custom load sequence #"systems/common/optional/boot/quiet_boot.nix" # with plymouth pretty custom load sequence
"systems/common/optional/boot/initrd_luks.nix" # luks encryption with pass only "systems/common/optional/boot/initrd_luks.nix" # luks encryption with pass only
# Desktop
# ------------------------ Desktop --------------------------- #
#"systems/common/optional/services/greetd.nix" # display manager #"systems/common/optional/services/greetd.nix" # display manager
#"systems/common/optional/hyprland.nix" # window manager #"systems/common/optional/hyprland.nix" # window manager
#################### Users to Create ####################
# ---------------------- Users to Create ---------------------- #
#"systems/common/users/zhuangzi" #"systems/common/users/zhuangzi"
"systems/common/users/laozi" "systems/common/users/laozi"
# ---------------------- Themeing ----------------------------- #
"systems/common/optional/stylix.nix"
]); ]);
# set custom autologin options. see greetd.nix for details # set custom autologin options. see greetd.nix for details