From 15268487f3ace0a610e224c13cc936720f0c6085 Mon Sep 17 00:00:00 2001 From: foglar Date: Tue, 26 Nov 2024 21:42:06 +0100 Subject: [PATCH] Bash config isolated, cleanup --- nixos/home.nix | 39 ------------------ nixos/packages/games.nix | 1 + nixos/packages/packages.nix | 1 - nixos/packages/programming/code.nix | 4 +- nixos/packages/programming/git.nix | 4 +- nixos/packages/programming/programming.nix | 5 +-- nixos/packages/terminal_tools.nix | 3 +- nixos/packages/tools/oh-my-posh.nix | 4 +- nixos/packages/tools/shell.nix | 47 ++++++++++++++++++++++ 9 files changed, 58 insertions(+), 50 deletions(-) create mode 100644 nixos/packages/tools/shell.nix diff --git a/nixos/home.nix b/nixos/home.nix index f8cbba1..e337dcb 100644 --- a/nixos/home.nix +++ b/nixos/home.nix @@ -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; } diff --git a/nixos/packages/games.nix b/nixos/packages/games.nix index 2cdb367..13fca07 100644 --- a/nixos/packages/games.nix +++ b/nixos/packages/games.nix @@ -12,6 +12,7 @@ home.packages = with pkgs; [ vitetris steam + superTuxKart heroic wine diff --git a/nixos/packages/packages.nix b/nixos/packages/packages.nix index a113287..597eea2 100644 --- a/nixos/packages/packages.nix +++ b/nixos/packages/packages.nix @@ -30,7 +30,6 @@ "discord" "spotify" - "webstorm" "pycharm" "pycharm-professional" diff --git a/nixos/packages/programming/code.nix b/nixos/packages/programming/code.nix index dee6299..6c56615 100644 --- a/nixos/packages/programming/code.nix +++ b/nixos/packages/programming/code.nix @@ -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 diff --git a/nixos/packages/programming/git.nix b/nixos/packages/programming/git.nix index 59489bb..46462b2 100644 --- a/nixos/packages/programming/git.nix +++ b/nixos/packages/programming/git.nix @@ -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"; diff --git a/nixos/packages/programming/programming.nix b/nixos/packages/programming/programming.nix index 6d3f198..91b22e3 100644 --- a/nixos/packages/programming/programming.nix +++ b/nixos/packages/programming/programming.nix @@ -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 diff --git a/nixos/packages/terminal_tools.nix b/nixos/packages/terminal_tools.nix index 0b202f3..3b447fd 100644 --- a/nixos/packages/terminal_tools.nix +++ b/nixos/packages/terminal_tools.nix @@ -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; diff --git a/nixos/packages/tools/oh-my-posh.nix b/nixos/packages/tools/oh-my-posh.nix index 66a9c21..5196279 100644 --- a/nixos/packages/tools/oh-my-posh.nix +++ b/nixos/packages/tools/oh-my-posh.nix @@ -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; diff --git a/nixos/packages/tools/shell.nix b/nixos/packages/tools/shell.nix new file mode 100644 index 0000000..59ea0d6 --- /dev/null +++ b/nixos/packages/tools/shell.nix @@ -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/"; + }; + }; +}