diff --git a/modules/base/default.nix b/modules/base/default.nix index 0fa8695..260cbeb 100644 --- a/modules/base/default.nix +++ b/modules/base/default.nix @@ -18,6 +18,11 @@ home = { inherit stateVersion; }; + + catppuccin = { + flavor = "mocha"; + accent = "lavender"; + }; }; nixos.base = diff --git a/modules/base/home/fish.nix b/modules/base/home/fish.nix index 639fe83..1bac34a 100644 --- a/modules/base/home/fish.nix +++ b/modules/base/home/fish.nix @@ -37,15 +37,16 @@ fish = { enable = true; shellInit = '' - set -x LESS_TERMCAP_mb \e'[01;32m' - set -x LESS_TERMCAP_md \e'[01;32m' - set -x LESS_TERMCAP_me \e'[0m' - set -x LESS_TERMCAP_se \e'[0m' - set -x LESS_TERMCAP_so \e'[01;47;34m' - set -x LESS_TERMCAP_ue \e'[0m' - set -x LESS_TERMCAP_us \e'[01;36m' - set -x LESS -R - set -x GROFF_NO_SGR 1 + # Auto-start Tmux on SSH login + if test -n "$SSH_TTY" && test -z "$TMUX" + if command -v tmux > /dev/null 2>&1 + if tmux has-session -t ssh-auto 2>/dev/null + tmux attach-session -t ssh-auto + else + tmux new-session -s ssh-auto + end + end + end ''; shellAliases = { vim = "hx"; diff --git a/modules/base/home/kitty.nix b/modules/base/home/kitty.nix deleted file mode 100644 index 2145448..0000000 --- a/modules/base/home/kitty.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - flake.modules = { - homeManager.cholli = - { pkgs, ... }: - { - catppuccin.kitty.enable = true; - - home.packages = [ - pkgs.kitty - ]; - - home.sessionVariables.TERMINAL = "kitty"; - - home.file.".config/Thunar/uca.xml".text = '' - - - - kitty - Open Kitty here - - 1726095927116900-1 - ${pkgs.kitty}/bin/kitty %f - Example for a custom action - - * - - - - - ''; - - programs.kitty = { - enable = true; - # themeFile = "tokyo_night_night"; - font = { - name = "FiraCode Nerd Font"; - size = 15; - }; - shellIntegration.enableFishIntegration = true; - settings = { - "background_opacity" = "0.90"; - "shell" = "fish"; - "confirm_os_window_close" = "0"; - }; - }; - - }; - }; -} diff --git a/modules/base/home/terminal.nix b/modules/base/home/terminal.nix new file mode 100644 index 0000000..43b4ece --- /dev/null +++ b/modules/base/home/terminal.nix @@ -0,0 +1,39 @@ +{ + flake.modules = { + homeManager.cholli = + { pkgs, ... }: + { + catppuccin.kitty.enable = true; + home.sessionVariables.TERMINAL = "kitty"; + programs.kitty = { + enable = true; + font = { + name = "FiraCode Nerd Font"; + size = 15; + }; + shellIntegration.enableFishIntegration = true; + settings = { + background_opacity = 0.9; + shell = "fish"; + confirm_os_window_close = 0; + }; + }; + + # catppuccin.ghostty.enable = true; + # programs.ghostty = { + # enable = true; + # enableFishIntegration = true; + # installVimSyntax = true; + # settings = { + # font-family = "FiraCode Nerd Font"; + # font-size = 15; + # font-codepoint-map = "U+E000-U+E00A,U+E0A0-U+E0A3,U+E0B0-U+E0C8,U+E0CA,U+E0CC-U+E0D7,U+E200-U+E2A9,U+E300-U+E3E3,U+E5FA-U+E6B7,U+E700-U+E8EF,U+EA60-U+EC1E,U+ED00-U+F2FF,U+EE00-U+EE0B,U+F300-U+F381,U+F400-U+F533,U+F0001-U+F1AF0=Symbols Nerd Font"; + # background-opacity = 0.9; + # clipboard-paste-protection = true; + # confirm-close-surface = false; + # mouse-scroll-multiplier = 0.3; + # }; + # }; + }; + }; +} diff --git a/modules/base/system/fonts.nix b/modules/base/system/fonts.nix index 6f5d840..1ccfb43 100644 --- a/modules/base/system/fonts.nix +++ b/modules/base/system/fonts.nix @@ -1,23 +1,19 @@ { - flake.modules.nixos.base = { pkgs, ... }: { - environment.variables = { - # Enable icons in tooling since we have nerdfonts. - LOG_ICONS = "true"; + fonts = { + enableDefaultPackages = true; + + packages = with pkgs; [ + nerd-fonts.fira-code + nerd-fonts.jetbrains-mono + nerd-fonts.symbols-only + ]; + + fontconfig = { + useEmbeddedBitmaps = true; + }; }; - - fonts.packages = with pkgs; [ - font-awesome - powerline-fonts - powerline-symbols - nerd-fonts.code-new-roman - nerd-fonts.fira-code - nerd-fonts.symbols-only - nerd-fonts.jetbrains-mono - fira - ]; - }; } diff --git a/modules/base/system/nixdaemon.nix b/modules/base/system/nixdaemon.nix index e06f693..7302fd0 100644 --- a/modules/base/system/nixdaemon.nix +++ b/modules/base/system/nixdaemon.nix @@ -29,6 +29,9 @@ enable = true; package = inputs.nh-flake.packages.${pkgs.stdenv.hostPlatform.system}.nh; flake = "/home/${username}/projects/config"; + + clean.enable = true; + clean.extraArgs = "--keep-since 7d --keep 5"; }; nix = { @@ -77,12 +80,6 @@ keep-outputs = true; keep-derivations = true; }); - - gc = { - automatic = true; - dates = "daily"; - options = "--delete-older-than 7d"; - }; }; }; } diff --git a/modules/desktop/niri.nix b/modules/desktop/niri.nix index 1f81685..9aba289 100644 --- a/modules/desktop/niri.nix +++ b/modules/desktop/niri.nix @@ -70,8 +70,6 @@ { config = lib.mkIf (osConfig.networking.hostName == "yggdrasil" && osConfig.programs.niri.enable) { catppuccin = { - flavor = "mocha"; - accent = "lavender"; cursors = { enable = true; }; @@ -322,7 +320,7 @@ "Mod+Shift+E".action = actions.quit; "Ctrl+Alt+Delete".action = actions.quit; - "Mod+Return".action.spawn = "${lib.getExe pkgs.kitty}"; + "Mod+Return".action.spawn = "${lib.getExe config.programs.kitty.package}"; "Mod+Escape" = { allow-inhibiting = false; diff --git a/modules/server/default.nix b/modules/server/default.nix new file mode 100644 index 0000000..1c55043 --- /dev/null +++ b/modules/server/default.nix @@ -0,0 +1,18 @@ +{ + flake.modules.nixos.server = + { ... }: + { + programs.tmux = { + enable = true; + + clock24 = true; + newSession = true; + keyMode = "vi"; + terminal = "kitty"; + extraConfig = '' + set -g mouse on + ''; + }; + + }; +}