makin' moves to sync computers
This commit is contained in:
21
.bashrc
21
.bashrc
@@ -1,4 +1,4 @@
|
||||
#!/bin/sh
|
||||
#!/bin/bash
|
||||
|
||||
# If not running interactively, don't do anything
|
||||
[ -z "$PS1" ] && return
|
||||
@@ -109,9 +109,6 @@ alias .....='cd ../../../..'
|
||||
# cd into the old directory
|
||||
alias bd='cd "$OLDPWD"'
|
||||
|
||||
# ls -> exa
|
||||
alias ls='exa'
|
||||
|
||||
# Search command line history
|
||||
alias h="history | grep "
|
||||
|
||||
@@ -149,10 +146,6 @@ alias tbr='trans :pt-BR'
|
||||
alias wgup='sudo wg-quick up /etc/wireguard/wg0.conf'
|
||||
alias wgdown='sudo wg-quick down /etc/wireguard/wg0.conf'
|
||||
|
||||
# Keychain
|
||||
alias keys='eval $(keychain --eval --quiet ry_ecdsa) && eval $(keychain --eval --quiet id_rsa)'
|
||||
|
||||
|
||||
#######################################################
|
||||
# SPECIAL FUNCTIONS
|
||||
#######################################################
|
||||
@@ -187,7 +180,19 @@ PS1="${CYAN}[\u@\h ${YELLOW}\w${GREEN}\$(parse_git_branch)${CYAN}]${WHITE}${RESE
|
||||
#######################################################
|
||||
# SSH
|
||||
#######################################################
|
||||
<<<<<<< Updated upstream
|
||||
# Set SSH_AUTH_SOCK to use Gnome Keyring's SSH agent
|
||||
export SSH_AUTH_SOCK="/run/user/1000/keyring/ssh"
|
||||
|
||||
todo ls
|
||||
=======
|
||||
|
||||
keys()
|
||||
{
|
||||
eval "$(keychain --eval --quiet ry_ecdsa)"
|
||||
eval "$(keychain --eval --quiet id_rsa)"
|
||||
}
|
||||
|
||||
keys
|
||||
|
||||
>>>>>>> Stashed changes
|
||||
|
||||
@@ -1,60 +1,8 @@
|
||||
require("config.lazy")
|
||||
-- ~/.config/nvim/init.lua
|
||||
vim.o.number = true
|
||||
vim.o.relativenumber = true
|
||||
vim.o.clipboard = "unnamedplus"
|
||||
|
||||
vim.opt.title = true
|
||||
vim.opt.background = 'dark'
|
||||
vim.opt.guicursor = ''
|
||||
vim.opt.mouse = 'a'
|
||||
vim.opt.hlsearch = false
|
||||
vim.opt.clipboard:append('unnamedplus')
|
||||
vim.opt.showmode = false
|
||||
vim.opt.ruler = false
|
||||
vim.opt.laststatus = 0
|
||||
vim.opt.showcmd = false
|
||||
|
||||
vim.cmd('highlight Normal ctermbg=NONE guibg=NONE')
|
||||
|
||||
-- Some basics:
|
||||
vim.api.nvim_set_keymap('n', 'c', '"_c', { noremap = true })
|
||||
vim.opt.compatible = false
|
||||
vim.cmd('filetype plugin on')
|
||||
vim.cmd('syntax on')
|
||||
vim.opt.encoding = 'utf-8'
|
||||
vim.opt.number = true
|
||||
vim.opt.relativenumber = true
|
||||
|
||||
-- Enable autocompletion:
|
||||
vim.opt.wildmode = { 'longest', 'list', 'full' }
|
||||
|
||||
-- Disables automatic commenting on newline:
|
||||
vim.api.nvim_exec([[
|
||||
autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
|
||||
]], false)
|
||||
|
||||
-- Perform dot commands over visual blocks:
|
||||
vim.api.nvim_set_keymap('v', '.', ':normal .<CR>', { noremap = true })
|
||||
|
||||
-- Goyo plugin makes text more readable when writing prose:
|
||||
vim.api.nvim_set_keymap('n', '<leader>f', ':Goyo | set bg=light | set linebreak<CR>', { noremap = true })
|
||||
|
||||
-- Spell-check set to <leader>o, 'o' for 'orthography':
|
||||
vim.api.nvim_set_keymap('n', '<leader>o', ':setlocal spell! spelllang=en_us<CR>', { noremap = true })
|
||||
|
||||
-- Splits open at the bottom and right, which is non-retarded, unlike vim defaults.
|
||||
vim.opt.splitbelow = true
|
||||
vim.opt.splitright = true
|
||||
|
||||
-- Shortcutting split navigation, saving a keypress:
|
||||
vim.api.nvim_set_keymap('n', '<C-h>', '<C-w>h', { noremap = true })
|
||||
vim.api.nvim_set_keymap('n', '<C-j>', '<C-w>j', { noremap = true })
|
||||
vim.api.nvim_set_keymap('n', '<C-k>', '<C-w>k', { noremap = true })
|
||||
vim.api.nvim_set_keymap('n', '<C-l>', '<C-w>l', { noremap = true })
|
||||
|
||||
|
||||
|
||||
vim.o.background = "dark" -- or "light" for light mode
|
||||
|
||||
require("solarizedDark").setup({
|
||||
transparent_mode = true,
|
||||
})
|
||||
|
||||
vim.cmd([[colorscheme solarizedDark]])
|
||||
vim.cmd [[highlight Normal guibg=NONE ctermbg=NONE]]
|
||||
vim.cmd [[highlight NormalNC guibg=NONE ctermbg=NONE]]
|
||||
vim.cmd [[highlight EndOfBuffer guibg=NONE ctermbg=NONE]]
|
||||
|
||||
@@ -149,6 +149,7 @@ settings:
|
||||
'*://accounts.google.com/*': true
|
||||
'*://api.us-west.punchh.com/*': true
|
||||
'*://archive.org/*': true
|
||||
'*://auth.openai.com/*': true
|
||||
'*://chatgpt.com/*': true
|
||||
'*://damonacy.bandcamp.com/*': true
|
||||
'*://digital.fidelity.com/*': true
|
||||
@@ -166,7 +167,9 @@ settings:
|
||||
'*://mega.nz/*': true
|
||||
'*://myaccounts.capitalone.com/*': true
|
||||
'*://navi.opal.sh/*': true
|
||||
'*://openai.com/*': true
|
||||
'*://order.tacotimenw.com/*': true
|
||||
'*://pypi.org/*': true
|
||||
'*://rateyourmusic.com/*': true
|
||||
'*://revelationofdoom.com/*': true
|
||||
'*://shop-hellsheadbangers.com/*': true
|
||||
@@ -175,6 +178,7 @@ settings:
|
||||
'*://www.discogs.com/*': true
|
||||
'*://www.duplicati.com/*': true
|
||||
'*://www.fidelity.com/*': true
|
||||
'*://www.google.com/*': true
|
||||
'*://www.hybridcalisthenics.com/*': true
|
||||
'*://www.instagram.com/*': true
|
||||
'*://www.newegg.com/*': true
|
||||
|
||||
@@ -1,152 +0,0 @@
|
||||
// Config //
|
||||
configuration {
|
||||
modi: "drun,filebrowser,window";
|
||||
show-icons: true;
|
||||
display-drun: "";
|
||||
display-run: "";
|
||||
display-filebrowser: "";
|
||||
display-window: "";
|
||||
drun-display-format: "{name}";
|
||||
window-format: "{w}{t}";
|
||||
font: "Hack Font 10";
|
||||
icon-theme: "Papirus";
|
||||
}
|
||||
|
||||
@theme "~/.config/rofi/graphite-mono.rasi"
|
||||
|
||||
|
||||
// Main //
|
||||
window {
|
||||
height: 200px;
|
||||
width: 600px;
|
||||
transparency: "real";
|
||||
fullscreen: false;
|
||||
enabled: true;
|
||||
cursor: "default";
|
||||
spacing: 0px;
|
||||
padding: 0px;
|
||||
border: 2px;
|
||||
border-radius: 40px;
|
||||
border-color: @main-br;
|
||||
background-color: transparent;
|
||||
}
|
||||
mainbox {
|
||||
enabled: true;
|
||||
spacing: 0px;
|
||||
padding: 0px;
|
||||
orientation: vertical;
|
||||
children: [ "listbox" , "inputmode" ];
|
||||
background-color: rgba(32, 32, 32, 0.88);
|
||||
}
|
||||
|
||||
|
||||
|
||||
// Lists //
|
||||
listbox {
|
||||
padding: 0px;
|
||||
spacing: 0px;
|
||||
orientation: horizontal;
|
||||
children: [ "listview" ];
|
||||
background-color: transparent;
|
||||
}
|
||||
listview {
|
||||
padding: 10px;
|
||||
spacing: 0px;
|
||||
enabled: true;
|
||||
columns: 5;
|
||||
cycle: true;
|
||||
dynamic: true;
|
||||
scrollbar: false;
|
||||
layout: vertical;
|
||||
reverse: false;
|
||||
fixed-height: true;
|
||||
fixed-columns: true;
|
||||
cursor: "default";
|
||||
background-color: @main-bg;
|
||||
text-color: @main-fg;
|
||||
}
|
||||
|
||||
|
||||
// Inputs //
|
||||
inputmode {
|
||||
padding: 0px;
|
||||
spacing: 0px;
|
||||
orientation: horizontal;
|
||||
children: [ "inputbar" , "mode-switcher" ];
|
||||
background-color: transparent;
|
||||
}
|
||||
inputbar {
|
||||
enabled: true;
|
||||
width: 400px;
|
||||
height: 0px;
|
||||
spacing: 0px;
|
||||
padding: 30px 10px 30px 65px;
|
||||
children: [ "entry" ];
|
||||
background-color: transparent;
|
||||
}
|
||||
entry {
|
||||
vertical-align: 0.5;
|
||||
border-radius: 50px;
|
||||
enabled: true;
|
||||
spacing: 0px;
|
||||
padding: 10px;
|
||||
text-color: @main-fg;
|
||||
background-color: @main-bg;
|
||||
}
|
||||
|
||||
|
||||
// Modes //
|
||||
mode-switcher {
|
||||
width: 200px;
|
||||
orientation: horizontal;
|
||||
enabled: true;
|
||||
padding: 30px 65px 30px 0px;
|
||||
spacing: 10px;
|
||||
background-color: transparent;
|
||||
}
|
||||
button {
|
||||
cursor: pointer;
|
||||
padding: 0px;
|
||||
border-radius: 50px;
|
||||
background-color: @main-bg;
|
||||
text-color: @main-fg;
|
||||
}
|
||||
button selected {
|
||||
background-color: @main-fg;
|
||||
text-color: @main-bg;
|
||||
}
|
||||
|
||||
|
||||
// Elements //
|
||||
element {
|
||||
orientation: vertical;
|
||||
enabled: true;
|
||||
spacing: 0px;
|
||||
padding: 10px;
|
||||
border-radius: 25px;
|
||||
cursor: pointer;
|
||||
background-color: transparent;
|
||||
text-color: @main-fg;
|
||||
}
|
||||
@media(max-aspect-ratio: 1.8) {
|
||||
element {
|
||||
orientation: vertical;
|
||||
}
|
||||
}
|
||||
element selected.normal {
|
||||
background-color: @select-bg;
|
||||
text-color: @select-fg;
|
||||
}
|
||||
element-icon {
|
||||
size: 38px;
|
||||
cursor: inherit;
|
||||
background-color: transparent;
|
||||
text-color: inherit;
|
||||
}
|
||||
element-text {
|
||||
vertical-align: 0.5;
|
||||
horizontal-align: 0.5;
|
||||
cursor: inherit;
|
||||
background-color: transparent;
|
||||
text-color: inherit;
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
* {
|
||||
main-bg: #262626e6;
|
||||
main-fg: #d9d9d9ff;
|
||||
main-br: #a6a6a6ff;
|
||||
main-ex: #595959cc;
|
||||
select-bg: #a6a6a6ff;
|
||||
select-fg: #262626ff;
|
||||
separatorcolor: transparent;
|
||||
border-color: transparent;
|
||||
}
|
||||
@@ -14,8 +14,8 @@ set $mod Mod4
|
||||
set $term alacritty
|
||||
|
||||
# Application Launcher
|
||||
#set $menu bemenu-run -p Run: -l 10 -c -M 500 --fn 'Terminus 17' --tf '#ff4e00' --ff '#dbc077' --hf '#ff4e00'
|
||||
set $menu rofi -show
|
||||
set $menu bemenu-run -p Run: -l 10 -c -M 500 --fn 'Terminus 17' --tf '#ff4e00' --ff '#dbc077' --hf '#ff4e00'
|
||||
#set $menu rofi -show
|
||||
|
||||
#######################
|
||||
# GENERAL KEYBINDS
|
||||
@@ -164,7 +164,7 @@ bindsym $mod+Ctrl+g exec grimshot save window
|
||||
|
||||
# Bookmarks
|
||||
# Enter selected bookmark into target text field
|
||||
bindsym $mod+i exec wtype $(grep -v '^#' ~/.local/share/bookmarks/bookmarks | bemenu -p Bookmark: -l 50 -c -M 500 --fn 'Monospace 14' --tf '#ff4e00' --ff '#dbc077' --hf '#ff4e00' | cut -d ' ' -f1)
|
||||
bindsym $mod+i exec wtype $(grep -v '^#' ~/.local/share/bookmarks/bookmarks | bemenu -p Bookmark: -l 25 -c -M 500 --fn 'Monospace 14' --tf '#ff4e00' --ff '#dbc077' --hf '#ff4e00' | cut -d ' ' -f1)
|
||||
|
||||
# Insert bookmark into bookmark file (~/.local/share/bookmarks/bookmarks)
|
||||
bindsym $mod+Shift+i exec ~/.local/bin/bookmark_insert
|
||||
@@ -182,25 +182,9 @@ bindsym $mod+p exec ~/.local/bin/pass_autofill
|
||||
# EXECS
|
||||
#######################
|
||||
|
||||
exec --no-startup-id /usr/libexec/xdg-desktop-portal-wlr
|
||||
exec --no-startup-id /usr/libexec/xdg-desktop-portal
|
||||
|
||||
set $gnome-schema org.gnome.desktop.interface
|
||||
|
||||
# Set GTK/icon theme
|
||||
exec_always {
|
||||
gsettings set $gnome-schema gtk-theme 'ArcDarker'
|
||||
gsettings set $gnome-schema icon-theme 'Papirus-Dark'
|
||||
gsettings set $gnome-schema cursor-theme 'Breeze_Light'
|
||||
gsettings set $gnome-schema cursor-size 30
|
||||
}
|
||||
|
||||
# Gnome-keyring stuff maybe?
|
||||
exec --no-startup-id /usr/bin/gnome-keyring-daemon --start --components=ssh
|
||||
|
||||
# Syncthing
|
||||
exec /usr/bin/syncthing
|
||||
|
||||
# Notifications
|
||||
exec_always sh -c 'pgrep -x dunst > /dev/null || dunst'
|
||||
|
||||
@@ -213,6 +197,8 @@ exec /usr/bin/udiskie &
|
||||
# Network Manager tray applet
|
||||
exec /usr/bin/nm-applet
|
||||
|
||||
exec eval $(ssh-agent -s)
|
||||
|
||||
# Bluetooth manager tray applet
|
||||
exec /usr/bin/blueman-applet
|
||||
|
||||
@@ -235,11 +221,11 @@ exec hash dbus-update-activation-environment 2>/dev/null && dbus-update-activati
|
||||
#######################
|
||||
|
||||
# SwayFX specific directions
|
||||
corner_radius 3
|
||||
shadows enable
|
||||
#corner_radius 3
|
||||
#shadows enable
|
||||
#default_dim_inactive 0.1
|
||||
blur enable
|
||||
blur_xray disable
|
||||
#blur enable
|
||||
#blur_xray disable
|
||||
|
||||
# Gaps
|
||||
smart_gaps off
|
||||
|
||||
@@ -5,7 +5,11 @@
|
||||
# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
|
||||
# absolute path. No other format is supported.
|
||||
#
|
||||
<<<<<<< Updated upstream
|
||||
XDG_DESKTOP_DIR="$HOME/desktop"
|
||||
=======
|
||||
XDG_DESKTOP_DIR="$HOME/"
|
||||
>>>>>>> Stashed changes
|
||||
XDG_DOWNLOAD_DIR="$HOME/dls"
|
||||
XDG_TEMPLATES_DIR="$HOME/"
|
||||
XDG_PUBLICSHARE_DIR="$HOME/"
|
||||
|
||||
|
Before Width: | Height: | Size: 416 KiB After Width: | Height: | Size: 416 KiB |
60
archive/nvim/init.lua
Normal file
60
archive/nvim/init.lua
Normal file
@@ -0,0 +1,60 @@
|
||||
require("config.lazy")
|
||||
|
||||
vim.opt.title = true
|
||||
vim.opt.background = 'dark'
|
||||
vim.opt.guicursor = ''
|
||||
vim.opt.mouse = 'a'
|
||||
vim.opt.hlsearch = false
|
||||
vim.opt.clipboard:append('unnamedplus')
|
||||
vim.opt.showmode = false
|
||||
vim.opt.ruler = false
|
||||
vim.opt.laststatus = 0
|
||||
vim.opt.showcmd = false
|
||||
|
||||
vim.cmd('highlight Normal ctermbg=NONE guibg=NONE')
|
||||
|
||||
-- Some basics:
|
||||
vim.api.nvim_set_keymap('n', 'c', '"_c', { noremap = true })
|
||||
vim.opt.compatible = false
|
||||
vim.cmd('filetype plugin on')
|
||||
vim.cmd('syntax on')
|
||||
vim.opt.encoding = 'utf-8'
|
||||
vim.opt.number = true
|
||||
vim.opt.relativenumber = true
|
||||
|
||||
-- Enable autocompletion:
|
||||
vim.opt.wildmode = { 'longest', 'list', 'full' }
|
||||
|
||||
-- Disables automatic commenting on newline:
|
||||
vim.api.nvim_exec([[
|
||||
autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
|
||||
]], false)
|
||||
|
||||
-- Perform dot commands over visual blocks:
|
||||
vim.api.nvim_set_keymap('v', '.', ':normal .<CR>', { noremap = true })
|
||||
|
||||
-- Goyo plugin makes text more readable when writing prose:
|
||||
vim.api.nvim_set_keymap('n', '<leader>f', ':Goyo | set bg=light | set linebreak<CR>', { noremap = true })
|
||||
|
||||
-- Spell-check set to <leader>o, 'o' for 'orthography':
|
||||
vim.api.nvim_set_keymap('n', '<leader>o', ':setlocal spell! spelllang=en_us<CR>', { noremap = true })
|
||||
|
||||
-- Splits open at the bottom and right, which is non-retarded, unlike vim defaults.
|
||||
vim.opt.splitbelow = true
|
||||
vim.opt.splitright = true
|
||||
|
||||
-- Shortcutting split navigation, saving a keypress:
|
||||
vim.api.nvim_set_keymap('n', '<C-h>', '<C-w>h', { noremap = true })
|
||||
vim.api.nvim_set_keymap('n', '<C-j>', '<C-w>j', { noremap = true })
|
||||
vim.api.nvim_set_keymap('n', '<C-k>', '<C-w>k', { noremap = true })
|
||||
vim.api.nvim_set_keymap('n', '<C-l>', '<C-w>l', { noremap = true })
|
||||
|
||||
|
||||
|
||||
vim.o.background = "dark" -- or "light" for light mode
|
||||
|
||||
require("solarizedDark").setup({
|
||||
transparent_mode = true,
|
||||
})
|
||||
|
||||
vim.cmd([[colorscheme solarizedDark]])
|
||||
Reference in New Issue
Block a user