diff --git a/README.md b/README.md index d0cbc88..776f06a 100644 --- a/README.md +++ b/README.md @@ -8,38 +8,38 @@ configuration may be difficult to translate to a non-Nix system. ## System Features -| Feature | Program | Configuration | -|----------------|-----------------------------------------------------|-----------------------------------------------| -| OS | [NixOS](https://nixos.org) | [Link](./modules/nixos) | -| Display Server | [X11](https://www.x.org/wiki/) | [Link](./modules/nixos/graphical/xorg.nix) | -| Compositor | [Picom](https://github.com/yshui/picom) | [Link](./modules/nixos/graphical/picom.nix) | -| Window Manager | [i3](https://i3wm.org/) | [Link](./modules/nixos/graphical/i3.nix) | -| Panel | [Polybar](https://polybar.github.io/) | [Link](./modules/nixos/graphical/polybar.nix) | -| Font | [Victor Mono](https://rubjo.github.io/victor-mono/) | [Link](./modules/nixos/graphical/fonts.nix) | -| Launcher | [Rofi](https://github.com/davatorium/rofi) | [Link](./modules/nixos/graphical/rofi.nix) | +| Feature | Program | Configuration | +|----------------|-----------------------------------------------------|-----------------------------------------------------------------------------------| +| OS | [NixOS](https://nixos.org) | [Link](./platforms/nixos) | +| Display Server | [X11](https://www.x.org/wiki/) | [Link](./platforms/nixos/modules/nmasur/profiles/gui.nix) | +| Compositor | [Picom](https://github.com/yshui/picom) | [Link](./platforms/home-manager/modules/nmasur/presets/services/picom.nix) | +| Window Manager | [i3](https://i3wm.org/) | [Link](./platforms/home-manager/modules/nmasur/presets/services/i3.nix) | +| Panel | [Polybar](https://polybar.github.io/) | [Link](./platforms/home-manager/modules/nmasur/presets/services/polybar.nix) | +| Font | [Victor Mono](https://rubjo.github.io/victor-mono/) | [Link](./platforms/home-manager/modules/nmasur/presets/fonts.nix) | +| Launcher | [Rofi](https://github.com/davatorium/rofi) | [Link](./platforms/home-manager/modules/nmasur/presets/programs/rofi/default.nix) | ## User Features -| Feature | Program | Configuration | -|--------------|----------------------------------------------------------------------------------|----------------------------------------------------| -| Dotfiles | [Home-Manager](https://github.com/nix-community/home-manager) | [Link](./modules/common) | -| Terminal | [Kitty](https://sw.kovidgoyal.net/kitty/) | [Link](./modules/common/applications/kitty.nix) | -| Shell | [Fish](https://fishshell.com/) | [Link](./modules/common/shell/fish) | -| Shell Prompt | [Starship](https://starship.rs/) | [Link](./modules/common/shell/starship.nix) | -| Colorscheme | [Gruvbox](https://github.com/morhetz/gruvbox) | [Link](./colorscheme/gruvbox/default.nix) | -| Wallpaper | [Road](https://gitlab.com/exorcist365/wallpapers/-/blob/master/gruvbox/road.jpg) | [Link](./hosts/tempest/default.nix) | -| Text Editor | [Neovim](https://neovim.io/) | [Link](./modules/common/neovim/config) | -| Browser | [Firefox](https://www.mozilla.org/en-US/firefox/new/) | [Link](./modules/common/applications/firefox.nix) | -| E-Mail | [Aerc](https://aerc-mail.org/) | [Link](./modules/common/mail/aerc.nix) | -| File Manager | [Nautilus](https://wiki.gnome.org/action/show/Apps/Files) | [Link](./modules/common/applications/nautilus.nix) | -| PDF Reader | [Zathura](https://pwmt.org/projects/zathura/) | [Link](./modules/common/applications/media.nix) | -| Video Player | [mpv](https://mpv.io/) | [Link](./modules/common/applications/media.nix) | +| Feature | Program | Configuration | +|--------------|----------------------------------------------------------------------------------|-------------------------------------------------------------------------------| +| Dotfiles | [Home-Manager](https://github.com/nix-community/home-manager) | [Link](./platforms/home-manager) | +| Terminal | [Ghostty](https://sw.kovidgoyal.net/kitty/) | [Link](./platforms/home-manager/modules/nmasur/presets/programs/ghostty.nix) | +| Shell | [Fish](https://fishshell.com/) | [Link](./platforms/home-manager/modules/nmasur/presets/programs/fish.nix) | +| Shell Prompt | [Starship](https://starship.rs/) | [Link](./platforms/home-manager/modules/nmasur/presets/programs/starship.nix) | +| Colorscheme | [Gruvbox](https://github.com/morhetz/gruvbox) | [Link](./colorscheme/gruvbox/default.nix) | +| Wallpaper | [Road](https://gitlab.com/exorcist365/wallpapers/-/blob/master/gruvbox/road.jpg) | [Link](./hosts/x86_64-linux/tempest/default.nix) | +| Text Editor | [Neovim](https://neovim.io/) | [Link](./pkgs/applications/editors/neovim/nmasur/neovim/package.nix) | +| Browser | [Firefox](https://www.mozilla.org/en-US/firefox/new/) | [Link](./platforms/home-manager/modules/nmasur/presets/programs/firefox.nix) | +| E-Mail | [Aerc](https://aerc-mail.org/) | [Link](./platforms/home-manager/modules/nmasur/presets/programs/aerc.nix) | +| File Manager | [Nautilus](https://wiki.gnome.org/action/show/Apps/Files) | [Link](./platforms/home-manager/modules/nmasur/presets/programs/nautilus.nix) | +| PDF Reader | [Zathura](https://pwmt.org/projects/zathura/) | [Link](./platforms/home-manager/modules/nmasur/presets/programs/zathura.nix) | +| Video Player | [mpv](https://mpv.io/) | [Link](./platforms/home-manager/modules/nmasur/presets/programs/mpv.nix) | ## macOS Features | Feature | Program | Configuration | |----------|---------------------------------------------|--------------------------------------| -| Keybinds | [Hammerspoon](https://www.hammerspoon.org/) | [Link](./modules/darwin/hammerspoon) | +| Keybinds | [Hammerspoon](https://www.hammerspoon.org/) | [Link](./platforms/home-manager/modules/nmasur/presets/services/hammerspoon/) | # Diagram @@ -51,15 +51,16 @@ configuration may be difficult to translate to a non-Nix system. This repo contains a few more elaborate elements of configuration. -- [Neovim config](./modules/common/neovim/default.nix) generated with Nix2Vim -and source-controlled plugins, differing based on installed LSPs, for example. -- [Caddy JSON](./modules/nixos/services/caddy.nix) file (routes, etc.) based -dynamically on enabled services rendered with Nix. -- [Grafana config](./modules/nixos/services/grafana.nix) rendered with Nix. -- Custom [secrets deployment](./modules/nixos/services/secrets.nix) similar to -agenix. -- Base16 [colorschemes](./colorscheme/) applied to multiple applications, -including Firefox userChrome. +- [Neovim config](./pkgs/applications/editors/neovim/nmasur/neovim/package.nix) +generated with Nix2Vim and source-controlled plugins, +differing based on installed LSPs, for example. - [Caddy +JSON](./platforms/nixos/modules/nmasur/presets/services/caddy.nix) file (routes, +etc.) based dynamically on enabled services rendered with Nix. - [Grafana +config](./platforms/nixos/modules/nmasur/presets/services/grafana/grafana.nix) +rendered with Nix. - Custom [secrets +deployment](./platforms/nixos/modules/secrets.nix) similar to agenix. - Base16 +[colorschemes](./colorscheme/) applied to multiple applications, including +Firefox userChrome. --- diff --git a/pkgs/tools/misc/ocr/ocr.sh b/pkgs/tools/misc/ocr/ocr.sh index 1d45bfd..30ba626 100755 --- a/pkgs/tools/misc/ocr/ocr.sh +++ b/pkgs/tools/misc/ocr/ocr.sh @@ -8,7 +8,7 @@ TEXT_FILE="/tmp/ocr.txt" IMAGE_FILE="/tmp/ocr.png" function notify-send() { - /usr/bin/osascript -e "display notification \"$2\" with title \"OCR\"" + /usr/bin/osascript -e "display notification \"$2\" with title \"OCR\"" } PATH="/usr/local/bin/:$PATH" @@ -32,8 +32,8 @@ STATUS=$? # specify /tmp/ocr.txt as the file path, tesseract would out the text to # /tmp/ocr.txt.txt cd /tmp || { - echo "Failed to jump to directory." - exit 1 + echo "Failed to jump to directory." + exit 1 } tesseract "$IMAGE_FILE" "${TEXT_FILE//\.txt/}" @@ -41,8 +41,8 @@ tesseract "$IMAGE_FILE" "${TEXT_FILE//\.txt/}" # of lines in the file LINES=$(wc -l <$TEXT_FILE) if [ "$LINES" -eq 0 ]; then - notify-send "ocr" "no text was detected" - exit 1 + notify-send "ocr" "no text was detected" + exit 1 fi # Copy text to clipboard diff --git a/platforms/home-manager/modules/nmasur/presets/programs/git/default.nix b/platforms/home-manager/modules/nmasur/presets/programs/git/default.nix index 73574ff..3dd245d 100644 --- a/platforms/home-manager/modules/nmasur/presets/programs/git/default.nix +++ b/platforms/home-manager/modules/nmasur/presets/programs/git/default.nix @@ -32,7 +32,7 @@ in userName = cfg.name; userEmail = cfg.email; extraConfig = { - core.pager = "${pkgs.git}/share/git/contrib/diff-highlight/diff-highlight | less -F"; + core.pager = "${pkgs.git}/share/git/contrib/diff-highlight/diff-highlight | less --no-init"; interactive.difffilter = "${pkgs.git}/share/git/contrib/diff-highlight/diff-highlight"; pager = { branch = "false"; diff --git a/platforms/home-manager/modules/nmasur/presets/programs/helix.nix b/platforms/home-manager/modules/nmasur/presets/programs/helix.nix index e56f385..158cde6 100644 --- a/platforms/home-manager/modules/nmasur/presets/programs/helix.nix +++ b/platforms/home-manager/modules/nmasur/presets/programs/helix.nix @@ -45,12 +45,36 @@ in command = "${pkgs.fish-lsp}/bin/fish-lsp"; }; + language-server.yaml-language-server = { + command = lib.getExe pkgs.yaml-language-server; + }; + + language-server.marksman = { + command = lib.getExe pkgs.marksman; + }; + + language-server.bash-language-server = { + command = lib.getExe ( + pkgs.bash-language-server.overrideAttrs { + buildInputs = [ + pkgs.shellcheck + pkgs.shfmt + ]; + } + ); + }; + language = [ { name = "nix"; auto-format = true; language-servers = [ "nixd" ]; } + { + name = "markdown"; + auto-format = true; + language-servers = [ "marksman" ]; + } ]; }; @@ -65,6 +89,11 @@ in select = "underline"; }; + # Text width + soft-wrap = { + enable = true; + }; + # View line numbers relative to the current cursors line-number = "relative"; @@ -226,10 +255,10 @@ in bg = config.theme.colors.base01; }; "ui.selection" = { - bg = config.theme.colors.base02; + bg = config.theme.colors.base01; }; "ui.selection.primary" = { - bg = config.theme.colors.base03; + bg = config.theme.colors.base02; }; "ui.statusline" = { fg = config.theme.colors.base04; diff --git a/platforms/nix-darwin/modules/nmasur/profiles/base.nix b/platforms/nix-darwin/modules/nmasur/profiles/base.nix index a0157b3..96de82b 100644 --- a/platforms/nix-darwin/modules/nmasur/profiles/base.nix +++ b/platforms/nix-darwin/modules/nmasur/profiles/base.nix @@ -36,6 +36,7 @@ in homebrew.casks = [ "scroll-reverser" # Different scroll style for mouse vs. trackpad "notunes" # Don't launch Apple Music with the play button + "topnotch" # Darkens the menu bar to complete black ]; };