diff options
author | Jack Sangdahl <[email protected]> | 2023-11-29 17:05:27 -0700 |
---|---|---|
committer | Jack Sangdahl <[email protected]> | 2023-11-29 17:05:27 -0700 |
commit | a6d98debc8ec095c7e0457950e9309c5061b99e1 (patch) | |
tree | d727e40ad37f664d1eb3426bad5b18c2876993a7 | |
parent | 1eace44f684e2830285eefbdbde4d6ced8b602db (diff) | |
download | dots-a6d98debc8ec095c7e0457950e9309c5061b99e1.tar.gz dots-a6d98debc8ec095c7e0457950e9309c5061b99e1.zip |
font cleanup
-rw-r--r-- | .config/alacritty/alacritty.yml | 75 | ||||
-rw-r--r-- | .config/gtk-3.0/bookmarks | 4 | ||||
-rw-r--r-- | .config/gtk-3.0/settings.ini | 2 | ||||
-rw-r--r-- | .config/nvchad/chadrc.lua | 36 | ||||
-rwxr-xr-x | .config/scripts/math_hw.sh | 6 | ||||
-rw-r--r-- | .config/starship.toml | 2 | ||||
-rw-r--r-- | .config/sway/config | 7 | ||||
-rw-r--r-- | .config/userChrome.css | 169 | ||||
-rw-r--r-- | .config/waybar/style.css | 2 | ||||
-rw-r--r-- | .config/zathura/zathurarc | 2 | ||||
-rw-r--r-- | .zshenv | 16 | ||||
-rw-r--r-- | .zshrc | 20 | ||||
-rw-r--r-- | readme.md | 24 |
13 files changed, 108 insertions, 257 deletions
diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml deleted file mode 100644 index 33e9126c..00000000 --- a/.config/alacritty/alacritty.yml +++ /dev/null @@ -1,75 +0,0 @@ -# Configuration for Alacritty, the GPU enhanced terminal emulator. - -env: - TERM: alacritty - -# Window configuration -window: - padding: - x: 9 - y: 5 - opacity: 1.0 - startup_mode: Windowed - title: alacritty - dynamic_title: true - -scrolling: - history: 10000 - multiplier: 3 # How many lines to jump when scrolling - -# Font configuration -font: - normal: - family: JetBrainsMono - style: Regular - - size: 12 - -# Colors (catppuccin) -colors: - primary: - background: '0x1E1D2F' - foreground: '0xD9E0EE' - - cursor: - text: '0x1E1D2F' - cursor: '0xF5E0DC' - - normal: - black: '0x6E6C7E' - red: '0xF28FAD' - green: '0xABE9B3' - yellow: '0xFAE3B0' - blue: '0x96CDFB' - magenta: '0xF5C2E7' - cyan: '0x89DCEB' - white: '0xD9E0EE' - - bright: - black: '0x988BA2' - red: '0xF28FAD' - green: '0xABE9B3' - yellow: '0xFAE3B0' - blue: '0x96CDFB' - magenta: '0xF5C2E7' - cyan: '0x89DCEB' - white: '0xD9E0EE' - - indexed_colors: - - { index: 16, color: '0xF8BD96' } - - { index: 17, color: '0xF5E0DC' } - -selection: - save_to_clipboard: true - -cursor: - shape: Block - blinking: Off - unfocused_hollow: true - thickness: 0.15 - -live_config_reload: true - -# Shell -shell: - program: /bin/zsh diff --git a/.config/gtk-3.0/bookmarks b/.config/gtk-3.0/bookmarks new file mode 100644 index 00000000..401cadad --- /dev/null +++ b/.config/gtk-3.0/bookmarks @@ -0,0 +1,4 @@ +file:///home/jack/waffle_git Waffle +file:///home/jack/Documents Documents +file:///home/jack/Downloads Downloads +file:///home/jack/Pictures Pictures diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini index 84657dce..d7582bcf 100644 --- a/.config/gtk-3.0/settings.ini +++ b/.config/gtk-3.0/settings.ini @@ -2,4 +2,4 @@ gtk-icon-theme-name = catppuccin-icons gtk-theme-name = catppuccin gtk-cursor-theme-name = sunity-cursors -gtk-font-name = mononoki Nerd Font +gtk-font-name = JetBrainsMono Nerd Font diff --git a/.config/nvchad/chadrc.lua b/.config/nvchad/chadrc.lua index 984d4805..ab974654 100644 --- a/.config/nvchad/chadrc.lua +++ b/.config/nvchad/chadrc.lua @@ -4,42 +4,6 @@ local M = {} M.ui = { statusline = { theme = "vscode_colored", - overriden_modules = function(modules) - modules[2] = (function() - local icon = " ? " - local filename = (vim.fn.expand("%") == "" and "Empty ") or vim.fn.expand("%:t") - if filename ~= "Empty " then - local devicons_present, devicons = pcall(require, "nvim-web-devicons") - if devicons_present then - local ft_icon = devicons.get_icon(filename) - icon = (ft_icon ~= nil and " " .. ft_icon) or "" - end - filename = " " .. filename .. " " - end - return "%#StText# " .. icon .. filename - end)() - modules[3] = (function() - if not vim.b.gitsigns_head or vim.b.gitsigns_git_status then - return "" - end - return " " .. vim.b.gitsigns_status_dict.head .. " " - end)() - modules[12] = (function() - if rawget(vim, "lsp") then - for _, client in ipairs(vim.lsp.get_active_clients()) do - if client.attached_buffers[vim.api.nvim_get_current_buf()] and client.name ~= "null-ls" then - return (vim.o.columns > 100 and "%#St_LspStatus# " .. client.name .. " ") - or "%#St_LspStatus# LSP " - end - end - end - return "" - end)() - modules[13] = (function() - local dir_name = "%#St_cwd# " .. vim.fn.fnamemodify(vim.fn.getcwd(), ":t") .. " " - return (vim.o.columns > 85 and dir_name) or "" - end)() - end, }, tabufline = { lazyload = true, diff --git a/.config/scripts/math_hw.sh b/.config/scripts/math_hw.sh deleted file mode 100755 index 109389a7..00000000 --- a/.config/scripts/math_hw.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -ASSIGNMENT_FILE=~/Documents/math2300/latex/hw$1.tex -DATE=$(date +%F) -cp ~/.local/share/latex_template/math_hw.tex $ASSIGNMENT_FILE -sed -i "s/DATE/${DATE}/g" $ASSIGNMENT_FILE -sed -i "s/ASSIGNMENT_NUMBER/${1}/g" $ASSIGNMENT_FILE diff --git a/.config/starship.toml b/.config/starship.toml index 449debb2..2dad1182 100644 --- a/.config/starship.toml +++ b/.config/starship.toml @@ -14,3 +14,5 @@ disabled = true disabled = true [perl] disabled = true +[c] +disabled = true diff --git a/.config/sway/config b/.config/sway/config index 2c2743bc..cfdc4df9 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -19,11 +19,6 @@ output * bg ~/.img/wallpaper/waves_mono.png fill exec /usr/bin/mako exec /usr/bin/gentoo-pipewire-launcher & -input type:keyboard { - xkb_layout us,ru - xkb_options grp:alts_toggle -} - input "1452:588:bcm5974" { dwt enabled tap enabled @@ -45,7 +40,7 @@ exec_always { # applications bindsym $mod+q kill -bindsym $mod+t exec alacritty +bindsym $mod+t exec st bindsym $mod+f exec firefox-bin bindsym $mod+r exec wofi bindsym $mod+p exec grim -g "$(slurp)" - | wl-copy diff --git a/.config/userChrome.css b/.config/userChrome.css index 7ee441e8..de3e6ec2 100644 --- a/.config/userChrome.css +++ b/.config/userChrome.css @@ -1,55 +1,46 @@ :root { - --mff-bg: #1E1E2E; - --mff-icon-color: #DDB6F2; - --mff-nav-toolbar-padding: 8px; - --mff-sidebar-bg: var(--mff-bg); - --mff-sidebar-color: #DDB6F2; - --mff-tab-border-radius: 0px; - --mff-tab-color: #96CDFB; - --mff-tab-font-family: "mononoki Nerd Font"; - --mff-tab-font-size: 11pt; - --mff-tab-font-weight: 400; - --mff-tab-height: 32px; - --mff-tab-pinned-bg: #1E1E2E; - --mff-tab-selected-bg: #302D41; - --mff-tab-soundplaying-bg: #1E1E2E; - --mff-urlbar-color: #96CDFB; - --mff-urlbar-focused-color: #DDB6F2; - --mff-urlbar-font-family: "Cantarell", serif; - --mff-urlbar-font-size: 12pt; - --mff-urlbar-font-weight: 700; - --mff-urlbar-results-color: #B5E8E0; - --mff-urlbar-results-font-family: "mononoki Nerd Font"; - --mff-urlbar-results-font-size: 12pt; - --mff-urlbar-results-font-weight: 700; - --mff-urlbar-results-url-color: #96CDFB; - --autocomplete-popup-background: var(--mff-bg) !important; - --default-arrowpanel-background: var(--mff-bg) !important; + --bg: #1E1E2E; + --icon-color: #DDB6F2; + --nav-toolbar-padding: 8px; + --sidebar-bg: var(--bg); + --sidebar-color: #DDB6F2; + --tab-border-radius: 0px; + --tab-color: #96CDFB; + --tab-font-family: "Mononoki Nerd Font"; + --tab-font-size: 11pt; + --tab-font-weight: 400; + --tab-height: 32px; + --tab-pinned-bg: #1E1E2E; + --tab-selected-bg: #302D41; + --tab-soundplaying-bg: #1E1E2E; + --urlbar-color: #96CDFB; + --urlbar-focused-color: #DDB6F2; + --urlbar-font-family: "Mononoki Nerd Font"; + --urlbar-font-size: 12pt; + --urlbar-font-weight: 700; + --urlbar-results-color: #B5E8E0; + --urlbar-results-font-family: "Mononoki Nerd Font"; + --urlbar-results-font-size: 12pt; + --urlbar-results-font-weight: 700; + --urlbar-results-url-color: #96CDFB; + --autocomplete-popup-background: var(--bg) !important; + --default-arrowpanel-background: var(--bg) !important; --default-arrowpanel-color: #fefefa !important; - --lwt-toolbarbutton-icon-fill: var(--mff-icon-color) !important; + --lwt-toolbarbutton-icon-fill: var(--icon-color) !important; --panel-disabled-color: #f9f9fa80; - --toolbar-bgcolor: var(--mff-bg) !important; + --toolbar-bgcolor: var(--bg) !important; --urlbar-separator-color: transparent !important; } -/* - _____ _ ___ ___ - |_ _/_\ | _ ) __| - | |/ _ \| _ \__ \ - |_/_/ \_\___/___/ - -*/ - .tab-background[selected="true"] { - background: var(--mff-tab-selected-bg) !important; + background: var(--tab-selected-bg) !important; } .tab-background:not[visuallyselected] { - background: var(--mff-tab-selected-bg) !important; + background: var(--tab-selected-bg) !important; opacity: 0.5 !important; } -/* This positions the tabs under the navaigator container */ #titlebar { -moz-box-ordinal-group: 3 !important; } @@ -73,18 +64,16 @@ } .tab-text { - font-family: var(--mff-tab-font-family); - font-weight: var(--mff-tab-font-weight); - font-size: var(--mff-tab-font-size) !important; - color: var(--mff-tab-color); + font-family: var(--tab-font-family); + font-weight: var(--tab-font-weight); + font-size: var(--tab-font-size) !important; + color: var(--tab-color); } -/* Hide the favicon for tabs */ hbox.tab-content .tab-icon-image { display: none !important; } -/* Show the favicon for tabs that are pinned */ hbox.tab-content[pinned=true] .tab-icon-image { display: initial !important; } @@ -112,18 +101,18 @@ hbox.tab-content[pinned=true] .tab-text { } .tabbrowser-tab { - border-radius: var(--mff-tab-border-radius) !important; + border-radius: var(--tab-border-radius) !important; border-width: 0; - height: var(--mff-tab-height) !important; + height: var(--tab-height) !important; margin-bottom: 4px !important; margin-inline-end: 4px !important; margin-top: 4px !important; - max-height: var(--mff-tab-height) !important; - min-height: var(--mff-tab-height) !important; + max-height: var(--tab-height) !important; + min-height: var(--tab-height) !important; } .tabbrowser-tab[soundplaying="true"] { - background-color: var(--mff-tab-soundplaying-bg) !important; + background-color: var(--tab-soundplaying-bg) !important; } #tabs-newtab-button { @@ -135,35 +124,24 @@ hbox.tab-content[pinned=true] .tab-text { display: none !important; } -/* - _____ ___ ___ _ ___ _ ___ -|_ _/ _ \ / _ \| | | _ ) /_\ | _ \ - | || (_) | (_) | |__| _ \/ _ \| / - |_| \___/ \___/|____|___/_/ \_\_|_\ -*/ - .urlbar-icon > image { - fill: var(--mff-icon-color) !important; - color: var(--mff-icon-color) !important; + fill: var(--icon-color) !important; + color: var(--icon-color) !important; } .toolbarbutton-text { - color: var(--mff-icon-color) !important; + color: var(--icon-color) !important; } .urlbar-icon { - color: var(--mff-icon-color) !important; + color: var(--icon-color) !important; } -.toolbarbutton-icon { -/* filter: drop-shadow(0 0 0.75rem crimson); */ -} - #urlbar-results { - font-family: var(--mff-urlbar-results-font-family); - font-weight: var(--mff-urlbar-results-font-weight); - font-size: var(--mff-urlbar-results-font-size) !important; - color: var(--mff-urlbar-results-color) !important; + font-family: var(--urlbar-results-font-family); + font-weight: var(--urlbar-results-font-weight); + font-size: var(--urlbar-results-font-size) !important; + color: var(--urlbar-results-color) !important; } .urlbarView-row[type="bookmark"] > span{ @@ -175,10 +153,10 @@ hbox.tab-content[pinned=true] .tab-text { } .urlbarView-url, .search-panel-one-offs-container { - color: var(--mff-urlbar-results-url-color) !important; - font-family: var(--mff-urlbar-font-family); - font-weight: var(--mff-urlbar-results-font-weight); - font-size: var(--mff-urlbar-font-size) !important; + color: var(--urlbar-results-url-color) !important; + font-family: var(--urlbar-font-family); + font-weight: var(--urlbar-results-font-weight); + font-size: var(--urlbar-font-size) !important; } .urlbarView-favicon, .urlbarView-type-icon { @@ -186,10 +164,10 @@ hbox.tab-content[pinned=true] .tab-text { } #urlbar-input { - font-size: var(--mff-urlbar-font-size) !important; - color: var(--mff-urlbar-color) !important; - font-family: var(--mff-urlbar-font-family) !important; - font-weight: var(--mff-urlbar-font-weight)!important; + font-size: var(--urlbar-font-size) !important; + color: var(--urlbar-color) !important; + font-family: var(--urlbar-font-family) !important; + font-weight: var(--urlbar-font-weight)!important; text-align: center !important; } @@ -223,16 +201,16 @@ toolbar { } #urlbar-background { - background-color: var(--mff-bg) !important; + background-color: var(--bg) !important; border: none !important; } .toolbar-items { - background-color: var(--mff-bg) !important; + background-color: var(--bg) !important; } #sidebar-search-container { - background-color: var(--mff-sidebar-bg) !important; + background-color: var(--sidebar-bg) !important; } box.panel-arrowbox { @@ -257,7 +235,7 @@ image#star-button { } toolbar#nav-bar { - padding: var(--mff-nav-toolbar-padding) !important; + padding: var(--nav-toolbar-padding) !important; } toolbar#nav-bar { @@ -267,11 +245,10 @@ toolbar#nav-bar { #urlbar { max-width: 70% !important; margin: 0 15% !important; - /* position: unset!important; */; } #urlbar-input:focus { - color: var(--mff-urlbar-focused-color) !important; + color: var(--urlbar-focused-color) !important; } @@ -284,28 +261,16 @@ toolbarbutton { box-shadow: none !important; } - -/* - ___ ___ ___ ___ ___ _ ___ - / __|_ _| \| __| _ ) /_\ | _ \ - \__ \| || |) | _|| _ \/ _ \| / - |___/___|___/|___|___/_/ \_\_|_\ -*/ - .close-icon, .urlbar-icon { - fill: var(--mff-icon-color) !important; + fill: var(--icon-color) !important; } .sidebar-placesTree { - color: var(--mff-sidebar-color) !important; -} - -#sidebar-switcher-target { -/* color: white !important; */ + color: var(--sidebar-color) !important; } #sidebar-box { - --sidebar-background-color: var(--mff-sidebar-bg) !important; + --sidebar-background-color: var(--sidebar-bg) !important; } splitter#sidebar-splitter { @@ -321,14 +286,6 @@ image#sidebar-icon { display: none; } - -/* - _ ___ ___ _____ _____ _ _ _ ___ _ - /_\ | _ \ _ \/ _ \ \ / / _ \/_\ | \| | __| | - / _ \| / / (_) \ \/\/ /| _/ _ \| .` | _|| |__ - /_/ \_\_|_\_|_\\___/ \_/\_/ |_|/_/ \_\_|\_|___|____| - */ - .panel-arrowcontent { padding: 0px !important; margin: 0px !important; diff --git a/.config/waybar/style.css b/.config/waybar/style.css index fcedaef5..a25169ac 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -1,7 +1,7 @@ @import url("../colours.css"); * { border-radius: 0; - font-family: "mononoki Nerd Font", "Font Awesome 6 Free"; + font-family: "Mononoki Nerd Font"; font-size: 11pt; min-height: 0; } diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc index 162623f8..e72e5aa7 100644 --- a/.config/zathura/zathurarc +++ b/.config/zathura/zathurarc @@ -1,4 +1,4 @@ -set font "JetBrainsMono 10" +set font "JetBrainsMono Nerd Font 10" set default-bg "#1E1E2E" set default-fg "#302D41" set statusbar-fg "#D9E0EE" diff --git a/.zshenv b/.zshenv deleted file mode 100644 index c0ffcb31..00000000 --- a/.zshenv +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/zsh - -if test -z "${XDG_RUNTIME_DIR}"; then - export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir - if ! test -d "${XDG_RUNTIME_DIR}"; then - mkdir "${XDG_RUNTIME_DIR}" - chmod 0700 "${XDG_RUNTIME_DIR}" - fi -fi - -typeset -U PATH path -path=("$HOME/.local/bin" "$path[@]") -export PATH -export BEMENU_BACKEND=wayland -export EDITOR=nvim -export MOZ_ENABLE_WAYLAND=1 @@ -1,7 +1,17 @@ #!/usr/bin/zsh + +if test -z "${XDG_RUNTIME_DIR}"; then + export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir + if ! test -d "${XDG_RUNTIME_DIR}"; then + mkdir "${XDG_RUNTIME_DIR}" + chmod 0700 "${XDG_RUNTIME_DIR}" + fi +fi + if [ "$(tty)" = "/dev/tty1" ]; then exec dbus-run-session sway fi + export HISTFILE=~/.zsh_history export HISTSIZE=20000 export SAVEHIST=20000 @@ -10,9 +20,15 @@ export LC_CTYPE=en_US.UTF-8 export GPG_TTY=$TTY export PROMPT_EOL_MARK="" export BAT_THEME="base16" +export EDITOR=nvim +export MOZ_ENABLE_WAYLAND=1 + +typeset -U PATH path +path=("$HOME/.local/bin" "$path[@]") path+=('/usr/local/texlive/2023/bin/x86_64-linux') export PATH + setopt HIST_IGNORE_ALL_DUPS setopt HIST_FIND_NO_DUPS @@ -26,8 +42,8 @@ autoload -U compinit && compinit eval "$(starship init zsh)" eval "$(zoxide init zsh)" -alias l="eza -la" -alias ls="eza" +alias l="eza --icons -la" +alias ls="eza --icons" alias cat="bat --paging=never" alias cd="z" alias sudo="doas" @@ -17,14 +17,13 @@ - notifications: [mako](https://github.com/emersion/mako) - lock screen: [gtklock](https://github.com/jovanlanik/gtklock) - keyboard manager: [keyd](https://github.com/rvaiya/keyd) -- terminal: [alacritty](https://github.com/alacritty/alacritty) +- terminal: [st](https://st.suckless.org) - shell: [zsh](https://github.com/zsh-users/zsh.git) - editor: [neovim](https://neovim.io) using [nvchad](https://nvchad.github.io) - document viewer: [zathura](https://pwmt.org/projects/zathura/) - music player: [spotify-tui](https://github.com/Rigellute/spotify-tui) & spotify with [spicetify](https://spicetify.app) - system monitor: [gotop](https://github.com/xxxserxxx/gotop.git) - gtk theme: [catppuccin](https://github.com/catppuccin/gtk) -- cursors: [reimu from touhou](https://www.gnome-look.org/p/1914275) #### `wpa_cli` notes ```shell @@ -44,9 +43,20 @@ bssid / freq / sig lvl / flags / ssid > save_config ``` -#### tty colors -(hex) colors can be set in `/etc/issue`: -``` -\x1B]P01E1E2E\x1B]P1F38BA8\x1B]P2A6E3A1\x1B]P3F9E2AF\x1B]P489B4FA\x1B]P5F5C2E7\x1B]P694E2D5\x1B]P7BAC2DE\x1B[H\x1B[2J\x1B[3J -This is \n.\O (\s \m \r) \t +#### tty colours (and art) +(hex) colors can be set in `/etc/issue` and ascii art: +```shell +]P01E1E2E]P8585B70]P7BAC2DE]PFA6ADC8]P1F38BA8]P9F38BA8]P2A6E3A1]PAA6E3A1]P3F9E2AF]PBF9E2AF]P489B4FA]PC89B4FA]P5F5C2E7]PDF5C2E7]P694E2D5]PE94E2D5[H[2J[3J]P01E1E2E]P8585B70]P7BAC2DE]PFA6ADC8]P1F38BA8]P9F38BA8]P2A6E3A1]PAA6E3A1]P3F9E2AF]PBF9E2AF]P489B4FA]PC89B4FA]P5F5C2E7]PDF5C2E7]P694E2D5]PE94E2D5[H[2J[3J +[0;35;40m . +[0;35;40m .vir. d$b +[0;35;40m .d$$$$$$b. .cd$$b. .d$$b. d$$$$$$$$$$$b .d$$b. .d$$b. +[0;35;40m $$$$( )$$$b d$$$()$$$. d$$$$$$$b Q$$$$$$$P$$$P.$$$$$$$b. .$$$$$$$b. +[0;35;40m Q$$$$$$$$$$B$$$$$$$$P" d$$$PQ$$$$b. $$$$. .$$$P' `$$$ .$$$P' `$$$ +[0;35;40m "$$$$$$$P Q$$$$$$$b d$$$P Q$$$$b $$$$b $$$$b..d$$$ $$$$b..d$$$ +[0;35;40m d$$$$$$P" "$$$$$$$$ Q$$$ Q$$$$ $$$$$ `Q$$$$$$$P `Q$$$$$$$P +[0;35;40m $$$$$$$P `""""" "" "" Q$$$P "Q$$$P" "Q$$$P" +[0;35;40m `Q$$P" """ +[0;37;40m + +\n (\s \m \r) \t \d ``` |