diff --git a/.gitignore b/.gitignore index 71f8379..cb2e47e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ .idea/* apply.sh -reset.sh \ No newline at end of file diff --git a/README.md b/README.md index 48108f0..096d580 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,11 @@ ![Preview](https://github.com/Nyxvectar/media/blob/main/dotfiles/dotfilesPreview.jpg) ## Nix Dotfiles for Colemak-DH & Apple Layout ### Before Using -- These dotfiles are designed exclusively for linux that using **Nix**, and under **Colemak-DH** keyboard layout. Package management and system configuration differ significantly from other distributions. However, if you are using a standard Linux distribution, this repository also provides standard config files, but they may not be updated very promptly. So, for non-Nix systems: - - Use only the raw configuration files in `./config/` - - Manual installation is required -- **sudo** has been **disabled** and replaced by **doas**. Witch is lighter and more secure. +- These dotfiles are designed exclusively for linux that using **Nix**, and under **Colemak-DH** keyboard layout. Package management and system configuration differ significantly from other distributions. +- **sudo** has been **disabled** and replaced by **doas**, witch is lighter and more secure. - The keymap in `hyprland.nix` is optimized for `Colemak-DH` keyboard layout. To adapt for standard `QWERTY` layouts: - Although modifying the keybindings is needed, fish hotkeys were configured as normal. - - Note that `nix.configuration` retains `kb_layout = us`, as my layout customization occurs at the hardware level, not in software configuration + - Note that `nix.configuration` retains `kb_layout = us`, as my layout customization occurs at the hardware level, not in software configuration. > [!NOTE] > This setup uses Dae and Daed proxy. If you don't need the eBPF core feature or related options, you can safely ignore them. They're imported in `./flake.nix` and `./imports/services.nix` diff --git a/config/alacritty/alacritty.toml b/config/alacritty/alacritty.toml deleted file mode 100755 index 20d5a5f..0000000 --- a/config/alacritty/alacritty.toml +++ /dev/null @@ -1,87 +0,0 @@ -[cursor.style] -blinking = "On" -shape = "Beam" - -[env] -TERM = "xterm-256color" - -[font] -size = 15 - -[font.bold] -style = "LXGW WenKai Mono" - -[font.normal] -family = "LXGW WenKai Mono" - -[[keyboard.bindings]] -action = "Paste" -key = "V" -mode = "~Vi" -mods = "Control|Shift" - -[[keyboard.bindings]] -action = "Copy" -key = "C" -mods = "Control|Shift" - -[[keyboard.bindings]] -action = "SearchForward" -key = "F" -mode = "~Search" -mods = "Control|Shift" - -[[keyboard.bindings]] -action = "SearchBackward" -key = "B" -mode = "~Search" -mods = "Control|Shift" - -[[keyboard.bindings]] -action = "IncreaseFontSize" -key = "Plus" -mods = "Control" - -[[keyboard.bindings]] -action = "DecreaseFontSize" -key = "Minus" -mods = "Control" - -[terminal.shell] -program = "/run/current-system/sw/bin/fish" - -[window] -opacity = 0.88 - -[window.padding] -x = 24 -y = 16 - -[colors.bright] -black = "0x585858" -blue = "0x7cafc2" -cyan = "0x86c1b9" -green = "0xa1b56c" -magenta = "0xba8baf" -red = "0xab4642" -white = "0xf8f8f8" -yellow = "0xf7ca88" - -[colors.cursor] -cursor = "0xd8d8d8" -text = "0x181818" - -[colors.normal] -black = "0x181818" -blue = "0x7cafc2" -cyan = "0x86c1b9" -green = "0xa1b56c" -magenta = "0xba8baf" -red = "0xab4642" -white = "0xd8d8d8" -yellow = "0xf7ca88" - -[colors.primary] -background = "0x000000" -foreground = "0xffffff" - diff --git a/config/fish/conf.d/fish-esp-idf.fish b/config/fish/conf.d/fish-esp-idf.fish deleted file mode 100755 index 6a9f210..0000000 --- a/config/fish/conf.d/fish-esp-idf.fish +++ /dev/null @@ -1,2 +0,0 @@ -alias get-idf 'source ~/.local/lib/esp/esp-idf/export.fish' -export IDF_TOOLS_PATH=$HOME/.local/lib/esp/.espressif/ diff --git a/config/fish/conf.d/fish-ls-aliases.fish b/config/fish/conf.d/fish-ls-aliases.fish deleted file mode 100755 index 4d5e3b9..0000000 --- a/config/fish/conf.d/fish-ls-aliases.fish +++ /dev/null @@ -1,9 +0,0 @@ -alias t="date" -alias ls="eza" -alias nyx="doas" -alias la="eza -alh" -alias nit="btop" -alias ff="fastfetch" -alias hypr="Hyprland" -alias reboot="doas reboot" -alias poweroff="doas poweroff" diff --git a/config/fish/conf.d/fish-ssh-agent.fish b/config/fish/conf.d/fish-ssh-agent.fish deleted file mode 100755 index 719087a..0000000 --- a/config/fish/conf.d/fish-ssh-agent.fish +++ /dev/null @@ -1,7 +0,0 @@ -if test -z "$SSH_ENV" - set -xg SSH_ENV $HOME/.ssh/environment -end - -if not __ssh_agent_is_started - __ssh_agent_start -end diff --git a/config/fish/config.fish b/config/fish/config.fish deleted file mode 100644 index 486ab1d..0000000 --- a/config/fish/config.fish +++ /dev/null @@ -1,4 +0,0 @@ -if status is-interactive - export GPG_TTY=$(tty) - # Commands to run in interactive sessions can go here -end diff --git a/config/fish/fish_variables b/config/fish/fish_variables deleted file mode 100644 index 819cb76..0000000 --- a/config/fish/fish_variables +++ /dev/null @@ -1,43 +0,0 @@ -# This file contains fish universal variable definitions. -# VERSION: 3.0 -SETUVAR __fish_initialized:3800 -SETUVAR fish_color_autosuggestion:707A8C -SETUVAR fish_color_cancel:\x2d\x2dreverse -SETUVAR fish_color_command:5CCFE6 -SETUVAR fish_color_comment:5C6773 -SETUVAR fish_color_cwd:73D0FF -SETUVAR fish_color_cwd_root:red -SETUVAR fish_color_end:ffaf00 -SETUVAR fish_color_error:FF3333 -SETUVAR fish_color_escape:95E6CB -SETUVAR fish_color_history_current:\x2d\x2dbold -SETUVAR fish_color_host:normal -SETUVAR fish_color_host_remote:\x1d -SETUVAR fish_color_keyword:\x1d -SETUVAR fish_color_match:F28779 -SETUVAR fish_color_normal:CBCCC6 -SETUVAR fish_color_operator:FFCC66 -SETUVAR fish_color_option:\x1d -SETUVAR fish_color_param:CBCCC6 -SETUVAR fish_color_quote:BAE67E -SETUVAR fish_color_redirection:D4BFFF -SETUVAR fish_color_search_match:\x2d\x2dbackground\x3dFFCC66 -SETUVAR fish_color_selection:\x2d\x2dbackground\x3dFFCC66 -SETUVAR fish_color_status:red -SETUVAR fish_color_user:brgreen -SETUVAR fish_color_valid_path:\x2d\x2dunderline -SETUVAR fish_greeting: -SETUVAR fish_key_bindings:fish_default_key_bindings -SETUVAR fish_pager_color_background:\x1d -SETUVAR fish_pager_color_completion:normal -SETUVAR fish_pager_color_description:B3A06D -SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline -SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan -SETUVAR fish_pager_color_secondary_background:\x1d -SETUVAR fish_pager_color_secondary_completion:\x1d -SETUVAR fish_pager_color_secondary_description:\x1d -SETUVAR fish_pager_color_secondary_prefix:\x1d -SETUVAR fish_pager_color_selected_background:\x2d\x2dbackground\x3d005D90 -SETUVAR fish_pager_color_selected_completion:\x1d -SETUVAR fish_pager_color_selected_description:\x1d -SETUVAR fish_pager_color_selected_prefix:\x1d diff --git a/config/fish/functions/__ssh_agent_is_started.fish b/config/fish/functions/__ssh_agent_is_started.fish deleted file mode 100755 index 7d481ee..0000000 --- a/config/fish/functions/__ssh_agent_is_started.fish +++ /dev/null @@ -1,14 +0,0 @@ -function __ssh_agent_is_started -d "check if ssh agent is already started" - if begin; test -f $SSH_ENV; and test -z "$SSH_AGENT_PID"; end - source $SSH_ENV > /dev/null - end - - if begin; test -z "$SSH_AGENT_PID"; and test -z "$SSH_CONNECTION"; end - return 1 - end - - ssh-add -l > /dev/null 2>&1 - if test $status -eq 2 - return 1 - end -end diff --git a/config/fish/functions/__ssh_agent_start.fish b/config/fish/functions/__ssh_agent_start.fish deleted file mode 100755 index 3766fe4..0000000 --- a/config/fish/functions/__ssh_agent_start.fish +++ /dev/null @@ -1,5 +0,0 @@ -function __ssh_agent_start -d "start a new ssh agent" - ssh-agent -c | sed 's/^echo/#echo/' > $SSH_ENV - chmod 600 $SSH_ENV - source $SSH_ENV > /dev/null -end diff --git a/config/fish/functions/fish_prompt.fish b/config/fish/functions/fish_prompt.fish deleted file mode 100755 index 6fd86b9..0000000 --- a/config/fish/functions/fish_prompt.fish +++ /dev/null @@ -1,10 +0,0 @@ -function fish_prompt - echo -n (set_color 00ffcf)(prompt_pwd)' ' - if fish_is_root_user - echo -n (set_color 8860ff)'FORCE ' - else - echo -n (set_color 00adff)'ORDER ' - end - echo -n (set_color ffffff)'> ' - set_color normal -end diff --git a/config/fish/functions/fish_right_prompt.fish b/config/fish/functions/fish_right_prompt.fish deleted file mode 100755 index 58db9a3..0000000 --- a/config/fish/functions/fish_right_prompt.fish +++ /dev/null @@ -1,126 +0,0 @@ -function fish_right_prompt - set -l cmd_status $status - if test $cmd_status -ne 0 - echo -n (set_color red)"err $cmd_status" - end - - if not command -sq git - set_color normal - return - end - - # Get the git directory for later use. - # Return if not inside a Git repository work tree. - if not set -l git_dir (command git rev-parse --git-dir 2>/dev/null) - set_color normal - return - end - - # Get the current action ("merge", "rebase", etc.) - # and if there's one get the current commit hash too. - set -l commit '' - if set -l action (fish_print_git_action "$git_dir") - set commit (command git rev-parse HEAD 2> /dev/null | string sub -l 7) - end - - # Get either the branch name or a branch descriptor. - set -l branch_detached 0 - if not set -l branch (command git symbolic-ref --short HEAD 2>/dev/null) - set branch_detached 1 - set branch (command git describe --contains --all HEAD 2>/dev/null) - end - - # Get the commit difference counts between local and remote. - command git rev-list --count --left-right 'HEAD...@{upstream}' 2>/dev/null \ - | read -d \t -l status_ahead status_behind - if test $status -ne 0 - set status_ahead 0 - set status_behind 0 - end - - # Get the stash status. - # (git stash list) is very slow. => Avoid using it. - set -l status_stashed 0 - if test -f "$git_dir/refs/stash" - set status_stashed 1 - else if test -r "$git_dir/commondir" - read -l commondir <"$git_dir/commondir" - if test -f "$commondir/refs/stash" - set status_stashed 1 - end - end - - set -l porcelain_status (command git status --porcelain 2>/dev/null | string sub -l2) - - set -l status_added 0 - if string match -qr '[ACDMT][ MT]|[ACMT]D' $porcelain_status - set status_added 1 - end - set -l status_deleted 0 - if string match -qr '[ ACMRT]D' $porcelain_status - set status_deleted 1 - end - set -l status_modified 0 - if string match -qr '[MT]$' $porcelain_status - set status_modified 1 - end - set -l status_renamed 0 - if string match -qe R $porcelain_status - set status_renamed 1 - end - set -l status_unmerged 0 - if string match -qr 'AA|DD|U' $porcelain_status - set status_unmerged 1 - end - set -l status_untracked 0 - if string match -qe '\?\?' $porcelain_status - set status_untracked 1 - end - - set_color -o - - if test -n "$branch" - if test $branch_detached -ne 0 - set_color brmagenta - else - set_color green - end - echo -n " $branch" - end - if test -n "$commit" - echo -n ' '(set_color yellow)"$commit" - end - if test -n "$action" - set_color normal - echo -n (set_color white)':'(set_color -o brred)"$action" - end - if test $status_ahead -ne 0 - echo -n ' '(set_color brmagenta)'ahead' - end - if test $status_behind -ne 0 - echo -n ' '(set_color brmagenta)'behind' - end - if test $status_stashed -ne 0 - echo -n ' '(set_color cyan)'stashed' - end - if test $status_added -ne 0 - echo -n ' '(set_color green)'added' - end - if test $status_deleted -ne 0 - echo -n ' '(set_color red)'deleted' - end - if test $status_modified -ne 0 - echo -n ' '(set_color blue)'modified' - end - if test $status_renamed -ne 0 - echo -n ' '(set_color magenta)'renamed' - end - if test $status_unmerged -ne 0 - echo -n ' '(set_color yellow)'unmerged' - end - if test $status_untracked -ne 0 - echo -n ' '(set_color white)'untracked' - end - - set_color normal -end \ No newline at end of file diff --git a/config/fish/functions/hashpass.fish b/config/fish/functions/hashpass.fish deleted file mode 100755 index 38a350a..0000000 --- a/config/fish/functions/hashpass.fish +++ /dev/null @@ -1,5 +0,0 @@ -function hashpass - read -s password - set -f hash (printf $password | sha256sum | cut -d " " -f 1 | xxd -r -p | base64 | cut -b 32-) - printf "C7c$hash" | wl-copy -end diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf deleted file mode 100644 index d2ad8c9..0000000 --- a/config/hypr/hyprland.conf +++ /dev/null @@ -1,185 +0,0 @@ -# Repo: github.com/Nyxvectar/dotfiles. # -# Created by github@'Nyxvectar' # -# Under MIT License, free to use. # -# Maybe you need to edit the apply.sh. # - -monitor = DP-1,2560x1080@75,0x0,1 -monitor = HDMI-A-1,2560x1080@120,0x1080,1 -# TODO: Update to hyprland 50.0 and update to monitorv2 - -env = XDG_CURRENT_DESKTOP, Hyprland -env = WLR_DRM_NO_ATOMIC,1 - -xwayland { - force_zero_scaling = true -} - -input { - kb_layout = us - follow_mouse = 1 - touchpad { - natural_scroll = yes - } - tablet { - region_position = 1080 540 - region_size = 2160 1080 - } - numlock_by_default = true - sensitivity = 0 - accel_profile = flat -} - -general { - gaps_in = 1 - gaps_out = 3 - border_size = 2 - layout = dwindle - allow_tearing = true - col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg - col.inactive_border = rgba(595959aa) rgba(727272aa) 45deg -} - -decoration { - rounding = 12 - blur { - enabled = true - size = 0 - passes = 0 - contrast = 2 - } -} - -animations { - enabled = true - bezier = customize, 0.05, 0.8, 0.1, 1.05 - animation = windowsMove, 1, 7, customize - animation = windowsIn, 1, 3, default, popin 90% - animation = windowsOut, 1, 2, default, popin 95% - animation = border, 1, 3, default - animation = fade, 1, 3, default - animation = workspaces, 1, 5, default -} - -dwindle { - pseudotile = yes - preserve_split = true - split_width_multiplier = 1.4 -} - -misc { - mouse_move_enables_dpms = true - key_press_enables_dpms = true -} - -# Layer Rules -layerrule = blur, notifications -layerrule = ignorezero, notifications -layerrule = blur, launcher -layerrule = ignorezero, launcher - -# Window Rules -windowrulev2 = float,class:(steam) # Steam Popups -windowrulev2 = float,title:(Fcitx Configuration) # Fcitx Config -windowrulev2 = float,class:(org.gnome.Nautilus) # Nautilus Popups -windowrulev2 = float,class:(firefox),title:(Library) # Firefox Popups -windowrulev2 = float,class:(mpv) # MPV Popups -windowrulev2 = float, class:^(jetbrains-.*),title:^(win.*) -windowrulev2 = noinitialfocus, opacity 0.8 0.8, class:^(jetbrains-.*) -windowrulev2 = opacity 1 0.90, class:(Alacritty) -windowrulev2 = opacity 0.95 0.90, class:(code) -windowrulev2 = opacity 0.98 0.95, class:(wechat) -windowrulev2 = opacity 1 0.98, class:(firefox) - -$mainMod = Super - -# Function Key bindings -bind = ,xf86audiolowervolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05- -bind = ,xf86audioraisevolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05+ -bind = ,xf86audiomute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle - -# Hyprland hotkeys for normal applications -bind = $mainMod, D, killactive, -bind = $mainMod, A, exec, alacritty -bind = $mainMod, W, exec, nautilus --new-window -bind = $mainMod, V, togglefloating, -bind = $mainMod, Q, exec, rofi -show drun -bind = $mainMod, R, exec, kitty -bind = $mainMod, F, fullscreen -bind = $mainMod, T, exec, firefox -bind = $mainMod, M, exec, hyprlock -bind = $mainMod, P, togglesplit -bind = $mainMod SHIFT, D, exec, discord -bind = $mainMod SHIFT, T, exec, telegram-desktop -bind = $mainMod SHIFT, R, exec, element-desktop -bind = $mainMod SHIFT, A, exec, wechat -bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" - | wl-copy - -# Exit or restart -bind = $mainMod SHIFT, H, exit -bind = $mainMod SHIFT, W, exec, killall .waybar-wrapped; waybar - -# Windows resize -bind = $mainMod, LEFT, resizeactive,-40 0 -bind = $mainMod, RIGHT, resizeactive,40 0 -bind = $mainMod, UP, resizeactive,0 -40 -bind = $mainMod, DOWN, resizeactive,0 40 -binds { - workspace_back_and_forth = false - allow_workspace_cycles = true -} - -# Bind the certain workspace to a monitor -workspace = 1,monitor:DP-1 -workspace = 2,monitor:DP-1 -workspace = 3,monitor:DP-1 -workspace = 4,monitor:DP-1 -workspace = 5,monitor:DP-1 -workspace = 6,monitor:HDMI-A-1 -workspace = 7,monitor:HDMI-A-1 -workspace = 8,monitor:HDMI-A-1 -workspace = 9,monitor:HDMI-A-1 -workspace = 10,monitor:HDMI-A-1 - -# Workspaces and windows focuses -bind = $mainMod, N, workspace, e-1 -bind = $mainMod, I, workspace, e+1 -bind = $mainMod, 1, workspace, 1 -bind = $mainMod, 2, workspace, 2 -bind = $mainMod, 3, workspace, 3 -bind = $mainMod, 4, workspace, 4 -bind = $mainMod, 5, workspace, 5 -bind = $mainMod, 6, workspace, 6 -bind = $mainMod, 7, workspace, 7 -bind = $mainMod, 8, workspace, 8 -bind = $mainMod, 9, workspace, 9 -bind = $mainMod, 0, workspace, 10 -bind = $mainMod SHIFT, 1, movetoworkspace, 1 -bind = $mainMod SHIFT, 2, movetoworkspace, 2 -bind = $mainMod SHIFT, 3, movetoworkspace, 3 -bind = $mainMod SHIFT, 4, movetoworkspace, 4 -bind = $mainMod SHIFT, 5, movetoworkspace, 5 -bind = $mainMod SHIFT, 6, movetoworkspace, 6 -bind = $mainMod SHIFT, 7, movetoworkspace, 7 -bind = $mainMod SHIFT, 8, movetoworkspace, 8 -bind = $mainMod SHIFT, 9, movetoworkspace, 9 -bind = $mainMod SHIFT, 0, movetoworkspace, 10 -bind = $mainMod SHIFT, N, movetoworkspace, e-1 -bind = $mainMod SHIFT, I, movetoworkspace, e+1 -bind = $mainMod, mouse_down, workspace, e+1 -bind = $mainMod, mouse_up, workspace, e-1 -bind = $mainMod, L, movefocus, l -bind = $mainMod, Y, movefocus, r -bind = $mainMod, U, focusmonitor, u -bind = $mainMod, E, focusmonitor, d -bind = $mainMod, TAB, workspace, previous -bindm = $mainMod, mouse:272, movewindow -bindm = $mainMod, mouse:273, resizewindow - -# Hyprcursor -env = HYPRCURSOR_THEME,rose-pine-hyprcursor -exec = hyprctl setcursor rose-pine-hyprcursor 24 - -# Auto starts -exec-once = hyprpaper -exec-once = waybar -exec-once = fcitx5 diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf deleted file mode 100755 index f33dce3..0000000 --- a/config/hypr/hyprlock.conf +++ /dev/null @@ -1,61 +0,0 @@ -# BACKGROUND -background { - monitor = - path = ~/host/Pictures/ACG/Arknights/Shu/wallpaper.7.jpg - blur_passes = 1 - contrast = 1 - brightness = 0.5 -} - -# GENERAL -general { - disable_loading_bar = true -} - -# INPUT FIELD -input-field { - monitor = - rounding = 10 - size = 230, 38 - outline_thickness = 2 - dots_size = 0.4 #[0.2, 0.8] - dots_spacing = 0.2 #[0.0, 1.0] - dots_center = true - dots_rounding = 5 - outer_color = rgb(1e1e1e) - inner_color = rgb(3c3c3c) - font_color = rgb(dddddd) - fade_on_empty = true - fade_timeout = 1000 - capslock_color = rgb(ff6c00) - numlock_color = rgb(000000) - placeholder_text = - hide_input = false - position = 0, 150 - halign = center - valign = bottom -} - -# Hour-Time -label { - monitor = - text = cmd[update:1000] echo -e "$(date +"%H")" - color = rgb(ff6c00) - font_family = Ubuntu Sans Mono Bold - font_size = 200 - position = 0, 240 - halign = center - valign = center -} - -# Minute-Time -label { - monitor = - text = cmd[update:1000] echo -e "$(date +"%M")" - color = $onSurface - font_family = Ubuntu Sans Mono Bold - font_size = 200 - position = 0, 15 - halign = center - valign = center -} diff --git a/config/hypr/hyprpaper.conf b/config/hypr/hyprpaper.conf deleted file mode 100755 index 3357101..0000000 --- a/config/hypr/hyprpaper.conf +++ /dev/null @@ -1,4 +0,0 @@ -preload = ~/host/Pictures/defaultPaper_Monitor_1.jpg -preload = ~/host/Pictures/defaultPaper_Monitor_2.jpg -wallpaper = DP-1,~/host/Pictures/defaultPaper_Monitor_1.jpg -wallpaper = HDMI-A-1,~/host/Pictures/defaultPaper_Monitor_2.jpg diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf deleted file mode 100755 index 20fab4b..0000000 --- a/config/kitty/kitty.conf +++ /dev/null @@ -1,63 +0,0 @@ -# Performance -repaint_delay 6 -input_delay 1 -sync_to_monitor no - -# Font settings -font_family Ubuntu Sans Mono -font_features thin -bold_font auto -italic_font auto -bold_italic_font auto -font_size 18 -disable_ligatures never -adjust_line_height 1 - -# Mouse -copy_on_select yes -strip_trailing_spaces always - -# Cursor -cursor_shape block -cursor_blink_interval 0 - -# Window layout -window_border_width 1px -hide_window_decorations yes - -# Bell -enable_audio_bell no -window_alert_on_bell yes -bell_on_tab no - -# Advance -shell_integration enabled no-cursor -update_check_interval 0 -background_opacity 0.9 - -active_tab_font_style bold -inactive_tab_font_style normal - -background #000000 -foreground #ffffff -cursor #bbbbbb -selection_background #b5d5ff -color0 #000000 -color8 #545454 -color1 #ff5555 -color9 #ff5555 -color2 #55ff55 -color10 #55ff55 -color3 #ffff55 -color11 #ffff55 -color4 #5555ff -color12 #5555ff -color5 #ff55ff -color13 #ff55ff -color6 #55ffff -color14 #55ffff -color7 #bbbbbb -color15 #ffffff -selection_foreground #000000 - -# END_KITTY_THEME diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi deleted file mode 100755 index 7fde4bf..0000000 --- a/config/rofi/config.rasi +++ /dev/null @@ -1,102 +0,0 @@ -* { - font: "LXGW WenKai 18px"; - g-spacing: 10px; - g-margin: 0; - b-color: #000000FF; - fg-color: #FFFFFFFF; - fgp-color: #888888FF; - b-radius: 8px; - g-padding: 8px; - hl-color: #FFFFFFFF; - hlt-color: #000000FF; - alt-color: #111111FF; - wbg-color: #000000CC; - w-border: 2px solid; - w-border-color: #FFFFFFFF; - w-padding: 12px; -} - -configuration { - modi: "drun"; - show-icons: true; - display-drun: "execute: "; -} - -listview { - columns: 1; - lines: 7; - fixed-height: true; - fixed-columns: true; - cycle: false; - scrollbar: false; - border: 0px solid; -} - -window { - transparency: "real"; - width: 700px; - location: 4; - border-radius: 20px; - background-color: @wbg-color; - border: @w-border; - border-color: @w-border-color; - padding: @w-padding; -} - -prompt { - text-color: @fg-color; -} - -inputbar { - children: ["prompt", "entry"]; - spacing: @g-spacing; -} - -entry { - placeholder: "Search Apps"; - text-color: @fg-color; - placeholder-color: @fgp-color; -} - -mainbox { - spacing: @g-spacing; - margin: @g-margin; - padding: @g-padding; - children: ["listview", "inputbar", "message"]; -} - -element { - spacing: @g-spacing; - margin: @g-margin; - padding: @g-padding; - border: 0px solid; - border-radius: @b-radius; - border-color: @b-color; - background-color: transparent; - text-color: @fg-color; -} - -element normal.normal { - background-color: transparent; - text-color: @fg-color; -} - -element alternate.normal { - background-color: @alt-color; - text-color: @fg-color; -} - -element selected.active { - background-color: @hl-color; - text-color: @hlt-color; -} - -element selected.normal { - background-color: @hl-color; - text-color: @hlt-color; -} - -message { - background-color: red; - border: 0px solid; -} diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc deleted file mode 100755 index f244ec5..0000000 --- a/config/waybar/config.jsonc +++ /dev/null @@ -1,84 +0,0 @@ -{ - "layer": "top", - "position": "top", - "spacing": 8, - "margin-top": 4, - "margin-left": 8, - "margin-right": 8, - "margin-bottom": 0, - "height": 36, - "modules-left": [ - "hyprland/window", - "network" - ], - "modules-center": [ - "hyprland/workspaces" - ], - "modules-right": [ - "tray", - "pulseaudio", - "memory", - "cpu", - "clock" - ], - "hyprland/workspaces": { - "format": "{icon}", - "persistent-workspaces": { - "*": 5 - }, - "on-click": "activate", - "on-scroll-up": "hyprctl dispatch workspace e+1", - "on-scroll-down": "hyprctl dispatch workspace e-1" - }, - "hyprland/window": { - "format": "\uf105 {initialTitle}", - "separate-outputs": true - }, - "tray": { - "icon-size": 21, - "spacing": 10 - }, - "clock": { - "interval": 1, - "format": "\uf133 {:%H:%M %b %d, %Y}" - }, - "cpu": { - "interval": 1, - "format": "\uf2db {usage:1}%", - "tooltip": true - }, - "memory": { - "interval": 1, - "format": "\uefc5 {used:0.1f}G", - "tooltip": true, - "tooltip-format": " RAM: {used:0.2f}G / {total:0.2f}G\nSwap: {swapUsed:0.2f}G / {swapTotal:0.2f}G" - }, - "network": { - "interval": 1, - "format-wifi": " {essid} ({signalStrength}%)", - "format-ethernet": " ↓{bandwidthDownBits} ↑{bandwidthUpBits}", - "format-linked": " No IP ({ifname})", - "format-disconnected": " Disconnected", - "tooltip-format": " {ifname} {ipaddr}/{cidr} via {gwaddr}", - "format-alt": " {ifname}: {ipaddr}/{cidr} ↓{bandwidthDownBits} ↑{bandwidthUpBits}" - }, - "pulseaudio": { - "scroll-step": 5, - "format": "{icon} {volume:2}%", - "format-muted": "\uf026 MUTED", - "format-bluetooth": "{icon}\uf294 {volume}%", - "format-bluetooth-muted": "\uf026 MUTED", - "format-icons": { - "default": [ - "\uf027", - "\uf028", - "\uf028" - ] - }, - "on-click-right": "pavucontrol", - "ignored-sinks": [ - "AudioRelay Virtual Sink", - "Recorder Sink" - ] - } -} diff --git a/config/waybar/style.css b/config/waybar/style.css deleted file mode 100755 index 4ecf322..0000000 --- a/config/waybar/style.css +++ /dev/null @@ -1,122 +0,0 @@ -* { - text-shadow: none; - font-family: "LXGW WenKai"; - font-weight: 500; - font-size: 16px; -} - -window#waybar { - background-color: transparent; -} - -.modules-left { - border-radius: 100px; - background-color: rgba(18, 18, 18, 1.0); - padding: 0 8px; -} - -.modules-center { - border-radius: 100px; - background-color: rgba(18, 18, 18, 1.0); -} - -.modules-right { - border-radius: 100px; - background-color: rgba(18, 18, 18, 1.0); - padding: 0 8px; -} - -tooltip { - background-color: rgba(18, 18, 18, 1.0); - border: 2px solid rgba(34, 34, 34, 0.5); - border-radius: 15px; - font-size: 18px; -} - -#clock, -#cpu, -#memory, -#network, -#pulseaudio, -#tray, -#mode, -#window, -#workspaces { - margin-top: 0px; - margin-bottom: 0px; - padding: 0px 6px 0px 6px; - background-color: transparent; -} - -#workspaces { - padding: 4px 12px; - - transition-property: background, color, border; - transition-duration: 0.2s; -} - -#workspaces button { - border: none; - border-radius: 0px; - padding: 0px 0px; - background: transparent; - color: #ffffff; - margin: 0 4px; - min-width: 24px; - - transition-property: background, color, border, margin, padding; - transition-duration: 0.2s; -} - -#workspaces button:hover { - color: rgba(255, 255, 255, 0.5); -} - -#workspaces button.empty { - color: rgba(255, 255, 255, 0.25); -} - -#workspaces button.active { - color: #ffffff; - border-bottom: 3px solid #ffffff; - margin-bottom: 1px; -} - -#workspaces button.urgent { - color: #eb4d4b; - border-bottom: 3px solid #eb4d4b; -} - -#mode { - background-color: #64727D; - border-bottom: 3px solid #ffffff; -} - -#clock { - color: #ffffff; -} - -#cpu { - color: #ffffff; -} - -#memory { - color: #ffffff; -} - -#pulseaudio { - color: #ffffff; -} - -#network { - color: #ffffff; -} - -#tray { - color: transparent; -} - -#window { - color: #ffffff; - margin-left: 4px; -} \ No newline at end of file diff --git a/home/home.nix b/home/home.nix index 6fba0c6..bcfb660 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1,6 +1,5 @@ -# Repo: github.com/Nyxvectar/dotfiles # +# By Nyxvectar Yan # # Under the MIT LICENSE, free to use. # -# Created by Nyxvectar Yan on GitHub. # { config, @@ -14,14 +13,14 @@ home.stateVersion = "25.05"; home.enableNixpkgsReleaseCheck = false; imports = [ - ./pkgs.nix - ./vscode/vscode.nix ./alacritty/alacritty.nix + ./fish/fish.nix + ./git/git.nix + ./hypr/hypr.nix ./kitty/kitty.nix + ./pkgs.nix ./rofi/rofi.nix - ./git/git.nix + ./vscode/vscode.nix ./waybar/waybar.nix - ./fish/fish.nix - ./hypr/hypr.nix ]; } \ No newline at end of file