noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2024-11-21 21:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor colors and options

Browse Source 
preparing for light mode, even though specializations aren't working
This commit is contained in:
Noah Masur 2022-11-02 21:29:14 -04:00
parent b2850e8b79
commit 41d289c5db
19 changed files with 513 additions and 492 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
modules/neovim/.stylua.toml → .stylua.toml
View File

45
hosts/common.nix
View File

@ -3,9 +3,9 @@
imports = imports =
[ ../modules/shell ../modules/neovim ../modules/repositories/dotfiles.nix ]; [ ../modules/shell ../modules/neovim ../modules/repositories/dotfiles.nix ];
options = with lib; { options = rec {
user = mkOption { user = lib.mkOption {
type = types.str; type = lib.types.str;
description = "Primary user of the system"; description = "Primary user of the system";
}; };
fullName = lib.mkOption { fullName = lib.mkOption {
@ -27,17 +27,30 @@
default = "/etc/ssh/ssh_host_ed25519_key"; default = "/etc/ssh/ssh_host_ed25519_key";
}; };
gui = { gui = {
enable = mkEnableOption { enable = lib.mkEnableOption {
description = "Enable graphics"; description = "Enable graphics.";
default = false; default = false;
}; };
}; };
colorscheme = mkOption { theme = {
type = types.attrs; colors = lib.mkOption {
description = "Base16 color scheme"; type = lib.types.attrs;
description = "Base16 color scheme.";
default = (import ../modules/colorscheme/gruvbox).dark;
}; };
homePath = mkOption { dark = lib.mkOption {
type = types.path; type = lib.types.bool;
description = "Enable dark mode.";
default = true;
};
};
# colorscheme = lib.mkOption {
# type = types.attrs;
# description = "Base16 color scheme";
# };
homePath = lib.mkOption {
type = lib.types.path;
description = "Path of user's home directory."; description = "Path of user's home directory.";
default = builtins.toPath (if pkgs.stdenv.isDarwin then default = builtins.toPath (if pkgs.stdenv.isDarwin then
"/Users/${config.user}" "/Users/${config.user}"
@ -45,17 +58,17 @@
"/home/${config.user}"); "/home/${config.user}");
}; };
dotfilesPath = mkOption { dotfilesPath = lib.mkOption {
type = types.path; type = lib.types.path;
description = "Path of dotfiles repository."; description = "Path of dotfiles repository.";
default = config.homePath + "/dev/personal/dotfiles"; default = config.homePath + "/dev/personal/dotfiles";
}; };
dotfilesRepo = mkOption { dotfilesRepo = lib.mkOption {
type = types.str; type = lib.types.str;
description = "Link to dotfiles repository."; description = "Link to dotfiles repository.";
}; };
unfreePackages = mkOption { unfreePackages = lib.mkOption {
type = types.listOf types.str; type = lib.types.listOf lib.types.str;
description = "List of unfree packages to allow."; description = "List of unfree packages to allow.";
default = [ ]; default = [ ];
}; };

25
hosts/desktop/default.nix
View File

@ -15,15 +15,13 @@ nixpkgs.lib.nixosSystem {
# Set registry to flake packages, used for nix X commands # Set registry to flake packages, used for nix X commands
nix.registry.nixpkgs.flake = nixpkgs; nix.registry.nixpkgs.flake = nixpkgs;
identityFile = "/home/${globals.user}/.ssh/id_ed25519"; identityFile = "/home/${globals.user}/.ssh/id_ed25519";
gaming.steam = true; gui.enable = true;
gaming.legendary = true; theme = {
gui = { colors = (import ../../modules/colorscheme/gruvbox).dark;
enable = true; dark = true;
compositor.enable = true;
wallpaper = "${wallpapers}/gruvbox/road.jpg";
gtk.theme = { name = "Adwaita-dark"; };
}; };
colorscheme = (import ../../modules/colorscheme/gruvbox); wallpaper = "${wallpapers}/gruvbox/road.jpg";
gtk.theme.name = nixpkgs.lib.mkDefault "Adwaita-dark";
passwordHash = passwordHash =
"$6$PZYiMGmJIIHAepTM$Wx5EqTQ5GApzXx58nvi8azh16pdxrN6Qrv1wunDlzveOgawitWzcIxuj76X9V868fsPi/NOIEO8yVXqwzS9UF."; "$6$PZYiMGmJIIHAepTM$Wx5EqTQ5GApzXx58nvi8azh16pdxrN6Qrv1wunDlzveOgawitWzcIxuj76X9V868fsPi/NOIEO8yVXqwzS9UF.";
} }
@ -33,14 +31,17 @@ nixpkgs.lib.nixosSystem {
../../modules/hardware ../../modules/hardware
../../modules/nixos ../../modules/nixos
../../modules/graphical ../../modules/graphical
../../modules/gaming ../../modules/gaming/steam.nix
../../modules/applications ../../modules/gaming/legendary.nix
../../modules/applications/media.nix
../../modules/applications/firefox.nix
../../modules/applications/kitty.nix
../../modules/applications/discord.nix
../../modules/applications/nautilus.nix
../../modules/mail/default.nix ../../modules/mail/default.nix
../../modules/repositories/notes.nix ../../modules/repositories/notes.nix
../../modules/services/keybase.nix ../../modules/services/keybase.nix
../../modules/services/gnupg.nix
../../modules/services/mullvad.nix ../../modules/services/mullvad.nix
../../modules/programming/nix.nix ../../modules/programming/nix.nix
../../modules/programming/haskell.nix
]; ];
} }

36
modules/applications/alacritty.nix
View File

@ -54,32 +54,32 @@
]; ];
colors = { colors = {
primary = { primary = {
background = config.colorscheme.base00; background = config.theme.colors.base00;
foreground = config.colorscheme.base05; foreground = config.theme.colors.base05;
}; };
cursor = { cursor = {
text = "#1d2021"; text = "#1d2021";
cursor = config.colorscheme.base05; cursor = config.theme.colors.base05;
}; };
normal = { normal = {
black = "#1d2021"; black = "#1d2021";
red = config.colorscheme.base08; red = config.theme.colors.base08;
green = config.colorscheme.base0B; green = config.theme.colors.base0B;
yellow = config.colorscheme.base0A; yellow = config.theme.colors.base0A;
blue = config.colorscheme.base0D; blue = config.theme.colors.base0D;
magenta = config.colorscheme.base0E; magenta = config.theme.colors.base0E;
cyan = config.colorscheme.base0C; cyan = config.theme.colors.base0C;
white = config.colorscheme.base05; white = config.theme.colors.base05;
}; };
bright = { bright = {
black = config.colorscheme.base03; black = config.theme.colors.base03;
red = config.colorscheme.base09; red = config.theme.colors.base09;
green = config.colorscheme.base01; green = config.theme.colors.base01;
yellow = config.colorscheme.base02; yellow = config.theme.colors.base02;
blue = config.colorscheme.base04; blue = config.theme.colors.base04;
magenta = config.colorscheme.base06; magenta = config.theme.colors.base06;
cyan = config.colorscheme.base0F; cyan = config.theme.colors.base0F;
white = config.colorscheme.base07; white = config.theme.colors.base07;
}; };
}; };
draw_bold_text_with_bright_colors = false; draw_bold_text_with_bright_colors = false;

42
modules/applications/firefox.nix
View File

@ -48,65 +48,65 @@
}; };
userChrome = '' userChrome = ''
:root { :root {
--focus-outline-color: ${config.colorscheme.base04} !important; --focus-outline-color: ${config.theme.colors.base04} !important;
--toolbar-color: ${config.colorscheme.base07} !important; --toolbar-color: ${config.theme.colors.base07} !important;
--tab-min-height: 30px !important; --tab-min-height: 30px !important;
} }
/* Background of tab bar */ /* Background of tab bar */
.toolbar-items { .toolbar-items {
background-color: ${config.colorscheme.base00} !important; background-color: ${config.theme.colors.base00} !important;
} }
/* Tabs themselves */ /* Tabs themselves */
.tabbrowser-tab .tab-stack { .tabbrowser-tab .tab-stack {
border-radius: 5px 5px 0 0; border-radius: 5px 5px 0 0;
overflow: hidden; overflow: hidden;
background-color: ${config.colorscheme.base00}; background-color: ${config.theme.colors.base00};
color: ${config.colorscheme.base06} !important; color: ${config.theme.colors.base06} !important;
} }
.tab-content { .tab-content {
border-bottom: 2px solid color-mix(in srgb, var(--identity-tab-color) 40%, transparent); border-bottom: 2px solid color-mix(in srgb, var(--identity-tab-color) 40%, transparent);
border-radius: 5px 5px 0 0; border-radius: 5px 5px 0 0;
background-color: ${config.colorscheme.base00}; background-color: ${config.theme.colors.base00};
color: ${config.colorscheme.base06} !important; color: ${config.theme.colors.base06} !important;
} }
.tab-content[selected=true] { .tab-content[selected=true] {
border-bottom: 2px solid color-mix(in srgb, var(--identity-tab-color) 25%, transparent); border-bottom: 2px solid color-mix(in srgb, var(--identity-tab-color) 25%, transparent);
background-color: ${config.colorscheme.base01} !important; background-color: ${config.theme.colors.base01} !important;
color: ${config.colorscheme.base07} !important; color: ${config.theme.colors.base07} !important;
} }
/* Below tab bar */ /* Below tab bar */
#nav-bar { #nav-bar {
background: ${config.colorscheme.base01} !important; background: ${config.theme.colors.base01} !important;
} }
/* URL bar in nav bar */ /* URL bar in nav bar */
#urlbar[focused=true] { #urlbar[focused=true] {
color: ${config.colorscheme.base07} !important; color: ${config.theme.colors.base07} !important;
background: ${config.colorscheme.base02} !important; background: ${config.theme.colors.base02} !important;
caret-color: ${config.colorscheme.base05} !important; caret-color: ${config.theme.colors.base05} !important;
} }
#urlbar:not([focused=true]) { #urlbar:not([focused=true]) {
color: ${config.colorscheme.base04} !important; color: ${config.theme.colors.base04} !important;
background: ${config.colorscheme.base02} !important; background: ${config.theme.colors.base02} !important;
} }
#urlbar ::-moz-selection { #urlbar ::-moz-selection {
color: ${config.colorscheme.base07} !important; color: ${config.theme.colors.base07} !important;
background: ${config.colorscheme.base02} !important; background: ${config.theme.colors.base02} !important;
} }
#urlbar-input-container { #urlbar-input-container {
border: 1px solid ${config.colorscheme.base01} !important; border: 1px solid ${config.theme.colors.base01} !important;
} }
#urlbar-background { #urlbar-background {
background: ${config.colorscheme.base01} !important; background: ${config.theme.colors.base01} !important;
} }
/* Text in URL bar */ /* Text in URL bar */
#urlbar-input, #urlbar-scheme, .searchbar-textbox { #urlbar-input, #urlbar-scheme, .searchbar-textbox {
color: ${config.colorscheme.base07} !important; color: ${config.theme.colors.base07} !important;
} }
''; '';
userContent = '' userContent = ''
@-moz-document url-prefix(about:blank) { @-moz-document url-prefix(about:blank) {
* { * {
background-color:${config.colorscheme.base01} !important; background-color:${config.theme.colors.base01} !important;
} }
} }
''; '';

70
modules/applications/kitty.nix
View File

@ -16,47 +16,47 @@
settings = { settings = {
# Colors (adapted from: https://github.com/kdrag0n/base16-kitty/blob/master/templates/default-256.mustache) # Colors (adapted from: https://github.com/kdrag0n/base16-kitty/blob/master/templates/default-256.mustache)
background = config.colorscheme.base00; background = config.theme.colors.base00;
foreground = config.colorscheme.base05; foreground = config.theme.colors.base05;
selection_background = config.colorscheme.base05; selection_background = config.theme.colors.base05;
selection_foreground = config.colorscheme.base00; selection_foreground = config.theme.colors.base00;
url_color = config.colorscheme.base04; url_color = config.theme.colors.base04;
cursor = config.colorscheme.base05; cursor = config.theme.colors.base05;
active_border_color = config.colorscheme.base03; active_border_color = config.theme.colors.base03;
inactive_border_color = config.colorscheme.base01; inactive_border_color = config.theme.colors.base01;
active_tab_background = config.colorscheme.base00; active_tab_background = config.theme.colors.base00;
active_tab_foreground = config.colorscheme.base05; active_tab_foreground = config.theme.colors.base05;
inactive_tab_background = config.colorscheme.base01; inactive_tab_background = config.theme.colors.base01;
inactive_tab_foreground = config.colorscheme.base04; inactive_tab_foreground = config.theme.colors.base04;
tab_bar_background = config.colorscheme.base01; tab_bar_background = config.theme.colors.base01;
# normal # normal
color0 = config.colorscheme.base00; color0 = config.theme.colors.base00;
color1 = config.colorscheme.base08; color1 = config.theme.colors.base08;
color2 = config.colorscheme.base0B; color2 = config.theme.colors.base0B;
color3 = config.colorscheme.base0A; color3 = config.theme.colors.base0A;
color4 = config.colorscheme.base0D; color4 = config.theme.colors.base0D;
color5 = config.colorscheme.base0E; color5 = config.theme.colors.base0E;
color6 = config.colorscheme.base0C; color6 = config.theme.colors.base0C;
color7 = config.colorscheme.base05; color7 = config.theme.colors.base05;
# bright # bright
color8 = config.colorscheme.base03; color8 = config.theme.colors.base03;
color9 = config.colorscheme.base08; color9 = config.theme.colors.base08;
color10 = config.colorscheme.base0B; color10 = config.theme.colors.base0B;
color11 = config.colorscheme.base0A; color11 = config.theme.colors.base0A;
color12 = config.colorscheme.base0D; color12 = config.theme.colors.base0D;
color13 = config.colorscheme.base0E; color13 = config.theme.colors.base0E;
color14 = config.colorscheme.base0C; color14 = config.theme.colors.base0C;
color15 = config.colorscheme.base07; color15 = config.theme.colors.base07;
# extended base16 colors # extended base16 colors
color16 = config.colorscheme.base09; color16 = config.theme.colors.base09;
color17 = config.colorscheme.base0F; color17 = config.theme.colors.base0F;
color18 = config.colorscheme.base01; color18 = config.theme.colors.base01;
color19 = config.colorscheme.base02; color19 = config.theme.colors.base02;
color20 = config.colorscheme.base04; color20 = config.theme.colors.base04;
color21 = config.colorscheme.base06; color21 = config.theme.colors.base06;
# Scrollback # Scrollback
scrolling_lines = 10000; scrolling_lines = 10000;

21
modules/colorscheme/gruvbox/default.nix
View File

@ -2,6 +2,7 @@
name = "gruvbox"; # Dark, Medium name = "gruvbox"; # Dark, Medium
author = author =
"Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)"; "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)";
dark = {
base00 = "#282828"; # ---- base00 = "#282828"; # ----
base01 = "#3c3836"; # --- base01 = "#3c3836"; # ---
base02 = "#504945"; # -- base02 = "#504945"; # --
@ -19,4 +20,24 @@
base0E = "#d3869b"; # purple base0E = "#d3869b"; # purple
base0F = "#d65d0e"; # brown base0F = "#d65d0e"; # brown
neovimConfig = ./neovim.lua; neovimConfig = ./neovim.lua;
};
light = {
base00 = "#fbf1c7"; # ----
base01 = "#ebdbb2"; # ---
base02 = "#d5c4a1"; # --
base03 = "#bdae93"; # -
base04 = "#665c54"; # +
base05 = "#504945"; # ++
base06 = "#3c3836"; # +++
base07 = "#282828"; # ++++
base08 = "#9d0006"; # red
base09 = "#af3a03"; # orange
base0A = "#b57614"; # yellow
base0B = "#79740e"; # green
base0C = "#427b58"; # aqua/cyan
base0D = "#076678"; # blue
base0E = "#8f3f71"; # purple
base0F = "#d65d0e"; # brown
neovimConfig = ./neovim-light.lua;
};
} }

1
modules/colorscheme/gruvbox/neovim.lua
View File

@ -6,6 +6,7 @@ M.packer = function(use)
config = function() config = function()
vim.g.gruvbox_italicize_strings = 0 vim.g.gruvbox_italicize_strings = 0
vim.cmd("colorscheme gruvbox8") vim.cmd("colorscheme gruvbox8")
vim.cmd("set background=dark")
end, end,
}) })
end end

2
modules/gaming/default.nix
View File

@ -1,7 +1,5 @@
{ config, ... }: { { config, ... }: {
imports = [ ./leagueoflegends.nix ./lutris.nix ./steam.nix ./legendary.nix ];
config = { config = {
hardware.opengl = { hardware.opengl = {
enable = true; enable = true;

5
modules/gaming/legendary.nix
View File

@ -4,10 +4,9 @@ let home-packages = config.home-manager.users.${config.user}.home.packages;
in { in {
options.gaming.legendary = imports = [ ./. ];
lib.mkEnableOption "Legendary - Epic Games Launcher";
config = lib.mkIf config.gaming.legendary { config = {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
legendary-gl legendary-gl
rare # GUI for Legendary (not working) rare # GUI for Legendary (not working)

4
modules/gaming/steam.nix
View File

@ -1,8 +1,8 @@
{ config, pkgs, lib, ... }: { { config, pkgs, lib, ... }: {
options.gaming.steam = lib.mkEnableOption "Steam"; imports = [ ./. ];
config = lib.mkIf config.gaming.steam { config = {
hardware.steam-hardware.enable = true; hardware.steam-hardware.enable = true;
unfreePackages = [ "steam" "steam-original" "steamcmd" "steam-run" ]; unfreePackages = [ "steam" "steam-original" "steamcmd" "steam-run" ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

46
modules/graphical/default.nix
View File

@ -1,54 +1,30 @@
{ lib, ... }: { { lib, ... }: {
imports = [ imports =
./xorg.nix [ ./xorg.nix ./fonts.nix ./i3.nix ./polybar.nix ./picom.nix ./rofi.nix ];
./fonts.nix
./i3.nix
./polybar.nix
./picom.nix
# ./dmenu.nix
./rofi.nix
];
options = with lib; { options = {
gui = { launcherCommand = lib.mkOption {
compositor.enable = mkEnableOption { type = lib.types.str;
description = "Enable transparency, blur, shadows";
default = false;
};
launcherCommand = mkOption {
type = types.str;
description = "Command to use for launching"; description = "Command to use for launching";
}; };
systemdSearch = mkOption { systemdSearch = lib.mkOption {
type = types.str; type = lib.types.str;
description = "Command to use for interacting with systemd"; description = "Command to use for interacting with systemd";
}; };
altTabCommand = mkOption { altTabCommand = lib.mkOption {
type = types.str; type = lib.types.str;
description = "Command to use for choosing windows"; description = "Command to use for choosing windows";
}; };
toggleBarCommand = lib.mkOption { toggleBarCommand = lib.mkOption {
type = lib.types.str; type = lib.types.str;
description = "Command to hide and show the status bar."; description = "Command to hide and show the status bar.";
}; };
gtk.theme = { wallpaper = lib.mkOption {
name = mkOption { type = lib.types.path;
type = types.str;
description = "Theme name for GTK applications";
};
package = mkOption {
type = types.str;
description = "Theme package name for GTK applications";
default = "gnome-themes-extra";
};
};
wallpaper = mkOption {
type = types.path;
description = "Wallpaper background image file"; description = "Wallpaper background image file";
}; };
};
}; };

46
modules/graphical/i3.nix
View File

@ -5,10 +5,9 @@ let
lockCmd = lockCmd =
"${pkgs.betterlockscreen}/bin/betterlockscreen --lock --display 1 --blur 0.5 --span"; "${pkgs.betterlockscreen}/bin/betterlockscreen --lock --display 1 --blur 0.5 --span";
lockUpdate = lockUpdate =
"${pkgs.betterlockscreen}/bin/betterlockscreen --update ${config.gui.wallpaper} --display 1 --span"; "${pkgs.betterlockscreen}/bin/betterlockscreen --update ${config.wallpaper} --display 1 --span";
in in {
{
config = { config = {
@ -28,8 +27,7 @@ in
xsession.windowManager.i3 = { xsession.windowManager.i3 = {
enable = config.services.xserver.enable; enable = config.services.xserver.enable;
package = pkgs.i3-gaps; package = pkgs.i3-gaps;
config = config = let
let
modifier = "Mod4"; # Super key modifier = "Mod4"; # Super key
ws1 = "1:I"; ws1 = "1:I";
ws2 = "2:II"; ws2 = "2:II";
@ -41,8 +39,7 @@ in
ws8 = "8:VIII"; ws8 = "8:VIII";
ws9 = "9:IX"; ws9 = "9:IX";
ws10 = "10:X"; ws10 = "10:X";
in in {
{
modifier = modifier; modifier = modifier;
assigns = { assigns = {
"${ws1}" = [{ class = "Firefox"; }]; "${ws1}" = [{ class = "Firefox"; }];
@ -51,19 +48,17 @@ in
"${ws4}" = [{ class = "Steam"; }]; "${ws4}" = [{ class = "Steam"; }];
}; };
bars = [{ command = "echo"; }]; # Disable i3bar bars = [{ command = "echo"; }]; # Disable i3bar
colors = colors = let
let background = config.theme.colors.base00;
background = config.colorscheme.base00; inactiveBackground = config.theme.colors.base01;
inactiveBackground = config.colorscheme.base01; border = config.theme.colors.base01;
border = config.colorscheme.base01; inactiveBorder = config.theme.colors.base01;
inactiveBorder = config.colorscheme.base01; text = config.theme.colors.base07;
text = config.colorscheme.base07; inactiveText = config.theme.colors.base04;
inactiveText = config.colorscheme.base04; urgentBackground = config.theme.colors.base08;
urgentBackground = config.colorscheme.base08;
indicator = "#00000000"; indicator = "#00000000";
in in {
{ background = config.theme.colors.base00;
background = config.colorscheme.base00;
focused = { focused = {
inherit background indicator text border; inherit background indicator text border;
childBorder = background; childBorder = background;
@ -118,10 +113,10 @@ in
"${modifier}+Return" = "${modifier}+Return" =
"exec --no-startup-id kitty; workspace ${ws2}; layout tabbed"; "exec --no-startup-id kitty; workspace ${ws2}; layout tabbed";
"${modifier}+space" = "${modifier}+space" =
"exec --no-startup-id ${config.gui.launcherCommand}"; "exec --no-startup-id ${config.launcherCommand}";
"${modifier}+Shift+s" = "${modifier}+Shift+s" =
"exec --no-startup-id ${config.gui.systemdSearch}"; "exec --no-startup-id ${config.systemdSearch}";
"Mod1+Tab" = "exec --no-startup-id ${config.gui.altTabCommand}"; "Mod1+Tab" = "exec --no-startup-id ${config.altTabCommand}";
"${modifier}+Shift+c" = "reload"; "${modifier}+Shift+c" = "reload";
"${modifier}+Shift+r" = "restart"; "${modifier}+Shift+r" = "restart";
"${modifier}+Shift+q" = '' "${modifier}+Shift+q" = ''
@ -130,7 +125,7 @@ in
# Window options # Window options
"${modifier}+q" = "kill"; "${modifier}+q" = "kill";
"${modifier}+b" = "exec ${config.gui.toggleBarCommand}"; "${modifier}+b" = "exec ${config.toggleBarCommand}";
"${modifier}+f" = "fullscreen toggle"; "${modifier}+f" = "fullscreen toggle";
"${modifier}+h" = "focus left"; "${modifier}+h" = "focus left";
"${modifier}+j" = "focus down"; "${modifier}+j" = "focus down";
@ -210,7 +205,7 @@ in
modes = { }; modes = { };
startup = [ startup = [
{ {
command = "feh --bg-fill ${config.gui.wallpaper}"; command = "feh --bg-fill ${config.wallpaper}";
always = true; always = true;
notification = false; notification = false;
} }
@ -258,8 +253,7 @@ in
# Update lock screen cache only if cache is empty # Update lock screen cache only if cache is empty
home.activation.updateLockScreenCache = home.activation.updateLockScreenCache =
let cacheDir = "${config.homePath}/.cache/betterlockscreen/current"; let cacheDir = "${config.homePath}/.cache/betterlockscreen/current";
in in lib.mkIf config.services.xserver.enable
lib.mkIf config.services.xserver.enable
(config.home-manager.users.${config.user}.lib.dag.entryAfter (config.home-manager.users.${config.user}.lib.dag.entryAfter
[ "writeBoundary" ] '' [ "writeBoundary" ] ''
if [ ! -d ${cacheDir} ] || [ -z "$(ls ${cacheDir})" ]; then if [ ! -d ${cacheDir} ] || [ -z "$(ls ${cacheDir})" ]; then

3
modules/graphical/picom.nix
View File

@ -1,7 +1,6 @@
{ config, lib, ... }: { { config, lib, ... }: {
config = config = lib.mkIf (config.services.xserver.enable) {
lib.mkIf (config.services.xserver.enable && config.gui.compositor.enable) {
home-manager.users.${config.user} = { home-manager.users.${config.user} = {
services.picom = { services.picom = {

38
modules/graphical/polybar.nix
View File

@ -2,7 +2,7 @@
config = lib.mkIf config.services.xserver.enable { config = lib.mkIf config.services.xserver.enable {
gui.toggleBarCommand = "polybar-msg cmd toggle"; toggleBarCommand = "polybar-msg cmd toggle";
home-manager.users.${config.user} = { home-manager.users.${config.user} = {
@ -23,14 +23,14 @@
# offset-y = -5; # offset-y = -5;
# offset-y = "5%"; # offset-y = "5%";
# dpi = 96; # dpi = 96;
background = config.colorscheme.base01; background = config.theme.colors.base01;
foreground = config.colorscheme.base05; foreground = config.theme.colors.base05;
line-size = "3pt"; line-size = "3pt";
border-top-size = 0; border-top-size = 0;
border-right-size = 0; border-right-size = 0;
border-left-size = 0; border-left-size = 0;
border-bottom-size = "4pt"; border-bottom-size = "4pt";
border-color = config.colorscheme.base00; border-color = config.theme.colors.base00;
padding-left = 2; padding-left = 2;
padding-right = 2; padding-right = 2;
module-margin = 1; module-margin = 1;
@ -58,35 +58,35 @@
fuzzy-match = true; fuzzy-match = true;
format = "<label-state> <label-mode>"; format = "<label-state> <label-mode>";
label-focused = "%name%"; label-focused = "%name%";
label-focused-foreground = config.colorscheme.base01; label-focused-foreground = config.theme.colors.base01;
label-focused-background = config.colorscheme.base05; label-focused-background = config.theme.colors.base05;
label-focused-underline = config.colorscheme.base03; label-focused-underline = config.theme.colors.base03;
label-focused-padding = padding; label-focused-padding = padding;
label-unfocused = "%name%"; label-unfocused = "%name%";
label-unfocused-padding = padding; label-unfocused-padding = padding;
label-visible = "%name%"; label-visible = "%name%";
label-visible-underline = config.colorscheme.base01; label-visible-underline = config.theme.colors.base01;
label-visible-padding = padding; label-visible-padding = padding;
label-urgent = "%name%"; label-urgent = "%name%";
label-urgent-foreground = config.colorscheme.base00; label-urgent-foreground = config.theme.colors.base00;
label-urgent-background = config.colorscheme.base08; label-urgent-background = config.theme.colors.base08;
label-urgent-underline = config.colorscheme.base0F; label-urgent-underline = config.theme.colors.base0F;
label-urgent-padding = padding; label-urgent-padding = padding;
}; };
"module/xworkspaces" = { "module/xworkspaces" = {
type = "internal/xworkspaces"; type = "internal/xworkspaces";
label-active = "%name%"; label-active = "%name%";
label-active-background = config.colorscheme.base05; label-active-background = config.theme.colors.base05;
label-active-foreground = config.colorscheme.base01; label-active-foreground = config.theme.colors.base01;
label-active-underline = config.colorscheme.base03; label-active-underline = config.theme.colors.base03;
label-active-padding = 1; label-active-padding = 1;
label-occupied = "%name%"; label-occupied = "%name%";
label-occupied-padding = 1; label-occupied-padding = 1;
label-urgent = "%name%"; label-urgent = "%name%";
label-urgent-background = config.colorscheme.base08; label-urgent-background = config.theme.colors.base08;
label-urgent-padding = 1; label-urgent-padding = 1;
label-empty = "%name%"; label-empty = "%name%";
label-empty-foreground = config.colorscheme.base06; label-empty-foreground = config.theme.colors.base06;
label-empty-padding = 1; label-empty-padding = 1;
}; };
"module/xwindow" = { "module/xwindow" = {
@ -108,10 +108,10 @@
format-volume = "<ramp-volume> <label-volume>"; format-volume = "<ramp-volume> <label-volume>";
# format-volume-background = colors.background; # format-volume-background = colors.background;
# label-volume-background = colors.background; # label-volume-background = colors.background;
format-volume-foreground = config.colorscheme.base0B; format-volume-foreground = config.theme.colors.base0B;
label-volume = "%percentage%%"; label-volume = "%percentage%%";
label-muted = "ﱝ ---"; label-muted = "ﱝ ---";
label-muted-foreground = config.colorscheme.base03; label-muted-foreground = config.theme.colors.base03;
ramp-volume-0 = ""; ramp-volume-0 = "";
ramp-volume-1 = "墳"; ramp-volume-1 = "墳";
ramp-volume-2 = ""; ramp-volume-2 = "";
@ -163,7 +163,7 @@
date = "%d %b %l:%M %p"; date = "%d %b %l:%M %p";
date-alt = "%Y-%m-%d %H:%M:%S"; date-alt = "%Y-%m-%d %H:%M:%S";
label = "%date%"; label = "%date%";
label-foreground = config.colorscheme.base0A; label-foreground = config.theme.colors.base0A;
# format-background = colors.background; # format-background = colors.background;
}; };
"settings" = { "settings" = {

46
modules/graphical/rofi.nix
View File

@ -25,19 +25,19 @@
# Inspired by https://github.com/sherubthakur/dotfiles/blob/master/users/modules/desktop-environment/rofi/launcher.rasi # Inspired by https://github.com/sherubthakur/dotfiles/blob/master/users/modules/desktop-environment/rofi/launcher.rasi
"*" = { "*" = {
background-color = mkLiteral config.colorscheme.base00; background-color = mkLiteral config.theme.colors.base00;
foreground-color = mkLiteral config.colorscheme.base07; foreground-color = mkLiteral config.theme.colors.base07;
text-color = mkLiteral config.colorscheme.base07; text-color = mkLiteral config.theme.colors.base07;
border-color = mkLiteral config.colorscheme.base04; border-color = mkLiteral config.theme.colors.base04;
}; };
# Holds the entire window # Holds the entire window
"#window" = { "#window" = {
transparency = "real"; transparency = "real";
background-color = mkLiteral config.colorscheme.base00; background-color = mkLiteral config.theme.colors.base00;
text-color = mkLiteral config.colorscheme.base07; text-color = mkLiteral config.theme.colors.base07;
border = mkLiteral "4px"; border = mkLiteral "4px";
border-color = mkLiteral config.colorscheme.base04; border-color = mkLiteral config.theme.colors.base04;
border-radius = mkLiteral "4px"; border-radius = mkLiteral "4px";
width = mkLiteral "850px"; width = mkLiteral "850px";
padding = mkLiteral "15px"; padding = mkLiteral "15px";
@ -45,10 +45,10 @@
# Wrapper around bar and results # Wrapper around bar and results
"#mainbox" = { "#mainbox" = {
background-color = mkLiteral config.colorscheme.base00; background-color = mkLiteral config.theme.colors.base00;
border = mkLiteral "0px"; border = mkLiteral "0px";
border-radius = mkLiteral "0px"; border-radius = mkLiteral "0px";
border-color = mkLiteral config.colorscheme.base04; border-color = mkLiteral config.theme.colors.base04;
children = map mkLiteral [ "inputbar" "listview" ]; children = map mkLiteral [ "inputbar" "listview" ];
spacing = mkLiteral "10px"; spacing = mkLiteral "10px";
padding = mkLiteral "10px"; padding = mkLiteral "10px";
@ -59,7 +59,7 @@
expand = false; expand = false;
str = ":"; str = ":";
margin = mkLiteral "0px 0.3em 0em 0em"; margin = mkLiteral "0px 0.3em 0em 0em";
text-color = mkLiteral config.colorscheme.base07; text-color = mkLiteral config.theme.colors.base07;
}; };
# Command prompt left of the input # Command prompt left of the input
@ -67,7 +67,7 @@
# Actual text box # Actual text box
"#entry" = { "#entry" = {
placeholder-color = mkLiteral config.colorscheme.base03; placeholder-color = mkLiteral config.theme.colors.base03;
expand = true; expand = true;
horizontal-align = "0"; horizontal-align = "0";
placeholder = "Launch Program"; placeholder = "Launch Program";
@ -85,7 +85,7 @@
# Results # Results
"#listview" = { "#listview" = {
background-color = mkLiteral config.colorscheme.base00; background-color = mkLiteral config.theme.colors.base00;
padding = mkLiteral "0px"; padding = mkLiteral "0px";
columns = 1; columns = 1;
lines = 12; lines = 12;
@ -104,9 +104,9 @@
"#element.selected" = { "#element.selected" = {
border = mkLiteral "1px"; border = mkLiteral "1px";
border-radius = mkLiteral "4px"; border-radius = mkLiteral "4px";
border-color = mkLiteral config.colorscheme.base07; border-color = mkLiteral config.theme.colors.base07;
background-color = mkLiteral config.colorscheme.base04; background-color = mkLiteral config.theme.colors.base04;
text-color = mkLiteral config.colorscheme.base00; text-color = mkLiteral config.theme.colors.base00;
}; };
"#element-text" = { "#element-text" = {
@ -116,8 +116,8 @@
margin = mkLiteral "0px 2.5px 0px 2.5px"; margin = mkLiteral "0px 2.5px 0px 2.5px";
}; };
"#element-text.selected" = { "#element-text.selected" = {
background-color = mkLiteral config.colorscheme.base04; background-color = mkLiteral config.theme.colors.base04;
text-color = mkLiteral config.colorscheme.base00; text-color = mkLiteral config.theme.colors.base00;
}; };
# Not sure how to get icons # Not sure how to get icons
@ -125,11 +125,11 @@
size = mkLiteral "18px"; size = mkLiteral "18px";
border = mkLiteral "0px"; border = mkLiteral "0px";
padding = mkLiteral "2px 5px 2px 2px"; padding = mkLiteral "2px 5px 2px 2px";
background-color = mkLiteral config.colorscheme.base00; background-color = mkLiteral config.theme.colors.base00;
}; };
"#element-icon.selected" = { "#element-icon.selected" = {
background-color = mkLiteral config.colorscheme.base04; background-color = mkLiteral config.theme.colors.base04;
text-color = mkLiteral config.colorscheme.base00; text-color = mkLiteral config.theme.colors.base00;
}; };
}; };
@ -144,9 +144,9 @@
}; };
gui.launcherCommand = "${pkgs.rofi}/bin/rofi -show run -modi run"; launcherCommand = "${pkgs.rofi}/bin/rofi -show run -modi run";
gui.systemdSearch = "${pkgs.rofi-systemd}/bin/rofi-systemd"; systemdSearch = "${pkgs.rofi-systemd}/bin/rofi-systemd";
gui.altTabCommand = "${pkgs.rofi}/bin/rofi -show window -modi window"; altTabCommand = "${pkgs.rofi}/bin/rofi -show window -modi window";
}; };

37
modules/graphical/xorg.nix
View File

@ -1,15 +1,25 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }: {
let options = {
gtk.theme = {
gtkTheme = { name = lib.mkOption {
name = config.gui.gtk.theme.name; type = lib.types.str;
package = pkgs.${config.gui.gtk.theme.package}; description = "Theme name for GTK applications";
};
package = lib.mkOption {
type = lib.types.str;
description = "Theme package name for GTK applications";
default = "gnome-themes-extra";
};
};
}; };
in { config = let
gtkTheme = {
config = lib.mkIf config.gui.enable { name = config.gtk.theme.name;
package = pkgs."${config.gtk.theme.package}";
};
in lib.mkIf config.gui.enable {
# Enable the X11 windowing system. # Enable the X11 windowing system.
services.xserver = { services.xserver = {
@ -22,7 +32,7 @@ in {
displayManager = { displayManager = {
lightdm = { lightdm = {
enable = config.services.xserver.enable; enable = config.services.xserver.enable;
background = config.gui.wallpaper; background = config.wallpaper;
# Make the login screen dark # Make the login screen dark
greeters.gtk.theme = gtkTheme; greeters.gtk.theme = gtkTheme;
@ -46,7 +56,7 @@ in {
services.dbus.packages = [ pkgs.dconf ]; services.dbus.packages = [ pkgs.dconf ];
programs.dconf.enable = true; programs.dconf.enable = true;
environment.sessionVariables = { GTK_THEME = config.gui.gtk.theme.name; }; environment.sessionVariables = { GTK_THEME = config.gtk.theme.name; };
home-manager.users.${config.user} = { home-manager.users.${config.user} = {
@ -55,7 +65,10 @@ in {
pbpaste = "xclip -selection clipboard -out"; pbpaste = "xclip -selection clipboard -out";
}; };
gtk = let gtkExtraConfig = { gtk-application-prefer-dark-theme = true; }; gtk = let
gtkExtraConfig = {
gtk-application-prefer-dark-theme = config.theme.dark;
};
in { in {
enable = true; enable = true;
theme = gtkTheme; theme = gtkTheme;

7
modules/neovim/default.nix
View File

@ -15,7 +15,12 @@
source = ./lua; source = ./lua;
recursive = true; # Allows adding more files recursive = true; # Allows adding more files
}; };
"nvim/lua/packer/colors.lua".source = config.colorscheme.neovimConfig; "nvim/lua/packer/colors.lua".source = config.theme.colors.neovimConfig;
"nvim/lua/background.lua".text = ''
vim.cmd("set background=${
if config.theme.dark == true then "dark" else "light"
}")
'';
}; };
programs.git.extraConfig.core.editor = "nvim"; programs.git.extraConfig.core.editor = "nvim";

1
modules/neovim/init.lua
View File

@ -1,3 +1,4 @@
require("packer_init") require("packer_init")
require("settings") require("settings")
require("keybinds") require("keybinds")
require("background")