diff options
Diffstat (limited to 'modules/tools')
| -rw-r--r-- | modules/tools/bat/default.nix (renamed from modules/tools/viewer/bat/default.nix) | 10 | ||||
| -rw-r--r-- | modules/tools/bat/theme.mustache.tmTheme (renamed from modules/tools/viewer/bat/theme.mustache.tmTheme) | 0 | ||||
| -rw-r--r-- | modules/tools/default.nix | 15 | ||||
| -rw-r--r-- | modules/tools/editor/default.nix | 7 | ||||
| -rw-r--r-- | modules/tools/feh/default.nix (renamed from modules/tools/viewer/feh/default.nix) | 4 | ||||
| -rw-r--r-- | modules/tools/file-manager/default.nix | 24 | ||||
| -rw-r--r-- | modules/tools/file-manager/lf/default.nix | 32 | ||||
| -rw-r--r-- | modules/tools/file-manager/lf/icons | 334 | ||||
| -rw-r--r-- | modules/tools/file-manager/lsd/default.nix | 13 | ||||
| -rw-r--r-- | modules/tools/file-manager/nnn/default.nix | 23 | ||||
| -rw-r--r-- | modules/tools/fzf/default.nix (renamed from modules/tools/utils/fzf/default.nix) | 4 | ||||
| -rw-r--r-- | modules/tools/htop/default.nix (renamed from modules/tools/system-monitor/htop/default.nix) | 4 | ||||
| -rw-r--r-- | modules/tools/kitty/default.nix (renamed from modules/tools/terminal/kitty/default.nix) | 14 | ||||
| -rw-r--r-- | modules/tools/lsd/default.nix | 12 | ||||
| -rw-r--r-- | modules/tools/neovim/config/default.nix (renamed from modules/tools/editor/neovim/config/default.nix) | 0 | ||||
| -rw-r--r-- | modules/tools/neovim/config/keybindings.lua (renamed from modules/tools/editor/neovim/config/keybindings.lua) | 0 | ||||
| -rw-r--r-- | modules/tools/neovim/config/options.lua (renamed from modules/tools/editor/neovim/config/options.lua) | 0 | ||||
| -rw-r--r-- | modules/tools/neovim/default.nix (renamed from modules/tools/editor/neovim/default.nix) | 4 | ||||
| -rw-r--r-- | modules/tools/neovim/plugins/config/base16.mustache.lua (renamed from modules/tools/editor/neovim/plugins/config/base16.mustache.lua) | 0 | ||||
| -rw-r--r-- | modules/tools/neovim/plugins/config/comment.lua (renamed from modules/tools/editor/neovim/plugins/config/comment.lua) | 0 | ||||
| -rw-r--r-- | modules/tools/neovim/plugins/config/default.nix (renamed from modules/tools/editor/neovim/plugins/config/default.nix) | 2 | ||||
| -rw-r--r-- | modules/tools/neovim/plugins/config/dressing.lua (renamed from modules/tools/editor/neovim/plugins/config/dressing.lua) | 0 | ||||
| -rw-r--r-- | modules/tools/neovim/plugins/config/lsp-config.lua (renamed from modules/tools/editor/neovim/plugins/config/lsp-config.lua) | 0 | ||||
| -rw-r--r-- | modules/tools/neovim/plugins/config/lualine.mustache.lua (renamed from modules/tools/editor/neovim/plugins/config/lualine.mustache.lua) | 0 | ||||
| -rw-r--r-- | modules/tools/neovim/plugins/config/noice.mustache.lua (renamed from modules/tools/editor/neovim/plugins/config/noice.mustache.lua) | 0 | ||||
| -rw-r--r-- | modules/tools/neovim/plugins/config/nvim-tree.lua (renamed from modules/tools/editor/neovim/plugins/config/nvim-tree.lua) | 0 | ||||
| -rw-r--r-- | modules/tools/neovim/plugins/config/nvim-ufo.lua (renamed from modules/tools/editor/neovim/plugins/config/nvim-ufo.lua) | 0 | ||||
| -rw-r--r-- | modules/tools/neovim/plugins/config/treesitter.nix (renamed from modules/tools/editor/neovim/plugins/config/treesitter.nix) | 0 | ||||
| -rw-r--r-- | modules/tools/neovim/plugins/config/which-key.lua (renamed from modules/tools/editor/neovim/plugins/config/which-key.lua) | 0 | ||||
| -rw-r--r-- | modules/tools/neovim/plugins/default.nix (renamed from modules/tools/editor/neovim/plugins/default.nix) | 2 | ||||
| -rw-r--r-- | modules/tools/nnn/default.nix | 16 | ||||
| -rw-r--r-- | modules/tools/system-monitor/default.nix | 7 | ||||
| -rw-r--r-- | modules/tools/terminal/alacritty/default.nix | 83 | ||||
| -rw-r--r-- | modules/tools/terminal/default.nix | 24 | ||||
| -rw-r--r-- | modules/tools/terminal/tmux/default.nix | 11 | ||||
| -rw-r--r-- | modules/tools/utils/default.nix | 7 | ||||
| -rw-r--r-- | modules/tools/viewer/default.nix | 8 | ||||
| -rw-r--r-- | modules/tools/zsh/default.nix | 25 | ||||
| -rw-r--r-- | modules/tools/zsh/zshrc | 23 |
39 files changed, 103 insertions, 605 deletions
diff --git a/modules/tools/viewer/bat/default.nix b/modules/tools/bat/default.nix index 4d52a62..d459042 100644 --- a/modules/tools/viewer/bat/default.nix +++ b/modules/tools/bat/default.nix @@ -1,19 +1,19 @@ { config, lib, pkgs, ... }: { - options.tools.viewer.bat = { + options.tools.bat = { enable = lib.mkEnableOption "Enables bat."; }; - config = lib.mkIf config.tools.viewer.bat.enable { + config = lib.mkIf config.tools.bat.enable { programs.bat.enable = true; programs.bat.config = { tabs = "4"; theme = "custom-theme"; }; - shell.alias."cat" = "${pkgs.bat}/bin/bat -pp"; - shell.alias."less" = "${pkgs.bat}/bin/bat --paging always"; - home.sessionVariables."PAGER" = "${pkgs.bat}/bin/bat --paging always"; + # shell.alias."cat" = "${pkgs.bat}/bin/bat -pp"; + # shell.alias."less" = "${pkgs.bat}/bin/bat --paging always"; + # home.sessionVariables."PAGER" = "${pkgs.bat}/bin/bat --paging always"; xdg.configFile."bat/themes/custom-theme.tmTheme".source = config.scheme { template = builtins.readFile ./theme.mustache.tmTheme; diff --git a/modules/tools/viewer/bat/theme.mustache.tmTheme b/modules/tools/bat/theme.mustache.tmTheme index 844b80d..844b80d 100644 --- a/modules/tools/viewer/bat/theme.mustache.tmTheme +++ b/modules/tools/bat/theme.mustache.tmTheme diff --git a/modules/tools/default.nix b/modules/tools/default.nix index 0180df9..20b661d 100644 --- a/modules/tools/default.nix +++ b/modules/tools/default.nix @@ -2,12 +2,15 @@ { imports = [ - ./editor - ./file-manager + ./bat + ./feh + ./fzf ./git - ./system-monitor - ./terminal - ./utils - ./viewer + ./htop + ./kitty + ./lsd + ./neovim + ./nnn + ./zsh ]; } diff --git a/modules/tools/editor/default.nix b/modules/tools/editor/default.nix deleted file mode 100644 index fd2da1a..0000000 --- a/modules/tools/editor/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: - -{ - imports = [ - ./neovim - ]; -} diff --git a/modules/tools/viewer/feh/default.nix b/modules/tools/feh/default.nix index d90e8b1..8aa5631 100644 --- a/modules/tools/viewer/feh/default.nix +++ b/modules/tools/feh/default.nix @@ -1,11 +1,11 @@ { config, lib, pkgs, ... }: { - options.tools.viewer.feh = { + options.tools.feh = { enable = lib.mkEnableOption "Enables feh."; }; - config = lib.mkIf config.tools.viewer.feh.enable { + config = lib.mkIf config.tools.git.enable { programs.feh.enable = true; }; } diff --git a/modules/tools/file-manager/default.nix b/modules/tools/file-manager/default.nix deleted file mode 100644 index 4889f5b..0000000 --- a/modules/tools/file-manager/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, ... }: - -{ - imports = [ - ./lf - ./lsd - ./nnn - ]; - - options.tools.file-manager = { - default = lib.mkOption { - type = lib.types.enum [ - "nnn" - "lf" - ]; - description = "Default file manager."; - }; - - command = lib.mkOption { - type = lib.types.str; - description = "Command for the default file manager program."; - }; - }; -} diff --git a/modules/tools/file-manager/lf/default.nix b/modules/tools/file-manager/lf/default.nix deleted file mode 100644 index 2fab997..0000000 --- a/modules/tools/file-manager/lf/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - options.tools.file-manager.lf = { - enable = lib.mkEnableOption "Enables lf."; - }; - - config = lib.mkIf config.tools.file-manager.lf.enable { - tools.file-manager.default = lib.mkDefault "lf"; - tools.file-manager.command = - lib.mkIf - (config.tools.file-manager.default == "lf") - "${pkgs.lf}/bin/lf"; - - programs.lf.enable = true; - programs.lf.settings = { - hidden = true; - }; - programs.lf.previewer.source = pkgs.writeShellScript - "previewer.sh" - '' -#!/bin/sh -unset COLORTERM -${if config.tools.viewer.bat.enable then - "bat -pp --line-range=:500 --color=always" -else "cat"} "$1" - ''; - programs.lf.extraConfig = "set icons"; - - xdg.configFile."lf/icons".source = ./icons; - }; -} diff --git a/modules/tools/file-manager/lf/icons b/modules/tools/file-manager/lf/icons deleted file mode 100644 index 2e9d8a2..0000000 --- a/modules/tools/file-manager/lf/icons +++ /dev/null @@ -1,334 +0,0 @@ -# vim:ft=conf - -# These examples require Nerd Fonts or a compatible font to be used. -# See https://www.nerdfonts.com for more information. - -# file types (with matching order) -ln # LINK -or # ORPHAN -tw t # STICKY_OTHER_WRITABLE -ow # OTHER_WRITABLE -st t # STICKY -di # DIR -pi p # FIFO -so s # SOCK -bd b # BLK -cd c # CHR -su u # SETUID -sg g # SETGID -ex # EXEC -fi # FILE - -# file extensions (vim-devicons) -*.styl -*.sass -*.scss -*.htm -*.html -*.slim -*.haml -*.ejs -*.css -*.less -*.md -*.mdx -*.markdown -*.rmd -*.json -*.webmanifest -*.js -*.mjs -*.jsx -*.rb -*.gemspec -*.rake -*.php -*.py -*.pyc -*.pyo -*.pyd -*.coffee -*.mustache -*.hbs -*.conf -*.ini -*.yml -*.yaml -*.toml -*.bat -*.mk -*.jpg -*.jpeg -*.bmp -*.png -*.webp -*.gif -*.ico -*.twig -*.cpp -*.c++ -*.cxx -*.cc -*.cp -*.c -*.cs -*.h -*.hh -*.hpp -*.hxx -*.hs -*.lhs -*.nix -*.lua -*.java -*.sh -*.fish -*.bash -*.zsh -*.ksh -*.csh -*.awk -*.ps1 -*.ml λ -*.mli λ -*.diff -*.db -*.sql -*.dump -*.clj -*.cljc -*.cljs -*.edn -*.scala -*.go -*.dart -*.xul -*.sln -*.suo -*.pl -*.pm -*.t -*.rss -'*.f#' -*.fsscript -*.fsx -*.fs -*.fsi -*.rs -*.rlib -*.d -*.erl -*.hrl -*.ex -*.exs -*.eex -*.leex -*.heex -*.vim -*.ai -*.psd -*.psb -*.ts -*.tsx -*.jl -*.pp -*.vue -*.elm -*.swift -*.xcplayground -*.tex -*.r -*.rproj -*.sol -*.pem - -# file names (vim-devicons) (case-insensitive not supported in lf) -*gruntfile.coffee -*gruntfile.js -*gruntfile.ls -*gulpfile.coffee -*gulpfile.js -*gulpfile.ls -*mix.lock -*dropbox -*.ds_store -*.gitconfig -*.gitignore -*.gitattributes -*.gitlab-ci.yml -*.bashrc -*.zshrc -*.zshenv -*.zprofile -*.vimrc -*.gvimrc -*_vimrc -*_gvimrc -*.bashprofile -*favicon.ico -*license -*node_modules -*react.jsx -*procfile -*dockerfile -*docker-compose.yml -*docker-compose.yaml -*compose.yml -*compose.yaml -*rakefile -*config.ru -*gemfile -*makefile -*cmakelists.txt -*robots.txt - -# file names (case-sensitive adaptations) -*Gruntfile.coffee -*Gruntfile.js -*Gruntfile.ls -*Gulpfile.coffee -*Gulpfile.js -*Gulpfile.ls -*Dropbox -*.DS_Store -*LICENSE -*React.jsx -*Procfile -*Dockerfile -*Docker-compose.yml -*Docker-compose.yaml -*Rakefile -*Gemfile -*Makefile -*CMakeLists.txt - -# file patterns (file name adaptations) -*jquery.min.js -*angular.min.js -*backbone.min.js -*require.min.js -*materialize.min.js -*materialize.min.css -*mootools.min.js -*vimrc -Vagrantfile - -# archives or compressed (extensions from dircolors defaults) -*.tar -*.tgz -*.arc -*.arj -*.taz -*.lha -*.lz4 -*.lzh -*.lzma -*.tlz -*.txz -*.tzo -*.t7z -*.zip -*.z -*.dz -*.gz -*.lrz -*.lz -*.lzo -*.xz -*.zst -*.tzst -*.bz2 -*.bz -*.tbz -*.tbz2 -*.tz -*.deb -*.rpm -*.jar -*.war -*.ear -*.sar -*.rar -*.alz -*.ace -*.zoo -*.cpio -*.7z -*.rz -*.cab -*.wim -*.swm -*.dwm -*.esd - -# image formats (extensions from dircolors defaults) -*.jpg -*.jpeg -*.mjpg -*.mjpeg -*.gif -*.bmp -*.pbm -*.pgm -*.ppm -*.tga -*.xbm -*.xpm -*.tif -*.tiff -*.png -*.svg -*.svgz -*.mng -*.pcx -*.mov -*.mpg -*.mpeg -*.m2v -*.mkv -*.webm -*.ogm -*.mp4 -*.m4v -*.mp4v -*.vob -*.qt -*.nuv -*.wmv -*.asf -*.rm -*.rmvb -*.flc -*.avi -*.fli -*.flv -*.gl -*.dl -*.xcf -*.xwd -*.yuv -*.cgm -*.emf -*.ogv -*.ogx - -# audio formats (extensions from dircolors defaults) -*.aac -*.au -*.flac -*.m4a -*.mid -*.midi -*.mka -*.mp3 -*.mpc -*.ogg -*.ra -*.wav -*.oga -*.opus -*.spx -*.xspf - -# other formats -*.pdf diff --git a/modules/tools/file-manager/lsd/default.nix b/modules/tools/file-manager/lsd/default.nix deleted file mode 100644 index d99413d..0000000 --- a/modules/tools/file-manager/lsd/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ pkgs, lib, config, ... }: - -{ - options.tools.file-manager.lsd = { - enable = lib.mkEnableOption "Enables lsd."; - }; - - config = lib.mkIf config.tools.file-manager.lsd.enable { - programs.lsd.enable = true; - programs.lsd.enableAliases = true; - programs.lsd.settings.icons.separator = " "; - }; -} diff --git a/modules/tools/file-manager/nnn/default.nix b/modules/tools/file-manager/nnn/default.nix deleted file mode 100644 index a41096c..0000000 --- a/modules/tools/file-manager/nnn/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - options.tools.file-manager.nnn = { - enable = lib.mkEnableOption "Enables nnn."; - }; - - config = - let - nnnWithNerdIcons = pkgs.nnn.override ({ withNerdIcons = true; }); - in lib.mkIf config.tools.file-manager.nnn.enable { - tools.file-manager.default = lib.mkDefault "nnn"; - tools.file-manager.command = - lib.mkIf - (config.tools.file-manager.default == "nnn") - "${nnnWithNerdIcons}/bin/nnn -H -d"; - - programs.nnn.enable = true; - programs.nnn.package = nnnWithNerdIcons; - programs.nnn.plugins.src = "${nnnWithNerdIcons}/share/plugins"; - shell.alias."nnn" = "${nnnWithNerdIcons}/bin/nnn -H -d"; - }; -} diff --git a/modules/tools/utils/fzf/default.nix b/modules/tools/fzf/default.nix index e6378bc..169a07f 100644 --- a/modules/tools/utils/fzf/default.nix +++ b/modules/tools/fzf/default.nix @@ -1,11 +1,11 @@ { config, lib,... }: { - options.tools.utils.fzf = { + options.tools.fzf = { enable = lib.mkEnableOption "Enables fzf."; }; - config = lib.mkIf config.tools.utils.fzf.enable { + config = lib.mkIf config.tools.fzf.enable { programs.fzf.enable = true; programs.fzf.defaultOptions = [ "--height 100%" diff --git a/modules/tools/system-monitor/htop/default.nix b/modules/tools/htop/default.nix index c19ab60..d4037e6 100644 --- a/modules/tools/system-monitor/htop/default.nix +++ b/modules/tools/htop/default.nix @@ -1,11 +1,11 @@ { pkgs, lib, config, ... }: { - options.tools.system-monitor.htop = { + options.tools.htop = { enable = lib.mkEnableOption "Enables htop."; }; - config = lib.mkIf config.tools.system-monitor.htop.enable { + config = lib.mkIf config.tools.htop.enable { programs.htop.enable = true; programs.htop.package = pkgs.htop-vim; }; diff --git a/modules/tools/terminal/kitty/default.nix b/modules/tools/kitty/default.nix index 94f013b..74b4519 100644 --- a/modules/tools/terminal/kitty/default.nix +++ b/modules/tools/kitty/default.nix @@ -1,20 +1,14 @@ { pkgs, config, lib, ... }: { - options.tools.terminal.kitty = { + options.tools.kitty = { enable = lib.mkEnableOption "Enables kitty. WARNING! Currently faces problems with color rendering with picom."; }; - config = lib.mkIf config.tools.terminal.kitty.enable { + config = lib.mkIf config.tools.kitty.enable { programs.kitty.enable = true; - tools.terminal.default = lib.mkDefault "kitty"; - tools.terminal.command = - lib.mkIf - (config.tools.terminal.default == "kitty") - "${pkgs.kitty}/bin/kitty"; - programs.kitty.settings = with config.scheme.withHashtag; { - window_padding_width = config.desktop.window-manager.gap; + window_padding_width = 10; font_size = config.fonts.size; font_family = config.fonts.normal; filter_notification = "all"; @@ -48,8 +42,6 @@ selection_background = base03; selection_foreground = base00; - - shell = config.shell.command; }; }; } diff --git a/modules/tools/lsd/default.nix b/modules/tools/lsd/default.nix new file mode 100644 index 0000000..feb1481 --- /dev/null +++ b/modules/tools/lsd/default.nix @@ -0,0 +1,12 @@ +{ config, lib, ... }: + +{ + options.tools.lsd = { + enable = lib.mkEnableOption "Enables lsd."; + }; + + config = lib.mkIf config.tools.lsd.enable { + programs.lsd.enable = true; + programs.lsd.settings.icons.separator = " "; + }; +} diff --git a/modules/tools/editor/neovim/config/default.nix b/modules/tools/neovim/config/default.nix index 4514d2f..4514d2f 100644 --- a/modules/tools/editor/neovim/config/default.nix +++ b/modules/tools/neovim/config/default.nix diff --git a/modules/tools/editor/neovim/config/keybindings.lua b/modules/tools/neovim/config/keybindings.lua index 3f2c9bf..3f2c9bf 100644 --- a/modules/tools/editor/neovim/config/keybindings.lua +++ b/modules/tools/neovim/config/keybindings.lua diff --git a/modules/tools/editor/neovim/config/options.lua b/modules/tools/neovim/config/options.lua index fc0b04c..fc0b04c 100644 --- a/modules/tools/editor/neovim/config/options.lua +++ b/modules/tools/neovim/config/options.lua diff --git a/modules/tools/editor/neovim/default.nix b/modules/tools/neovim/default.nix index 7d257ba..2c0b7aa 100644 --- a/modules/tools/editor/neovim/default.nix +++ b/modules/tools/neovim/default.nix @@ -1,7 +1,7 @@ { pkgs, config, lib, ... }: { - options.tools.editor.neovim = { + options.tools.neovim = { enable = lib.mkEnableOption "Enables neovim."; profile = lib.mkOption { type = lib.types.enum [ @@ -16,7 +16,7 @@ config = let plugins = import ./plugins { inherit config pkgs lib; }; - in lib.mkIf config.tools.editor.neovim.enable { + in lib.mkIf config.tools.neovim.enable { programs.neovim.enable = true; programs.neovim.viAlias = true; programs.neovim.vimAlias = true; diff --git a/modules/tools/editor/neovim/plugins/config/base16.mustache.lua b/modules/tools/neovim/plugins/config/base16.mustache.lua index 3c13fcc..3c13fcc 100644 --- a/modules/tools/editor/neovim/plugins/config/base16.mustache.lua +++ b/modules/tools/neovim/plugins/config/base16.mustache.lua diff --git a/modules/tools/editor/neovim/plugins/config/comment.lua b/modules/tools/neovim/plugins/config/comment.lua index 9086261..9086261 100644 --- a/modules/tools/editor/neovim/plugins/config/comment.lua +++ b/modules/tools/neovim/plugins/config/comment.lua diff --git a/modules/tools/editor/neovim/plugins/config/default.nix b/modules/tools/neovim/plugins/config/default.nix index dcdb371..9ae2485 100644 --- a/modules/tools/editor/neovim/plugins/config/default.nix +++ b/modules/tools/neovim/plugins/config/default.nix @@ -1,7 +1,7 @@ { config }: let - fullExtra = if config.tools.editor.neovim.profile == "full" then + fullExtra = if config.tools.neovim.profile == "full" then '' ${builtins.readFile ./lsp-config.lua} ${builtins.readFile ./dressing.lua} diff --git a/modules/tools/editor/neovim/plugins/config/dressing.lua b/modules/tools/neovim/plugins/config/dressing.lua index 6d14d47..6d14d47 100644 --- a/modules/tools/editor/neovim/plugins/config/dressing.lua +++ b/modules/tools/neovim/plugins/config/dressing.lua diff --git a/modules/tools/editor/neovim/plugins/config/lsp-config.lua b/modules/tools/neovim/plugins/config/lsp-config.lua index cca4116..cca4116 100644 --- a/modules/tools/editor/neovim/plugins/config/lsp-config.lua +++ b/modules/tools/neovim/plugins/config/lsp-config.lua diff --git a/modules/tools/editor/neovim/plugins/config/lualine.mustache.lua b/modules/tools/neovim/plugins/config/lualine.mustache.lua index bf4f1d1..bf4f1d1 100644 --- a/modules/tools/editor/neovim/plugins/config/lualine.mustache.lua +++ b/modules/tools/neovim/plugins/config/lualine.mustache.lua diff --git a/modules/tools/editor/neovim/plugins/config/noice.mustache.lua b/modules/tools/neovim/plugins/config/noice.mustache.lua index a258c8e..a258c8e 100644 --- a/modules/tools/editor/neovim/plugins/config/noice.mustache.lua +++ b/modules/tools/neovim/plugins/config/noice.mustache.lua diff --git a/modules/tools/editor/neovim/plugins/config/nvim-tree.lua b/modules/tools/neovim/plugins/config/nvim-tree.lua index cdbef6a..cdbef6a 100644 --- a/modules/tools/editor/neovim/plugins/config/nvim-tree.lua +++ b/modules/tools/neovim/plugins/config/nvim-tree.lua diff --git a/modules/tools/editor/neovim/plugins/config/nvim-ufo.lua b/modules/tools/neovim/plugins/config/nvim-ufo.lua index 641373f..641373f 100644 --- a/modules/tools/editor/neovim/plugins/config/nvim-ufo.lua +++ b/modules/tools/neovim/plugins/config/nvim-ufo.lua diff --git a/modules/tools/editor/neovim/plugins/config/treesitter.nix b/modules/tools/neovim/plugins/config/treesitter.nix index be0bdb6..be0bdb6 100644 --- a/modules/tools/editor/neovim/plugins/config/treesitter.nix +++ b/modules/tools/neovim/plugins/config/treesitter.nix diff --git a/modules/tools/editor/neovim/plugins/config/which-key.lua b/modules/tools/neovim/plugins/config/which-key.lua index 1290432..1290432 100644 --- a/modules/tools/editor/neovim/plugins/config/which-key.lua +++ b/modules/tools/neovim/plugins/config/which-key.lua diff --git a/modules/tools/editor/neovim/plugins/default.nix b/modules/tools/neovim/plugins/default.nix index f801519..b06cb24 100644 --- a/modules/tools/editor/neovim/plugins/default.nix +++ b/modules/tools/neovim/plugins/default.nix @@ -15,7 +15,7 @@ patchPhase = "ln -s ${config.scheme base16-vim} colors/base16-scheme.vim"; })) ] - (if config.tools.editor.neovim.profile == "full" then + (if config.tools.neovim.profile == "full" then [ noice-nvim dressing-nvim diff --git a/modules/tools/nnn/default.nix b/modules/tools/nnn/default.nix new file mode 100644 index 0000000..298f538 --- /dev/null +++ b/modules/tools/nnn/default.nix @@ -0,0 +1,16 @@ +{ config, pkgs, lib, ... }: + +{ + options.tools.nnn = { + enable = lib.mkEnableOption "Enables nnn."; + }; + + config = + let + nnnWithNerdIcons = pkgs.nnn.override ({ withNerdIcons = true; }); + in lib.mkIf config.tools.nnn.enable { + programs.nnn.enable = true; + programs.nnn.package = nnnWithNerdIcons; + programs.nnn.plugins.src = "${nnnWithNerdIcons}/share/plugins"; + }; +} diff --git a/modules/tools/system-monitor/default.nix b/modules/tools/system-monitor/default.nix deleted file mode 100644 index a5b569c..0000000 --- a/modules/tools/system-monitor/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: - -{ - imports = [ - ./htop - ]; -} diff --git a/modules/tools/terminal/alacritty/default.nix b/modules/tools/terminal/alacritty/default.nix deleted file mode 100644 index fa3c080..0000000 --- a/modules/tools/terminal/alacritty/default.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ pkgs, config, lib, ... }: - -{ - options.tools.terminal.alacritty = { - enable = lib.mkEnableOption "Enables alacritty."; - }; - - config = lib.mkIf config.tools.terminal.alacritty.enable { - programs.alacritty.enable = true; - tools.terminal.default = lib.mkDefault "alacritty"; - tools.terminal.command = - lib.mkIf - (config.tools.terminal.default == "alacritty") - "${pkgs.alacritty}/bin/alacritty"; - - programs.alacritty.settings = { - window = { - opacity = 1.0; - padding = { - x = config.desktop.window-manager.gap; - y = config.desktop.window-manager.gap; - }; - decorations = "none"; - }; - - font = { - normal = { - family = config.fonts.normal; - style = "Retina"; - }; - bold = { - family = config.fonts.bold; - style = "Bold"; - }; - italic = { - family = config.fonts.italic; - }; - size = config.fonts.size; - }; - - colors = with config.scheme; { - primary = { - background = "0x${base00}"; - foreground = "0x${base05}"; - }; - normal = { - black = "0x${base00}"; - red = "0x${base08}"; - green = "0x${base0B}"; - yellow = "0x${base0A}"; - blue = "0x${base0D}"; - magenta = "0x${base0E}"; - cyan = "0x${base0C}"; - white = "0x${base05}"; - }; - bright = { - black = "0x${base03}"; - red = "0x${base08}"; - green = "0x${base0B}"; - yellow = "0x${base0A}"; - blue = "0x${base0D}"; - magenta = "0x${base0E}"; - cyan = "0x${base0C}"; - white = "0x${base07}"; - }; - dim = { - black = "0x${base01}"; - red = "0x${base08}"; - green = "0x${base0B}"; - yellow = "0x${base0A}"; - blue = "0x${base0D}"; - magenta = "0x${base0E}"; - cyan = "0x${base0C}"; - white = "0x${base04}"; - }; - }; - - shell = { - program = config.shell.command; - }; - }; - }; -} diff --git a/modules/tools/terminal/default.nix b/modules/tools/terminal/default.nix deleted file mode 100644 index 2e29bce..0000000 --- a/modules/tools/terminal/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, ... }: - -{ - imports = [ - ./alacritty - ./kitty - ./tmux - ]; - - options.tools.terminal = { - command = lib.mkOption { - type = lib.types.str; - description = "Command for the terminal."; - }; - - default = lib.mkOption { - type = lib.types.enum [ - "kitty" - "alacritty" - ]; - description = "Default terminal."; - }; - }; -} diff --git a/modules/tools/terminal/tmux/default.nix b/modules/tools/terminal/tmux/default.nix deleted file mode 100644 index a77bbcb..0000000 --- a/modules/tools/terminal/tmux/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, config, lib, ... }: - -{ - options.tools.terminal.tmux = { - enable = lib.mkEnableOption "Enables tmus."; - }; - - config = lib.mkIf config.tools.terminal.tmux.enable { - programs.tmux.enable = true; - }; -} diff --git a/modules/tools/utils/default.nix b/modules/tools/utils/default.nix deleted file mode 100644 index 5d758fc..0000000 --- a/modules/tools/utils/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: - -{ - imports = [ - ./fzf - ]; -} diff --git a/modules/tools/viewer/default.nix b/modules/tools/viewer/default.nix deleted file mode 100644 index 01fd204..0000000 --- a/modules/tools/viewer/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ ... }: - -{ - imports = [ - ./bat - ./feh - ]; -} diff --git a/modules/tools/zsh/default.nix b/modules/tools/zsh/default.nix new file mode 100644 index 0000000..0f10e72 --- /dev/null +++ b/modules/tools/zsh/default.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +{ + options.tools.zsh = { + enable = lib.mkEnableOption "Enables zsh."; + }; + + config = lib.mkIf config.tools.zsh.enable { + programs.zsh.enable = true; + programs.zsh.dotDir = ".config/zsh"; + programs.zsh.history.path = "${config.xdg.cacheHome}/zsh/history"; + programs.zsh.initContent = '' +${if config.tools.fzf.enable then + "eval \"$(fzf --zsh)\"" +else ""} +${builtins.readFile ./zshrc} +${if config.scripts.enable then + "export PATH=${config.home.homeDirectory}/scripts:$PATH" +else ""} + ''; + programs.kitty.settings.shell = lib.mkIf config.tools.kitty.enable "zsh"; + programs.zsh.shellAliases."nnn" = lib.mkIf config.tools.nnn.enable "nnn -H -d"; + # programs.zsh.shellAliases."ls" = lib.mkIf config.tools.lsd.enable "lsd"; + }; +} diff --git a/modules/tools/zsh/zshrc b/modules/tools/zsh/zshrc new file mode 100644 index 0000000..3465071 --- /dev/null +++ b/modules/tools/zsh/zshrc @@ -0,0 +1,23 @@ +setopt PROMPT_SUBST + +autoload -U colors && colors + +autoload -Uz vcs_info +precmd() { vcs_info } + +zstyle ':vcs_info:git:*' formats '%F{red}┄[%F{cyan}%b%c%F{blue}%a%F{red}]' +zstyle ':vcs_info:git:*' actionformats '%F{red}┄[%F{cyan}%b%c%F{blue}%a%F{red}]' + +zstyle ':vcs_info:*+set-message:*' hooks git-untracked git-dirty + +zstyle ':vcs_info:git:*' check-for-changes true +zstyle ':vcs_info:git:*' stagedstr ' %F{green}✓%f' +zstyle ':vcs_info:git:*' unstagedstr ' %F{red}✗%f' +zstyle ':vcs_info:git:*' aheadstr ' %F{blue}⬆%f' +zstyle ':vcs_info:git:*' behindstr ' %F{yellow}⬇%f' + +PROMPT='%F{red}╭──[%F{green}%m%F{red}@%F{blue}%n%F{red}]┄[%F{magenta}%~%F{red}]${vcs_info_msg_0_}%(?..%F{red}┄[%F{white}Exit status: %F{yellow}%?%F{red}] ) +╰─>%f ' + +bindkey "^[[3~" delete-char +bindkey "^?" backward-delete-char |