diff options
| -rw-r--r-- | .Xresources | 42 | ||||
| -rw-r--r-- | .config/VSCodium/User/settings.json | 2 | ||||
| -rw-r--r-- | .config/alacritty/alacritty.yml | 56 | ||||
| -rw-r--r-- | .config/fish/config.fish | 4 | ||||
| -rw-r--r-- | .config/fish/fish_variables | 18 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .spacemacs | 21 | ||||
| -rw-r--r-- | .ssh/config | 57 |
8 files changed, 97 insertions, 104 deletions
diff --git a/.Xresources b/.Xresources index 0fe48db..0f81ced 100644 --- a/.Xresources +++ b/.Xresources @@ -1,25 +1,29 @@ -*faceName: 'Fira Code' -*faceSize: 8.5 +XTerm*faceName: 'Fira Code' +XTerm*faceSize: 8.5 *background: #000000 -*foreground: #657b83 +!*foreground: #657b83 +*foreground: #ffffff *cursorColor: #16A085 -*color0: #232423 -*color8: #282928 -*color1: #BA2922 -*color9: #CC372C -*color2: #7E807E -*color10: #8D8F8D -*color3: #4C4F4D -*color11: #4E524F -*color4: #16A085 -*color12: #13BF9D -*color5: #43746A -*color13: #487D72 -*color6: #00CCCC -*color14: #00D1D1 -*color7: #E0E0E0 -*color15: #E8E8E8 +!*color0: #232423 +!*color8: #282928 +!*color1: #BA2922 +!*color9: #CC372C +!*color2: #7E807E +!*color10: #8D8F8D +!*color3: #4C4F4D +!*color11: #4E524F +!*color4: #16A085 +!*color12: #13BF9D +!*color5: #43746A +!*color13: #487D72 +!*color6: #00CCCC +!*color14: #00D1D1 +!*color7: #E0E0E0 +!*color15: #E8E8E8 + +XTerm*utf8: true +XTerm*metaSendsEscape: true URxvt.font: xft:Fira Code:size=8.5 URxvt.depth: 32 diff --git a/.config/VSCodium/User/settings.json b/.config/VSCodium/User/settings.json index b7e3211..6d72dd3 100644 --- a/.config/VSCodium/User/settings.json +++ b/.config/VSCodium/User/settings.json @@ -3,7 +3,7 @@ "clang-format.executable": "/usr/bin/clang-format", "d.servedPath": "$HOME/.local/share/code-d/bin/serve-d", "editor.acceptSuggestionOnEnter": "off", - "editor.fontFamily": "Fira Code", + "editor.fontFamily": "JetBrains Mono", "editor.fontLigatures": true, "editor.formatOnPaste": true, "editor.formatOnSave": true, diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 5ef3302..1769e0a 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -93,24 +93,24 @@ scrolling: font: # Normal (roman) font face normal: - family: Fira Code + family: JetBrains Mono # The `style` can be specified to pick a specific face. style: Regular # Bold font face bold: - family: Fira Code + family: JetBrains Mono # The `style` can be specified to pick a specific face. style: Bold # Italic font face italic: - family: Fira Code + family: JetBrains Mono # The `style` can be specified to pick a specific face. style: Italic # Point size - size: 9.5 + size: 8.5 # Offset is the extra space around each character. `offset.y` can be thought of # as modifying the line spacing, and `offset.x` as modifying the letter spacing. @@ -237,12 +237,12 @@ mouse: # If this is `true`, the cursor is temporarily hidden when typing. hide_when_typing: false - url: + #url: # URL launcher # # This program is executed when clicking on a text which is recognized as a URL. # The URL is always added to the command as the last parameter. - launcher: firefox + #launcher: firefox # URL modifiers # @@ -250,6 +250,50 @@ mouse: # on them. The available modifiers are documented in the key binding section. #modifiers: Control|Shift +# Regex hints +# +# Terminal hints can be used to find text in the visible part of the terminal +# and pipe it to other applications. +#hints: + # Keys used for the hint labels. + #alphabet: "jfkdls;ahgurieowpq" + + # List with all available hints + # + # Each hint must have a `regex` and either an `action` or a `command` field. + # The fields `mouse`, `binding` and `post_processing` are optional. + # + # The fields `command`, `binding.key`, `binding.mods` and `mouse.mods` accept + # the same values as they do in the `key_bindings` section. + # + # The `mouse.enabled` field controls if the hint should be underlined while + # the mouse with all `mouse.mods` keys held or the vi mode cursor is above it. + # + # If the `post_processing` field is set to `true`, heuristics will be used to + # shorten the match if there are characters likely not to be part of the hint + # (e.g. a trailing `.`). This is most useful for URIs. + # + # Values for `action`: + # - Copy + # Copy the hint's text to the clipboard. + # - Paste + # Paste the hint's text to the terminal or search. + # - Select + # Select the hint's text. + # - MoveViModeCursor + # Move the vi mode cursor to the beginning of the hint. + enabled: + - regex: "(mailto:|gemini:|gopher:|https:|http:|news:|file:|git:|ssh:|ftp:)\ + [^\u0000-\u001F\u007F-\u009F<>\" {-}\\^⟨⟩`]+" + command: firefox + post_processing: true + mouse: + enabled: true + mods: None + binding: + key: U + mods: Control|Shift + selection: semantic_escape_chars: ",│`|:\"' ()[]{}<>" diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 7de1e02..a221170 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -83,7 +83,7 @@ end # misc environment modifications set -x VISUAL vim set -x EDITOR $VISUAL -set -x PAGER "$HOME/.cargo/bin/bat -p" +#set -x PAGER "$HOME/.cargo/bin/bat -p" set -x BROWSER firefox set -x TERM xterm-256color set -x MANPATH /usr/local/man $MANPATH @@ -111,7 +111,7 @@ set -x HUB_CONFIG $HOME/.config/hub set -x HUB_PROTOCOL ssh # rust env -set -x RUST_SRC_PATH ~/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library +#set -x RUST_SRC_PATH ~/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library # go env set -x GOPATH $HOME/dev/go diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index 8fec0ec..4f9f771 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -1,14 +1,14 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 SETUVAR __fish_initialized:3100 -SETUVAR fish_color_autosuggestion:555\x1ebrblack +SETUVAR fish_color_autosuggestion:777777 SETUVAR fish_color_cancel:\x2dr -SETUVAR fish_color_command:005fd7 -SETUVAR fish_color_comment:990000 +SETUVAR fish_color_command:00FF00 +SETUVAR fish_color_comment:30BE30 SETUVAR fish_color_cwd:green SETUVAR fish_color_cwd_root:red -SETUVAR fish_color_end:009900 -SETUVAR fish_color_error:ff0000 +SETUVAR fish_color_end:FF7B7B +SETUVAR fish_color_error:A40000 SETUVAR fish_color_escape:00a6b2 SETUVAR fish_color_history_current:\x2d\x2dbold SETUVAR fish_color_host:normal @@ -16,9 +16,9 @@ SETUVAR fish_color_host_remote:yellow SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue SETUVAR fish_color_normal:normal SETUVAR fish_color_operator:00a6b2 -SETUVAR fish_color_param:00afff -SETUVAR fish_color_quote:999900 -SETUVAR fish_color_redirection:00afff +SETUVAR fish_color_param:30BE30 +SETUVAR fish_color_quote:44FF44 +SETUVAR fish_color_redirection:7BFF7B SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack SETUVAR fish_color_status:red @@ -26,7 +26,7 @@ SETUVAR fish_color_user:brgreen SETUVAR fish_color_valid_path:\x2d\x2dunderline SETUVAR fish_greeting:\x1d SETUVAR fish_key_bindings:fish_default_key_bindings -SETUVAR fish_pager_color_completion:\x1d +SETUVAR fish_pager_color_completion:normal SETUVAR fish_pager_color_description:B3A06D\x1eyellow SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan diff --git a/.gitignore b/.gitignore index 485dee6..f18e914 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .idea +venv/ diff --git a/.spacemacs b/.spacemacs index bdd153a..0d9b9c3 100644 --- a/.spacemacs +++ b/.spacemacs @@ -33,19 +33,19 @@ This function should only modify configuration layer settings." ;; List of configuration layers to load. dotspacemacs-configuration-layers '( - asciidoc - c-c++ - d - (elixir :variables elixir-backend 'lsp elixir-ls-path "$HOME/.emacs.opt/elixir-ls") - go + ;;asciidoc + ;;c-c++ + ;;d + ;;(elixir :variables elixir-backend 'lsp elixir-ls-path "$HOME/.emacs.opt/elixir-ls") + ;;go html markdown - python - racket - rust + ;;python + ;;racket + ;;rust shell-scripts yaml - zig + ;;zig ;; ---------------------------------------------------------------- ;; Example of useful layers you may want to use right away. ;; Uncomment some layer names and press `SPC f e R' (Vim style) or @@ -63,6 +63,7 @@ This function should only modify configuration layer settings." ;; (shell :variables ;; shell-default-height 30 ;; shell-default-position 'bottom) + perl5 spell-checking syntax-checking version-control @@ -507,7 +508,7 @@ before packages are loaded." (setq rust-format-on-save t) - (spacemacs/toggle-evil-safe-lisp-structural-editing-on-register-hook-racket-mode) + ;;(spacemacs/toggle-evil-safe-lisp-structural-editing-on-register-hook-racket-mode) ) diff --git a/.ssh/config b/.ssh/config deleted file mode 100644 index 8687229..0000000 --- a/.ssh/config +++ /dev/null @@ -1,57 +0,0 @@ -Host gbmor - HostName gbmor.dev - VerifyHostKeyDNS yes - IdentitiesOnly yes - IdentityFile ~/.ssh/id_rsa_yubikey.pub - RemoteForward /home/ben/.gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra - -Host institute inst - HostName tilde.institute - VerifyHostKeyDNS yes - IdentitiesOnly yes - IdentityFile ~/.ssh/id_rsa_yubikey.pub - RemoteForward /home/gbmor/.gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra - -Host crawl - HostName crawl.tildeverse.org - -Host town - HostName tilde.town - -Host team - HostName tilde.team - -Host git.sr.ht - IdentitiesOnly yes - IdentityFile ~/.ssh/id_rsa_yubikey.pub - -Host github.com - IdentitiesOnly yes - IdentityFile ~/.ssh/id_rsa_yubikey.pub - -Host tildegit.org - IdentitiesOnly yes - IdentityFile ~/.ssh/id_rsa_yubikey.pub - -Host pestilence - HostName 192.168.1.217 - IdentitiesOnly yes - IdentityFile ~/.ssh/id_rsa_yubikey.pub - RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra - -Host * - Compression no - UseRoaming no - HashKnownHosts yes - VisualHostKey yes - #StrictHostKeyChecking ask - ForwardAgent no - ForwardX11 no - ForwardX11Trusted no - ServerAliveInterval 300 - ServerAliveCountMax 2 - Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com - MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com - #MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com - KexAlgorithms curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256 - HostKeyAlgorithms ssh-ed25519-cert-v01@openssh.com,ssh-rsa-cert-v01@openssh.com,ssh-ed25519,ssh-rsa |