From ba3f71208b6622f3ffafb545b517b32d85e2842c Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sun, 5 Nov 2023 17:21:37 +0800 Subject: [PATCH] home: sort files --- .../common/dotfiles/config/fish/fish_plugins | 3 - .../config/fish/themes/tokyonight_day.theme | 25 -- .../config/fish/themes/tokyonight_moon.theme | 25 -- .../config/fish/themes/tokyonight_night.theme | 25 -- .../config/fish/themes/tokyonight_storm.theme | 25 -- .../dotfiles/config/fish/tokyonight_day.fish | 36 --- .../dotfiles/config/fish/tokyonight_moon.fish | 36 --- .../config/fish/tokyonight_night.fish | 36 --- .../config/fish/tokyonight_storm.fish | 36 --- .../common/dotfiles/config/foot/foot.ini | 24 -- .../common/dotfiles/config/waybar/config | 75 ----- .../common/dotfiles/config/waybar/config-sway | 72 ----- .../common/dotfiles/config/waybar/frappe.css | 37 --- .../common/dotfiles/config/waybar/latte.css | 37 --- .../dotfiles/config/waybar/macchiato.css | 37 --- .../common/dotfiles/config/waybar/mocha.css | 37 --- .../common/dotfiles/config/waybar/style.css | 142 --------- .../guanranwang/home-manager/common/home.nix | 273 ------------------ .../home-manager/darwin/dotfiles.nix | 12 - .../home-manager/darwin/presets/desktop.nix | 9 +- users/guanranwang/home-manager/default.nix | 77 +++++ .../home-manager/nixos/dotfiles.nix | 16 +- users/guanranwang/home-manager/nixos/home.nix | 9 +- .../home-manager/nixos/presets/desktop.nix | 13 +- .../home-manager/nixos/wm/default.nix | 7 + .../home-manager/nixos/{ => wm}/dunst.nix | 0 .../home-manager/nixos/{ => wm}/sway.nix | 0 .../home-manager/nixos/{ => wm}/waybar.nix | 0 .../{common => resources}/dotfiles/.drirc | 0 .../{common => resources}/dotfiles/.xinitrc | 0 .../dotfiles/bin/batterynotify | 0 .../dotfiles/bin/chargingnotify | 0 .../dotfiles/bin/hyprland-autostart | 0 .../dotfiles/bin/hyprland-gamemode | 0 .../{common => resources}/dotfiles/bin/lofi | 0 .../dotfiles/bin/minecraft-inputfix | 0 .../dotfiles/bin/update-hosts | 0 .../dotfiles/bin/wrapped-brightnessctl | 0 .../dotfiles/bin/wrapped-grim | 0 .../dotfiles/bin/wrapped-mpvpaper | 0 .../dotfiles/bin/wrapped-pamixer | 0 .../dotfiles/bin/wrapped-swaylock-effects | 0 .../dotfiles/bin/wrapped-swww | 0 .../dotfiles/bin/wrapped-wayshot | 0 .../dotfiles/config/alsoft.conf | 0 .../config/fontconfig/conf.d/qt-fonts.conf | 0 .../fontconfig/conf.d/web-ui-fonts.conf | 0 .../dotfiles/config/fontconfig/fonts.conf | 4 + .../dotfiles/config/hyprland/autostart.conf | 0 .../dotfiles/config/hyprland/env.conf | 0 .../dotfiles/config/hyprland/hyprpaper.conf | 0 .../dotfiles/config/hyprland/keybinds.conf | 0 .../dotfiles/config/hyprland/main.conf | 0 .../dotfiles/config/hyprland/plugins.conf | 0 .../config/hyprland/themes/colors.conf | 0 .../config/hyprland/themes/frappe.conf | 0 .../config/hyprland/themes/latte.conf | 0 .../config/hyprland/themes/macchiato.conf | 0 .../config/hyprland/themes/mocha.conf | 0 .../dotfiles/config/makepkgs.conf | 0 .../dotfiles/config/picom/picom.conf | 0 .../dotfiles/config/polybar/config.ini | 0 .../dotfiles/config/rofi/colors.rasi | 0 .../dotfiles/config/rofi/config.rasi | 0 .../config/user-tmpfiles.d/discord-rpc.conf | 0 .../ca.desrt.dconf-editor.desktop | 0 .../com.github.wwmm.easyeffects.desktop | 0 .../applications/io.bassi.Amberol.desktop | 0 .../applications/org.gnome.Calendar.desktop | 0 .../applications/org.gnome.Characters.desktop | 0 .../applications/org.gnome.baobab.desktop | 0 .../applications/org.telegram.desktop.desktop | 0 .../data/backgrounds/Mojave Night.jpg | Bin .../dotfiles/data/backgrounds/wallpaper1.png | Bin .../dotfiles/data/backgrounds/wallpaper2.jpg | Bin .../dotfiles/data/backgrounds/wallpaper3.jpg | Bin .../dotfiles/data/backgrounds/wallpaper4.png | Bin .../dotfiles/data/backgrounds/wallpaper5.png | Bin .../com.github.Eloston.UngoogledChromium | 0 .../data/flatpak/overrides/com.google.Chrome | 0 .../overrides/com.lunarclient.LunarClient | 0 .../flatpak/overrides/com.mojang.Minecraft | 0 .../flatpak/overrides/com.valvesoftware.Steam | 0 .../dotfiles/data/flatpak/overrides/global | 0 .../data/flatpak/overrides/im.riot.Riot | 0 .../flatpak/overrides/org.chromium.Chromium | 0 .../flatpak/overrides/org.mozilla.firefox | 0 .../overrides/org.prismlauncher.PrismLauncher | 0 .../data/icons/dunst/battery-alert.png | Bin .../data/icons/dunst/battery-charging.png | Bin .../dotfiles/data/icons/dunst/battery.png | Bin .../dotfiles/data/icons/dunst/volume-high.png | Bin .../data/icons/dunst/volume-minus.png | Bin .../dotfiles/data/icons/dunst/volume-mute.png | Bin .../dotfiles/data/icons/dunst/volume-off.png | Bin .../dotfiles/data/icons/dunst/volume-plus.png | Bin .../data/icons/dunst/volume-source.png | Bin .../home-manager/resources/editor/helix.nix | 34 +++ .../home-manager/resources/editor/neovim.nix | 8 + .../home-manager/resources/editor/vscode.nix | 58 ++++ .../home-manager/resources/shell/bash.nix | 6 + .../home-manager/resources/shell/fish.nix | 53 ++++ .../home-manager/resources/shell/zsh.nix | 43 +++ .../resources/terms/alacritty.nix | 40 +++ .../home-manager/resources/terms/foot.nix | 34 +++ .../home-manager/resources/terms/kitty.nix | 12 + 106 files changed, 398 insertions(+), 1018 deletions(-) delete mode 100755 users/guanranwang/home-manager/common/dotfiles/config/fish/fish_plugins delete mode 100644 users/guanranwang/home-manager/common/dotfiles/config/fish/themes/tokyonight_day.theme delete mode 100644 users/guanranwang/home-manager/common/dotfiles/config/fish/themes/tokyonight_moon.theme delete mode 100644 users/guanranwang/home-manager/common/dotfiles/config/fish/themes/tokyonight_night.theme delete mode 100644 users/guanranwang/home-manager/common/dotfiles/config/fish/themes/tokyonight_storm.theme delete mode 100644 users/guanranwang/home-manager/common/dotfiles/config/fish/tokyonight_day.fish delete mode 100644 users/guanranwang/home-manager/common/dotfiles/config/fish/tokyonight_moon.fish delete mode 100644 users/guanranwang/home-manager/common/dotfiles/config/fish/tokyonight_night.fish delete mode 100644 users/guanranwang/home-manager/common/dotfiles/config/fish/tokyonight_storm.fish delete mode 100644 users/guanranwang/home-manager/common/dotfiles/config/foot/foot.ini delete mode 100644 users/guanranwang/home-manager/common/dotfiles/config/waybar/config delete mode 100644 users/guanranwang/home-manager/common/dotfiles/config/waybar/config-sway delete mode 100644 users/guanranwang/home-manager/common/dotfiles/config/waybar/frappe.css delete mode 100644 users/guanranwang/home-manager/common/dotfiles/config/waybar/latte.css delete mode 100644 users/guanranwang/home-manager/common/dotfiles/config/waybar/macchiato.css delete mode 100644 users/guanranwang/home-manager/common/dotfiles/config/waybar/mocha.css delete mode 100755 users/guanranwang/home-manager/common/dotfiles/config/waybar/style.css delete mode 100644 users/guanranwang/home-manager/common/home.nix delete mode 100644 users/guanranwang/home-manager/darwin/dotfiles.nix create mode 100644 users/guanranwang/home-manager/default.nix create mode 100644 users/guanranwang/home-manager/nixos/wm/default.nix rename users/guanranwang/home-manager/nixos/{ => wm}/dunst.nix (100%) rename users/guanranwang/home-manager/nixos/{ => wm}/sway.nix (100%) rename users/guanranwang/home-manager/nixos/{ => wm}/waybar.nix (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/.drirc (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/.xinitrc (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/bin/batterynotify (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/bin/chargingnotify (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/bin/hyprland-autostart (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/bin/hyprland-gamemode (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/bin/lofi (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/bin/minecraft-inputfix (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/bin/update-hosts (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/bin/wrapped-brightnessctl (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/bin/wrapped-grim (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/bin/wrapped-mpvpaper (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/bin/wrapped-pamixer (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/bin/wrapped-swaylock-effects (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/bin/wrapped-swww (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/bin/wrapped-wayshot (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/config/alsoft.conf (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/config/fontconfig/conf.d/qt-fonts.conf (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/config/fontconfig/conf.d/web-ui-fonts.conf (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/config/fontconfig/fonts.conf (98%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/config/hyprland/autostart.conf (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/config/hyprland/env.conf (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/config/hyprland/hyprpaper.conf (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/config/hyprland/keybinds.conf (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/config/hyprland/main.conf (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/config/hyprland/plugins.conf (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/config/hyprland/themes/colors.conf (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/config/hyprland/themes/frappe.conf (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/config/hyprland/themes/latte.conf (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/config/hyprland/themes/macchiato.conf (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/config/hyprland/themes/mocha.conf (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/config/makepkgs.conf (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/config/picom/picom.conf (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/config/polybar/config.ini (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/config/rofi/colors.rasi (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/config/rofi/config.rasi (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/config/user-tmpfiles.d/discord-rpc.conf (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/applications/ca.desrt.dconf-editor.desktop (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/applications/com.github.wwmm.easyeffects.desktop (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/applications/io.bassi.Amberol.desktop (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/applications/org.gnome.Calendar.desktop (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/applications/org.gnome.Characters.desktop (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/applications/org.gnome.baobab.desktop (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/applications/org.telegram.desktop.desktop (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/backgrounds/Mojave Night.jpg (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/backgrounds/wallpaper1.png (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/backgrounds/wallpaper2.jpg (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/backgrounds/wallpaper3.jpg (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/backgrounds/wallpaper4.png (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/backgrounds/wallpaper5.png (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/flatpak/overrides/com.github.Eloston.UngoogledChromium (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/flatpak/overrides/com.google.Chrome (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/flatpak/overrides/com.lunarclient.LunarClient (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/flatpak/overrides/com.mojang.Minecraft (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/flatpak/overrides/com.valvesoftware.Steam (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/flatpak/overrides/global (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/flatpak/overrides/im.riot.Riot (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/flatpak/overrides/org.chromium.Chromium (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/flatpak/overrides/org.mozilla.firefox (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/flatpak/overrides/org.prismlauncher.PrismLauncher (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/icons/dunst/battery-alert.png (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/icons/dunst/battery-charging.png (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/icons/dunst/battery.png (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/icons/dunst/volume-high.png (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/icons/dunst/volume-minus.png (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/icons/dunst/volume-mute.png (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/icons/dunst/volume-off.png (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/icons/dunst/volume-plus.png (100%) rename users/guanranwang/home-manager/{common => resources}/dotfiles/data/icons/dunst/volume-source.png (100%) create mode 100644 users/guanranwang/home-manager/resources/editor/helix.nix create mode 100644 users/guanranwang/home-manager/resources/editor/neovim.nix create mode 100644 users/guanranwang/home-manager/resources/editor/vscode.nix create mode 100644 users/guanranwang/home-manager/resources/shell/bash.nix create mode 100644 users/guanranwang/home-manager/resources/shell/fish.nix create mode 100644 users/guanranwang/home-manager/resources/shell/zsh.nix create mode 100644 users/guanranwang/home-manager/resources/terms/alacritty.nix create mode 100644 users/guanranwang/home-manager/resources/terms/foot.nix create mode 100644 users/guanranwang/home-manager/resources/terms/kitty.nix diff --git a/users/guanranwang/home-manager/common/dotfiles/config/fish/fish_plugins b/users/guanranwang/home-manager/common/dotfiles/config/fish/fish_plugins deleted file mode 100755 index 3a7cfee..0000000 --- a/users/guanranwang/home-manager/common/dotfiles/config/fish/fish_plugins +++ /dev/null @@ -1,3 +0,0 @@ -jorgebucaran/fisher -oh-my-fish/plugin-sudope -gazorby/fish-abbreviation-tips diff --git a/users/guanranwang/home-manager/common/dotfiles/config/fish/themes/tokyonight_day.theme b/users/guanranwang/home-manager/common/dotfiles/config/fish/themes/tokyonight_day.theme deleted file mode 100644 index 95c7916..0000000 --- a/users/guanranwang/home-manager/common/dotfiles/config/fish/themes/tokyonight_day.theme +++ /dev/null @@ -1,25 +0,0 @@ - # TokyoNight - - # Syntax Highlighting Colors - fish_color_normal 3760bf - fish_color_command 007197 - fish_color_keyword 9854f1 - fish_color_quote 8c6c3e - fish_color_redirection 3760bf - fish_color_end b15c00 - fish_color_error f52a65 - fish_color_param 7847bd - fish_color_comment 848cb5 - fish_color_selection --background=b6bfe2 - fish_color_search_match --background=b6bfe2 - fish_color_operator 587539 - fish_color_escape 9854f1 - fish_color_autosuggestion 848cb5 - - # Completion Pager Colors - fish_pager_color_progress 848cb5 - fish_pager_color_prefix 007197 - fish_pager_color_completion 3760bf - fish_pager_color_description 848cb5 - fish_pager_color_selected_background --background=b6bfe2 - \ No newline at end of file diff --git a/users/guanranwang/home-manager/common/dotfiles/config/fish/themes/tokyonight_moon.theme b/users/guanranwang/home-manager/common/dotfiles/config/fish/themes/tokyonight_moon.theme deleted file mode 100644 index c12d4a7..0000000 --- a/users/guanranwang/home-manager/common/dotfiles/config/fish/themes/tokyonight_moon.theme +++ /dev/null @@ -1,25 +0,0 @@ - # TokyoNight - - # Syntax Highlighting Colors - fish_color_normal c8d3f5 - fish_color_command 86e1fc - fish_color_keyword c099ff - fish_color_quote ffc777 - fish_color_redirection c8d3f5 - fish_color_end ff966c - fish_color_error ff757f - fish_color_param fca7ea - fish_color_comment 636da6 - fish_color_selection --background=2d3f76 - fish_color_search_match --background=2d3f76 - fish_color_operator c3e88d - fish_color_escape c099ff - fish_color_autosuggestion 636da6 - - # Completion Pager Colors - fish_pager_color_progress 636da6 - fish_pager_color_prefix 86e1fc - fish_pager_color_completion c8d3f5 - fish_pager_color_description 636da6 - fish_pager_color_selected_background --background=2d3f76 - \ No newline at end of file diff --git a/users/guanranwang/home-manager/common/dotfiles/config/fish/themes/tokyonight_night.theme b/users/guanranwang/home-manager/common/dotfiles/config/fish/themes/tokyonight_night.theme deleted file mode 100644 index 828bcbb..0000000 --- a/users/guanranwang/home-manager/common/dotfiles/config/fish/themes/tokyonight_night.theme +++ /dev/null @@ -1,25 +0,0 @@ - # TokyoNight - - # Syntax Highlighting Colors - fish_color_normal c0caf5 - fish_color_command 7dcfff - fish_color_keyword bb9af7 - fish_color_quote e0af68 - fish_color_redirection c0caf5 - fish_color_end ff9e64 - fish_color_error f7768e - fish_color_param 9d7cd8 - fish_color_comment 565f89 - fish_color_selection --background=283457 - fish_color_search_match --background=283457 - fish_color_operator 9ece6a - fish_color_escape bb9af7 - fish_color_autosuggestion 565f89 - - # Completion Pager Colors - fish_pager_color_progress 565f89 - fish_pager_color_prefix 7dcfff - fish_pager_color_completion c0caf5 - fish_pager_color_description 565f89 - fish_pager_color_selected_background --background=283457 - \ No newline at end of file diff --git a/users/guanranwang/home-manager/common/dotfiles/config/fish/themes/tokyonight_storm.theme b/users/guanranwang/home-manager/common/dotfiles/config/fish/themes/tokyonight_storm.theme deleted file mode 100644 index aafc0f6..0000000 --- a/users/guanranwang/home-manager/common/dotfiles/config/fish/themes/tokyonight_storm.theme +++ /dev/null @@ -1,25 +0,0 @@ - # TokyoNight - - # Syntax Highlighting Colors - fish_color_normal c0caf5 - fish_color_command 7dcfff - fish_color_keyword bb9af7 - fish_color_quote e0af68 - fish_color_redirection c0caf5 - fish_color_end ff9e64 - fish_color_error f7768e - fish_color_param 9d7cd8 - fish_color_comment 565f89 - fish_color_selection --background=2e3c64 - fish_color_search_match --background=2e3c64 - fish_color_operator 9ece6a - fish_color_escape bb9af7 - fish_color_autosuggestion 565f89 - - # Completion Pager Colors - fish_pager_color_progress 565f89 - fish_pager_color_prefix 7dcfff - fish_pager_color_completion c0caf5 - fish_pager_color_description 565f89 - fish_pager_color_selected_background --background=2e3c64 - \ No newline at end of file diff --git a/users/guanranwang/home-manager/common/dotfiles/config/fish/tokyonight_day.fish b/users/guanranwang/home-manager/common/dotfiles/config/fish/tokyonight_day.fish deleted file mode 100644 index d41de0f..0000000 --- a/users/guanranwang/home-manager/common/dotfiles/config/fish/tokyonight_day.fish +++ /dev/null @@ -1,36 +0,0 @@ - # TokyoNight Color Palette - set -l foreground 3760bf - set -l selection b6bfe2 - set -l comment 848cb5 - set -l red f52a65 - set -l orange b15c00 - set -l yellow 8c6c3e - set -l green 587539 - set -l purple 7847bd - set -l cyan 007197 - set -l pink 9854f1 - - # Syntax Highlighting Colors - set -g fish_color_normal $foreground - set -g fish_color_command $cyan - set -g fish_color_keyword $pink - set -g fish_color_quote $yellow - set -g fish_color_redirection $foreground - set -g fish_color_end $orange - set -g fish_color_error $red - set -g fish_color_param $purple - set -g fish_color_comment $comment - set -g fish_color_selection --background=$selection - set -g fish_color_search_match --background=$selection - set -g fish_color_operator $green - set -g fish_color_escape $pink - set -g fish_color_autosuggestion $comment - - # Completion Pager Colors - set -g fish_pager_color_progress $comment - set -g fish_pager_color_prefix $cyan - set -g fish_pager_color_completion $foreground - set -g fish_pager_color_description $comment - set -g fish_pager_color_selected_background --background=$selection - - \ No newline at end of file diff --git a/users/guanranwang/home-manager/common/dotfiles/config/fish/tokyonight_moon.fish b/users/guanranwang/home-manager/common/dotfiles/config/fish/tokyonight_moon.fish deleted file mode 100644 index 8c8226a..0000000 --- a/users/guanranwang/home-manager/common/dotfiles/config/fish/tokyonight_moon.fish +++ /dev/null @@ -1,36 +0,0 @@ - # TokyoNight Color Palette - set -l foreground c8d3f5 - set -l selection 2d3f76 - set -l comment 636da6 - set -l red ff757f - set -l orange ff966c - set -l yellow ffc777 - set -l green c3e88d - set -l purple fca7ea - set -l cyan 86e1fc - set -l pink c099ff - - # Syntax Highlighting Colors - set -g fish_color_normal $foreground - set -g fish_color_command $cyan - set -g fish_color_keyword $pink - set -g fish_color_quote $yellow - set -g fish_color_redirection $foreground - set -g fish_color_end $orange - set -g fish_color_error $red - set -g fish_color_param $purple - set -g fish_color_comment $comment - set -g fish_color_selection --background=$selection - set -g fish_color_search_match --background=$selection - set -g fish_color_operator $green - set -g fish_color_escape $pink - set -g fish_color_autosuggestion $comment - - # Completion Pager Colors - set -g fish_pager_color_progress $comment - set -g fish_pager_color_prefix $cyan - set -g fish_pager_color_completion $foreground - set -g fish_pager_color_description $comment - set -g fish_pager_color_selected_background --background=$selection - - \ No newline at end of file diff --git a/users/guanranwang/home-manager/common/dotfiles/config/fish/tokyonight_night.fish b/users/guanranwang/home-manager/common/dotfiles/config/fish/tokyonight_night.fish deleted file mode 100644 index 67b6686..0000000 --- a/users/guanranwang/home-manager/common/dotfiles/config/fish/tokyonight_night.fish +++ /dev/null @@ -1,36 +0,0 @@ - # TokyoNight Color Palette - set -l foreground c0caf5 - set -l selection 283457 - set -l comment 565f89 - set -l red f7768e - set -l orange ff9e64 - set -l yellow e0af68 - set -l green 9ece6a - set -l purple 9d7cd8 - set -l cyan 7dcfff - set -l pink bb9af7 - - # Syntax Highlighting Colors - set -g fish_color_normal $foreground - set -g fish_color_command $cyan - set -g fish_color_keyword $pink - set -g fish_color_quote $yellow - set -g fish_color_redirection $foreground - set -g fish_color_end $orange - set -g fish_color_error $red - set -g fish_color_param $purple - set -g fish_color_comment $comment - set -g fish_color_selection --background=$selection - set -g fish_color_search_match --background=$selection - set -g fish_color_operator $green - set -g fish_color_escape $pink - set -g fish_color_autosuggestion $comment - - # Completion Pager Colors - set -g fish_pager_color_progress $comment - set -g fish_pager_color_prefix $cyan - set -g fish_pager_color_completion $foreground - set -g fish_pager_color_description $comment - set -g fish_pager_color_selected_background --background=$selection - - \ No newline at end of file diff --git a/users/guanranwang/home-manager/common/dotfiles/config/fish/tokyonight_storm.fish b/users/guanranwang/home-manager/common/dotfiles/config/fish/tokyonight_storm.fish deleted file mode 100644 index a93999c..0000000 --- a/users/guanranwang/home-manager/common/dotfiles/config/fish/tokyonight_storm.fish +++ /dev/null @@ -1,36 +0,0 @@ - # TokyoNight Color Palette - set -l foreground c0caf5 - set -l selection 2e3c64 - set -l comment 565f89 - set -l red f7768e - set -l orange ff9e64 - set -l yellow e0af68 - set -l green 9ece6a - set -l purple 9d7cd8 - set -l cyan 7dcfff - set -l pink bb9af7 - - # Syntax Highlighting Colors - set -g fish_color_normal $foreground - set -g fish_color_command $cyan - set -g fish_color_keyword $pink - set -g fish_color_quote $yellow - set -g fish_color_redirection $foreground - set -g fish_color_end $orange - set -g fish_color_error $red - set -g fish_color_param $purple - set -g fish_color_comment $comment - set -g fish_color_selection --background=$selection - set -g fish_color_search_match --background=$selection - set -g fish_color_operator $green - set -g fish_color_escape $pink - set -g fish_color_autosuggestion $comment - - # Completion Pager Colors - set -g fish_pager_color_progress $comment - set -g fish_pager_color_prefix $cyan - set -g fish_pager_color_completion $foreground - set -g fish_pager_color_description $comment - set -g fish_pager_color_selected_background --background=$selection - - \ No newline at end of file diff --git a/users/guanranwang/home-manager/common/dotfiles/config/foot/foot.ini b/users/guanranwang/home-manager/common/dotfiles/config/foot/foot.ini deleted file mode 100644 index e78005f..0000000 --- a/users/guanranwang/home-manager/common/dotfiles/config/foot/foot.ini +++ /dev/null @@ -1,24 +0,0 @@ -font=monospace:size=12 -pad=12x12 center -[colors] -#alpha = 0.9 -background=1a1b26 -foreground=c0caf5 -regular0=15161e # black -regular1=f7768e # red -regular2=9ece6a # green -regular3=e0af68 # yellow -regular4=7aa2f7 # blue -regular5=bb9af7 # magenta -regular6=7dcfff # cyan -regular7=a91bd6 # white -bright0=414868 # bright black -bright1=f7768e # bright red -bright2=9ece6a # bright green -bright3=e0af68 # bright yellow -bright4=7aa2f7 # bright blue -bright5=bb9af7 # bright magenta -bright6=7dcfff # bright cyan -bright7=c0caf5 # bright white -16 = ff9e64 -17 = db4b4b diff --git a/users/guanranwang/home-manager/common/dotfiles/config/waybar/config b/users/guanranwang/home-manager/common/dotfiles/config/waybar/config deleted file mode 100644 index 241bc7b..0000000 --- a/users/guanranwang/home-manager/common/dotfiles/config/waybar/config +++ /dev/null @@ -1,75 +0,0 @@ -{ - "layer": "top", - "modules-left": ["custom/launcher", "hyprland/workspaces", "gamemode"], - "modules-center": ["hyprland/window"], - "modules-right": ["tray", "pulseaudio", "battery", "clock"], - "custom/launcher": { "format": "" }, - "gamemode": { - "format": "{glyph} {count}", - "glyph": "󰊴", - "hide-not-running": true, - "use-icon": true, - "icon-name": "input-gaming-symbolic", - "icon-spacing": 4, - "icon-size": 20, - "tooltip": true, - "tooltip-format": "Games running: {count}" - }, - "hyprland/workspaces": { - "format": "{icon}", - "on-click": "activate", - "on-scroll-up": "hyprctl dispatch workspace e-1", - "on-scroll-down": "hyprctl dispatch workspace e+1", - "format-icons": { - "1": "", - "2": "", - "3": "", - "4": "", - "5": "", - "urgent": "", - "active": "", - "default": "" - }, - "sort-by-number": true - }, - "hyprland/window": { - "format": "{}", - "separate-outputs": true - }, - "tray": { - "spacing": 10 - }, - "pulseaudio": { - "format": "{volume}% {icon}", - "format-bluetooth": "{volume}% {icon}", - "format-muted": "", - "format-icons": { - "headphone": "", - "hands-free": "󰂑", - "headset": "󰂑", - "phone": "", - "portable": "", - "car": "", - "default": ["", ""] - }, - "scroll-step": 5, - "on-click": "pavucontrol", - "ignored-sinks": ["Easy Effects Sink"] - }, - "battery": { - "bat": "BAT0", - "interval": 60, - "states": { - "warning": 30, - "critical": 15 - }, - "format": "{capacity}% {icon}", - "format-icons": ["", "", "", "", ""], - "max-length": 25 - }, - "clock": { - "format": "{:%A %H:%M} ", - "tooltip-format": "{calendar}" - } -} - diff --git a/users/guanranwang/home-manager/common/dotfiles/config/waybar/config-sway b/users/guanranwang/home-manager/common/dotfiles/config/waybar/config-sway deleted file mode 100644 index bebc8ee..0000000 --- a/users/guanranwang/home-manager/common/dotfiles/config/waybar/config-sway +++ /dev/null @@ -1,72 +0,0 @@ -{ - "layer": "top", - "modules-left": ["custom/launcher", "sway/workspaces", "gamemode"], - "modules-center": ["sway/window"], - "modules-right": ["tray", "pulseaudio", "battery", "clock"], - "custom/launcher": { "format": "" }, - "gamemode": { - "format": "{glyph} {count}", - "glyph": "󰊴", - "hide-not-running": true, - "use-icon": true, - "icon-name": "input-gaming-symbolic", - "icon-spacing": 4, - "icon-size": 20, - "tooltip": true, - "tooltip-format": "Games running: {count}" - }, - "sway/workspaces": { - "format": "{icon}", - "format-icons": { - "1": "", - "2": "", - "3": "", - "4": "", - "5": "", - "urgent": "", - "active": "", - "default": "" - }, - "sort-by-number": true - }, - "sway/window": { - "format": "{}", - "separate-outputs": true - }, - "tray": { - "spacing": 10 - }, - "pulseaudio": { - "format": "{volume}% {icon}", - "format-bluetooth": "{volume}% {icon}", - "format-muted": "", - "format-icons": { - "headphone": "", - "hands-free": "󰂑", - "headset": "󰂑", - "phone": "", - "portable": "", - "car": "", - "default": ["", ""] - }, - "scroll-step": 5, - "on-click": "pavucontrol", - "ignored-sinks": ["Easy Effects Sink"] - }, - "battery": { - "bat": "BAT0", - "interval": 60, - "states": { - "warning": 30, - "critical": 15 - }, - "format": "{capacity}% {icon}", - "format-icons": ["", "", "", "", ""], - "max-length": 25 - }, - "clock": { - "format": "{:%A %H:%M} ", - "tooltip-format": "{calendar}" - } -} - diff --git a/users/guanranwang/home-manager/common/dotfiles/config/waybar/frappe.css b/users/guanranwang/home-manager/common/dotfiles/config/waybar/frappe.css deleted file mode 100644 index 18520fb..0000000 --- a/users/guanranwang/home-manager/common/dotfiles/config/waybar/frappe.css +++ /dev/null @@ -1,37 +0,0 @@ -/* -* -* Catppuccin Frappe palette -* Maintainer: rubyowo -* -*/ - -@define-color base #303446; -@define-color mantle #292c3c; -@define-color crust #232634; - -@define-color text #c6d0f5; -@define-color subtext0 #a5adce; -@define-color subtext1 #b5bfe2; - -@define-color surface0 #414559; -@define-color surface1 #51576d; -@define-color surface2 #626880; - -@define-color overlay0 #737994; -@define-color overlay1 #838ba7; -@define-color overlay2 #949cbb; - -@define-color blue #8caaee; -@define-color lavender #babbf1; -@define-color sapphire #85c1dc; -@define-color sky #99d1db; -@define-color teal #81c8be; -@define-color green #a6d189; -@define-color yellow #e5c890; -@define-color peach #ef9f76; -@define-color maroon #ea999c; -@define-color red #e78284; -@define-color mauve #ca9ee6; -@define-color pink #f4b8e4; -@define-color flamingo #eebebe; -@define-color rosewater #f2d5cf; diff --git a/users/guanranwang/home-manager/common/dotfiles/config/waybar/latte.css b/users/guanranwang/home-manager/common/dotfiles/config/waybar/latte.css deleted file mode 100644 index 085cc3e..0000000 --- a/users/guanranwang/home-manager/common/dotfiles/config/waybar/latte.css +++ /dev/null @@ -1,37 +0,0 @@ -/* -* -* Catppuccin Latte palette -* Maintainer: rubyowo -* -*/ - -@define-color base #eff1f5; -@define-color mantle #e6e9ef; -@define-color crust #dce0e8; - -@define-color text #4c4f69; -@define-color subtext0 #6c6f85; -@define-color subtext1 #5c5f77; - -@define-color surface0 #ccd0da; -@define-color surface1 #bcc0cc; -@define-color surface2 #acb0be; - -@define-color overlay0 #9ca0b0; -@define-color overlay1 #8c8fa1; -@define-color overlay2 #7c7f93; - -@define-color blue #1e66f5; -@define-color lavender #7287fd; -@define-color sapphire #209fb5; -@define-color sky #04a5e5; -@define-color teal #179299; -@define-color green #40a02b; -@define-color yellow #df8e1d; -@define-color peach #fe640b; -@define-color maroon #e64553; -@define-color red #d20f39; -@define-color mauve #8839ef; -@define-color pink #ea76cb; -@define-color flamingo #dd7878; -@define-color rosewater #dc8a78; diff --git a/users/guanranwang/home-manager/common/dotfiles/config/waybar/macchiato.css b/users/guanranwang/home-manager/common/dotfiles/config/waybar/macchiato.css deleted file mode 100644 index 6880473..0000000 --- a/users/guanranwang/home-manager/common/dotfiles/config/waybar/macchiato.css +++ /dev/null @@ -1,37 +0,0 @@ -/* -* -* Catppuccin Macchiato palette -* Maintainer: rubyowo -* -*/ - -@define-color base #24273a; -@define-color mantle #1e2030; -@define-color crust #181926; - -@define-color text #cad3f5; -@define-color subtext0 #a5adcb; -@define-color subtext1 #b8c0e0; - -@define-color surface0 #363a4f; -@define-color surface1 #494d64; -@define-color surface2 #5b6078; - -@define-color overlay0 #6e738d; -@define-color overlay1 #8087a2; -@define-color overlay2 #939ab7; - -@define-color blue #8aadf4; -@define-color lavender #b7bdf8; -@define-color sapphire #7dc4e4; -@define-color sky #91d7e3; -@define-color teal #8bd5ca; -@define-color green #a6da95; -@define-color yellow #eed49f; -@define-color peach #f5a97f; -@define-color maroon #ee99a0; -@define-color red #ed8796; -@define-color mauve #c6a0f6; -@define-color pink #f5bde6; -@define-color flamingo #f0c6c6; -@define-color rosewater #f4dbd6; diff --git a/users/guanranwang/home-manager/common/dotfiles/config/waybar/mocha.css b/users/guanranwang/home-manager/common/dotfiles/config/waybar/mocha.css deleted file mode 100644 index 98e218a..0000000 --- a/users/guanranwang/home-manager/common/dotfiles/config/waybar/mocha.css +++ /dev/null @@ -1,37 +0,0 @@ -/* -* -* Catppuccin Mocha palette -* Maintainer: rubyowo -* -*/ - -@define-color base #1e1e2e; -@define-color mantle #181825; -@define-color crust #11111b; - -@define-color text #cdd6f4; -@define-color subtext0 #a6adc8; -@define-color subtext1 #bac2de; - -@define-color surface0 #313244; -@define-color surface1 #45475a; -@define-color surface2 #585b70; - -@define-color overlay0 #6c7086; -@define-color overlay1 #7f849c; -@define-color overlay2 #9399b2; - -@define-color blue #89b4fa; -@define-color lavender #b4befe; -@define-color sapphire #74c7ec; -@define-color sky #89dceb; -@define-color teal #94e2d5; -@define-color green #a6e3a1; -@define-color yellow #f9e2af; -@define-color peach #fab387; -@define-color maroon #eba0ac; -@define-color red #f38ba8; -@define-color mauve #cba6f7; -@define-color pink #f5c2e7; -@define-color flamingo #f2cdcd; -@define-color rosewater #f5e0dc; diff --git a/users/guanranwang/home-manager/common/dotfiles/config/waybar/style.css b/users/guanranwang/home-manager/common/dotfiles/config/waybar/style.css deleted file mode 100755 index e34edee..0000000 --- a/users/guanranwang/home-manager/common/dotfiles/config/waybar/style.css +++ /dev/null @@ -1,142 +0,0 @@ -/* - * Waybar styles config - * ~/.config/waybar/style.css - * based on https://gitlab.com/fazzi/dotfiles - * made for `waybar-hyprland` - * remember to download `JetBrainsMono Nerd Font` font, - * `sudo pacman -S ttf-jetbrains-mono-nerd` on Arch Linux - * - * yes i have no knowledge about css - * why am i commenting everything - * - * this config works in a terrible way, please do not edit - */ - -* { - font: bold 14px "JetBrainsMono Nerd Font Propo"; /* font weight, font size and font. propo nerd font for centered icons, symbols nerd font does not work great on bold text */ - /*color: #c0caf5;*/ /* text color */ - - /* Tokyo Night color scheme */ -} - -window#waybar { - background: transparent; /* main window transparent background */ -} - -tooltip { - background: #1a1b26; /* tooltip background */ - color: #c0caf5; /* tooltip text color */ - border: 2px solid #c0caf5; /* tooltip border size and color */ - border-radius: 5px; /* tooltip rounded corners */ -} - -/* ***************************** - * modules (pills) section start - * *****************************/ -#custom-launcher, -#gamemode, -#window, -#workspaces, -#tray, -#pulseaudio, -#battery, -#clock, -#cava { - text-shadow: 1px 1px 2px black; /* text shadow, offset-x | offset-y | blur-radius | color */ - background: #1a1b26; /* background color */ - color: #c0caf5; /* text color */ - margin: 10px 4px 4px 4px; /* empty spaces around */ - padding: 4px 10px; /* extend pill size, vertical then horizontal */ - box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.4); /* pill background shadows */ - border-radius: 5px; /* rounded corners */ -} - -/* extend empty space on both side of the bar, - * value from ~/.config/hypr/hyprland.conf - * gaps_out (8px) + border size (2px) = 10px */ - -#custom-launcher { - margin-left: 10px; -} - -#clock { - margin-right: 10px; -} - - -#workspaces { - padding: 0px; /* remove padding around workspace module */ -} - -#workspaces button { - text-shadow: 1px 1px 2px black; /* text shadow, offset-x | offset-y | blur-radius | color */ - color: #c0caf5; /* #workspace != workspace button */ - - padding: 0px 4px; /* fit with pill padding, 0px for not haveing duped vertical padding, 4px to make a square (4px value from module padding: ...#clock {padding >>4px<< 10px}) */ - border: 2px solid #1a1b26; /* required by active workspace top color, or the bar will jitter */ - - transition-property: background-color, min-width; /* smooth transition for workspace module */ - transition-duration: .15s; -} - -#workspaces button.active { - text-shadow: none; /* text shadow, offset-x | offset-y | blur-radius | color */ - color: #c0caf5; /* #workspace != workspace button */ - - /* active workspace */ - background: linear-gradient( - 70deg, - rgb(192, 202, 245), - rgb(192, 202, 245), - rgb(192, 202, 245), - rgb(192, 202, 245), - rgb(229, 234, 255), - rgb(192, 202, 245), - rgb(192, 202, 245), - rgb(192, 202, 245), - rgb(192, 202, 245) - ); - background-size: 300% 100%; - background-position: 0% 0%; - animation: colored-gradient 2s linear infinite; - - color: #1a1b26; /* icon(text) color */ - min-width: 36px; -} - -#workspaces button.active:hover { - background: #9fa7cc; /* hovered workspace color */ -} - -#workspaces button:hover { - background: #11111b; /* hovered workspace color */ -} - -/* *************************** - * modules (pills) section end - * ***************************/ - -/* - -Does not seem to do anything, I'm not really sure... -UPDATE: it does do stuff on sway, will investigate - -#workspaces button.visible { -} - -#workspaces button.urgent { -} - -#workspaces button.persistent{ -} - -#workspaces button.hidden { -} - -*/ - -@keyframes colored-gradient { - from {background-position: 0% 0%;} - to {background-position: 100% 0%;} -} - diff --git a/users/guanranwang/home-manager/common/home.nix b/users/guanranwang/home-manager/common/home.nix deleted file mode 100644 index d19f03d..0000000 --- a/users/guanranwang/home-manager/common/home.nix +++ /dev/null @@ -1,273 +0,0 @@ -{ - pkgs, - config, - lib, - inputs, - ... -}: { - home = { - # This value determines the Home Manager release that your - # configuration is compatible with. This helps avoid breakage - # when a new Home Manager release introduces backwards - # incompatible changes. - # - # You can update Home Manager without changing this value. See - # the Home Manager release notes for a list of state version - # changes in each release. - stateVersion = "23.05"; - - shellAliases = { - # navigation - "l" = "${pkgs.eza}/bin/eza -Fhl --icons --git"; - "ll" = "${pkgs.eza}/bin/eza -Fahl --icons --git"; - "ls" = "${pkgs.eza}/bin/eza -F --icons --git"; - "la" = "${pkgs.eza}/bin/eza -Fa --icons --git"; - "tree" = "${pkgs.eza}/bin/eza --icons --git --tree"; - ".." = "cd .."; - - # replacements - #"code" = "codium"; - #"neofetch" = "fastfetch"; - #"ranger" = "joshuto"; # rust - #"grep" = "rg"; - #"top" = "btm -b"; - #"htop" = "btm -b"; - #"btop" = "btm"; - - "yd" = "ydict -c"; - "farsee" = "curl -F 'c=@-' 'https://fars.ee/'"; # pb - "clock" = "tty-clock -5Ccs"; - - # proxy - "setproxy" = let - proxy = "http://127.0.0.1:7890/"; - in "export http_proxy=${proxy} https_proxy=${proxy} ftp_proxy=${proxy} rsync_proxy=${proxy}"; - "unsetproxy" = "set -e http_proxy https_proxy all_proxy"; # fish syntax (?) - }; - sessionVariables = { - # misc - "MANPAGER" = "sh -c 'col -bx | bat -l man -p'"; # man: use bat as man's pager - "MANROFFOPT" = "-c"; # man: fix formatting issue with bat - "SKIM_DEFAULT_COMMAND" = "fd --type f || git ls-tree -r --name-only head || rg --files || find ."; # skim: use fd by default - }; - }; - programs = { - # Let Home Manager install and manage itself. - home-manager.enable = true; - - bash = { - enable = true; - historyFile = "${config.xdg.configHome}/bash/.bash_history"; - }; - zsh = { - enable = true; - ### XDG - dotDir = ".config/zsh"; - ### Plugins - syntaxHighlighting.enable = true; - historySubstringSearch.enable = true; - enableAutosuggestions = true; - plugins = [ - { - name = "fzf-tab"; - src = "${pkgs.zsh-fzf-tab}/share/fzf-tab"; - } - { - # should I use flake inputs / fetchurl? - name = "sudo"; - src = - pkgs.fetchFromGitHub { - owner = "ohmyzsh"; - repo = "ohmyzsh"; - rev = "f8bf8f0029a475831ebfba0799975ede20e08742"; - hash = "sha256-9cJQQycahO+vo/YcAHjF+PVhsWxu7pa4MsK8Dgr69k0="; - sparseCheckout = [ - "plugins/sudo" - ]; - } - + "/plugins/sudo"; - } - ]; - initExtra = "zstyle ':fzf-tab:*' fzf-command sk"; - ### History - history = { - path = "${config.xdg.configHome}/zsh/.zsh_history"; - save = 1000000; - size = 1000000; - }; - }; - fish = { - enable = true; - interactiveShellInit = '' - set fish_greeting - source ${config.xdg.configHome}/fish/tokyonight_night.fish - ''; - }; - - tealdeer.enable = true; - zoxide.enable = true; - starship = { - enable = true; - settings = { - add_newline = false; - aws.disabled = true; - gcloud.disabled = true; - line_break.disabled = true; - }; - }; - - #eza = { - # enable = true; - # git = true; - # icons = true; - #}; - - git = { - enable = true; - userName = "Guanran Wang"; - userEmail = "guanran928@outlook.com"; - delta.enable = true; - }; - - alacritty = { - enable = true; - settings = { - import = ["${inputs.tokyonight}/extras/alacritty/tokyonight_night.yml"]; - cursor.style = "beam"; - env.WINIT_X11_SCALE_FACTOR = "1"; - window = { - #opacity = 0.9; - padding = { - x = 12; - y = 12; - }; - }; - font = { - size = 12; - normal = { - family = lib.mkDefault "monospace"; # macOS dont have fontconfig, so mkDefault is nessesary - style = "SemiBold"; - }; - bold = { - family = lib.mkDefault "monospace"; - style = "Bold"; - }; - bold_italic = { - family = lib.mkDefault "monospace"; - style = "Bold Itailc"; - }; - italic = { - family = lib.mkDefault "monospace"; - style = "SemiBold Italic"; - }; - }; - }; - }; - - kitty = { - enable = true; - settings = { - include = "${inputs.tokyonight}/extras/kitty/tokyonight_night.conf"; - font_size = 12; - confirm_os_window_close = 0; - window_padding_width = 6; - adjust_line_height = 0; - }; - }; - - # Editors - ### VSCode - vscode = { - enable = true; - package = pkgs.vscodium; # foss - enableExtensionUpdateCheck = false; - enableUpdateCheck = false; - userSettings = { - "diffEditor.ignoreTrimWhitespace" = false; - "editor.cursorBlinking" = "smooth"; - "editor.cursorSmoothCaretAnimation" = "on"; - "editor.fontFamily" = lib.mkDefault "Monospace"; - "editor.fontWeight" = 600; - "editor.tabSize" = 2; - "explorer.confirmDragAndDrop" = false; - "explorer.confirmDelete" = false; - "files.autoSave" = "onFocusChange"; - "files.trimTrailingWhitespace" = true; - "files.trimFinalNewlines" = true; - "security.workspace.trust.enabled" = false; - "telemetry.telemetryLevel" = "off"; - "terminal.external.osxExec" = "Alacritty.app"; - "terminal.integrated.cursorBlinking" = true; - "update.mode" = "none"; - "window.menuBarVisibility" = "toggle"; - "workbench.colorTheme" = "Tokyo Night"; - - # Extensions - ### Nix IDE - "nix.enableLanguageServer" = true; - "nix.serverPath" = "${pkgs.nil}/bin/nil"; - ### GitLens - "gitlens.telemetry.enabled" = false; - }; - extensions = with pkgs.vscode-extensions; [ - ### LSP - jnoortheen.nix-ide - #ms-python.python - rust-lang.rust-analyzer - tamasfe.even-better-toml - #bungcip.better-toml - - ### QoL - eamodio.gitlens - esbenp.prettier-vscode - ritwickdey.liveserver - vscodevim.vim - - ### Themes - enkia.tokyo-night - #catppuccin.catppuccin-vsc-icons - #catppuccin.catppuccin-vsc - ]; - }; - ### Neovim - neovim = { - enable = true; - #defaultEditor = true; - viAlias = true; - vimAlias = true; - }; - ### Helix - helix = { - enable = true; - defaultEditor = true; - settings = { - theme = "tokyonight"; - editor = { - cursor-shape = { - insert = "bar"; - normal = "block"; - select = "underline"; - }; - statusline = { - mode = { - normal = "--NORMAL--"; - insert = "--INSERT--"; - select = "--SELECT--"; - }; - }; - indent-guides.render = true; - file-picker.hidden = false; - }; - # i still use these keybinds somethimes, even its hard to reach - keys.insert = { - C-left = "move_prev_word_start"; - C-right = "move_next_word_end"; - }; - keys.normal = { - C-left = "move_prev_word_start"; - C-right = "move_next_word_end"; - }; - }; - }; - }; -} diff --git a/users/guanranwang/home-manager/darwin/dotfiles.nix b/users/guanranwang/home-manager/darwin/dotfiles.nix deleted file mode 100644 index 0936198..0000000 --- a/users/guanranwang/home-manager/darwin/dotfiles.nix +++ /dev/null @@ -1,12 +0,0 @@ -{...}: let - configPath = ../common/dotfiles/config; - #dataPath = ../common/dotfiles/data; - #binPath = ../common/dotfiles/bin; -in { - xdg.configFile = { - "fish" = { - source = "${configPath}/fish"; - recursive = true; - }; - }; -} diff --git a/users/guanranwang/home-manager/darwin/presets/desktop.nix b/users/guanranwang/home-manager/darwin/presets/desktop.nix index b820943..b8d10cb 100644 --- a/users/guanranwang/home-manager/darwin/presets/desktop.nix +++ b/users/guanranwang/home-manager/darwin/presets/desktop.nix @@ -1,6 +1,13 @@ {...}: { imports = [ - ../../common/home.nix + ../.. + ../../resources/terms/alacritty.nix + ../../resources/shell/fish.nix + ../../resources/shell/bash.nix + ../../resources/editor/helix.nix + ../../resources/editor/neovim.nix + ../../resources/editor/vscode.nix + ../home.nix ../dotfiles.nix ]; diff --git a/users/guanranwang/home-manager/default.nix b/users/guanranwang/home-manager/default.nix new file mode 100644 index 0000000..fae37a4 --- /dev/null +++ b/users/guanranwang/home-manager/default.nix @@ -0,0 +1,77 @@ +{pkgs, ...}: { + home = { + # This value determines the Home Manager release that your + # configuration is compatible with. This helps avoid breakage + # when a new Home Manager release introduces backwards + # incompatible changes. + # + # You can update Home Manager without changing this value. See + # the Home Manager release notes for a list of state version + # changes in each release. + stateVersion = "23.05"; + + shellAliases = { + # navigation + "l" = "${pkgs.eza}/bin/eza -Fhl --icons --git"; + "ll" = "${pkgs.eza}/bin/eza -Fahl --icons --git"; + "ls" = "${pkgs.eza}/bin/eza -F --icons --git"; + "la" = "${pkgs.eza}/bin/eza -Fa --icons --git"; + "tree" = "${pkgs.eza}/bin/eza --icons --git --tree"; + ".." = "cd .."; + + # replacements + #"code" = "codium"; + #"neofetch" = "fastfetch"; + #"ranger" = "joshuto"; # rust + #"grep" = "rg"; + #"top" = "btm -b"; + #"htop" = "btm -b"; + #"btop" = "btm"; + + "yd" = "ydict -c"; + "farsee" = "curl -F 'c=@-' 'https://fars.ee/'"; # pb + "clock" = "tty-clock -5Ccs"; + + # proxy + "setproxy" = let + proxy = "http://127.0.0.1:7890/"; + in "export http_proxy=${proxy} https_proxy=${proxy} ftp_proxy=${proxy} rsync_proxy=${proxy}"; + "unsetproxy" = "set -e http_proxy https_proxy all_proxy"; # fish syntax (?) + }; + sessionVariables = { + # misc + "MANPAGER" = "sh -c 'col -bx | bat -l man -p'"; # man: use bat as man's pager + "MANROFFOPT" = "-c"; # man: fix formatting issue with bat + "SKIM_DEFAULT_COMMAND" = "fd --type f || git ls-tree -r --name-only head || rg --files || find ."; # skim: use fd by default + }; + }; + programs = { + # Let Home Manager install and manage itself. + home-manager.enable = true; + + tealdeer.enable = true; + zoxide.enable = true; + starship = { + enable = true; + settings = { + add_newline = false; + aws.disabled = true; + gcloud.disabled = true; + line_break.disabled = true; + }; + }; + + #eza = { + # enable = true; + # git = true; + # icons = true; + #}; + + git = { + enable = true; + userName = "Guanran Wang"; + userEmail = "guanran928@outlook.com"; + delta.enable = true; + }; + }; +} diff --git a/users/guanranwang/home-manager/nixos/dotfiles.nix b/users/guanranwang/home-manager/nixos/dotfiles.nix index ac8babe..d21aed7 100644 --- a/users/guanranwang/home-manager/nixos/dotfiles.nix +++ b/users/guanranwang/home-manager/nixos/dotfiles.nix @@ -1,18 +1,10 @@ {...}: let - homePath = ../common/dotfiles; - binPath = ../common/dotfiles/bin; - configPath = ../common/dotfiles/config; - dataPath = ../common/dotfiles/data; + homePath = ../resources/dotfiles; + binPath = ../resources/dotfiles/bin; + configPath = ../resources/dotfiles/config; + dataPath = ../resources/dotfiles/data; in { xdg.configFile = { - "foot" = { - source = "${configPath}/foot"; - recursive = true; - }; - "fish" = { - source = "${configPath}/fish"; - recursive = true; - }; "fontconfig" = { source = "${configPath}/fontconfig"; recursive = true; diff --git a/users/guanranwang/home-manager/nixos/home.nix b/users/guanranwang/home-manager/nixos/home.nix index aa9dcc2..5f7429e 100644 --- a/users/guanranwang/home-manager/nixos/home.nix +++ b/users/guanranwang/home-manager/nixos/home.nix @@ -83,7 +83,7 @@ bat # cli - fastfetch + #fastfetch wget sops skim @@ -129,13 +129,6 @@ gamemode # outdated just-perfection kimpanel - ]) - ++ (with pkgs.fishPlugins; [ - autopair - done - #tide - sponge - puffer ]); pointerCursor = { diff --git a/users/guanranwang/home-manager/nixos/presets/desktop.nix b/users/guanranwang/home-manager/nixos/presets/desktop.nix index 7bd258f..27c1d2b 100644 --- a/users/guanranwang/home-manager/nixos/presets/desktop.nix +++ b/users/guanranwang/home-manager/nixos/presets/desktop.nix @@ -1,15 +1,20 @@ {...}: { imports = [ - ../../common/home.nix + ../.. + ../../resources/terms/alacritty.nix + ../../resources/shell/fish.nix + ../../resources/shell/bash.nix + ../../resources/editor/helix.nix + ../../resources/editor/neovim.nix + ../../resources/editor/vscode.nix + ../home.nix ../dotfiles.nix - ../dunst.nix ../fonts.nix ../i18n.nix - ../sway.nix - ../waybar.nix + ../wm ../xdg ]; } diff --git a/users/guanranwang/home-manager/nixos/wm/default.nix b/users/guanranwang/home-manager/nixos/wm/default.nix new file mode 100644 index 0000000..9a83d67 --- /dev/null +++ b/users/guanranwang/home-manager/nixos/wm/default.nix @@ -0,0 +1,7 @@ +{...}: { + imports = [ + ./dunst.nix + ./sway.nix + ./waybar.nix + ]; +} diff --git a/users/guanranwang/home-manager/nixos/dunst.nix b/users/guanranwang/home-manager/nixos/wm/dunst.nix similarity index 100% rename from users/guanranwang/home-manager/nixos/dunst.nix rename to users/guanranwang/home-manager/nixos/wm/dunst.nix diff --git a/users/guanranwang/home-manager/nixos/sway.nix b/users/guanranwang/home-manager/nixos/wm/sway.nix similarity index 100% rename from users/guanranwang/home-manager/nixos/sway.nix rename to users/guanranwang/home-manager/nixos/wm/sway.nix diff --git a/users/guanranwang/home-manager/nixos/waybar.nix b/users/guanranwang/home-manager/nixos/wm/waybar.nix similarity index 100% rename from users/guanranwang/home-manager/nixos/waybar.nix rename to users/guanranwang/home-manager/nixos/wm/waybar.nix diff --git a/users/guanranwang/home-manager/common/dotfiles/.drirc b/users/guanranwang/home-manager/resources/dotfiles/.drirc similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/.drirc rename to users/guanranwang/home-manager/resources/dotfiles/.drirc diff --git a/users/guanranwang/home-manager/common/dotfiles/.xinitrc b/users/guanranwang/home-manager/resources/dotfiles/.xinitrc similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/.xinitrc rename to users/guanranwang/home-manager/resources/dotfiles/.xinitrc diff --git a/users/guanranwang/home-manager/common/dotfiles/bin/batterynotify b/users/guanranwang/home-manager/resources/dotfiles/bin/batterynotify similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/bin/batterynotify rename to users/guanranwang/home-manager/resources/dotfiles/bin/batterynotify diff --git a/users/guanranwang/home-manager/common/dotfiles/bin/chargingnotify b/users/guanranwang/home-manager/resources/dotfiles/bin/chargingnotify similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/bin/chargingnotify rename to users/guanranwang/home-manager/resources/dotfiles/bin/chargingnotify diff --git a/users/guanranwang/home-manager/common/dotfiles/bin/hyprland-autostart b/users/guanranwang/home-manager/resources/dotfiles/bin/hyprland-autostart similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/bin/hyprland-autostart rename to users/guanranwang/home-manager/resources/dotfiles/bin/hyprland-autostart diff --git a/users/guanranwang/home-manager/common/dotfiles/bin/hyprland-gamemode b/users/guanranwang/home-manager/resources/dotfiles/bin/hyprland-gamemode similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/bin/hyprland-gamemode rename to users/guanranwang/home-manager/resources/dotfiles/bin/hyprland-gamemode diff --git a/users/guanranwang/home-manager/common/dotfiles/bin/lofi b/users/guanranwang/home-manager/resources/dotfiles/bin/lofi similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/bin/lofi rename to users/guanranwang/home-manager/resources/dotfiles/bin/lofi diff --git a/users/guanranwang/home-manager/common/dotfiles/bin/minecraft-inputfix b/users/guanranwang/home-manager/resources/dotfiles/bin/minecraft-inputfix similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/bin/minecraft-inputfix rename to users/guanranwang/home-manager/resources/dotfiles/bin/minecraft-inputfix diff --git a/users/guanranwang/home-manager/common/dotfiles/bin/update-hosts b/users/guanranwang/home-manager/resources/dotfiles/bin/update-hosts similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/bin/update-hosts rename to users/guanranwang/home-manager/resources/dotfiles/bin/update-hosts diff --git a/users/guanranwang/home-manager/common/dotfiles/bin/wrapped-brightnessctl b/users/guanranwang/home-manager/resources/dotfiles/bin/wrapped-brightnessctl similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/bin/wrapped-brightnessctl rename to users/guanranwang/home-manager/resources/dotfiles/bin/wrapped-brightnessctl diff --git a/users/guanranwang/home-manager/common/dotfiles/bin/wrapped-grim b/users/guanranwang/home-manager/resources/dotfiles/bin/wrapped-grim similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/bin/wrapped-grim rename to users/guanranwang/home-manager/resources/dotfiles/bin/wrapped-grim diff --git a/users/guanranwang/home-manager/common/dotfiles/bin/wrapped-mpvpaper b/users/guanranwang/home-manager/resources/dotfiles/bin/wrapped-mpvpaper similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/bin/wrapped-mpvpaper rename to users/guanranwang/home-manager/resources/dotfiles/bin/wrapped-mpvpaper diff --git a/users/guanranwang/home-manager/common/dotfiles/bin/wrapped-pamixer b/users/guanranwang/home-manager/resources/dotfiles/bin/wrapped-pamixer similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/bin/wrapped-pamixer rename to users/guanranwang/home-manager/resources/dotfiles/bin/wrapped-pamixer diff --git a/users/guanranwang/home-manager/common/dotfiles/bin/wrapped-swaylock-effects b/users/guanranwang/home-manager/resources/dotfiles/bin/wrapped-swaylock-effects similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/bin/wrapped-swaylock-effects rename to users/guanranwang/home-manager/resources/dotfiles/bin/wrapped-swaylock-effects diff --git a/users/guanranwang/home-manager/common/dotfiles/bin/wrapped-swww b/users/guanranwang/home-manager/resources/dotfiles/bin/wrapped-swww similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/bin/wrapped-swww rename to users/guanranwang/home-manager/resources/dotfiles/bin/wrapped-swww diff --git a/users/guanranwang/home-manager/common/dotfiles/bin/wrapped-wayshot b/users/guanranwang/home-manager/resources/dotfiles/bin/wrapped-wayshot similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/bin/wrapped-wayshot rename to users/guanranwang/home-manager/resources/dotfiles/bin/wrapped-wayshot diff --git a/users/guanranwang/home-manager/common/dotfiles/config/alsoft.conf b/users/guanranwang/home-manager/resources/dotfiles/config/alsoft.conf similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/config/alsoft.conf rename to users/guanranwang/home-manager/resources/dotfiles/config/alsoft.conf diff --git a/users/guanranwang/home-manager/common/dotfiles/config/fontconfig/conf.d/qt-fonts.conf b/users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/conf.d/qt-fonts.conf similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/config/fontconfig/conf.d/qt-fonts.conf rename to users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/conf.d/qt-fonts.conf diff --git a/users/guanranwang/home-manager/common/dotfiles/config/fontconfig/conf.d/web-ui-fonts.conf b/users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/conf.d/web-ui-fonts.conf similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/config/fontconfig/conf.d/web-ui-fonts.conf rename to users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/conf.d/web-ui-fonts.conf diff --git a/users/guanranwang/home-manager/common/dotfiles/config/fontconfig/fonts.conf b/users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/fonts.conf similarity index 98% rename from users/guanranwang/home-manager/common/dotfiles/config/fontconfig/fonts.conf rename to users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/fonts.conf index 0dd2875..810e638 100644 --- a/users/guanranwang/home-manager/common/dotfiles/config/fontconfig/fonts.conf +++ b/users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/fonts.conf @@ -306,6 +306,10 @@ SF Mono monospace + + Noto Sans Mono + monospace + diff --git a/users/guanranwang/home-manager/common/dotfiles/config/hyprland/autostart.conf b/users/guanranwang/home-manager/resources/dotfiles/config/hyprland/autostart.conf similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/config/hyprland/autostart.conf rename to users/guanranwang/home-manager/resources/dotfiles/config/hyprland/autostart.conf diff --git a/users/guanranwang/home-manager/common/dotfiles/config/hyprland/env.conf b/users/guanranwang/home-manager/resources/dotfiles/config/hyprland/env.conf similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/config/hyprland/env.conf rename to users/guanranwang/home-manager/resources/dotfiles/config/hyprland/env.conf diff --git a/users/guanranwang/home-manager/common/dotfiles/config/hyprland/hyprpaper.conf b/users/guanranwang/home-manager/resources/dotfiles/config/hyprland/hyprpaper.conf similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/config/hyprland/hyprpaper.conf rename to users/guanranwang/home-manager/resources/dotfiles/config/hyprland/hyprpaper.conf diff --git a/users/guanranwang/home-manager/common/dotfiles/config/hyprland/keybinds.conf b/users/guanranwang/home-manager/resources/dotfiles/config/hyprland/keybinds.conf similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/config/hyprland/keybinds.conf rename to users/guanranwang/home-manager/resources/dotfiles/config/hyprland/keybinds.conf diff --git a/users/guanranwang/home-manager/common/dotfiles/config/hyprland/main.conf b/users/guanranwang/home-manager/resources/dotfiles/config/hyprland/main.conf similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/config/hyprland/main.conf rename to users/guanranwang/home-manager/resources/dotfiles/config/hyprland/main.conf diff --git a/users/guanranwang/home-manager/common/dotfiles/config/hyprland/plugins.conf b/users/guanranwang/home-manager/resources/dotfiles/config/hyprland/plugins.conf similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/config/hyprland/plugins.conf rename to users/guanranwang/home-manager/resources/dotfiles/config/hyprland/plugins.conf diff --git a/users/guanranwang/home-manager/common/dotfiles/config/hyprland/themes/colors.conf b/users/guanranwang/home-manager/resources/dotfiles/config/hyprland/themes/colors.conf similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/config/hyprland/themes/colors.conf rename to users/guanranwang/home-manager/resources/dotfiles/config/hyprland/themes/colors.conf diff --git a/users/guanranwang/home-manager/common/dotfiles/config/hyprland/themes/frappe.conf b/users/guanranwang/home-manager/resources/dotfiles/config/hyprland/themes/frappe.conf similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/config/hyprland/themes/frappe.conf rename to users/guanranwang/home-manager/resources/dotfiles/config/hyprland/themes/frappe.conf diff --git a/users/guanranwang/home-manager/common/dotfiles/config/hyprland/themes/latte.conf b/users/guanranwang/home-manager/resources/dotfiles/config/hyprland/themes/latte.conf similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/config/hyprland/themes/latte.conf rename to users/guanranwang/home-manager/resources/dotfiles/config/hyprland/themes/latte.conf diff --git a/users/guanranwang/home-manager/common/dotfiles/config/hyprland/themes/macchiato.conf b/users/guanranwang/home-manager/resources/dotfiles/config/hyprland/themes/macchiato.conf similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/config/hyprland/themes/macchiato.conf rename to users/guanranwang/home-manager/resources/dotfiles/config/hyprland/themes/macchiato.conf diff --git a/users/guanranwang/home-manager/common/dotfiles/config/hyprland/themes/mocha.conf b/users/guanranwang/home-manager/resources/dotfiles/config/hyprland/themes/mocha.conf similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/config/hyprland/themes/mocha.conf rename to users/guanranwang/home-manager/resources/dotfiles/config/hyprland/themes/mocha.conf diff --git a/users/guanranwang/home-manager/common/dotfiles/config/makepkgs.conf b/users/guanranwang/home-manager/resources/dotfiles/config/makepkgs.conf similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/config/makepkgs.conf rename to users/guanranwang/home-manager/resources/dotfiles/config/makepkgs.conf diff --git a/users/guanranwang/home-manager/common/dotfiles/config/picom/picom.conf b/users/guanranwang/home-manager/resources/dotfiles/config/picom/picom.conf similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/config/picom/picom.conf rename to users/guanranwang/home-manager/resources/dotfiles/config/picom/picom.conf diff --git a/users/guanranwang/home-manager/common/dotfiles/config/polybar/config.ini b/users/guanranwang/home-manager/resources/dotfiles/config/polybar/config.ini similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/config/polybar/config.ini rename to users/guanranwang/home-manager/resources/dotfiles/config/polybar/config.ini diff --git a/users/guanranwang/home-manager/common/dotfiles/config/rofi/colors.rasi b/users/guanranwang/home-manager/resources/dotfiles/config/rofi/colors.rasi similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/config/rofi/colors.rasi rename to users/guanranwang/home-manager/resources/dotfiles/config/rofi/colors.rasi diff --git a/users/guanranwang/home-manager/common/dotfiles/config/rofi/config.rasi b/users/guanranwang/home-manager/resources/dotfiles/config/rofi/config.rasi similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/config/rofi/config.rasi rename to users/guanranwang/home-manager/resources/dotfiles/config/rofi/config.rasi diff --git a/users/guanranwang/home-manager/common/dotfiles/config/user-tmpfiles.d/discord-rpc.conf b/users/guanranwang/home-manager/resources/dotfiles/config/user-tmpfiles.d/discord-rpc.conf similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/config/user-tmpfiles.d/discord-rpc.conf rename to users/guanranwang/home-manager/resources/dotfiles/config/user-tmpfiles.d/discord-rpc.conf diff --git a/users/guanranwang/home-manager/common/dotfiles/data/applications/ca.desrt.dconf-editor.desktop b/users/guanranwang/home-manager/resources/dotfiles/data/applications/ca.desrt.dconf-editor.desktop similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/applications/ca.desrt.dconf-editor.desktop rename to users/guanranwang/home-manager/resources/dotfiles/data/applications/ca.desrt.dconf-editor.desktop diff --git a/users/guanranwang/home-manager/common/dotfiles/data/applications/com.github.wwmm.easyeffects.desktop b/users/guanranwang/home-manager/resources/dotfiles/data/applications/com.github.wwmm.easyeffects.desktop similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/applications/com.github.wwmm.easyeffects.desktop rename to users/guanranwang/home-manager/resources/dotfiles/data/applications/com.github.wwmm.easyeffects.desktop diff --git a/users/guanranwang/home-manager/common/dotfiles/data/applications/io.bassi.Amberol.desktop b/users/guanranwang/home-manager/resources/dotfiles/data/applications/io.bassi.Amberol.desktop similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/applications/io.bassi.Amberol.desktop rename to users/guanranwang/home-manager/resources/dotfiles/data/applications/io.bassi.Amberol.desktop diff --git a/users/guanranwang/home-manager/common/dotfiles/data/applications/org.gnome.Calendar.desktop b/users/guanranwang/home-manager/resources/dotfiles/data/applications/org.gnome.Calendar.desktop similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/applications/org.gnome.Calendar.desktop rename to users/guanranwang/home-manager/resources/dotfiles/data/applications/org.gnome.Calendar.desktop diff --git a/users/guanranwang/home-manager/common/dotfiles/data/applications/org.gnome.Characters.desktop b/users/guanranwang/home-manager/resources/dotfiles/data/applications/org.gnome.Characters.desktop similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/applications/org.gnome.Characters.desktop rename to users/guanranwang/home-manager/resources/dotfiles/data/applications/org.gnome.Characters.desktop diff --git a/users/guanranwang/home-manager/common/dotfiles/data/applications/org.gnome.baobab.desktop b/users/guanranwang/home-manager/resources/dotfiles/data/applications/org.gnome.baobab.desktop similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/applications/org.gnome.baobab.desktop rename to users/guanranwang/home-manager/resources/dotfiles/data/applications/org.gnome.baobab.desktop diff --git a/users/guanranwang/home-manager/common/dotfiles/data/applications/org.telegram.desktop.desktop b/users/guanranwang/home-manager/resources/dotfiles/data/applications/org.telegram.desktop.desktop similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/applications/org.telegram.desktop.desktop rename to users/guanranwang/home-manager/resources/dotfiles/data/applications/org.telegram.desktop.desktop diff --git a/users/guanranwang/home-manager/common/dotfiles/data/backgrounds/Mojave Night.jpg b/users/guanranwang/home-manager/resources/dotfiles/data/backgrounds/Mojave Night.jpg similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/backgrounds/Mojave Night.jpg rename to users/guanranwang/home-manager/resources/dotfiles/data/backgrounds/Mojave Night.jpg diff --git a/users/guanranwang/home-manager/common/dotfiles/data/backgrounds/wallpaper1.png b/users/guanranwang/home-manager/resources/dotfiles/data/backgrounds/wallpaper1.png similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/backgrounds/wallpaper1.png rename to users/guanranwang/home-manager/resources/dotfiles/data/backgrounds/wallpaper1.png diff --git a/users/guanranwang/home-manager/common/dotfiles/data/backgrounds/wallpaper2.jpg b/users/guanranwang/home-manager/resources/dotfiles/data/backgrounds/wallpaper2.jpg similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/backgrounds/wallpaper2.jpg rename to users/guanranwang/home-manager/resources/dotfiles/data/backgrounds/wallpaper2.jpg diff --git a/users/guanranwang/home-manager/common/dotfiles/data/backgrounds/wallpaper3.jpg b/users/guanranwang/home-manager/resources/dotfiles/data/backgrounds/wallpaper3.jpg similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/backgrounds/wallpaper3.jpg rename to users/guanranwang/home-manager/resources/dotfiles/data/backgrounds/wallpaper3.jpg diff --git a/users/guanranwang/home-manager/common/dotfiles/data/backgrounds/wallpaper4.png b/users/guanranwang/home-manager/resources/dotfiles/data/backgrounds/wallpaper4.png similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/backgrounds/wallpaper4.png rename to users/guanranwang/home-manager/resources/dotfiles/data/backgrounds/wallpaper4.png diff --git a/users/guanranwang/home-manager/common/dotfiles/data/backgrounds/wallpaper5.png b/users/guanranwang/home-manager/resources/dotfiles/data/backgrounds/wallpaper5.png similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/backgrounds/wallpaper5.png rename to users/guanranwang/home-manager/resources/dotfiles/data/backgrounds/wallpaper5.png diff --git a/users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/com.github.Eloston.UngoogledChromium b/users/guanranwang/home-manager/resources/dotfiles/data/flatpak/overrides/com.github.Eloston.UngoogledChromium similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/com.github.Eloston.UngoogledChromium rename to users/guanranwang/home-manager/resources/dotfiles/data/flatpak/overrides/com.github.Eloston.UngoogledChromium diff --git a/users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/com.google.Chrome b/users/guanranwang/home-manager/resources/dotfiles/data/flatpak/overrides/com.google.Chrome similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/com.google.Chrome rename to users/guanranwang/home-manager/resources/dotfiles/data/flatpak/overrides/com.google.Chrome diff --git a/users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/com.lunarclient.LunarClient b/users/guanranwang/home-manager/resources/dotfiles/data/flatpak/overrides/com.lunarclient.LunarClient similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/com.lunarclient.LunarClient rename to users/guanranwang/home-manager/resources/dotfiles/data/flatpak/overrides/com.lunarclient.LunarClient diff --git a/users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/com.mojang.Minecraft b/users/guanranwang/home-manager/resources/dotfiles/data/flatpak/overrides/com.mojang.Minecraft similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/com.mojang.Minecraft rename to users/guanranwang/home-manager/resources/dotfiles/data/flatpak/overrides/com.mojang.Minecraft diff --git a/users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/com.valvesoftware.Steam b/users/guanranwang/home-manager/resources/dotfiles/data/flatpak/overrides/com.valvesoftware.Steam similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/com.valvesoftware.Steam rename to users/guanranwang/home-manager/resources/dotfiles/data/flatpak/overrides/com.valvesoftware.Steam diff --git a/users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/global b/users/guanranwang/home-manager/resources/dotfiles/data/flatpak/overrides/global similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/global rename to users/guanranwang/home-manager/resources/dotfiles/data/flatpak/overrides/global diff --git a/users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/im.riot.Riot b/users/guanranwang/home-manager/resources/dotfiles/data/flatpak/overrides/im.riot.Riot similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/im.riot.Riot rename to users/guanranwang/home-manager/resources/dotfiles/data/flatpak/overrides/im.riot.Riot diff --git a/users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/org.chromium.Chromium b/users/guanranwang/home-manager/resources/dotfiles/data/flatpak/overrides/org.chromium.Chromium similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/org.chromium.Chromium rename to users/guanranwang/home-manager/resources/dotfiles/data/flatpak/overrides/org.chromium.Chromium diff --git a/users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/org.mozilla.firefox b/users/guanranwang/home-manager/resources/dotfiles/data/flatpak/overrides/org.mozilla.firefox similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/org.mozilla.firefox rename to users/guanranwang/home-manager/resources/dotfiles/data/flatpak/overrides/org.mozilla.firefox diff --git a/users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/org.prismlauncher.PrismLauncher b/users/guanranwang/home-manager/resources/dotfiles/data/flatpak/overrides/org.prismlauncher.PrismLauncher similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/org.prismlauncher.PrismLauncher rename to users/guanranwang/home-manager/resources/dotfiles/data/flatpak/overrides/org.prismlauncher.PrismLauncher diff --git a/users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/battery-alert.png b/users/guanranwang/home-manager/resources/dotfiles/data/icons/dunst/battery-alert.png similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/battery-alert.png rename to users/guanranwang/home-manager/resources/dotfiles/data/icons/dunst/battery-alert.png diff --git a/users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/battery-charging.png b/users/guanranwang/home-manager/resources/dotfiles/data/icons/dunst/battery-charging.png similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/battery-charging.png rename to users/guanranwang/home-manager/resources/dotfiles/data/icons/dunst/battery-charging.png diff --git a/users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/battery.png b/users/guanranwang/home-manager/resources/dotfiles/data/icons/dunst/battery.png similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/battery.png rename to users/guanranwang/home-manager/resources/dotfiles/data/icons/dunst/battery.png diff --git a/users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/volume-high.png b/users/guanranwang/home-manager/resources/dotfiles/data/icons/dunst/volume-high.png similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/volume-high.png rename to users/guanranwang/home-manager/resources/dotfiles/data/icons/dunst/volume-high.png diff --git a/users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/volume-minus.png b/users/guanranwang/home-manager/resources/dotfiles/data/icons/dunst/volume-minus.png similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/volume-minus.png rename to users/guanranwang/home-manager/resources/dotfiles/data/icons/dunst/volume-minus.png diff --git a/users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/volume-mute.png b/users/guanranwang/home-manager/resources/dotfiles/data/icons/dunst/volume-mute.png similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/volume-mute.png rename to users/guanranwang/home-manager/resources/dotfiles/data/icons/dunst/volume-mute.png diff --git a/users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/volume-off.png b/users/guanranwang/home-manager/resources/dotfiles/data/icons/dunst/volume-off.png similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/volume-off.png rename to users/guanranwang/home-manager/resources/dotfiles/data/icons/dunst/volume-off.png diff --git a/users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/volume-plus.png b/users/guanranwang/home-manager/resources/dotfiles/data/icons/dunst/volume-plus.png similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/volume-plus.png rename to users/guanranwang/home-manager/resources/dotfiles/data/icons/dunst/volume-plus.png diff --git a/users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/volume-source.png b/users/guanranwang/home-manager/resources/dotfiles/data/icons/dunst/volume-source.png similarity index 100% rename from users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/volume-source.png rename to users/guanranwang/home-manager/resources/dotfiles/data/icons/dunst/volume-source.png diff --git a/users/guanranwang/home-manager/resources/editor/helix.nix b/users/guanranwang/home-manager/resources/editor/helix.nix new file mode 100644 index 0000000..d1608a0 --- /dev/null +++ b/users/guanranwang/home-manager/resources/editor/helix.nix @@ -0,0 +1,34 @@ +{...}: { + programs.helix = { + enable = true; + defaultEditor = true; + settings = { + theme = "tokyonight"; + editor = { + cursor-shape = { + insert = "bar"; + normal = "block"; + select = "underline"; + }; + statusline = { + mode = { + normal = "--NORMAL--"; + insert = "--INSERT--"; + select = "--SELECT--"; + }; + }; + indent-guides.render = true; + file-picker.hidden = false; + }; + # i still use these keybinds somethimes, even its hard to reach + keys.insert = { + C-left = "move_prev_word_start"; + C-right = "move_next_word_end"; + }; + keys.normal = { + C-left = "move_prev_word_start"; + C-right = "move_next_word_end"; + }; + }; + }; +} diff --git a/users/guanranwang/home-manager/resources/editor/neovim.nix b/users/guanranwang/home-manager/resources/editor/neovim.nix new file mode 100644 index 0000000..a83292e --- /dev/null +++ b/users/guanranwang/home-manager/resources/editor/neovim.nix @@ -0,0 +1,8 @@ +{...}: { + programs.neovim = { + enable = true; + #defaultEditor = true; + viAlias = true; + vimAlias = true; + }; +} diff --git a/users/guanranwang/home-manager/resources/editor/vscode.nix b/users/guanranwang/home-manager/resources/editor/vscode.nix new file mode 100644 index 0000000..9d271a4 --- /dev/null +++ b/users/guanranwang/home-manager/resources/editor/vscode.nix @@ -0,0 +1,58 @@ +{ + lib, + pkgs, + ... +}: { + programs.vscode = { + enable = true; + package = pkgs.vscodium; # foss + enableExtensionUpdateCheck = false; + enableUpdateCheck = false; + userSettings = { + "diffEditor.ignoreTrimWhitespace" = false; + "editor.cursorBlinking" = "smooth"; + "editor.cursorSmoothCaretAnimation" = "on"; + "editor.fontFamily" = lib.mkDefault "Monospace"; + "editor.fontWeight" = 600; + "editor.tabSize" = 2; + "explorer.confirmDragAndDrop" = false; + "explorer.confirmDelete" = false; + "files.autoSave" = "onFocusChange"; + "files.trimTrailingWhitespace" = true; + "files.trimFinalNewlines" = true; + "security.workspace.trust.enabled" = false; + "telemetry.telemetryLevel" = "off"; + "terminal.external.osxExec" = "Alacritty.app"; + "terminal.integrated.cursorBlinking" = true; + "update.mode" = "none"; + "window.menuBarVisibility" = "toggle"; + "workbench.colorTheme" = "Tokyo Night"; + + # Extensions + ### Nix IDE + "nix.enableLanguageServer" = true; + "nix.serverPath" = "${pkgs.nil}/bin/nil"; + ### GitLens + "gitlens.telemetry.enabled" = false; + }; + extensions = with pkgs.vscode-extensions; [ + ### LSP + jnoortheen.nix-ide + #ms-python.python + rust-lang.rust-analyzer + tamasfe.even-better-toml + #bungcip.better-toml + + ### QoL + eamodio.gitlens + esbenp.prettier-vscode + ritwickdey.liveserver + vscodevim.vim + + ### Themes + enkia.tokyo-night + #catppuccin.catppuccin-vsc-icons + #catppuccin.catppuccin-vsc + ]; + }; +} diff --git a/users/guanranwang/home-manager/resources/shell/bash.nix b/users/guanranwang/home-manager/resources/shell/bash.nix new file mode 100644 index 0000000..7dd196a --- /dev/null +++ b/users/guanranwang/home-manager/resources/shell/bash.nix @@ -0,0 +1,6 @@ +{config, ...}: { + programs.bash = { + enable = true; + historyFile = "${config.xdg.configHome}/bash/.bash_history"; + }; +} diff --git a/users/guanranwang/home-manager/resources/shell/fish.nix b/users/guanranwang/home-manager/resources/shell/fish.nix new file mode 100644 index 0000000..297d389 --- /dev/null +++ b/users/guanranwang/home-manager/resources/shell/fish.nix @@ -0,0 +1,53 @@ +{ + inputs, + pkgs, + ... +}: { + programs.fish = { + enable = true; + interactiveShellInit = '' + set fish_greeting + source ${inputs.tokyonight}/extras/fish/tokyonight_night.fish + ''; + plugins = [ + { + name = "autopair"; + src = pkgs.fishPlugins.autopair.src; + } + { + name = "done"; + src = pkgs.fishPlugins.done.src; + } + { + name = "tide"; + src = pkgs.fishPlugins.tide.src; + } + { + name = "sponge"; + src = pkgs.fishPlugins.sponge.src; + } + { + name = "puffer"; + src = pkgs.fishPlugins.puffer.src; + } + { + name = "sudope"; + src = pkgs.fetchFromGitHub { + owner = "oh-my-fish"; + repo = "plugin-sudope"; + rev = "83919a692bc1194aa322f3627c859fecace5f496"; + hash = "sha256-pD4rNuqg6TG22L9m8425CO2iqcYm8JaAEXIVa0H/v/U="; + }; + } + { + name = "fish-abbreviation-tips"; + src = pkgs.fetchFromGitHub { + owner = "gazorby"; + repo = "fish-abbreviation-tips"; + rev = "8ed76a62bb044ba4ad8e3e6832640178880df485"; + hash = "sha256-F1t81VliD+v6WEWqj1c1ehFBXzqLyumx5vV46s/FZRU="; + }; + } + ]; + }; +} diff --git a/users/guanranwang/home-manager/resources/shell/zsh.nix b/users/guanranwang/home-manager/resources/shell/zsh.nix new file mode 100644 index 0000000..601a76e --- /dev/null +++ b/users/guanranwang/home-manager/resources/shell/zsh.nix @@ -0,0 +1,43 @@ +{ + config, + pkgs, + ... +}: { + programs.zsh = { + enable = true; + ### XDG + dotDir = ".config/zsh"; + ### Plugins + syntaxHighlighting.enable = true; + historySubstringSearch.enable = true; + enableAutosuggestions = true; + plugins = [ + { + name = "fzf-tab"; + src = "${pkgs.zsh-fzf-tab}/share/fzf-tab"; + } + { + # should I use flake inputs / fetchurl? + name = "sudo"; + src = + pkgs.fetchFromGitHub { + owner = "ohmyzsh"; + repo = "ohmyzsh"; + rev = "f8bf8f0029a475831ebfba0799975ede20e08742"; + hash = "sha256-9cJQQycahO+vo/YcAHjF+PVhsWxu7pa4MsK8Dgr69k0="; + sparseCheckout = [ + "plugins/sudo" + ]; + } + + "/plugins/sudo"; + } + ]; + initExtra = "zstyle ':fzf-tab:*' fzf-command sk"; + ### History + history = { + path = "${config.xdg.configHome}/zsh/.zsh_history"; + save = 1000000; + size = 1000000; + }; + }; +} diff --git a/users/guanranwang/home-manager/resources/terms/alacritty.nix b/users/guanranwang/home-manager/resources/terms/alacritty.nix new file mode 100644 index 0000000..67369d0 --- /dev/null +++ b/users/guanranwang/home-manager/resources/terms/alacritty.nix @@ -0,0 +1,40 @@ +{ + inputs, + lib, + ... +}: { + programs.alacritty = { + enable = true; + settings = { + import = ["${inputs.tokyonight}/extras/alacritty/tokyonight_night.yml"]; + cursor.style = "beam"; + env.WINIT_X11_SCALE_FACTOR = "1"; + window = { + #opacity = 0.9; + padding = { + x = 12; + y = 12; + }; + }; + font = { + size = 12; + normal = { + family = lib.mkDefault "monospace"; # macOS dont have fontconfig, so mkDefault is nessesary + style = "SemiBold"; + }; + bold = { + family = lib.mkDefault "monospace"; + style = "Bold"; + }; + bold_italic = { + family = lib.mkDefault "monospace"; + style = "Bold Itailc"; + }; + italic = { + family = lib.mkDefault "monospace"; + style = "SemiBold Italic"; + }; + }; + }; + }; +} diff --git a/users/guanranwang/home-manager/resources/terms/foot.nix b/users/guanranwang/home-manager/resources/terms/foot.nix new file mode 100644 index 0000000..1ede17a --- /dev/null +++ b/users/guanranwang/home-manager/resources/terms/foot.nix @@ -0,0 +1,34 @@ +{...}: { + programs.foot = { + enable = true; + settings = { + font = "monospace:size=12"; + pad = "12x12 center"; + colors = { + #"alpha" = 0.9; + + # Tokyonight + "background" = "1a1b26"; + "foreground" = "c0caf5"; + "regular0" = "15161e"; # black + "regular1" = "f7768e"; # red + "regular2" = "9ece6a"; # green + "regular3" = "e0af68"; # yellow + "regular4" = "7aa2f7"; # blue + "regular5" = "bb9af7"; # magenta + "regular6" = "7dcfff"; # cyan + "regular7" = "a91bd6"; # white + "bright0" = "414868"; # bright black + "bright1" = "f7768e"; # bright red + "bright2" = "9ece6a"; # bright green + "bright3" = "e0af68"; # bright yellow + "bright4" = "7aa2f7"; # bright blue + "bright5" = "bb9af7"; # bright magenta + "bright6" = "7dcfff"; # bright cyan + "bright7" = "c0caf5"; # bright white + "16" = "ff9e64"; + "17" = "db4b4b"; + }; + }; + }; +} diff --git a/users/guanranwang/home-manager/resources/terms/kitty.nix b/users/guanranwang/home-manager/resources/terms/kitty.nix new file mode 100644 index 0000000..235fd88 --- /dev/null +++ b/users/guanranwang/home-manager/resources/terms/kitty.nix @@ -0,0 +1,12 @@ +{inputs, ...}: { + programs.kitty = { + enable = true; + settings = { + include = "${inputs.tokyonight}/extras/kitty/tokyonight_night.conf"; + font_size = 12; + confirm_os_window_close = 0; + window_padding_width = 6; + adjust_line_height = 0; + }; + }; +}