| sway, nvim and qutebrowser updates. - dotfiles - These are my dotfiles. There a… | |
| Log | |
| Files | |
| Refs | |
| README | |
| --- | |
| commit 1bbe6709f226fc75c75271dd1879f37c6912ca40 | |
| parent d655708f331b2054ccb85e956b05777b698669b0 | |
| Author: Jay Scott <[email protected]> | |
| Date: Sat, 13 Jul 2024 19:57:58 +0100 | |
| sway, nvim and qutebrowser updates. | |
| Diffstat: | |
| M README | 8 ++++++-- | |
| M ashrc | 10 ++-------- | |
| M bin/music.sh | 2 +- | |
| M nvim/init.lua | 188 ++++++++++++++++-------------… | |
| M qutebrowser/config.py | 6 +++--- | |
| M sway/config | 9 +++------ | |
| 6 files changed, 113 insertions(+), 110 deletions(-) | |
| --- | |
| diff --git a/README b/README | |
| @@ -1,5 +1,9 @@ | |
| -|> dotfiles | |
| + __ __ ___ ___ ___ __ | |
| +| \ / \ | |__ | | |__ /__` | |
| +|__/ \__/ | | | |___ |___ .__/ | |
| + | |
| +--- | |
| Since 2011, I mainly use the terminal for everything. | |
| @@ -16,4 +20,4 @@ at all, the closest I come is using IRC. | |
| video / music : mpv | |
| password mgt : pass | |
| vpn : mullvad | |
| - news : newsraft | |
| + news : sfeed | |
| diff --git a/ashrc b/ashrc | |
| @@ -11,16 +11,12 @@ export CARGO_HOME="$XDG_DATA_HOME"/cargo | |
| GPG_TTY=$(tty) | |
| export GPG_TTY | |
| export EDITOR="nvim" | |
| -export BROWSER="firefox" | |
| +export BROWSER="qutebrowser" | |
| export PATH=$PATH:$HOME/bin | |
| # tools | |
| export OPENER=~/bin/link_handler.sh | |
| -export BEMENU_OPTS="-l 5 -p '>>> ' --tb '#55a1ba' --tf '#ffffff' --hf '#444444… | |
| - | |
| -# terraform config | |
| -export TF_CLOUD_ORGANIZATION="jay-scot" | |
| -export TF_WORKSPACE="hetzner" | |
| +export BEMENU_OPTS="-l 10 -p '>>> ' --tb '#55a1ba' --tf '#ffffff' --hf '#44444… | |
| # lynx | |
| export LYNX_CFG=$HOME/.config/lynx/config | |
| @@ -58,5 +54,3 @@ export LANG=en_US.UTF-8 | |
| export LC_CTYPE="en_US.UTF-8" | |
| export LC_ALL=en_US.UTF-8 | |
| export PS1="\[\e[00;34m\]▶▶▶ \W \[\e[0m\]" | |
| - | |
| -source ~/.secret | |
| diff --git a/bin/music.sh b/bin/music.sh | |
| @@ -3,7 +3,7 @@ | |
| DIRECTORY="$HOME/media/music_videos" | |
| directories=$(find "$DIRECTORY" -mindepth 1 -maxdepth 1 -type d -exec basename… | |
| -selected_directory=$(printf "%s\n" "$directories" | bemenu -p 'music: ') | |
| +selected_directory=$(printf "%s\n" "$directories" | bemenu -l 10 -p 'music: ') | |
| if [ -n "$selected_directory" ]; then | |
| mpv --autofit=30% --really-quiet --no-terminal "$DIRECTORY/$selected_direc… | |
| fi | |
| diff --git a/nvim/init.lua b/nvim/init.lua | |
| @@ -2,14 +2,14 @@ | |
| local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" | |
| if not vim.loop.fs_stat(lazypath) then | |
| - vim.fn.system({ | |
| - "git", | |
| - "clone", | |
| - "--filter=blob:none", | |
| - "https://github.com/folke/lazy.nvim.git", | |
| - "--branch=stable", | |
| - lazypath, | |
| - }) | |
| + vim.fn.system({ | |
| + "git", | |
| + "clone", | |
| + "--filter=blob:none", | |
| + "https://github.com/folke/lazy.nvim.git", | |
| + "--branch=stable", | |
| + lazypath, | |
| + }) | |
| end | |
| vim.opt.rtp:prepend(lazypath) | |
| @@ -17,73 +17,80 @@ vim.opt.rtp:prepend(lazypath) | |
| require("lazy").setup({ | |
| - -- colour theme | |
| - { | |
| - "ellisonleao/gruvbox.nvim", | |
| - priority = 1000, | |
| - config = function () | |
| - require("gruvbox").setup({ | |
| - contrast = "hard" | |
| - }) | |
| - vim.cmd([[colorscheme gruvbox]]) | |
| - end, | |
| - }, | |
| - | |
| - -- status bar | |
| - { | |
| - "nvim-lualine/lualine.nvim", | |
| - dependencies = { 'nvim-tree/nvim-web-devicons' }, | |
| - config = function () | |
| - require("lualine").setup({ | |
| - options = { | |
| - theme = 'gruvbox', | |
| - icons_enabled = false, | |
| - }, | |
| - sections = { | |
| - lualine_c = { | |
| - { | |
| - 'filename', | |
| - file_status = true, | |
| - path = 1 | |
| - } | |
| - } | |
| - } | |
| - }) | |
| - end, | |
| - }, | |
| - | |
| - -- remove spaces at the end of lines | |
| - { | |
| - "lewis6991/spaceless.nvim", | |
| - config = function() | |
| - require'spaceless'.setup() | |
| - end | |
| - }, | |
| - | |
| - -- comments | |
| - { | |
| - 'numToStr/Comment.nvim', | |
| - config = function() | |
| - require('Comment').setup() | |
| - end | |
| - }, | |
| - | |
| - -- file fuzzy finding | |
| - { | |
| - "nvim-telescope/telescope.nvim", | |
| - dependencies = { | |
| - "nvim-lua/plenary.nvim" | |
| + -- colour theme | |
| + { | |
| + "ellisonleao/gruvbox.nvim", | |
| + priority = 1000, | |
| + config = function() | |
| + require("gruvbox").setup({ | |
| + contrast = "hard", | |
| + }) | |
| + vim.cmd([[colorscheme gruvbox]]) | |
| + end, | |
| + }, | |
| + | |
| + -- status bar | |
| + { | |
| + "nvim-lualine/lualine.nvim", | |
| + dependencies = { "nvim-tree/nvim-web-devicons" }, | |
| + config = function() | |
| + require("lualine").setup({ | |
| + options = { | |
| + theme = "gruvbox", | |
| + icons_enabled = false, | |
| + }, | |
| + sections = { | |
| + lualine_c = { | |
| + { | |
| + "filename", | |
| + file_status = true, | |
| + path = 1, | |
| + }, | |
| + }, | |
| + }, | |
| + }) | |
| + end, | |
| + }, | |
| + | |
| + -- remove spaces at the end of lines | |
| + { | |
| + "lewis6991/spaceless.nvim", | |
| + config = function() | |
| + require("spaceless").setup() | |
| + end, | |
| + }, | |
| + | |
| + -- comments | |
| + { | |
| + "numToStr/Comment.nvim", | |
| + config = function() | |
| + require("Comment").setup() | |
| + end, | |
| + }, | |
| + | |
| + -- file fuzzy finding | |
| + { | |
| + "nvim-telescope/telescope.nvim", | |
| + dependencies = { | |
| + "nvim-lua/plenary.nvim", | |
| + }, | |
| + }, | |
| + | |
| + -- file browser | |
| + { | |
| + "nvim-telescope/telescope-file-browser.nvim", | |
| + dependencies = { | |
| + "nvim-telescope/telescope.nvim", | |
| + "nvim-lua/plenary.nvim", | |
| + }, | |
| + }, | |
| + | |
| + -- terraform | |
| + { | |
| + "hashivim/vim-terraform", | |
| + lazy = true, | |
| + ft = { 'terraform', 'hcl' } | |
| } | |
| - }, | |
| - | |
| - -- file browser | |
| - { | |
| - "nvim-telescope/telescope-file-browser.nvim", | |
| - dependencies = { | |
| - "nvim-telescope/telescope.nvim", | |
| - "nvim-lua/plenary.nvim" | |
| - } | |
| - } | |
| }) | |
| @@ -91,8 +98,8 @@ require("lazy").setup({ | |
| -- appearance | |
| vim.opt.number = true | |
| -vim.opt.signcolumn = 'yes' | |
| -vim.opt.colorcolumn = '80' | |
| +vim.opt.signcolumn = "yes" | |
| +vim.opt.colorcolumn = "80" | |
| vim.opt.termguicolors = true | |
| -- behaviour | |
| @@ -103,8 +110,8 @@ vim.opt.mouse = "" | |
| -- spelling | |
| vim.opt.spell = true | |
| -vim.opt.spelllang = 'en_gb' | |
| -vim.opt.spelloptions = 'camel' | |
| +vim.opt.spelllang = "en_gb" | |
| +vim.opt.spelloptions = "camel" | |
| -- search | |
| vim.opt.hlsearch = true | |
| @@ -120,32 +127,33 @@ vim.opt.smartindent = true | |
| -- show space and tab characters | |
| vim.o.list = true | |
| -vim.o.listchars = 'tab:› ,trail:⋅,nbsp:␣' | |
| +vim.o.listchars = "tab:› ,trail:⋅,nbsp:␣" | |
| -- map leader to <space> | |
| -vim.keymap.set('n', ' ', '<Nop>', { silent = true, remap = false }) | |
| -vim.g.mapleader = ' ' | |
| +vim.keymap.set("n", " ", "<Nop>", { silent = true, remap = false }) | |
| +vim.g.mapleader = " " | |
| -- indenting | |
| -vim.keymap.set('v', '<', '<gv') | |
| -vim.keymap.set('v', '>', '>gv') | |
| +vim.keymap.set("v", "<", "<gv") | |
| +vim.keymap.set("v", ">", ">gv") | |
| -- comments | |
| -vim.keymap.set('n', '<C-/>', 'gcc', { noremap = false }) | |
| -vim.keymap.set('v', '<C-/>', 'gcc', { noremap = false }) | |
| +vim.keymap.set("n", "<C-/>", "gcc", { noremap = false }) | |
| +vim.keymap.set("v", "<C-/>", "gcc", { noremap = false }) | |
| -- open file_browser with the path of the current buffer | |
| -vim.keymap.set('n', '<leader>ff', ':Telescope file_browser path=%:p:h select_b… | |
| +vim.keymap.set("n", "<leader>ff", ":Telescope file_browser path=%:p:h select_b… | |
| -- open fuzzy find file browser | |
| -vim.keymap.set('n', '<leader>fg', ':Telescope find_files<CR>', { noremap = tru… | |
| +vim.keymap.set("n", "<leader>fg", ":Telescope find_files<CR>", { noremap = tru… | |
| -- open buffers list | |
| -vim.keymap.set('n', '<leader>fb', ':Telescope buffers<CR>', { noremap = true }) | |
| +vim.keymap.set("n", "<leader>fb", ":Telescope buffers<CR>", { noremap = true }) | |
| -- format paragraphs | |
| -vim.keymap.set('n', '<leader>pp', 'gqap', { noremap = true, silent = true }) | |
| +vim.keymap.set("n", "<leader>pp", "gqap", { noremap = true, silent = true }) | |
| -- enable spellchecking | |
| -vim.keymap.set('n', '<leader>ps', ':setlocal spell! spelllang=en_gb<CR>', { no… | |
| +vim.keymap.set("n", "<leader>ps", ":setlocal spell! spelllang=en_gb<CR>", { no… | |
| +vim.g.terraform_fmt_on_save = 1 | |
| diff --git a/qutebrowser/config.py b/qutebrowser/config.py | |
| @@ -12,15 +12,15 @@ except ImportError: | |
| # default local page | |
| #DEFAULT_PAGE = str(config.configdir / 'blank.html') | |
| -DEFAULT_PAGE = "https://dashboard.jay.scot" | |
| +DEFAULT_PAGE = "https://local.jay.scot/dashboard" | |
| # keybinds remapping | |
| config.bind("xx", "set tabs.show always;; later 5000 set tabs.show switching") | |
| config.bind("xc", "spawn --userscript password_fill") | |
| config.bind("zd", "download-open") | |
| config.bind("xz", "hint links spawn --detach ~/bin/link_handler.sh {hint-url}") | |
| -config.bind("j", "run-with-count 5 scroll down") | |
| -config.bind("k", "run-with-count 5 scroll up") | |
| +config.bind("j", "cmd-run-with-count 5 scroll down") | |
| +config.bind("k", "cmd-run-with-count 5 scroll up") | |
| # tabbar | |
| c.tabs.position = "top" | |
| diff --git a/sway/config b/sway/config | |
| @@ -21,16 +21,16 @@ for_window [app_id="mpv"] floating enable, sticky enable, m… | |
| xwayland enable | |
| bar swaybar_command waybar | |
| -# Keyboard layout | |
| +# keyboard layout | |
| input * { | |
| xkb_layout "gb" | |
| xkb_variant "extd" | |
| } | |
| -# Keybinds | |
| +# keybinds | |
| bindsym $mod+Space exec footclient | |
| bindsym $mod+p exec $menu | |
| -bindsym $mod+f exec firefox | |
| +bindsym $mod+f exec qutebrowser | |
| bindsym $mod+m exec /home/jay/bin/music.sh | |
| bindsym XF86AudioRaiseVolume exec pamixer -i 5 | |
| @@ -41,19 +41,16 @@ bindsym $mod+x exec killall -SIGUSR1 waybar | |
| bindsym $mod+Shift+c reload | |
| bindsym $mod+Shift+q exec swaymsg exit | |
| -# Move your focus around | |
| bindsym $mod+h focus left | |
| bindsym $mod+j focus down | |
| bindsym $mod+k focus up | |
| bindsym $mod+l focus right | |
| -# Or use $mod+[up|down|left|right] | |
| bindsym $mod+Left focus left | |
| bindsym $mod+Down focus down | |
| bindsym $mod+Up focus up | |
| bindsym $mod+Right focus right | |
| -# Switch to workspace | |
| bindsym $mod+1 workspace number 1 | |
| bindsym $mod+2 workspace number 2 | |
| bindsym $mod+3 workspace number 3 |