diff --git a/maskiner/jobb/configuration.nix b/maskiner/jobb/configuration.nix index edf4902..ad2c2c6 100644 --- a/maskiner/jobb/configuration.nix +++ b/maskiner/jobb/configuration.nix @@ -17,12 +17,12 @@ networking.hostName = myhostname; - services.k3s = { - enable = true; - role = "server"; - token = "supersupersecretkey"; - clusterInit = true; - }; + # services.k3s = { + # enable = true; + # role = "server"; + # token = "supersupersecretkey"; + # clusterInit = true; + # }; # services = { # syncthing = { diff --git a/shared/alacritty.nix b/shared/alacritty.nix index f89c6ba..9fed548 100644 --- a/shared/alacritty.nix +++ b/shared/alacritty.nix @@ -3,84 +3,106 @@ programs.alacritty = { enable = true; settings = { - colors = { - primary = { - background = "#1e1e2e"; - foreground = "#cdd6f4"; - dim_foreground = "#7f849c"; - bright_foreground = "#cdd6f4"; - }; - cursor = { - text = "#1e1e2e"; - cursor = "#f5e0dc"; - }; - vi_mode_cursor = { - text = "#1e1e2e"; - cursor = "#b4befe"; - }; - search = { - matches = { - foreground = "#1e1e2e"; - background = "#a6adc8"; - }; - focused_match = { - foreground = "#1e1e2e"; - background = "#a6e3a1"; + env = { + TERM = "alacritty"; + }; + font = { + normal = { + family = "FiraCode Nerd Font"; + style = "SemiBold"; + }; + bold = { + family = "FiraCode Nerd Font"; + style = "Bold"; + }; + italic = { + family = "FiraCode Nerd Font"; + style = "Light"; + }; + bold_italic = { + family = "FiraCode Nerd Font"; + style = "Regular"; + }; + size = 9; + }; + colors = { + primary = { + background = "#1e1e2e"; + foreground = "#cdd6f4"; + dim_foreground = "#7f849c"; + bright_foreground = "#cdd6f4"; + }; + cursor = { + text = "#1e1e2e"; + cursor = "#f5e0dc"; + }; + vi_mode_cursor = { + text = "#1e1e2e"; + cursor = "#b4befe"; + }; + search = { + matches = { + foreground = "#1e1e2e"; + background = "#a6adc8"; + }; + focused_match = { + foreground = "#1e1e2e"; + background = "#a6e3a1"; + }; + }; + footer_bar = { + foreground = "#1e1e2e"; + background = "#a6adc8"; + }; + hints = { + start = { + foreground = "#1e1e2e"; + background = "#f9e2af"; + }; + end = { + foreground = "#1e1e2e"; + background = "#a6adc8"; + }; + }; + selection = { + text = "#1e1e2e"; + background = "#f5e0dc"; + }; + normal = { + black = "#45475a"; + red = "#f38ba8"; + green = "#a6e3a1"; + yellow = "#f9e2af"; + blue = "#89b4fa"; + magenta = "#f5c2e7"; + cyan = "#94e2d5"; + white = "#bac2de"; + }; + bright = { + black = "#585b70"; + red = "#f38ba8"; + green = "#a6e3a1"; + yellow = "#f9e2af"; + blue = "#89b4fa"; + magenta = "#f5c2e7"; + cyan = "#94e2d5"; + white = "#a6adc8"; + }; + dim = { + black = "#45475a"; + red = "#f38ba8"; + green = "#a6e3a1"; + yellow = "#f9e2af"; + blue = "#89b4fa"; + magenta = "#f5c2e7"; + cyan = "#94e2d5"; + white = "#bac2de"; + }; + indexed_colors = [ + { index = 16; color = "#fab387"; } + { index = 17; color = "#f5e0dc"; } + ]; }; }; - footer_bar = { - foreground = "#1e1e2e"; - background = "#a6adc8"; - }; - hints = { - start = { - foreground = "#1e1e2e"; - background = "#f9e2af"; - }; - end = { - foreground = "#1e1e2e"; - background = "#a6adc8"; - }; - }; - selection = { - text = "#1e1e2e"; - background = "#f5e0dc"; - }; - normal = { - black = "#45475a"; - red = "#f38ba8"; - green = "#a6e3a1"; - yellow = "#f9e2af"; - blue = "#89b4fa"; - magenta = "#f5c2e7"; - cyan = "#94e2d5"; - white = "#bac2de"; - }; - bright = { - black = "#585b70"; - red = "#f38ba8"; - green = "#a6e3a1"; - yellow = "#f9e2af"; - blue = "#89b4fa"; - magenta = "#f5c2e7"; - cyan = "#94e2d5"; - white = "#a6adc8"; - }; - dim = { - black = "#45475a"; - red = "#f38ba8"; - green = "#a6e3a1"; - yellow = "#f9e2af"; - blue = "#89b4fa"; - magenta = "#f5c2e7"; - cyan = "#94e2d5"; - white = "#bac2de"; - }; - indexed_colors = [ - { index = 16; color = "#fab387"; } - { index = 17; color = "#f5e0dc"; } - ]; - }; - }; }; } diff --git a/shared/dwm.nix b/shared/dwm.nix index 31ba613..f9157ea 100644 --- a/shared/dwm.nix +++ b/shared/dwm.nix @@ -3,7 +3,7 @@ let dwm = pkgs.dwm.overrideAttrs (old: { src = builtins.fetchGit { url = "https://github.com/FredzyW/dwm-conf.git"; - rev = "eb3015553442df6a92a79d47ff4ace8297edb9cb"; + rev = "964a3b9c94e780636a1a4ef01afb90ab8de4bb6d"; }; nativeBuildInputs = with pkgs; [ xorg.libX11.dev diff --git a/shared/tmux.nix b/shared/tmux.nix index 86ee905..0aa1d8d 100644 --- a/shared/tmux.nix +++ b/shared/tmux.nix @@ -34,11 +34,11 @@ ]; prefix = "C-a"; - terminal = "xterm-256color"; + terminal = "alacritty"; keyMode = "vi"; escapeTime = 0; - extraConfig = " - - "; + extraConfig = '' + set-option -ga terminal-overrides ",alacritty:Tc" + ''; }; }