diff --git a/darwin/profiles/common/opt-in/clash-meta-client.nix b/darwin/profiles/common/opt-in/mihomo.nix similarity index 100% rename from darwin/profiles/common/opt-in/clash-meta-client.nix rename to darwin/profiles/common/opt-in/mihomo.nix diff --git a/darwin/profiles/desktop/home/default.nix b/darwin/profiles/desktop/home/default.nix index 2e011c0..348968a 100644 --- a/darwin/profiles/desktop/home/default.nix +++ b/darwin/profiles/desktop/home/default.nix @@ -5,19 +5,10 @@ ... }: { imports = map (n: ../../../../home/applications/${n}) [ - # Terminal "alacritty" - - # Editor - "neovim" - "vscode" - - # Language - "nix" "go" - - # Media "mpv" + "nix" ]; # Install MacOS applications to the user Applications folder. Also update Docked applications @@ -46,15 +37,6 @@ programs = let monospace = "JetBrainsMono Nerd Font"; in { - ### VSCode - vscode.userSettings.editor.fontFamily = monospace; - - ### Alacritty - alacritty.settings.font = { - normal.family = monospace; - bold.family = monospace; - bold_italic.family = monospace; - italic.family = monospace; - }; + alacritty.settings.font.normal.family = monospace; }; } diff --git a/home/applications/alacritty/default.nix b/home/applications/alacritty/default.nix index 4220518..8f03ee8 100644 --- a/home/applications/alacritty/default.nix +++ b/home/applications/alacritty/default.nix @@ -6,8 +6,18 @@ programs.alacritty = { enable = true; settings = { - env.WINIT_X11_SCALE_FACTOR = "1"; # workaround for scaling in X11 - window.option_as_alt = lib.mkIf pkgs.stdenv.hostPlatform.isDarwin "Both"; # for zellij on macOS + import = [ + "${pkgs.vimPlugins.tokyonight-nvim}/extras/alacritty/tokyonight_night.toml" + ]; + + cursor.style = "beam"; + font.size = 10; + + # workaround for scaling in X11 + env.WINIT_X11_SCALE_FACTOR = "1"; + + # for zellij on macOS + window.option_as_alt = lib.mkIf pkgs.stdenv.hostPlatform.isDarwin "Both"; }; }; } diff --git a/home/applications/blackbox-terminal/default.nix b/home/applications/blackbox-terminal/default.nix deleted file mode 100644 index c6b6bc9..0000000 --- a/home/applications/blackbox-terminal/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - lib, - pkgs, - ... -}: { - home.packages = [pkgs.blackbox-terminal]; - - # classic... dconf - dconf.settings."com/raggesilver/BlackBox" = { - pretty = false; # "Theme Integration" - cursor-shape = lib.hm.gvariant.mkUint32 1; # "line" cursor - #show-headerbar = false; - terminal-padding = lib.hm.gvariant.mkTuple [ - (lib.hm.gvariant.mkUint32 12) - (lib.hm.gvariant.mkUint32 12) - (lib.hm.gvariant.mkUint32 12) - (lib.hm.gvariant.mkUint32 12) - ]; - }; - - # TODO: Tokyo Night - # Example: - #'' - # { - # "name": "Gruvbox for Tilix", - # "comment": "Ported for Trilix Colour Scheme", - # "use-theme-colors": false, - # "foreground-color": "#ebdbb2", - # "background-color": "#282828", - # "palette": [ - # "#282829", - # "#cc241d", - # "#98971a", - # "#d79921", - # "#458588", - # "#b16286", - # "#689d6a", - # "#a89984", - # "#928374", - # "#fb4934", - # "#b8bb26", - # "#fabd2f", - # "#83a598", - # "#d3869b", - # "#8ec07c", - # "#ebdbb2" - # ] - # } - #''; -} diff --git a/home/applications/bspwm/default.nix b/home/applications/bspwm/default.nix deleted file mode 100644 index 9a65b33..0000000 --- a/home/applications/bspwm/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{pkgs, ...}: { - imports = [ - ../common/wm.nix - ../dunst - ../picom - ../polybar - ../rofi - ../sxhkd - ../udiskie - ]; - - home.packages = with pkgs; [flameshot feh]; - - xsession = { - enable = true; - windowManager.bspwm = { - enable = true; - startupPrograms = [ - "pgrep -x sxhkd > /dev/null || sxhkd" - "pgrep -x feh > /dev/null || feh --no-fehbg --bg-fill ~/.local/share/backgrounds/Minato-Aqua-Dark.png" - ]; - monitors = { - eDP-1 = ["I" "II" "III" "IV" "V" "VI" "VII" "VIII" "IX" "X"]; - }; - settings = { - border_width = 2; - window_gap = 4; - focus_follows_pointer = true; - split_ratio = 0.52; - borderless_monocle = true; - gapless_monocle = true; - }; - }; - }; - - home.file.".xinitrc".text = '' - #!/usr/bin/env bash - - userresources=$HOME/.Xresources - usermodmap=$HOME/.Xmodmap - sysresources=/etc/X11/xinit/.Xresources - sysmodmap=/etc/X11/xinit/.Xmodmap - - # merge in defaults and keymaps - if [ -f $sysresources ]; then - xrdb -merge $sysresources - fi - - if [ -f $sysmodmap ]; then - xmodmap $sysmodmap - fi - - if [ -f "$userresources" ]; then - xrdb -merge "$userresources" - - fi - - if [ -f "$usermodmap" ]; then - xmodmap "$usermodmap" - fi - - # start some nice programs - if [ -d /etc/X11/xinit/xinitrc.d ] ; then - for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do - [ -x "$f" ] && . "$f" - done - unset f - fi - - # https://wiki.archlinux.org/title/Cursor_themes#Change_X_shaped_default_cursor - xsetroot -cursor_name left_ptr - - exec bspwm - ''; -} diff --git a/home/applications/chromium/default.nix b/home/applications/chromium/default.nix deleted file mode 100644 index f5916ad..0000000 --- a/home/applications/chromium/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - programs.chromium = { - enable = true; - #package = pkgs.ungoogled-chromium; - # ungoogled-chrome does not work with extensions for now - # https://github.com/nix-community/home-manager/issues/2216 - # https://github.com/nix-community/home-manager/issues/2585 - extensions = [ - {id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";} # ublock origin - {id = "mnjggcdmjocbbbhaepdhchncahnbgone";} # sponsorblock - {id = "icallnadddjmdinamnolclfjanhfoafe";} # fastforward - {id = "dbepggeogbaibhgnhhndojpepiihcmeb";} # vimium - {id = "nngceckbapebfimnlniiiahkandclblb";} # bitwarden - {id = "gebbhagfogifgggkldgodflihgfeippi";} # return youtube dislike - {id = "eimadpbcbfnmbkopoojfekhnkhdbieeh";} # dark reader - {id = "njdfdhgcmkocbgbhcioffdbicglldapd";} # localcdn - {id = "hipekcciheckooncpjeljhnekcoolahp";} # tabliss - {id = "bgfofngpplpmpijncjegfdgilpgamhdk";} # modern scrollbar - {id = "ajhmfdgkijocedmfjonnpjfojldioehi";} # privacy pass - {id = "hkgfoiooedgoejojocmhlaklaeopbecg";} # picture in picture - #{id = "fnaicdffflnofjppbagibeoednhnbjhg";} # floccus bookmark sync - #{id = "jaoafjdoijdconemdmodhbfpianehlon";} # skip redirect - #{id = "dhdgffkkebhmkfjojejmpbldmpobfkfo";} # tampermonkey - #{id = "jinjaccalgkegednnccohejagnlnfdag";} # violentmonkey - #{id = "kdbmhfkmnlmbkgbabkdealhhbfhlmmon";} # steamdb - #{id = "cmeakgjggjdlcpncigglobpjbkabhmjl";} # steam inventory helper - #{id = "mgijmajocgfcbeboacabfgobmjgjcoja";} # google dictionary - #{id = "kbfnbcaeplbcioakkpcpgfkobkghlhen";} # grammarly - #{id = "ekbmhggedfdlajiikminikhcjffbleac";} # 喵喵折+ - ]; - }; -} diff --git a/home/applications/dunst/default.nix b/home/applications/dunst/default.nix deleted file mode 100644 index 02606f8..0000000 --- a/home/applications/dunst/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - config, - pkgs, - ... -}: { - services.dunst = { - enable = true; - settings = lib.mkMerge [ - { - global = { - padding = 10; - horizontal_padding = 10; - frame_width = 2; - font = "Monospace 10"; - icon_path = "/home/guanranwang/.local/share/icons/dunst"; - corner_radius = 10; - - max_icon_size = 128; # weird bug, default value (128) not working - }; - } - (lib.mkIf (config.myFlake.home-manager.colorScheme == "tokyonight") - (builtins.fromTOML (builtins.readFile "${pkgs.vimPlugins.tokyonight-nvim}/extras/dunst/tokyonight_night.dunstrc"))) - ]; - }; - - xdg.dataFile."icons/dunst" = { - source = ./dunst; - recursive = true; - }; -} diff --git a/home/applications/dunst/dunst/battery-alert.png b/home/applications/dunst/dunst/battery-alert.png deleted file mode 100644 index 2570bf6..0000000 Binary files a/home/applications/dunst/dunst/battery-alert.png and /dev/null differ diff --git a/home/applications/dunst/dunst/battery-charging.png b/home/applications/dunst/dunst/battery-charging.png deleted file mode 100644 index 7892afd..0000000 Binary files a/home/applications/dunst/dunst/battery-charging.png and /dev/null differ diff --git a/home/applications/dunst/dunst/battery.png b/home/applications/dunst/dunst/battery.png deleted file mode 100644 index fc2abad..0000000 Binary files a/home/applications/dunst/dunst/battery.png and /dev/null differ diff --git a/home/applications/dunst/dunst/volume-high.png b/home/applications/dunst/dunst/volume-high.png deleted file mode 100644 index cebb5dc..0000000 Binary files a/home/applications/dunst/dunst/volume-high.png and /dev/null differ diff --git a/home/applications/dunst/dunst/volume-minus.png b/home/applications/dunst/dunst/volume-minus.png deleted file mode 100644 index ea750d7..0000000 Binary files a/home/applications/dunst/dunst/volume-minus.png and /dev/null differ diff --git a/home/applications/dunst/dunst/volume-mute.png b/home/applications/dunst/dunst/volume-mute.png deleted file mode 100644 index bb8a88b..0000000 Binary files a/home/applications/dunst/dunst/volume-mute.png and /dev/null differ diff --git a/home/applications/dunst/dunst/volume-off.png b/home/applications/dunst/dunst/volume-off.png deleted file mode 100644 index c0d8925..0000000 Binary files a/home/applications/dunst/dunst/volume-off.png and /dev/null differ diff --git a/home/applications/dunst/dunst/volume-plus.png b/home/applications/dunst/dunst/volume-plus.png deleted file mode 100644 index 46081b5..0000000 Binary files a/home/applications/dunst/dunst/volume-plus.png and /dev/null differ diff --git a/home/applications/dunst/dunst/volume-source.png b/home/applications/dunst/dunst/volume-source.png deleted file mode 100644 index a964829..0000000 Binary files a/home/applications/dunst/dunst/volume-source.png and /dev/null differ diff --git a/home/applications/fastfetch/default.nix b/home/applications/fastfetch/default.nix deleted file mode 100644 index 8123d8c..0000000 --- a/home/applications/fastfetch/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{pkgs, ...}: { - home.packages = [pkgs.fastfetch]; -} diff --git a/home/applications/fish/default.nix b/home/applications/fish/default.nix index 76ce7fa..cb1ee57 100644 --- a/home/applications/fish/default.nix +++ b/home/applications/fish/default.nix @@ -1,15 +1,9 @@ -{ - pkgs, - config, - lib, - ... -}: { +{pkgs, ...}: { programs.fish = { enable = true; interactiveShellInit = '' set fish_greeting - ${lib.strings.optionalString (config.myFlake.home-manager.colorScheme == "tokyonight") - "source ${pkgs.vimPlugins.tokyonight-nvim}/extras/fish/tokyonight_night.fish"} + source ${pkgs.vimPlugins.tokyonight-nvim}/extras/fish/tokyonight_night.fish ''; plugins = [ { diff --git a/home/applications/foot/default.nix b/home/applications/foot/default.nix deleted file mode 100644 index 169e275..0000000 --- a/home/applications/foot/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - programs.foot.enable = true; -} diff --git a/home/applications/gnome/default.nix b/home/applications/gnome/default.nix deleted file mode 100644 index e0b85e3..0000000 --- a/home/applications/gnome/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -# why is this placed in ./wm -{pkgs, ...}: { - home.packages = - (with pkgs.gnomeExtensions; [ - # GNOME extensions - arcmenu - appindicator - blur-my-shell - caffeine - dash-to-panel - dash-to-dock - gamemode # outdated - just-perfection - kimpanel - ]) - ++ (with pkgs.gnome; [ - gnome-tweaks - gnome-software - gnome-shell-extensions - ]); -} diff --git a/home/applications/go/default.nix b/home/applications/go/default.nix index c1e979a..b7663fc 100644 --- a/home/applications/go/default.nix +++ b/home/applications/go/default.nix @@ -5,15 +5,11 @@ }: { programs.go.enable = true; home.packages = with pkgs; [ - gopls # lsp - delve # debugger - go-tools # linter and static analysis + gopls + delve + go-tools ]; - ### VSCode - programs.vscode.extensions = with pkgs.vscode-extensions; [golang.go]; - # Make Go follow XDG - # "$HOME/go"... xdg.configFile = { "go/env".text = '' GOPATH=${config.xdg.cacheHome}/go diff --git a/home/applications/helix/default.nix b/home/applications/helix/default.nix deleted file mode 100644 index a8f2fc4..0000000 --- a/home/applications/helix/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - config, - lib, - ... -}: { - programs.helix = { - enable = true; - # defaultEditor = true; - settings = { - theme = - lib.mkIf (config.myFlake.home-manager.colorScheme == "tokyonight") - "tokyonight"; - editor = { - cursor-shape = { - insert = "bar"; - normal = "block"; - select = "underline"; - }; - statusline.mode = { - normal = "--NORMAL--"; - insert = "--INSERT--"; - select = "--SELECT--"; - }; - soft-wrap.enable = true; - indent-guides.render = true; - file-picker.hidden = false; - }; - # i still use these keybinds sometimes, 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/home/applications/hyprland/default.nix b/home/applications/hyprland/default.nix deleted file mode 100644 index 19ad28e..0000000 --- a/home/applications/hyprland/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - #inputs, - lib, - ... -}: { - imports = [ - ../common/wayland.nix - ../common/wm.nix - ../cliphist - ../dunst - ../rofi - ../swayidle - ../swaylock - ../swww - ../udiskie - ../waybar - ]; - - home.sessionVariables = { - QT_IM_MODULE = lib.mkForce "wayland"; # use text-input-v2 - GTK_IM_MODULE = lib.mkForce "wayland"; # use text-input-v3 - }; - - wayland.windowManager.hyprland = { - enable = true; - #plugins = with inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}; [ - # csgo-vulkan-fix - #]; - - extraConfig = '' - source = ~/.config/hypr/main.conf - source = ~/.config/hypr/keybinds.conf - source = ~/.config/hypr/autostart.conf - ''; - }; - - xdg.configFile."hypr" = { - source = ./hypr; - recursive = true; - }; -} diff --git a/home/applications/hyprland/hypr/autostart.conf b/home/applications/hyprland/hypr/autostart.conf deleted file mode 100644 index 58b967d..0000000 --- a/home/applications/hyprland/hypr/autostart.conf +++ /dev/null @@ -1,2 +0,0 @@ -exec-once = swww init -exec-once = waybar diff --git a/home/applications/hyprland/hypr/hyprpaper.conf b/home/applications/hyprland/hypr/hyprpaper.conf deleted file mode 100644 index a5a2192..0000000 --- a/home/applications/hyprland/hypr/hyprpaper.conf +++ /dev/null @@ -1,2 +0,0 @@ -preload = /usr/share/backgrounds/odin-dark.jpg -wallpaper = eDP-1, /usr/share/backgrounds/odin-dark.jpg diff --git a/home/applications/hyprland/hypr/keybinds.conf b/home/applications/hyprland/hypr/keybinds.conf deleted file mode 100644 index 3272c18..0000000 --- a/home/applications/hyprland/hypr/keybinds.conf +++ /dev/null @@ -1,118 +0,0 @@ -# bind vars -$wp = ~/.local/bin/wrapped-swww -$dwp = ~/.local/bin/wrapped-mpvpaper -$changevolume = ~/.local/bin/wrapped-pamixer -$changebrightness = ~/.local/bin/wrapped-brightnessctl -$screenshot = ~/.local/bin/screenshot -$video_path = ~/.var/app/com.valvesoftware.Steam/data/Steam/steamapps/workshop/content/431960 - -# binds -bind = SUPER, return, exec, alacritty -bind = SUPER, E, exec, xdg-open ~ -bind = SUPER, W, exec, xdg-open http: -bind = CONTROL SHIFT, Escape, exec, gnome-system-monitor - -bind = ALT, R, exec, zenity --width 500 --entry | wl-copy -bind = SUPER, Backspace, exec, swaylock - -bind = SUPER, F, fullscreen, 0 -bind = SUPER SHIFT, F, fullscreen, 1 - -bind = SUPER, Q, killactive -bind = CONTROL SUPER SHIFT, Q, exec, hyprctl kill -bind = SUPER SHIFT, R, exec, pkill waybar; waybar -bind = CONTROL ALT, delete, exit, - -# rofi / application launcher -bind = SUPER, D, exec, rofi -show drun -show-icons -icon-theme Tela-dracula-dark -bind = SUPER SHIFT, D, exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy -bind = SUPER, Period, exec, rofi -modi emoji -show emoji -bind = SUPER SHIFT, L, exec, rofi -modi "power-menu:rofi-power-menu --confirm=reboot/shutdown" -show power-menu - -# screenshot -bind = ,Print, exec, $screenshot fullscreen -bind = SUPER SHIFT, S, exec, $screenshot region -bind = ALT SHIFT, S, exec, $screenshot swappy - -# wallpaper switching -bind = SHIFT ALT, 1, exec, $wp /usr/share/backgrounds/odin.jpg # pkg: elementary-wallpapers -bind = SHIFT ALT, 2, exec, $wp /usr/share/backgrounds/odin-dark.jpg -bind = SHIFT ALT, 3, exec, $wp ~/.local/share/backgrounds/Mojave\ Night.jpg -bind = SHIFT ALT, 4, exec, $wp ~/.local/share/backgrounds/wallpaper2.jpg -bind = SHIFT ALT, 5, exec, $wp ~/.local/share/backgrounds/wallpaper3.jpg -bind = SHIFT ALT, 6, exec, $wp ~/.local/share/backgrounds/wallpaper1.png # aur: mint-backgrounds -# /usr/share/backgrounds/archlinux/simple.png # archlinux-wallpapers -# /usr/share/backgrounds/archlinux/small.png - -# video wallpapers from wallpaper engine -bind = SHIFT ALT, 7, exec, $dwp $video_path/2292710588/KleeWP.mp4 -bind = SHIFT ALT, 8, exec, $dwp $video_path/821372791/灵梦.mp4 -bind = SHIFT ALT, 9, exec, $dwp $video_path/827148653/Gargantua_BGM.mp4 -bind = SHIFT ALT, 0, exec, $dwp $video_path/1661372823/EP03.mp4 -bind = SHIFT ALT, Minus, exec, $dwp $video_path/2855732285/彩虹鸭鸭.mp4 -bind = SHIFT ALT, Backspace, exec, pkill mpvpaper - -# keyboard fn buttons -binde = ,XF86MonBrightnessUp, exec, $changebrightness up -binde = ,XF86MonBrightnessDown, exec, $changebrightness down -binde = ,XF86AudioRaiseVolume, exec, $changevolume up -binde = ,XF86AudioLowerVolume, exec, $changevolume down -bind = ,XF86AudioMute, exec, $changevolume mute - -bind = ,XF86AudioPlay, exec, playerctl play-pause -bind = ,XF86AudioPrev, exec, playerctl previous -bind = ,XF86AudioNext, exec, playerctl next -bind = ,XF86AudioStop, exec, playerctl stop -bind = ,XF86AudioMedia, exec, playerctl play-pause - -# window mode -bind = SUPER, C, pseudo # dwindle -bind = SUPER, S, togglesplit # dwindle -bind = SUPER, V, togglefloating - -# window size -binde = SUPER, Minus, splitratio, -0.1 -binde = SUPER, Equal, splitratio, 0.1 - -# move window focus -bind = SUPER, H, movefocus, l -bind = SUPER, J, movefocus, d -bind = SUPER, K, movefocus, u -bind = SUPER, L, movefocus, r - -bind = SUPER, left, movefocus, l -bind = SUPER, right, movefocus, r -bind = SUPER, up, movefocus, u -bind = SUPER, down, movefocus, d - -bind = SUPER, Tab, cyclenext # change focus to another window -bind = SUPER, Tab, bringactivetotop # bring it to the top - -# workspaces binds -bind = SUPER, 1, workspace, 1 -bind = SUPER, 2, workspace, 2 -bind = SUPER, 3, workspace, 3 -bind = SUPER, 4, workspace, 4 -bind = SUPER, 5, workspace, 5 -bind = SUPER, 6, workspace, 6 -bind = SUPER, 7, workspace, 7 -bind = SUPER, 8, workspace, 8 -bind = SUPER, 9, workspace, 9 -bind = SUPER, 0, workspace, 10 - -bind = SUPER SHIFT, 1, movetoworkspacesilent, 1 -bind = SUPER SHIFT, 2, movetoworkspacesilent, 2 -bind = SUPER SHIFT, 3, movetoworkspacesilent, 3 -bind = SUPER SHIFT, 4, movetoworkspacesilent, 4 -bind = SUPER SHIFT, 5, movetoworkspacesilent, 5 -bind = SUPER SHIFT, 6, movetoworkspacesilent, 6 -bind = SUPER SHIFT, 7, movetoworkspacesilent, 7 -bind = SUPER SHIFT, 8, movetoworkspacesilent, 8 -bind = SUPER SHIFT, 9, movetoworkspacesilent, 9 -bind = SUPER SHIFT, 0, movetoworkspacesilent, 10 - -# mouse binds -bind = SUPER, mouse_down, workspace, e-1 # scroll wheels -bind = SUPER, mouse_up, workspace, e+1 -bindm = SUPER, mouse:272, movewindow # left click -bindm = SUPER, mouse:273, resizewindow # right click diff --git a/home/applications/hyprland/hypr/main.conf b/home/applications/hyprland/hypr/main.conf deleted file mode 100644 index bd66cfd..0000000 --- a/home/applications/hyprland/hypr/main.conf +++ /dev/null @@ -1,80 +0,0 @@ -# Display settings -monitor = ,preferred, auto, 1 -monitor = eDP-1, 1920x1080@60, 0x0, 1.25 # laptop screen eDP-1 - -# General settings -general { - gaps_in = 4 - gaps_out = 8 # dont forget to change waybar margin - border_size = 2 - layout = dwindle -} - -# Decorations -decoration { - blur { - size = 4 - passes = 4 - } - rounding = 4 - shadow_range = 50 - shadow_render_power = 5 - col.shadow = 0x88000000 - col.shadow_inactive = 0x44000000 -} - -# Animations -animations { - bezier = easeOutExpo, 0.16, 1, 0.3, 1 - bezier = easeOutQuint, 0.22, 1, 0.36, 1 - animation = windows, 1, 6, default, popin - animation = fade, 1, 8, default - animation = border, 1, 8, default - animation = borderangle, 1, 8, default - animation = workspaces, 1, 4, default -} - -# Input settings -input { - accel_profile = flat - #force_no_accel = false - natural_scroll = true - touchpad { - natural_scroll = true - disable_while_typing = false - drag_lock = true - } -} - -# idk -dwindle { - pseudotile = true - preserve_split = true -} - -# Touchpad gestures -gestures { - workspace_swipe = true # touchpad swipe to switch workspaces - workspace_swipe_distance = 600 # doubles gesture distance -} - -# XWayland -XWayland { - #use_nearest_neighbor = false - force_zero_scaling = true -} - -misc { - disable_hyprland_logo = true - disable_splash_rendering = true - animate_manual_resizes = true -} - -# Windows rules -windowrule = float, ^(pwvucontrol)$ -windowrule = float, ^(org.gnome.Calculator)$ - -# Layer rules -layerrule = blur, notifications -layerrule = blur, rofi -layerrule = ignorezero, notifications diff --git a/home/applications/hyprland/hypr/themes/colors.conf b/home/applications/hyprland/hypr/themes/colors.conf deleted file mode 100644 index 4e8c55c..0000000 --- a/home/applications/hyprland/hypr/themes/colors.conf +++ /dev/null @@ -1,10 +0,0 @@ -# i dont actually know how did i get this color scheme - -general { - #col.active_border = rgba(60C4F1FF) rgba(9F9BABFF) rgba(A2AECFFF) 45deg - #col.active_border = rgba(222222FF) - col.active_border = rgba(C0CAF5FF) - #col.inactive_border = rgba(60C4F166) - #col.inactive_border = rgba(222222FF) - col.inactive_border = rgba(414868FF) -} diff --git a/home/applications/hyprland/hypr/themes/frappe.conf b/home/applications/hyprland/hypr/themes/frappe.conf deleted file mode 100644 index 94a32db..0000000 --- a/home/applications/hyprland/hypr/themes/frappe.conf +++ /dev/null @@ -1,61 +0,0 @@ -$rosewaterAlpha = f2d5cf -$flamingoAlpha = eebebe -$pinkAlpha = f4b8e4 -$mauveAlpha = ca9ee6 -$redAlpha = e78284 -$maroonAlpha = ea999c -$peachAlpha = ef9f76 -$yellowAlpha = e5c890 -$greenAlpha = a6d189 -$tealAlpha = 81c8be -$skyAlpha = 99d1db -$sapphireAlpha = 85c1dc -$blueAlpha = 8caaee -$lavenderAlpha = babbf1 - -$textAlpha = c6d0f5 -$subtext1Alpha = b5bfe2 -$subtext0Alpha = a5adce - -$overlay2Alpha = 949cbb -$overlay1Alpha = 838ba7 -$overlay0Alpha = 737994 - -$surface2Alpha = 626880 -$surface1Alpha = 51576d -$surface0Alpha = 414559 - -$baseAlpha = 303446 -$mantleAlpha = 292c3c -$crustAlpha = 232634 - -$rosewater = 0xfff5e0dc -$flamingo = 0xfff2cdcd -$pink = 0xfff5c2e7 -$mauve = 0xffcba6f7 -$red = 0xfff38ba8 -$maroon = 0xffeba0ac -$peach = 0xfffab387 -$yellow = 0xfff9e2af -$green = 0xffa6e3a1 -$teal = 0xff94e2d5 -$sky = 0xff89dceb -$sapphire = 0xff74c7ec -$blue = 0xff89b4fa -$lavender = 0xffb4befe - -$text = 0xffcdd6f4 -$subtext1 = 0xffbac2de -$subtext0 = 0xffa6adc8 - -$overlay2 = 0xff9399b2 -$overlay1 = 0xff7f849c -$overlay0 = 0xff6c7086 - -$surface2 = 0xff585b70 -$surface1 = 0xff45475a -$surface0 = 0xff313244 - -$base = 0xff1e1e2e -$mantle = 0xff181825 -$crust = 0xff11111b diff --git a/home/applications/hyprland/hypr/themes/latte.conf b/home/applications/hyprland/hypr/themes/latte.conf deleted file mode 100644 index dbad7f9..0000000 --- a/home/applications/hyprland/hypr/themes/latte.conf +++ /dev/null @@ -1,61 +0,0 @@ -$rosewaterAlpha = dc8a78 -$flamingoAlpha = dd7878 -$pinkAlpha = ea76cb -$mauveAlpha = 8839ef -$redAlpha = d20f39 -$maroonAlpha = e64553 -$peachAlpha = fe640b -$yellowAlpha = df8e1d -$greenAlpha = 40a02b -$tealAlpha = 179299 -$skyAlpha = 04a5e5 -$sapphireAlpha = 209fb5 -$blueAlpha = 1e66f5 -$lavenderAlpha = 7287fd - -$textAlpha = 4c4f69 -$subtext1Alpha = 5c5f77 -$subtext0Alpha = 6c6f85 - -$overlay2Alpha = 7c7f93 -$overlay1Alpha = 8c8fa1 -$overlay0Alpha = 9ca0b0 - -$surface2Alpha = acb0be -$surface1Alpha = bcc0cc -$surface0Alpha = ccd0da - -$baseAlpha = eff1f5 -$mantleAlpha = e6e9ef -$crustAlpha = dce0e8 - -$rosewater = 0xfff5e0dc -$flamingo = 0xfff2cdcd -$pink = 0xfff5c2e7 -$mauve = 0xffcba6f7 -$red = 0xfff38ba8 -$maroon = 0xffeba0ac -$peach = 0xfffab387 -$yellow = 0xfff9e2af -$green = 0xffa6e3a1 -$teal = 0xff94e2d5 -$sky = 0xff89dceb -$sapphire = 0xff74c7ec -$blue = 0xff89b4fa -$lavender = 0xffb4befe - -$text = 0xffcdd6f4 -$subtext1 = 0xffbac2de -$subtext0 = 0xffa6adc8 - -$overlay2 = 0xff9399b2 -$overlay1 = 0xff7f849c -$overlay0 = 0xff6c7086 - -$surface2 = 0xff585b70 -$surface1 = 0xff45475a -$surface0 = 0xff313244 - -$base = 0xff1e1e2e -$mantle = 0xff181825 -$crust = 0xff11111b diff --git a/home/applications/hyprland/hypr/themes/macchiato.conf b/home/applications/hyprland/hypr/themes/macchiato.conf deleted file mode 100644 index 91a88a1..0000000 --- a/home/applications/hyprland/hypr/themes/macchiato.conf +++ /dev/null @@ -1,61 +0,0 @@ -$rosewaterAlpha = f4dbd6 -$flamingoAlpha = f0c6c6 -$pinkAlpha = f5bde6 -$mauveAlpha = c6a0f6 -$redAlpha = ed8796 -$maroonAlpha = ee99a0 -$peachAlpha = f5a97f -$yellowAlpha = eed49f -$greenAlpha = a6da95 -$tealAlpha = 8bd5ca -$skyAlpha = 91d7e3 -$sapphireAlpha = 7dc4e4 -$blueAlpha = 8aadf4 -$lavenderAlpha = b7bdf8 - -$textAlpha = cad3f5 -$subtext1Alpha = b8c0e0 -$subtext0Alpha = a5adcb - -$overlay2Alpha = 939ab7 -$overlay1Alpha = 8087a2 -$overlay0Alpha = 6e738d - -$surface2Alpha = 5b6078 -$surface1Alpha = 494d64 -$surface0Alpha = 363a4f - -$baseAlpha = 24273a -$mantleAlpha = 1e2030 -$crustAlpha = 181926 - -$rosewater = 0xfff5e0dc -$flamingo = 0xfff2cdcd -$pink = 0xfff5c2e7 -$mauve = 0xffcba6f7 -$red = 0xfff38ba8 -$maroon = 0xffeba0ac -$peach = 0xfffab387 -$yellow = 0xfff9e2af -$green = 0xffa6e3a1 -$teal = 0xff94e2d5 -$sky = 0xff89dceb -$sapphire = 0xff74c7ec -$blue = 0xff89b4fa -$lavender = 0xffb4befe - -$text = 0xffcdd6f4 -$subtext1 = 0xffbac2de -$subtext0 = 0xffa6adc8 - -$overlay2 = 0xff9399b2 -$overlay1 = 0xff7f849c -$overlay0 = 0xff6c7086 - -$surface2 = 0xff585b70 -$surface1 = 0xff45475a -$surface0 = 0xff313244 - -$base = 0xff1e1e2e -$mantle = 0xff181825 -$crust = 0xff11111b diff --git a/home/applications/hyprland/hypr/themes/mocha.conf b/home/applications/hyprland/hypr/themes/mocha.conf deleted file mode 100644 index 1463565..0000000 --- a/home/applications/hyprland/hypr/themes/mocha.conf +++ /dev/null @@ -1,61 +0,0 @@ -$rosewaterAlpha = f5e0dc -$flamingoAlpha = f2cdcd -$pinkAlpha = f5c2e7 -$mauveAlpha = cba6f7 -$redAlpha = f38ba8 -$maroonAlpha = eba0ac -$peachAlpha = fab387 -$yellowAlpha = f9e2af -$greenAlpha = a6e3a1 -$tealAlpha = 94e2d5 -$skyAlpha = 89dceb -$sapphireAlpha = 74c7ec -$blueAlpha = 89b4fa -$lavenderAlpha = b4befe - -$textAlpha = cdd6f4 -$subtext1Alpha = bac2de -$subtext0Alpha = a6adc8 - -$overlay2Alpha = 9399b2 -$overlay1Alpha = 7f849c -$overlay0Alpha = 6c7086 - -$surface2Alpha = 585b70 -$surface1Alpha = 45475a -$surface0Alpha = 313244 - -$baseAlpha = 1e1e2e -$mantleAlpha = 181825 -$crustAlpha = 11111b - -$rosewater = 0xfff5e0dc -$flamingo = 0xfff2cdcd -$pink = 0xfff5c2e7 -$mauve = 0xffcba6f7 -$red = 0xfff38ba8 -$maroon = 0xffeba0ac -$peach = 0xfffab387 -$yellow = 0xfff9e2af -$green = 0xffa6e3a1 -$teal = 0xff94e2d5 -$sky = 0xff89dceb -$sapphire = 0xff74c7ec -$blue = 0xff89b4fa -$lavender = 0xffb4befe - -$text = 0xffcdd6f4 -$subtext1 = 0xffbac2de -$subtext0 = 0xffa6adc8 - -$overlay2 = 0xff9399b2 -$overlay1 = 0xff7f849c -$overlay0 = 0xff6c7086 - -$surface2 = 0xff585b70 -$surface1 = 0xff45475a -$surface0 = 0xff313244 - -$base = 0xff1e1e2e -$mantle = 0xff181825 -$crust = 0xff11111b diff --git a/home/applications/kitty/default.nix b/home/applications/kitty/default.nix deleted file mode 100644 index 4534c2c..0000000 --- a/home/applications/kitty/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - programs.kitty = { - enable = true; - settings.confirm_os_window_close = 0; - }; -} diff --git a/home/applications/librewolf/default.nix b/home/applications/librewolf/default.nix deleted file mode 100644 index 213f197..0000000 --- a/home/applications/librewolf/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -_: { - programs.librewolf = { - enable = true; - settings = { - # https://codeberg.org/librewolf/settings/src/branch/master/librewolf.cfg - # https://github.com/yokoffing/Betterfox/blob/main/librewolf.overrides.cfg - - ### Restore disabled functions - "browser.cache.disk.enable" = true; - "identity.fxaccounts.enabled" = true; - "media.eme.enabled" = true; - "privacy.donottrackheader.enabled" = false; - "privacy.globalprivacycontrol.enabled" = false; - "privacy.resistFingerprinting" = false; - "privacy.sanitize.sanitizeOnShutdown" = false; - "security.OCSP.enabled" = 0; - "security.OCSP.require" = false; - "security.pki.crlite_mode" = 2; - "webgl.disabled" = false; - - ### Smooth scrolling - "apz.overscroll.enabled" = true; - "general.smoothScroll" = true; - "general.smoothScroll.msdPhysics.enabled" = true; - "general.smoothScroll.msdPhysics.motionBeginSpringConstant" = 600; - "mousewheel.default.delta_multiplier_y" = 75; - - ### Misc - "extensions.activeThemeID" = "firefox-compact-dark@mozilla.org"; - }; - }; - - home.sessionVariables = { - MOZ_USE_XINPUT2 = "1"; - }; -} diff --git a/home/applications/loupe/default.nix b/home/applications/loupe/default.nix deleted file mode 100644 index 2f702e1..0000000 --- a/home/applications/loupe/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{pkgs, ...}: { - home.packages = [pkgs.loupe]; -} diff --git a/home/applications/nix/default.nix b/home/applications/nix/default.nix index 586ee61..fefeaa3 100644 --- a/home/applications/nix/default.nix +++ b/home/applications/nix/default.nix @@ -23,17 +23,4 @@ # for `nh` # yes, i know, weird and long path home.sessionVariables.FLAKE = "/home/guanranwang/Documents/Projects/git-repos/github.com/Guanran928/flake"; - - ### VSCode - programs.vscode = { - extensions = [pkgs.vscode-extensions.jnoortheen.nix-ide]; - userSettings.nix = { - enableLanguageServer = true; - serverPath = "nil"; - serverSettings.nil = { - formatting.command = ["alejandra"]; - nix.flake.autoArchive = true; - }; - }; - }; } diff --git a/home/applications/picom/default.nix b/home/applications/picom/default.nix deleted file mode 100644 index 30458cd..0000000 --- a/home/applications/picom/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{config, ...}: { - services.picom = { - enable = true; - package = config.nur.repos.guanran928.picom-ft-labs; - settings = { - # Animations - animations = true; - animation-for-open-window = "zoom"; - animation-for-unmap-window = "squeeze"; - animation-for-transient-window = "slide-down"; - - # Blur - blur-method = "dual_kawase"; - blur-strength = 10; - blur-background-exclude = [ - "_GTK_FRAME_EXTENTS@:c" - ]; - - # Corners - corner-radius = 12; - rounded-corners-exclude = [ - "class_g = 'Polybar'" - ]; - - # Opacity - opacity-rule = [ - "100:_NET_WM_STATE@:32a = '_NET_WM_STATE_FULLSCREEN'" - "90:class_g = 'Polybar'" - "90:class_g = 'Rofi'" - "90:class_g = 'Alacritty'" - ]; - - # Shadow - shadow = true; - shadow-exclude = [ - "_GTK_FRAME_EXTENTS@:c" - ]; - - # Misc - backend = "glx"; - glx-no-rebind-pixmap = true; - glx-no-stencil = true; - vsync = true; - unredir-if-possible = true; - }; - }; -} diff --git a/home/applications/polybar/default.nix b/home/applications/polybar/default.nix deleted file mode 100644 index b5bd3ec..0000000 --- a/home/applications/polybar/default.nix +++ /dev/null @@ -1,177 +0,0 @@ -{ - services.polybar = { - enable = true; - script = "polybar bar"; - config = { - colors = { - base = "#1e1e2e"; - mantle = "#181825"; - crust = "#cc11111b"; - - text = "#cdd6f4"; - subtext0 = "#a6adc8"; - subtext1 = "#bac2de"; - - surface0 = "#313244"; - surface1 = "#45475a"; - surface2 = "#585b70"; - - overlay0 = "#6c7086"; - overlay1 = "#7f849c"; - overlay2 = "#9399b2"; - - blue = "#89b4fa"; - lavender = "#b4befe"; - sapphire = "#74c7ec"; - sky = "#89dceb"; - teal = "#94e2d5"; - green = "#a6e3a1"; - yellow = "#f9e2af"; - peach = "#fab387"; - maroon = "#eba0ac"; - red = "#f38ba8"; - mauve = "#cba6f7"; - pink = "#f5c2e7"; - flamingo = "#f2cdcd"; - rosewater = "#f5e0dc"; - - transparent = "#FF00"; - }; - - "bar/main" = { - width = "100%"; - height = 30; - offset-y = 0; - top = true; - fixed-center = true; - - wm-restack = "bspwm"; - override-redirect = false; - - scroll-up = "next"; - scroll-down = "prev"; - - enable-ipc = true; - - background = "\${colors.crust}"; - foreground = "\${colors.text}"; - - font-0 = "JetBrainsMono Nerd Font:style=Bold:size=10;2"; - font-1 = "Source Han Sans CN:size=10;2"; - - modules-left = "bspwm"; - modules-center = "title"; - modules-right = "pulseaudio battery date"; - - tray-position = "right"; - - cursor-click = "pointer"; - }; - - settings = { - screenchange-reload = true; - format-padding = 1; - }; - - "module/nowplaying" = { - type = "custom/script"; - tail = true; - interval = 1; - format = "󰕾