Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
frnsys committed Jun 27, 2023
1 parent 0f4fdbc commit 155b890
Show file tree
Hide file tree
Showing 19 changed files with 316 additions and 62 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ gui-tools:
# unclutter - hide cursor after inactivity
# gdebi - easier installation of deb packages
sudo apt install -y xsel xclip xdotool i3lock libnotify-bin unclutter gdebi
sudo apt install -y --no-install-recommends acpi bc dos2unix imagemagick sqlitebrowser rclone
sudo apt install -y --no-install-recommends dos2unix imagemagick sqlitebrowser rclone
sudo pip3 install -U yt-dlp
cargo install xcolor # color picking

Expand Down
Binary file modified assets/walls/13.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/walls/17.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/walls/18.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/walls/19.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions bin/bkup
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ echo "wine/
build/
.git/lfs/
node_modules/
target/release/
target/debug/
target/*
dist/*
deaddrop/vids/" > /tmp/bkup.exclude

REPOS=(~/projects ~/docs ~/notes ~/photos ~/work)
Expand Down Expand Up @@ -87,4 +87,4 @@ elif [[ $1 == 'cloud' ]]; then
elif [[ $1 == 'usb' ]]; then
dest=/media/usb/backup
localSync $dest
fi
fi
2 changes: 1 addition & 1 deletion bin/rec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ fi
# https://github.com/lolilolicon/xrectsel
TIME=$(date +%F-%T)
VID=/tmp/recording_${TIME}.ogv
recordmydesktop $OPTS -o $VID --overwrite --fps 24 --no-frame --no-cursor
recordmydesktop $OPTS -o $VID --overwrite --fps 24 --no-frame #--no-cursor

# Trim the last bit (it catches the recording notification)
DURATION=$(ffprobe -v 0 -show_entries format=duration -of compact=p=0:nk=1 "$VID")
Expand Down
5 changes: 0 additions & 5 deletions bin/tl

This file was deleted.

5 changes: 1 addition & 4 deletions dots/bash/bashrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# Bash completion
# [ -f /etc/bash_completion ] && source /etc/bash_completion

export GPG_TTY=$(tty)

# nvm, lazy loaded
Expand All @@ -17,7 +14,7 @@ export FZF_DEFAULT_COMMAND='rg --files --follow --glob "!.git/*"'
export FZF_DEFAULT_OPTS="--history=$HOME/.fzf_history"

# Add yabridge
export PATH="$PATH:$HOME/.local/share/yabridge"
# export PATH="$PATH:$HOME/.local/share/yabridge"

# Load the shell dotfiles, and then some:
# * ~/.path can be used to extend `$PATH`.
Expand Down
2 changes: 1 addition & 1 deletion dots/bspwm/wm
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

while true ; do
bspwm || break
done
done
284 changes: 284 additions & 0 deletions dots/firefox/prefs.js

Large diffs are not rendered by default.

26 changes: 0 additions & 26 deletions dots/misc/picom.conf

This file was deleted.

2 changes: 1 addition & 1 deletion dots/nvim/lua/plugins/completion.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
return {
{ -- Autocompletion
{
'hrsh7th/nvim-cmp',
event = "InsertEnter",
dependencies = {
Expand Down
1 change: 0 additions & 1 deletion dots/nvim/lua/plugins/dap.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

return {
--- sudo apt install lldb
---
Expand Down
14 changes: 13 additions & 1 deletion dots/nvim/lua/plugins/lsp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,14 @@ return {
client.server_capabilities.semanticTokensProvider = nil
end

--- Create a command to run rust-analyzer cargo check
--- manually, for if checkOnSave is disabled (see below).
vim.api.nvim_create_user_command("Check", function()
vim.lsp.buf_notify(0, "rust-analyzer/runFlycheck", {
textDocument = vim.lsp.util.make_text_document_params()
})
end, {})

--- Enable the following language servers
local servers = {
pyright = {},
Expand All @@ -80,7 +88,11 @@ return {
enable = true,
},
},
checkOnSave = {

-- Disable check on save,
-- instead trigger manually
checkOnSave = false,
check = {
command = "clippy",
extraArgs = {
"--target-dir=target/analyzer"
Expand Down
9 changes: 7 additions & 2 deletions dots/nvim/lua/plugins/movement.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
return {
--- Faster movement
{
"folke/flash.nvim",
event = "VeryLazy",
Expand Down Expand Up @@ -68,7 +69,7 @@ return {
}
},

-- Better text objects/motions
--- Better text objects/motions
{ 'echasnovski/mini.ai',
event = 'VeryLazy',
-- Two new text objects by default:
Expand All @@ -90,9 +91,13 @@ return {
},
}
},

--- Surround motion
{ 'echasnovski/mini.surround',
event = 'VeryLazy',
opts = {} },

--- Substitute motion
{ 'gbprod/substitute.nvim',
opts = {},
keys = {
Expand All @@ -114,7 +119,7 @@ return {
},
},

-- Symbol navigation
--- Symbol navigation
{ 'stevearc/aerial.nvim',
keys = {
{'<leader>j', function()
Expand Down
12 changes: 0 additions & 12 deletions dots/nvim/lua/sights.lua
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,6 @@ end
--- Takes a table of sight targets and
--- uses flash to handle them.
local function handle_targets(targets, key)
-- Add highlights for the node ranges.
-- for _, target in ipairs(targets) do
-- vim.api.nvim_buf_set_extmark(0, ns,
-- target['pos'][1],
-- target['pos'][2], {
-- hl_group = "SightsPreview",
-- end_row = target['end_pos'][1],
-- end_col = target['end_pos'][2],
-- priority = 65534, -- High priority so it's drawn over flash
-- })
-- end

-- Pass the targets to flash.
require('flash').jump({
matcher = function(win)
Expand Down
4 changes: 0 additions & 4 deletions dots/sxhkd/sxhkdrc
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,6 @@ super + alt + k
super + z
pkill -USR1 redshift

# translate
super + x
tl "$(echo "" | dmenu -p 'translate:')"

# toggle bluetooth
super + shift + b
bt toggle; notify-send "toggling bluetooth"
Expand Down
4 changes: 4 additions & 0 deletions dots/xinitrc
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ redshift &
dunst &
agenda remind 5 &

# This messes up the X startup,
# so start this manually elsewhere
# syncthing --no-browser &

# for web highlighting
maw ~/notes/annos/web/annos.jsonl ~/notes/annos/web/assets &

Expand Down

0 comments on commit 155b890

Please sign in to comment.