Skip to content
Merged

bugs #144

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Brewfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
tap "1password/tap"
brew "zstd"
brew "openssl@3"
brew "autoconf"
brew "libssh2"
brew "bat"
brew "glib"
brew "cmake"
brew "zstd"
brew "curl"
brew "defaultbrowser"
brew "eza"
brew "fd"
brew "fdupes"
brew "gnutls"
brew "libssh"
brew "ffmpeg"
brew "fish"
brew "fzf"
Expand All @@ -21,7 +18,9 @@ brew "gh"
brew "git"
brew "git-delta"
brew "git-lfs"
brew "glib"
brew "gnu-sed"
brew "gnutls"
brew "gnupg"
brew "go"
brew "grep"
Expand All @@ -31,11 +30,13 @@ brew "libheif"
brew "imagemagick"
brew "jq"
brew "libmagic"
brew "libssh"
brew "libxmlsec1"
brew "lolcat"
brew "macchina"
brew "make"
brew "ncurses"
brew "tree-sitter"
brew "neovim"
brew "nghttp2"
brew "nmap"
Expand Down
2 changes: 1 addition & 1 deletion fish/.exports.fish
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ set -gx FZF_ALT_C_OPTS "--preview 'eza --all --color=always'"
pyenv init - | source
starship init fish | source
zoxide init fish | source
docker completion fish | source
# docker completion fish | source
gh completion -s fish | source
poetry completions fish | source

Expand Down
2 changes: 1 addition & 1 deletion nvim/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Plug 'hrsh7th/cmp-nvim-lsp'
Plug 'hrsh7th/cmp-buffer'
Plug 'hrsh7th/cmp-path'
Plug 'nvim-lualine/lualine.nvim'
Plug 'nvim-treesitter/nvim-treesitter'
Plug ('nvim-treesitter/nvim-treesitter', {['do'] = ':TSUpdate', ['branch'] = 'master'})

Plug 'hrsh7th/cmp-vsnip'
Plug 'hrsh7th/vim-vsnip'
Expand Down
8 changes: 5 additions & 3 deletions nvim/lua/plugins.lua
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@ local capabilities = require('cmp_nvim_lsp').default_capabilities()
local capabilities = require('cmp_nvim_lsp').default_capabilities()

-- Configure Python LSP (pyright)
require('lspconfig').pyright.setup({
capabilities = capabilities,
vim.lsp.config('pyright', {
settings = {
python = {
analysis = {
ignore = { '*' },
autoSearchPaths = true,
diagnosticMode = "workspace",
useLibraryCodeForTypes = true,
Expand All @@ -118,6 +118,8 @@ require('lspconfig').pyright.setup({
}
})

vim.lsp.enable('pyright')

local function get_poetry_python()
local handle = io.popen("poetry env info -p")
if handle then
Expand All @@ -126,7 +128,7 @@ local function get_poetry_python()
local venv_path = vim.fn.trim(result)
return venv_path .. "/bin/python"
else
print("Could not find poetry environment")
-- print("Could not find poetry environment")
return "/usr/bin/python3" -- os.getenv("HOME") .. "/.virtualenvs/debugpy/bin/python",
end
end
Expand Down
198 changes: 35 additions & 163 deletions themes/Tokyo Night.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
{
"Custom Directory" : "No",
"Ansi 5 Color" : {
"Red Component" : 0.73333334922790527,
"Color Space" : "sRGB",
"Blue Component" : 0.9686274528503418,
"Alpha Component" : 1,
"Green Component" : 0.60392159223556519
},
"Working Directory" : "\/Users\/dan.white",
"Prompt Before Closing 2" : false,
"Selected Text Color" : {
Expand Down Expand Up @@ -84,7 +90,7 @@
"Alpha Component" : 1,
"Green Component" : 0.85490196943283081
},
"Background Image Location" : "\/Users\/dan.white\/Pictures\/Backgrounds\/Dark-blue-pattern-wallpaper.jpg",
"Background Image Location" : "\/Users\/badger\/Library\/Mobile Documents\/com~apple~CloudDocs\/Pictures\/Backgrounds\/Dark-blue-pattern-wallpaper.jpg",
"Bold Color" : {
"Red Component" : 0.93333333730697632,
"Color Space" : "sRGB",
Expand All @@ -96,165 +102,37 @@
"Custom Command" : "No",
"Title Components" : 512,
"Keyboard Map" : {
"0xf700-0x260000" : {
"Text" : "[1;6A",
"Action" : 10
},
"0x37-0x40000" : {
"Text" : "0x1f",
"Action" : 11
},
"0x32-0x40000" : {
"Text" : "0x00",
"Action" : 11
},
"0xf709-0x20000" : {
"Text" : "[17;2~",
"Action" : 10
},
"0xf70c-0x20000" : {
"Text" : "[20;2~",
"Action" : 10
},
"0xf729-0x20000" : {
"Text" : "[1;2H",
"Action" : 10
},
"0xf72b-0x40000" : {
"Text" : "[1;5F",
"Action" : 10
},
"0xf705-0x20000" : {
"Text" : "[1;2Q",
"Action" : 10
},
"0xf703-0x260000" : {
"Text" : "[1;6C",
"Action" : 10
},
"0xf700-0x220000" : {
"Text" : "[1;2A",
"Action" : 10
},
"0xf701-0x280000" : {
"Text" : "0x1b 0x1b 0x5b 0x42",
"Action" : 11
},
"0x38-0x40000" : {
"Text" : "0x7f",
"Action" : 11
},
"0x33-0x40000" : {
"Text" : "0x1b",
"Action" : 11
},
"0xf703-0x220000" : {
"Text" : "[1;2C",
"Action" : 10
},
"0xf701-0x240000" : {
"Text" : "[1;5B",
"Action" : 10
},
"0xf70d-0x20000" : {
"Text" : "[21;2~",
"Action" : 10
},
"0xf702-0x260000" : {
"Text" : "[1;6D",
"Action" : 10
"f702-0x300000" : {
"Action" : 11,
"Text" : "0x1"
},
"0xf729-0x40000" : {
"Text" : "[1;5H",
"Action" : 10
"f702-0x280000" : {
"Action" : 10,
"Text" : "b"
},
"0xf706-0x20000" : {
"Text" : "[1;2R",
"Action" : 10
"f703-0x280000" : {
"Action" : 10,
"Text" : "f"
},
"0x34-0x40000" : {
"Text" : "0x1c",
"Action" : 11
"f728-0x80000" : {
"Action" : 10,
"Text" : "d"
},
"0xf700-0x280000" : {
"Text" : "0x1b 0x1b 0x5b 0x41",
"Action" : 11
"0x7f-0x100000" : {
"Action" : 11,
"Text" : "0x15"
},
"0x2d-0x40000" : {
"Text" : "0x1f",
"Action" : 11
"f728-0x0" : {
"Action" : 11,
"Text" : "0x4"
},
"0xf70e-0x20000" : {
"Text" : "[23;2~",
"Action" : 10
"f703-0x300000" : {
"Action" : 11,
"Text" : "0x5"
},
"0xf702-0x220000" : {
"Text" : "[1;2D",
"Action" : 10
},
"0xf703-0x280000" : {
"Text" : "0x1b 0x1b 0x5b 0x43",
"Action" : 11
},
"0xf700-0x240000" : {
"Text" : "[1;5A",
"Action" : 10
},
"0xf707-0x20000" : {
"Text" : "[1;2S",
"Action" : 10
},
"0xf70a-0x20000" : {
"Text" : "[18;2~",
"Action" : 10
},
"0x35-0x40000" : {
"Text" : "0x1d",
"Action" : 11
},
"0xf70f-0x20000" : {
"Text" : "[24;2~",
"Action" : 10
},
"0xf703-0x240000" : {
"Text" : "[1;5C",
"Action" : 10
},
"0xf701-0x260000" : {
"Text" : "[1;6B",
"Action" : 10
},
"0xf702-0x280000" : {
"Text" : "0x1b 0x1b 0x5b 0x44",
"Action" : 11
},
"0xf72b-0x20000" : {
"Text" : "[1;2F",
"Action" : 10
},
"0x36-0x40000" : {
"Text" : "0x1e",
"Action" : 11
},
"0xf708-0x20000" : {
"Text" : "[15;2~",
"Action" : 10
},
"0xf701-0x220000" : {
"Text" : "[1;2B",
"Action" : 10
},
"0xf70b-0x20000" : {
"Text" : "[19;2~",
"Action" : 10
},
"0xf702-0x240000" : {
"Text" : "[1;5D",
"Action" : 10
},
"0xf704-0x20000" : {
"Text" : "[1;2P",
"Action" : 10
"0x7f-0x80000" : {
"Action" : 11,
"Text" : "0x1b 0x7f"
}
},
"Ansi 14 Color" : {
Expand Down Expand Up @@ -402,13 +280,7 @@
},
"Columns" : 120,
"Visual Bell" : true,
"ASCII Ligatures" : false,
"Ansi 5 Color" : {
"Red Component" : 0.73333334922790527,
"Color Space" : "sRGB",
"Blue Component" : 0.9686274528503418,
"Alpha Component" : 1,
"Green Component" : 0.60392159223556519
},
"Thin Strokes" : 4
"Custom Directory" : "No",
"Thin Strokes" : 4,
"ASCII Ligatures" : false
}
Loading
Loading