Bash config isolated, cleanup

This commit is contained in:
foglar 2024-11-26 21:42:06 +01:00
parent 25718939f8
commit 15268487f3
9 changed files with 58 additions and 50 deletions

View File

@ -14,37 +14,6 @@
gtk.enable = true;
programs.bash = {
enable = true;
enableCompletion = true;
shellAliases = {
vim = "nvim";
ls = "exa --icons";
ll = "exa -alh --icons";
tree = "exa --tree --icons";
open = "rifle";
ip = "ip -c";
s = "kitten ssh";
diff = "diff --color";
cd = "z";
respawn = "clear; pfetch";
l = "eza -lh --icons=auto";
mkdir = "mkdir -p";
cat = "bat --style plain";
rasp = "s foglar@192.168.8.140";
hist = "history | awk '{for (i=2; i<=NF; i++) printf \$i\" \"; print \"\"}' | fzf | wl-copy";
cdx = "zoxide query --interactive";
distrobox-enter = "distrobox-enter --root";
distrobox-create = "distrobox-create --root";
distrobox-list = "distrobox-list --root";
};
bashrcExtra = ''
pfetch'';
};
home.file = {
".config/hypr/hyprlock.conf".source = ../config/hyprlock.conf;
@ -58,14 +27,6 @@
}
'';
};
home.sessionVariables = {
EDITOR = "nvim";
FLAKE = "/home/foglar/dotfiles";
XDG_DATA_HOME = "$HOME/.local/share";
XDG_PICTURES_DIR = "$HOME/Pictures/Screenshots/";
};
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;
}

View File

@ -12,6 +12,7 @@
home.packages = with pkgs; [
vitetris
steam
superTuxKart
heroic
wine

View File

@ -30,7 +30,6 @@
"discord"
"spotify"
"webstorm"
"pycharm"
"pycharm-professional"

View File

@ -5,10 +5,10 @@
...
}: {
options = {
vscode.enable = lib.mkEnableOption "enable vscode";
programming.vscode.enable = lib.mkEnableOption "enable vscode";
};
config = lib.mkIf config.vscode.enable {
config = lib.mkIf config.programming.vscode.enable {
home.packages = with pkgs; [
vscode
gopls

View File

@ -6,10 +6,10 @@
}:
{
options = {
git.enable = lib.mkEnableOption "enable git";
programming.git.enable = lib.mkEnableOption "enable git";
};
config = lib.mkIf config.git.enable {
config = lib.mkIf config.programming.git.enable {
programs.git = {
enable = true;
userName = "foglar";

View File

@ -17,8 +17,8 @@
config = lib.mkIf config.programming.enable {
vscode.enable = lib.mkDefault true;
git.enable = lib.mkDefault true;
programming.vscode.enable = lib.mkDefault true;
programming.git.enable = lib.mkDefault true;
home.packages = with pkgs; [
neovim
@ -27,7 +27,6 @@
go
jq
conda
jetbrains.webstorm
jetbrains.pycharm-professional
dotnet-sdk_8
nodejs

View File

@ -15,7 +15,8 @@
config = lib.mkIf config.terminal_tools.enable {
oh-my-posh.enable = lib.mkDefault true;
shell.bash.enable = lib.mkDefault true;
shell.bash.oh-my-posh.enable = lib.mkDefault true;
programs = {
bat.enable = true;

View File

@ -5,10 +5,10 @@
...
}: {
options = {
oh-my-posh.enable = lib.mkEnableOption "enable oh-my-posh";
shell.oh-my-posh.enable = lib.mkEnableOption "enable oh-my-posh";
};
config = lib.mkIf config.oh-my-posh.enable {
config = lib.mkIf config.shell.oh-my-posh.enable {
programs.oh-my-posh = {
enable = true;
enableBashIntegration = true;

View File

@ -0,0 +1,47 @@
{lib, ...}: {
options = {
shell.enable =
lib.mkEnableOption "enables shell tools";
};
config = lib.mkIf lib.config.shell.enable {
programs.bash = {
enable = true;
enableCompletion = true;
shellAliases = {
vim = "nvim";
ls = "exa --icons";
ll = "exa -alh --icons";
tree = "exa --tree --icons";
open = "rifle";
ip = "ip -c";
s = "kitten ssh";
diff = "diff --color";
cd = "z";
respawn = "clear; pfetch";
l = "eza -lh --icons=auto";
mkdir = "mkdir -p";
cat = "bat --style plain";
rasp = "s foglar@192.168.8.140";
hist = "history | awk '{for (i=2; i<=NF; i++) printf \$i\" \"; print \"\"}' | fzf | wl-copy";
cdx = "zoxide query --interactive";
distrobox-enter = "distrobox-enter --root";
distrobox-create = "distrobox-create --root";
distrobox-list = "distrobox-list --root";
};
bashrcExtra = ''
pfetch'';
};
home.sessionVariables = {
EDITOR = "nvim";
FLAKE = "/home/foglar/dotfiles";
XDG_DATA_HOME = "$HOME/.local/share";
XDG_PICTURES_DIR = "$HOME/Pictures/Screenshots/";
};
};
}