diff --git a/common/users/default.nix b/common/users/default.nix index e087dd1..459cce4 100644 --- a/common/users/default.nix +++ b/common/users/default.nix @@ -13,6 +13,7 @@ syntaxHighlighting.enable = true; interactiveShellInit = '' source "${pkgs.grml-zsh-config}/etc/zsh/zshrc" + export FZF_DEFAULT_COMMAND="${pkgs.ripgrep}/bin/rg --files --follow" source "${pkgs.fzf}/share/fzf/key-bindings.zsh" source "${pkgs.fzf}/share/fzf/completion.zsh" eval "$(${pkgs.zoxide}/bin/zoxide init zsh)" @@ -20,7 +21,7 @@ # otherwise it'll override the grml prompt promptInit = ""; }; - + environment.pathsToLink = [ "/share/zsh" ]; # Disable sudo prompt for `wheel` users. @@ -59,6 +60,7 @@ git htop rsync + ripgrep vim zoxide ]; diff --git a/hosts/k3s/configuration.nix b/hosts/k3s/configuration.nix index 0d13a03..6a9bd9b 100644 --- a/hosts/k3s/configuration.nix +++ b/hosts/k3s/configuration.nix @@ -1,9 +1,4 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - { config, pkgs, ... }: - { imports = [ @@ -35,24 +30,25 @@ vim ]; - # Disable the firewall + # Disable the firewall as we need all the ports networking.firewall.enable = false; # Force-enable Cgroupv2 systemd.enableUnifiedCgroupHierarchy = lib.mkForce true; - # Ensure `mount` and `grep` are available + # Ensure `mount` and `grep` are available systemd.services.k3s.path = [ pkgs.gnugrep pkgs.utillinux ]; + # Enable k3s as a master node services.k3s = { - enable = true; - role = "server"; + enable = true; + role = "server"; - extraFlags = builtins.toString [ - "--data-dir=/var/lib/k3s" # Set data dir to var lib - "--cluster-init" # Enable embedded etcd - "--disable=servicelb" # disable servicelb - "--no-deploy=traefik" # we want to configure traefik ourselves (or use nginx instead) - ]; + extraFlags = builtins.toString [ + "--data-dir=/var/lib/k3s" # Set data dir to var lib + "--cluster-init" # Enable embedded etcd + "--disable=servicelb" # disable servicelb + "--no-deploy=traefik" # we want to configure traefik ourselves (or use nginx instead) + ]; }; }