From 8b4a0a70557a62b091cc507a249448e9cdd8b603 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Fri, 28 Jul 2023 14:28:06 +0800 Subject: [PATCH] fix: typo --- README.md | 42 ++++++++++--------- home/base/desktop/alacritty/default.nix | 4 +- ...e_catppuccino.yml => theme_catppuccin.yml} | 2 +- home/base/desktop/helix/default.nix | 4 +- home/base/desktop/neovim/default.nix | 1 + 5 files changed, 28 insertions(+), 25 deletions(-) rename home/base/desktop/alacritty/{theme_catppuccino.yml => theme_catppuccin.yml} (94%) diff --git a/README.md b/README.md index cc2d0515..3ab6e5cf 100644 --- a/README.md +++ b/README.md @@ -26,26 +26,26 @@ Nix allows for easy-to-manage, collaborative, reproducible deployments. This mea ## Components -| | NixOS(Wayland) | NixOS(Xorg) | -| --------------------------- | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| **Window Manager** | [Hyprland][Hyprland] | [i3][i3] | -| **Terminal Emulator** | [Kitty][Kitty] | [Kitty][Kitty] | -| **Bar** | [Waybar][Waybar] | [i3block][i3block] | -| **Application Launcher** | [wofi][wofi] | [rofi][rofi] | -| **Notification Daemon** | [Mako][Mako] | [Dunst][Dunst] | -| **Display Manager** | [GDM][GDM] | [GDM][GDM] | -| **network management tool** | [NetworkManager][NetworkManager] | [NetworkManager][NetworkManager] | -| **Input method framework** | [Fcitx5][Fcitx5] | [Fcitx5][Fcitx5] | -| **System resource monitor** | [Btop][Btop] | [Btop][Btop] | -| **File Manager** | [thunar][thunar] | [thunar][thunar] | -| **Shell** | [Nushell][Nushell] + [Starship][Starship] | [Nushell][Nushell] + [Starship][Starship] | -| **Music Player** | [mpd][mpd], [ncmpcpp][ncmpcpp], [mpc][mpc], [Netease-cloud-music-gtk][netease-cloud-music-gtk] | [Netease-cloud-music-gtk][netease-cloud-music-gtk] | -| **Media Player** | [mpv][mpv] | [mpv][mpv] | -| **Text Editor** | [Neovim][Neovim] | [Neovim][Neovim] | -| **Fonts** | [Nerd fonts][Nerd fonts] | [Nerd fonts][Nerd fonts] | -| **Image Viewer** | [imv][imv] | [feh][feh] | -| **Screenshot Software** | [grim][grim] | [flameshot](https://github.com/flameshot-org/flameshot) | -| **Screen Recording** | [OBS][OBS] | [OBS][OBS] | +| | NixOS(Wayland) | NixOS(Xorg) | +| --------------------------- | :--------------------------------------------------------------------------------------------- | :------------------------------------------------------ | +| **Window Manager** | [Hyprland][Hyprland] | [i3][i3] | +| **Terminal Emulator** | [Kitty][Kitty] | [Kitty][Kitty] | +| **Bar** | [Waybar][Waybar] | [i3block][i3block] | +| **Application Launcher** | [wofi][wofi] | [rofi][rofi] | +| **Notification Daemon** | [Mako][Mako] | [Dunst][Dunst] | +| **Display Manager** | [GDM][GDM] | [GDM][GDM] | +| **network management tool** | [NetworkManager][NetworkManager] | [NetworkManager][NetworkManager] | +| **Input method framework** | [Fcitx5][Fcitx5] | [Fcitx5][Fcitx5] | +| **System resource monitor** | [Btop][Btop] | [Btop][Btop] | +| **File Manager** | [thunar][thunar] | [thunar][thunar] | +| **Shell** | [Nushell][Nushell] + [Starship][Starship] | [Nushell][Nushell] + [Starship][Starship] | +| **Music Player** | [mpd][mpd], [ncmpcpp][ncmpcpp], [mpc][mpc], [Netease-cloud-music-gtk][netease-cloud-music-gtk] | [Netease-cloud-music-gtk][netease-cloud-music-gtk] | +| **Media Player** | [mpv][mpv] | [mpv][mpv] | +| **Text Editor** | [Neovim][Neovim] | [Neovim][Neovim] | +| **Fonts** | [Nerd fonts][Nerd fonts] | [Nerd fonts][Nerd fonts] | +| **Image Viewer** | [imv][imv] | [feh][feh] | +| **Screenshot Software** | [grim][grim] | [flameshot](https://github.com/flameshot-org/flameshot) | +| **Screen Recording** | [OBS][OBS] | [OBS][OBS] | ## Hyprland + AstroNvim @@ -170,6 +170,8 @@ Other dotfiles that inspired me: - [denisse-dev/dotfiles](https://github.com/denisse-dev/dotfiles) - Neovim/AstroNvim - [maxbrunet/dotfiles](https://github.com/maxbrunet/dotfiles): astronvim with nix flakes. +- Theme + - [catppuccin][catppuccin] - Misc - [1amSimp1e/dots](https://github.com/1amSimp1e/dots) diff --git a/home/base/desktop/alacritty/default.nix b/home/base/desktop/alacritty/default.nix index 182d702f..0a509f10 100644 --- a/home/base/desktop/alacritty/default.nix +++ b/home/base/desktop/alacritty/default.nix @@ -27,7 +27,7 @@ import: # all alacritty themes can be found at # https://github.com/alacritty/alacritty-theme - - ~/.config/alacritty/theme_catppuccino.yml + - ~/.config/alacritty/theme_catppuccin.yml window: # Background opacity @@ -96,5 +96,5 @@ '' ); - xdg.configFile."alacritty/theme_catppuccino.yml".source = ./theme_catppuccino.yml; + xdg.configFile."alacritty/theme_catppuccin.yml".source = ./theme_catppuccin.yml; } diff --git a/home/base/desktop/alacritty/theme_catppuccino.yml b/home/base/desktop/alacritty/theme_catppuccin.yml similarity index 94% rename from home/base/desktop/alacritty/theme_catppuccino.yml rename to home/base/desktop/alacritty/theme_catppuccin.yml index 1e425913..fd99700d 100644 --- a/home/base/desktop/alacritty/theme_catppuccino.yml +++ b/home/base/desktop/alacritty/theme_catppuccin.yml @@ -1,4 +1,4 @@ -# Catppuccino theme scheme for Alacritty +# Catppuccin theme scheme for Alacritty colors: primary: diff --git a/home/base/desktop/helix/default.nix b/home/base/desktop/helix/default.nix index f73fef9d..fd2fdd52 100644 --- a/home/base/desktop/helix/default.nix +++ b/home/base/desktop/helix/default.nix @@ -1,13 +1,13 @@ { pkgs, lib, ... }: { - xdg.configFile."helix/themes/catppuccino_mocha.toml".source = ./theme_catppuccin_mocha.toml; + xdg.configFile."helix/themes/catppuccin_mocha.toml".source = ./theme_catppuccin_mocha.toml; programs.helix = { enable = true; package = pkgs.helix; settings = { - theme = "catppuccino_mocha"; + theme = "catppuccin_mocha"; editor = { line-number = "relative"; lsp.display-messages = true; diff --git a/home/base/desktop/neovim/default.nix b/home/base/desktop/neovim/default.nix index cb90e783..64f55413 100644 --- a/home/base/desktop/neovim/default.nix +++ b/home/base/desktop/neovim/default.nix @@ -26,6 +26,7 @@ # Vertical Split Terminal: ` + tv` # Open IPython REPL: ` + tp` # Opening LSP symbols: ` + lS` +# Toggle line wrap: ` + uw` # Show line diagnostics: `gl` # Go to definition: `gd` #