5 files changed, 12 insertions(+), 1 deletions(-)

M .config/foot/foot.ini
M .config/nvim/init.lua
M .config/nvim/lua/plugins.lua
M .config/senpai/senpai.scfg
M .config/sway/config

@@ 1,4 1,5 @@
 font=Iosevka CK Fixed:size=8
+#dpi-aware=no
 
 [colors]
 alpha=0.95

@@ 13,4 13,7 @@ vim.cmd('colorscheme palenight')
 
 vim.o.mouse = 'a'
 
+vim.o.tabstop=4
+vim.o.shiftwidth=4
+
 require('telescope').load_extension('projects')

@@ 119,6 119,7 @@ return require('packer').startup(function(use)
 	use 'tpope/vim-commentary'
 
 	-- additional filetypes
+<<<<<<< Updated upstream
 	use 'nathom/filetype.nvim'
 
 	-- project management


@@ 147,4 148,6 @@ return require('packer').startup(function(use)
 		'glacambre/firenvim',
 		run = function() vim.fn['firenvim#install'](0) end
 	}
+
+	use "nathom/filetype.nvim"
 end)

@@ 5,6 5,8 @@ username coder_kalyan
 realname "Kalyan Sriram"
 password-cmd gopass show chat.sr.ht/coder_kalyan
 
+#highlight help coder_kalyan
+
 mouse true
 
 pane-widths {

@@ 20,7 20,8 @@ font Iosevka CK Fixed Book 12
 output DVI-D-1 position 0,0
 # Wallpaper
 # marsh 0124
-output * bg /home/kalyan/Pictures/wallpapers/wallpapers/0059.jpg fill
+#output * bg /home/kalyan/Pictures/wallpapers/wallpapers/0059.jpg fill
+output * bg /home/kalyan/Pictures/wallpapers/0124.jpg fill
 
 # TODO: idle configuration
 


@@ 158,6 159,7 @@ bindsym ctrl+Print exec "slurp | grim -g - - | wl-copy"
 bindsym Mod1+Print exec "slurp | grim -g - - | wl-copy"
 bindsym ctrl+Mod1+Print exec "slurp | grim -g - - | wl-copy"
 
+bindsym $mod+c exec "wofi-calc"
 # waybar system bar
 exec waybar &