update

23 files changed, 436 insertions, 5 deletions

diff --git a/dmenu/config.h b/dmenu/config.h
index 1655574..d82693d 100755
--- a/dmenu/config.h
+++ b/dmenu/config.h
@@ -1,6 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 /* Default settings; can be overriden by command line. */
-#include "themes/cicada.h"
+#include "themes/rurbania.h"
 
 static const unsigned int border_width = 2;
 
diff --git a/dmenu/dmenu b/dmenu/dmenu
index ca3a574..77928a5 100755
--- a/dmenu/dmenu
+++ b/dmenu/dmenu
diff --git a/dmenu/dmenu.o b/dmenu/dmenu.o
index 8f869d0..9c61bf1 100644
--- a/dmenu/dmenu.o
+++ b/dmenu/dmenu.o
diff --git a/dmenu/themes/cicada.h b/dmenu/themes/cicada.h
index c08fee7..de0caff 100644
--- a/dmenu/themes/cicada.h
+++ b/dmenu/themes/cicada.h
@@ -1,8 +1,8 @@
 static const char *colors[SchemeLast][2] = {
 	/*     fg         bg       */
 	[SchemeNorm] = { "#bbbbbb", "#0c0c0c" },
-	[SchemeSel] = { "#eeeeee", "#880" },
-	[SchemeOut] = { "#000000", "#880" },
+	[SchemeSel] = { "#eeeeee", "#888" },
+	[SchemeOut] = { "#000000", "#888" },
 };
 //static const unsigned int alpha = 0xf9;
 static const unsigned int alpha = 0xff;
diff --git a/dmenu/themes/rurbania.h b/dmenu/themes/rurbania.h
new file mode 100644
index 0000000..330e314
--- /dev/null
+++ b/dmenu/themes/rurbania.h
@@ -0,0 +1,14 @@
+static const char *colors[SchemeLast][2] = {
+	/*     fg         bg       */
+	[SchemeNorm] = { "#bbbbbb", "#111111" },
+	[SchemeSel] = { "#eeeeee", "#aa0000" },
+	[SchemeOut] = { "#000000", "#aa0000" },
+};
+//static const unsigned int alpha = 0xf9;
+static const unsigned int alpha = 0xff;
+
+static const unsigned int alphas[SchemeLast][2] = {
+	[SchemeNorm] = { OPAQUE, alpha },
+	[SchemeSel] = { OPAQUE, alpha },
+	[SchemeOut] = { OPAQUE, alpha },
+};
diff --git a/nvim/.luarc.json b/nvim/.luarc.json
new file mode 100644
index 0000000..af7a43e
--- /dev/null
+++ b/nvim/.luarc.json
@@ -0,0 +1,13 @@
+{
+  "runtime.version": "LuaJIT",
+  "runtime.path": [
+    "lua/?.lua",
+    "lua/?/init.lua"
+  ],
+  "diagnostics.globals": ["vim"],
+  "workspace.checkThirdParty": false,
+  "workspace.library": [
+    "$VIMRUNTIME",
+    "${3rd}/luv/library"
+  ]
+}
diff --git a/nvim/init.lua b/nvim/init.lua
new file mode 100644
index 0000000..710fce0
--- /dev/null
+++ b/nvim/init.lua
@@ -0,0 +1,13 @@
+require("aa_prime.remap")
+require("aa_prime.packer")
+require("after.plugin.colors")
+require("after.plugin.treesitter")
+require("after.plugin.telescope")
+require("after.plugin.fterm")
+require("niliara.lsp")
+require("mason").setup()
+
+vim.cmd("set shiftwidth=4")
+vim.cmd("let g:user_emmet_leader_key='<C-c>'")
+
+print("i am king terry the terrible")
diff --git a/nvim/lua/aa_prime/init.lua b/nvim/lua/aa_prime/init.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/nvim/lua/aa_prime/init.lua
diff --git a/nvim/lua/aa_prime/packer.lua b/nvim/lua/aa_prime/packer.lua
new file mode 100644
index 0000000..c557eb6
--- /dev/null
+++ b/nvim/lua/aa_prime/packer.lua
@@ -0,0 +1,48 @@
+vim.cmd [[packadd packer.nvim]]
+
+return require('packer').startup(function(use)
+	use 'wbthomason/packer.nvim'
+	use {
+		'nvim-telescope/telescope.nvim', tag = '0.1.8',
+		requires = { {'nvim-lua/plenary.nvim'} }
+	}
+	-- use "rebelot/kanagawa.nvim" -- kanagawa-{lotus, wave, dragon}
+	use "tanvirtin/monokai.nvim"
+	use {
+	    "loctvl842/monokai-pro.nvim",
+	    config = function()
+		require("monokai-pro").setup()
+	    end
+	}
+
+	use ("nvim-treesitter/nvim-treesitter", {run = ':TSUpdate'})
+	use "ThePrimeagen/harpoon"
+
+	use {
+	    'VonHeikemen/lsp-zero.nvim',
+	    branch = 'v3.x',
+	    requires = {
+
+		-- LSP support
+		{'neovim/nvim-lspconfig'},
+		{'williamboman/mason.nvim'},
+		{'williamboman/mason-lspconfig.nvim'},
+
+		-- Autocompletion
+		{'hrsh7th/nvim-cmp'},
+		{'hrsh7th/cmp-buffer'},
+		{'hrsh7th/cmp-path'},
+		{'saadparwaiz1/cmp_luasnip'},
+		{'hrsh7th/cmp-nvim-lsp'},
+		{'hrsh7th/cmp-nvim-lua'},
+
+		-- Snippets
+		{'L3MON4D3/LuaSnip'},
+		{'rafamadriz/friendly-snippets'},
+	    }
+	}
+
+	use "savq/melange-nvim"
+	use "numToStr/FTerm.nvim"
+	use "mattn/emmet-vim"
+end)
diff --git a/nvim/lua/aa_prime/remap.lua b/nvim/lua/aa_prime/remap.lua
new file mode 100644
index 0000000..0b1002f
--- /dev/null
+++ b/nvim/lua/aa_prime/remap.lua
@@ -0,0 +1,2 @@
+vim.g.mapleader = " "
+vim.keymap.set("n", "<leader>d", vim.cmd.Ex)
diff --git a/nvim/lua/after/plugin/colors.lua b/nvim/lua/after/plugin/colors.lua
new file mode 100644
index 0000000..ef4f9c2
--- /dev/null
+++ b/nvim/lua/after/plugin/colors.lua
@@ -0,0 +1,15 @@
+--[[
+require("monokai-pro").setup({
+    transparent_background = true,
+    filter = "pro", -- classic | octagon | pro | machine | ristretto | spectrum
+})
+
+vim.cmd.colorscheme('monokai-pro')
+]]
+
+vim.opt.termguicolors = true
+vim.cmd.colorscheme('melange')
+
+vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
+vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
+
diff --git a/nvim/lua/after/plugin/fterm.lua b/nvim/lua/after/plugin/fterm.lua
new file mode 100644
index 0000000..f253408
--- /dev/null
+++ b/nvim/lua/after/plugin/fterm.lua
@@ -0,0 +1,11 @@
+require'FTerm'.setup({
+    border = 'double',
+    dimensions  = {
+        height = 0.9,
+        width = 0.9,
+    },
+})
+
+-- Example keybindings
+vim.keymap.set('n', '<A-i>', '<CMD>lua require("FTerm").toggle()<CR>')
+vim.keymap.set('t', '<A-i>', '<C-\\><C-n><CMD>lua require("FTerm").toggle()<CR>')
diff --git a/nvim/lua/after/plugin/harpoon.lua b/nvim/lua/after/plugin/harpoon.lua
new file mode 100644
index 0000000..2d22c19
--- /dev/null
+++ b/nvim/lua/after/plugin/harpoon.lua
@@ -0,0 +1,3 @@
+local mark = require("harpoon.mark")
+local ui = require("harpoon.ui")
+vim.keymap.set("n", "<leader>a", mark.add_file)
diff --git a/nvim/lua/after/plugin/telescope.lua b/nvim/lua/after/plugin/telescope.lua
new file mode 100644
index 0000000..73a160e
--- /dev/null
+++ b/nvim/lua/after/plugin/telescope.lua
@@ -0,0 +1,11 @@
+local builtin = require('telescope.builtin')
+vim.keymap.set('n', '<leader>f', builtin.find_files, {})
+vim.keymap.set('n', '<leader>s', builtin.live_grep, {})
+vim.keymap.set('n', '<leader>b', builtin.buffers, {})
+--vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
+
+--[[
+vim.keymap.set('n', '<leader>fs', function()
+	builtin.grep_string({ search = vim.fn.input("Grep > ") });
+end)
+--]]
diff --git a/nvim/lua/after/plugin/treesitter.lua b/nvim/lua/after/plugin/treesitter.lua
new file mode 100644
index 0000000..280f923
--- /dev/null
+++ b/nvim/lua/after/plugin/treesitter.lua
@@ -0,0 +1,41 @@
+require'nvim-treesitter.configs'.setup {
+  -- A list of parser names, or "all" (the listed parsers MUST always be installed)
+  ensure_installed = { "c", "lua", "vim", "vimdoc", "query", "markdown", "markdown_inline", "rust" },
+
+  -- Install parsers synchronously (only applied to `ensure_installed`)
+  sync_install = false,
+
+  -- Automatically install missing parsers when entering buffer
+  -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
+  auto_install = true,
+
+  -- List of parsers to ignore installing (or "all")
+  ignore_install = { "javascript" },
+
+  ---- If you need to change the installation directory of the parsers (see -> Advanced Setup)
+  -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")!
+
+  highlight = {
+    enable = true,
+
+    -- NOTE: these are the names of the parsers and not the filetype. (for example if you want to
+    -- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is
+    -- the name of the parser)
+    -- list of language that will be disabled
+    -- disable = { "c", "rust" },
+    -- Or use a function for more flexibility, e.g. to disable slow treesitter highlight for large files
+    disable = function(lang, buf)
+        local max_filesize = 100 * 1024 -- 100 KB
+        local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
+        if ok and stats and stats.size > max_filesize then
+            return true
+        end
+    end,
+
+    -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
+    -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
+    -- Using this option may slow down your editor, and you may see some duplicate highlights.
+    -- Instead of true it can also be a list of languages
+    additional_vim_regex_highlighting = false,
+  },
+}
diff --git a/nvim/lua/niliara/lsp.lua b/nvim/lua/niliara/lsp.lua
new file mode 100644
index 0000000..e833937
--- /dev/null
+++ b/nvim/lua/niliara/lsp.lua
@@ -0,0 +1,16 @@
+local lsp_zero = require('lsp-zero')
+
+lsp_zero.on_attach(function(client, bufnr)
+  lsp_zero.default_keymaps({buffer = bufnr})
+end)
+
+local lspconfig = require('lspconfig')
+
+lspconfig.lua_ls.setup({})
+lspconfig.perlls.setup({})
+lspconfig.pylsp.setup({})
+lspconfig.rust_analyzer.setup({})
+lspconfig.sqls.setup({})
+lspconfig.emmet_ls.setup({})
+
+
diff --git a/nvim/plugin/packer_compiled.lua b/nvim/plugin/packer_compiled.lua
new file mode 100644
index 0000000..f9edc36
--- /dev/null
+++ b/nvim/plugin/packer_compiled.lua
@@ -0,0 +1,209 @@
+-- Automatically generated packer.nvim plugin loader code
+
+if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then
+  vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"')
+  return
+end
+
+vim.api.nvim_command('packadd packer.nvim')
+
+local no_errors, error_msg = pcall(function()
+
+_G._packer = _G._packer or {}
+_G._packer.inside_compile = true
+
+local time
+local profile_info
+local should_profile = false
+if should_profile then
+  local hrtime = vim.loop.hrtime
+  profile_info = {}
+  time = function(chunk, start)
+    if start then
+      profile_info[chunk] = hrtime()
+    else
+      profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6
+    end
+  end
+else
+  time = function(chunk, start) end
+end
+
+local function save_profiles(threshold)
+  local sorted_times = {}
+  for chunk_name, time_taken in pairs(profile_info) do
+    sorted_times[#sorted_times + 1] = {chunk_name, time_taken}
+  end
+  table.sort(sorted_times, function(a, b) return a[2] > b[2] end)
+  local results = {}
+  for i, elem in ipairs(sorted_times) do
+    if not threshold or threshold and elem[2] > threshold then
+      results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms'
+    end
+  end
+  if threshold then
+    table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)')
+  end
+
+  _G._packer.profile_output = results
+end
+
+time([[Luarocks path setup]], true)
+local package_path_str = "/home/niliara/.cache/nvim/packer_hererocks/2.1.1720049189/share/lua/5.1/?.lua;/home/niliara/.cache/nvim/packer_hererocks/2.1.1720049189/share/lua/5.1/?/init.lua;/home/niliara/.cache/nvim/packer_hererocks/2.1.1720049189/lib/luarocks/rocks-5.1/?.lua;/home/niliara/.cache/nvim/packer_hererocks/2.1.1720049189/lib/luarocks/rocks-5.1/?/init.lua"
+local install_cpath_pattern = "/home/niliara/.cache/nvim/packer_hererocks/2.1.1720049189/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
+
+if not string.find(package.cpath, install_cpath_pattern, 1, true) then
+  package.cpath = package.cpath .. ';' .. install_cpath_pattern
+end
+
+time([[Luarocks path setup]], false)
+time([[try_loadstring definition]], true)
+local function try_loadstring(s, component, name)
+  local success, result = pcall(loadstring(s), name, _G.packer_plugins[name])
+  if not success then
+    vim.schedule(function()
+      vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {})
+    end)
+  end
+  return result
+end
+
+time([[try_loadstring definition]], false)
+time([[Defining packer_plugins]], true)
+_G.packer_plugins = {
+  ["FTerm.nvim"] = {
+    loaded = true,
+    path = "/home/niliara/.local/share/nvim/site/pack/packer/start/FTerm.nvim",
+    url = "https://github.com/numToStr/FTerm.nvim"
+  },
+  LuaSnip = {
+    loaded = true,
+    path = "/home/niliara/.local/share/nvim/site/pack/packer/start/LuaSnip",
+    url = "https://github.com/L3MON4D3/LuaSnip"
+  },
+  ["cmp-buffer"] = {
+    loaded = true,
+    path = "/home/niliara/.local/share/nvim/site/pack/packer/start/cmp-buffer",
+    url = "https://github.com/hrsh7th/cmp-buffer"
+  },
+  ["cmp-nvim-lsp"] = {
+    loaded = true,
+    path = "/home/niliara/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
+    url = "https://github.com/hrsh7th/cmp-nvim-lsp"
+  },
+  ["cmp-nvim-lua"] = {
+    loaded = true,
+    path = "/home/niliara/.local/share/nvim/site/pack/packer/start/cmp-nvim-lua",
+    url = "https://github.com/hrsh7th/cmp-nvim-lua"
+  },
+  ["cmp-path"] = {
+    loaded = true,
+    path = "/home/niliara/.local/share/nvim/site/pack/packer/start/cmp-path",
+    url = "https://github.com/hrsh7th/cmp-path"
+  },
+  cmp_luasnip = {
+    loaded = true,
+    path = "/home/niliara/.local/share/nvim/site/pack/packer/start/cmp_luasnip",
+    url = "https://github.com/saadparwaiz1/cmp_luasnip"
+  },
+  ["emmet-vim"] = {
+    loaded = true,
+    path = "/home/niliara/.local/share/nvim/site/pack/packer/start/emmet-vim",
+    url = "https://github.com/mattn/emmet-vim"
+  },
+  ["friendly-snippets"] = {
+    loaded = true,
+    path = "/home/niliara/.local/share/nvim/site/pack/packer/start/friendly-snippets",
+    url = "https://github.com/rafamadriz/friendly-snippets"
+  },
+  harpoon = {
+    loaded = true,
+    path = "/home/niliara/.local/share/nvim/site/pack/packer/start/harpoon",
+    url = "https://github.com/ThePrimeagen/harpoon"
+  },
+  ["lsp-zero.nvim"] = {
+    loaded = true,
+    path = "/home/niliara/.local/share/nvim/site/pack/packer/start/lsp-zero.nvim",
+    url = "https://github.com/VonHeikemen/lsp-zero.nvim"
+  },
+  ["mason-lspconfig.nvim"] = {
+    loaded = true,
+    path = "/home/niliara/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim",
+    url = "https://github.com/williamboman/mason-lspconfig.nvim"
+  },
+  ["mason.nvim"] = {
+    loaded = true,
+    path = "/home/niliara/.local/share/nvim/site/pack/packer/start/mason.nvim",
+    url = "https://github.com/williamboman/mason.nvim"
+  },
+  ["melange-nvim"] = {
+    loaded = true,
+    path = "/home/niliara/.local/share/nvim/site/pack/packer/start/melange-nvim",
+    url = "https://github.com/savq/melange-nvim"
+  },
+  ["monokai-pro.nvim"] = {
+    config = { "\27LJ\2\n9\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\16monokai-pro\frequire\0" },
+    loaded = true,
+    path = "/home/niliara/.local/share/nvim/site/pack/packer/start/monokai-pro.nvim",
+    url = "https://github.com/loctvl842/monokai-pro.nvim"
+  },
+  ["monokai.nvim"] = {
+    loaded = true,
+    path = "/home/niliara/.local/share/nvim/site/pack/packer/start/monokai.nvim",
+    url = "https://github.com/tanvirtin/monokai.nvim"
+  },
+  ["nvim-cmp"] = {
+    loaded = true,
+    path = "/home/niliara/.local/share/nvim/site/pack/packer/start/nvim-cmp",
+    url = "https://github.com/hrsh7th/nvim-cmp"
+  },
+  ["nvim-lspconfig"] = {
+    loaded = true,
+    path = "/home/niliara/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
+    url = "https://github.com/neovim/nvim-lspconfig"
+  },
+  ["nvim-treesitter"] = {
+    loaded = true,
+    path = "/home/niliara/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
+    url = "https://github.com/nvim-treesitter/nvim-treesitter"
+  },
+  ["packer.nvim"] = {
+    loaded = true,
+    path = "/home/niliara/.local/share/nvim/site/pack/packer/start/packer.nvim",
+    url = "https://github.com/wbthomason/packer.nvim"
+  },
+  ["plenary.nvim"] = {
+    loaded = true,
+    path = "/home/niliara/.local/share/nvim/site/pack/packer/start/plenary.nvim",
+    url = "https://github.com/nvim-lua/plenary.nvim"
+  },
+  ["telescope.nvim"] = {
+    loaded = true,
+    path = "/home/niliara/.local/share/nvim/site/pack/packer/start/telescope.nvim",
+    url = "https://github.com/nvim-telescope/telescope.nvim"
+  }
+}
+
+time([[Defining packer_plugins]], false)
+-- Config for: monokai-pro.nvim
+time([[Config for monokai-pro.nvim]], true)
+try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\16monokai-pro\frequire\0", "config", "monokai-pro.nvim")
+time([[Config for monokai-pro.nvim]], false)
+
+_G._packer.inside_compile = false
+if _G._packer.needs_bufread == true then
+  vim.cmd("doautocmd BufRead")
+end
+_G._packer.needs_bufread = false
+
+if should_profile then save_profiles() end
+
+end)
+
+if not no_errors then
+  error_msg = error_msg:gsub('"', '\\"')
+  vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None')
+end
diff --git a/sent b/sent
new file mode 160000
+Subproject 882d54c225b83c762acf5bb3967f4890c3ecef8
diff --git a/st/config.h b/st/config.h
index c9e057d..5986fce 100755
--- a/st/config.h
+++ b/st/config.h
@@ -6,7 +6,7 @@
  *
  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
  */
-static char *font = "NotoSansM Nerd Font Mono:pixelsize=16:antialias=true:autohint=true";
+static char *font = "NotoSansM Nerd Font Mono:pixelsize=20:antialias=true:autohint=true";
 static int borderpx = 2;
 
 /*
diff --git a/st/st b/st/st
index fdb3b1d..72854b7 100755
--- a/st/st
+++ b/st/st
diff --git a/st/themes/cicada.h b/st/themes/cicada.h
index a69aa51..3bfacb9 100644
--- a/st/themes/cicada.h
+++ b/st/themes/cicada.h
@@ -25,7 +25,7 @@ static const char *colorname[] = {
 	"#cccccc",
 	"#555555",
 	"gray90", /* default foreground colour */
-	"#0c0c0c", /* default background colour */
+	"#111111", /* default background colour */
 };
 
 
diff --git a/st/themes/rurbania.h b/st/themes/rurbania.h
new file mode 100644
index 0000000..618324e
--- /dev/null
+++ b/st/themes/rurbania.h
@@ -0,0 +1,35 @@
+static const char *colorname[] = {
+	/* 8 normal colors */
+	"black",
+	"red3",
+	"green3",
+	"yellow3",
+	"blue2",
+	"magenta3",
+	"cyan3",
+	"gray80",
+
+	/* 8 bright colors */
+	"gray50",
+	"red",
+	"green",
+	"yellow",
+	"#5c5cff",
+	"magenta",
+	"cyan",
+	"white",
+
+	[255] = 0,
+
+	/* more colors can be added after 255 to use with DefaultXX */
+	"#cccccc",
+	"#555555",
+	"gray90", /* default foreground colour */
+	"#111111", /* default background colour */
+};
+
+
+unsigned int defaultfg = 258;
+unsigned int defaultbg = 259;
+unsigned int defaultcs = 256;
+static unsigned int defaultrcs = 257;
diff --git a/st/x.o b/st/x.o
index 23ab174..f24a716 100644
--- a/st/x.o
+++ b/st/x.o