Skip to content

Commit

Permalink
Updated config
Browse files Browse the repository at this point in the history
  • Loading branch information
Faraday committed May 18, 2024
1 parent 9442ebd commit 7d90638
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 20 deletions.
8 changes: 4 additions & 4 deletions config/alacritty/alacritty.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
live_config_reload = true

[font.bold]
family = "JetBrains Mono"
family = "JetBrains Mono Nerd Font"
style = "Bold"

[font.bold_italic]
family = "JetBrains Mono"
family = "JetBrains Mono Nerd Font"
style = "Bold Italic"

[font.italic]
family = "JetBrains Mono"
family = "JetBrains Mono Nerd Font"
style = "Italic"

[font.normal]
family = "JetBrains Mono"
family = "JetBrains Mono Nerd Font"
style = "Regular"

[[keyboard.bindings]]
Expand Down
6 changes: 3 additions & 3 deletions config/nvim/after/plugin/lsp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ require('mason-lspconfig').setup({
-- Replace the language servers listed here
-- with the ones you want to install
ensure_installed = {
'tsserver', 'gopls', 'jdtls', 'clangd', 'bashls', 'cssls',
'html', 'yamlls', 'zls', 'taplo', 'jsonls', 'intelephense', 'lua_ls',
'rust_analyzer', 'kotlin_language_server' , 'vimls',},
'tsserver', 'bashls',
'html', 'yamlls', 'zls', 'lua_ls',
},
handlers = {
lsp_zero.default_setup,
}
Expand Down
4 changes: 4 additions & 0 deletions config/nvim/after/plugin/treesitter.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ require'nvim-treesitter.configs'.setup {
-- A list of parser names, or "all" (the five listed parsers should always be installed)
ensure_installed = { "c",
'lua',
'gdscript',
'godot_resource',
'gdshader',
'c_sharp',
'zig',
'go',
'bash',
Expand Down
7 changes: 7 additions & 0 deletions config/nvim/lua/faraday/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ vim.o.expandtab = true -- Use spaces instead of tabs
vim.o.smarttab = true


-- Settings for godot
local projectfile = vim.fn.getcwd() .. '/project.godot'
if projectfile then
vim.fn.serverstart './godothost'
end


-- Turn off mouse & Arrow Keys
vim.o.mouse = ''
-- Arrow Keys
Expand Down
2 changes: 0 additions & 2 deletions config/nvim/lua/faraday/packer.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
-- This file can be loaded by calling `lua require('plugins')` from your init.vim


-- Only required if you have packer configured as `opt`
vim.cmd [[packadd packer.nvim]]

Expand All @@ -16,7 +15,6 @@ return require('packer').startup(function(use)
}
use "savq/melange-nvim"


use 'nvim-tree/nvim-web-devicons'
use {
'nvim-lualine/lualine.nvim',
Expand Down
4 changes: 2 additions & 2 deletions config/nvim/plugin/packer_compiled.lua
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ local function save_profiles(threshold)
end

time([[Luarocks path setup]], true)
local package_path_str = "/home/faraday/.cache/nvim/packer_hererocks/2.1.1702233742/share/lua/5.1/?.lua;/home/faraday/.cache/nvim/packer_hererocks/2.1.1702233742/share/lua/5.1/?/init.lua;/home/faraday/.cache/nvim/packer_hererocks/2.1.1702233742/lib/luarocks/rocks-5.1/?.lua;/home/faraday/.cache/nvim/packer_hererocks/2.1.1702233742/lib/luarocks/rocks-5.1/?/init.lua"
local install_cpath_pattern = "/home/faraday/.cache/nvim/packer_hererocks/2.1.1702233742/lib/lua/5.1/?.so"
local package_path_str = "/home/faraday/.cache/nvim/packer_hererocks/2.1.1713773202/share/lua/5.1/?.lua;/home/faraday/.cache/nvim/packer_hererocks/2.1.1713773202/share/lua/5.1/?/init.lua;/home/faraday/.cache/nvim/packer_hererocks/2.1.1713773202/lib/luarocks/rocks-5.1/?.lua;/home/faraday/.cache/nvim/packer_hererocks/2.1.1713773202/lib/luarocks/rocks-5.1/?/init.lua"
local install_cpath_pattern = "/home/faraday/.cache/nvim/packer_hererocks/2.1.1713773202/lib/lua/5.1/?.so"
if not string.find(package.path, package_path_str, 1, true) then
package.path = package.path .. ';' .. package_path_str
end
Expand Down
2 changes: 1 addition & 1 deletion config/sway/config
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ output * bg ~/Wallpapers/TrainJP.jpg fill
bindsym $mod+Return exec $term


exec superclipboard &
# exec superclipboard &
# clipboard to run in background
# ###
# Not fully working atm
Expand Down
14 changes: 6 additions & 8 deletions config/zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ export ZSH="$HOME/.oh-my-zsh"
ZSH_THEME="jaischeema"
plugins=(
git
zsh-autosuggestions
colored-man-pages
rust
)


Expand All @@ -17,14 +15,15 @@ export EDITOR="nvim"
export VISUAL="nvim"

# For java windows
export _JAVA_AWT_WM_NONREPARENTING=1
#export _JAVA_AWT_WM_NONREPARENTING=1

# Bluetooth
alias start_bluetooth="sudo systemctl start bluetooth && sudo systemctl enable bluetooth"
alias stop_bluetooth="sudo systemctl stop bluetooth && sudo systemctl disable bluetooth"
#alias start_bluetooth="sudo systemctl start bluetooth && sudo systemctl enable bluetooth"
#alias stop_bluetooth="sudo systemctl stop bluetooth && sudo systemctl disable bluetooth"


# Custom Aliases
alias steam="flatpak run com.valvesoftware.Steam &"
alias rgb="openrgb &"
alias unixp="clear ; neofetch"
alias vim="nvim"
Expand All @@ -34,9 +33,8 @@ alias video="vlc"
alias audio="~/helpful/audioControl.sh"
alias ss="~/helpful/screenshot.sh"
alias ms="~/helpful/getMcShots.sh"
alias mlogin="~/personal/AutoMCLog/main.sh"
alias clock="peaclock"
alias lz="eza --icons -F -l"
#alias clock="peaclock"
#alias lz="eza --icons -F -l"
alias windows="~/helpful/windows.sh"
alias cat="bat"
alias lg="lazygit"
Expand Down

0 comments on commit 7d90638

Please sign in to comment.