mirror of
https://github.com/gensokyo-zone/infrastructure.git
synced 2026-02-09 12:29:19 -08:00
Refactors for usability
Using ./home.nix and ./nixos.nix as entrypoints for hosts. Using hardware profiles. Using new entrypoints (profiles/base/profiles.nix + profiles/base/home.nix). New modules (for DNS handling, for themeing, ...). Split up deploy-tf.nix into several modules. Renamed common profile to base profile.
This commit is contained in:
parent
487bf9c8d5
commit
2a5ec2e0b4
114 changed files with 1209 additions and 953 deletions
|
|
@ -1,9 +1,5 @@
|
|||
{ config, ... }:
|
||||
|
||||
{
|
||||
deploy.profile.gui = true;
|
||||
|
||||
imports = [ ./firefox ./packages.nix ./gtk.nix ./wezterm.nix ./foot.nix ./xdg.nix ./ranger.nix ];
|
||||
|
||||
fonts.fontconfig.enable = true;
|
||||
imports = [ ./firefox ./packages.nix ./gtk.nix ./foot.nix ./xdg.nix ./ranger.nix ./fonts.nix ];
|
||||
}
|
||||
|
|
|
|||
5
config/users/kat/gui/fonts.nix
Normal file
5
config/users/kat/gui/fonts.nix
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
{ config, ... }:
|
||||
|
||||
{
|
||||
fonts.fontconfig.enable = true;
|
||||
}
|
||||
|
|
@ -13,10 +13,10 @@ in {
|
|||
settings = {
|
||||
main = {
|
||||
term = "xterm-256color";
|
||||
font = "Cozette:size=9, Twitter Color Emoji:size=8";
|
||||
font-bold = "Cozette:size=9:style=Bold";
|
||||
font-italic = "Cozette:size=9:style=Italic";
|
||||
font-bold-italic = "Cozette:size=9:style=Bold Italic";
|
||||
font = "${config.kw.font.name}:size=${toString config.kw.font.size}, Twitter Color Emoji:size=8";
|
||||
font-bold = "${config.kw.font.name}:size=${toString config.kw.font.size}:style=Bold";
|
||||
font-italic = "${config.kw.font.name}:size=${toString config.kw.font.size}:style=Italic";
|
||||
font-bold-italic = "${config.kw.font.name}:size=${toString config.kw.font.size}:style=Bold Italic";
|
||||
dpi-aware = "no";
|
||||
};
|
||||
colors = {
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
{ config, lib, pkgs, witch, ... }:
|
||||
|
||||
let
|
||||
witch.style.base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}")
|
||||
config.lib.arc.base16.schemeForAlias.default;
|
||||
witch.style.font = {
|
||||
name = "Iosevka Nerd Font";
|
||||
size = "10";
|
||||
size_css = "14px";
|
||||
};
|
||||
in
|
||||
{
|
||||
wayland.windowManager.sway.extraSessionCommands = ''
|
||||
export KITTY_CACHE_DIRECTORY="/tmp/kitty";
|
||||
'';
|
||||
programs.kitty = {
|
||||
enable = true;
|
||||
font.name = witch.style.font.name;
|
||||
settings = {
|
||||
font_size = witch.style.font.size;
|
||||
# background = witch.style.base16.color0;
|
||||
background_opacity = "0.9";
|
||||
# foreground = witch.style.base16.color7;
|
||||
# selection_background = witch.style.base16.color7;
|
||||
# selection_foreground = witch.style.base16.color0;
|
||||
# url_color = witch.style.base16.color3;
|
||||
# cursor = witch.style.base16.color7;
|
||||
# active_border_color = "#75715e";
|
||||
# active_tab_background = "#9900ff";
|
||||
# active_tab_foreground = witch.style.base16.color7;
|
||||
# inactive_tab_background = "#3a3a3a";
|
||||
# inactive_tab_foreground = "#665577";
|
||||
}; # // witch.style.base16;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
witch.style.base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}")
|
||||
config.lib.arc.base16.schemeForAlias.default;
|
||||
colors.ansi = builtins.concatStringsSep ", " (map (c: ''"#${c.hex.rgb}"'') (sublist 0 8 config.lib.arc.base16.schemeForAlias.default.shell.colours));
|
||||
colors.brights = builtins.concatStringsSep ", " (map (c: ''"#${c.hex.rgb}"'') (sublist 8 8 config.lib.arc.base16.schemeForAlias.default.shell.colours));
|
||||
in {
|
||||
home.packages = [
|
||||
pkgs.wezterm
|
||||
];
|
||||
|
||||
xdg.configFile."wezterm/wezterm.lua".text = ''
|
||||
local wezterm = require 'wezterm';
|
||||
|
||||
return {
|
||||
term = "wezterm",
|
||||
font = wezterm.font_with_fallback({"Iosevka Term","Twitter Color Emoji"}),
|
||||
font_size = 9.0,
|
||||
window_background_opacity = 0.9,
|
||||
colors = {
|
||||
ansi = {${colors.ansi}},
|
||||
brights = {${colors.brights}},
|
||||
background = "${witch.style.base16.base00}",
|
||||
foreground = "${witch.style.base16.base05}",
|
||||
tab_bar = {
|
||||
background = "${witch.style.base16.base00}",
|
||||
active_tab = {
|
||||
bg_color = "${witch.style.base16.base0A}",
|
||||
fg_color = "${witch.style.base16.base05}",
|
||||
},
|
||||
inactive_tab = {
|
||||
bg_color = "${witch.style.base16.base01}",
|
||||
fg_color = "${witch.style.base16.base03}",
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
'';
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue