added rg fzf
This commit is contained in:
parent
13e3ccb7b0
commit
40166f0c26
2 changed files with 14 additions and 16 deletions
|
@ -13,6 +13,7 @@
|
||||||
syntaxHighlighting.enable = true;
|
syntaxHighlighting.enable = true;
|
||||||
interactiveShellInit = ''
|
interactiveShellInit = ''
|
||||||
source "${pkgs.grml-zsh-config}/etc/zsh/zshrc"
|
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/key-bindings.zsh"
|
||||||
source "${pkgs.fzf}/share/fzf/completion.zsh"
|
source "${pkgs.fzf}/share/fzf/completion.zsh"
|
||||||
eval "$(${pkgs.zoxide}/bin/zoxide init zsh)"
|
eval "$(${pkgs.zoxide}/bin/zoxide init zsh)"
|
||||||
|
@ -20,7 +21,7 @@
|
||||||
# otherwise it'll override the grml prompt
|
# otherwise it'll override the grml prompt
|
||||||
promptInit = "";
|
promptInit = "";
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.pathsToLink = [ "/share/zsh" ];
|
environment.pathsToLink = [ "/share/zsh" ];
|
||||||
|
|
||||||
# Disable sudo prompt for `wheel` users.
|
# Disable sudo prompt for `wheel` users.
|
||||||
|
@ -59,6 +60,7 @@
|
||||||
git
|
git
|
||||||
htop
|
htop
|
||||||
rsync
|
rsync
|
||||||
|
ripgrep
|
||||||
vim
|
vim
|
||||||
zoxide
|
zoxide
|
||||||
];
|
];
|
||||||
|
|
|
@ -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, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
[
|
[
|
||||||
|
@ -35,24 +30,25 @@
|
||||||
vim
|
vim
|
||||||
];
|
];
|
||||||
|
|
||||||
# Disable the firewall
|
# Disable the firewall as we need all the ports
|
||||||
networking.firewall.enable = false;
|
networking.firewall.enable = false;
|
||||||
|
|
||||||
# Force-enable Cgroupv2
|
# Force-enable Cgroupv2
|
||||||
systemd.enableUnifiedCgroupHierarchy = lib.mkForce true;
|
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 ];
|
systemd.services.k3s.path = [ pkgs.gnugrep pkgs.utillinux ];
|
||||||
|
|
||||||
|
# Enable k3s as a master node
|
||||||
services.k3s = {
|
services.k3s = {
|
||||||
enable = true;
|
enable = true;
|
||||||
role = "server";
|
role = "server";
|
||||||
|
|
||||||
extraFlags = builtins.toString [
|
extraFlags = builtins.toString [
|
||||||
"--data-dir=/var/lib/k3s" # Set data dir to var lib
|
"--data-dir=/var/lib/k3s" # Set data dir to var lib
|
||||||
"--cluster-init" # Enable embedded etcd
|
"--cluster-init" # Enable embedded etcd
|
||||||
"--disable=servicelb" # disable servicelb
|
"--disable=servicelb" # disable servicelb
|
||||||
"--no-deploy=traefik" # we want to configure traefik ourselves (or use nginx instead)
|
"--no-deploy=traefik" # we want to configure traefik ourselves (or use nginx instead)
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue