diff --git a/users/myuser/graphical/default.nix b/users/myuser/graphical/default.nix index 91bc6a6..657de56 100644 --- a/users/myuser/graphical/default.nix +++ b/users/myuser/graphical/default.nix @@ -65,7 +65,6 @@ # TODO sway shortcuts # TODO VP9 hardware video decoding blocklisted # TODO gpg switch to sk - # TODO some font icons not showing neovim because removed from nerdfonts, replace with bertter . persistence."/state".directories = [ "Downloads" # config.xdg.userDirs.download (infinite recursion) diff --git a/users/myuser/neovim/aaa/init.lua b/users/myuser/neovim/aaa/init.lua index b4bba5a..1c454c5 100644 --- a/users/myuser/neovim/aaa/init.lua +++ b/users/myuser/neovim/aaa/init.lua @@ -54,9 +54,10 @@ opt.shiftwidth = 4 opt.softtabstop = 4 opt.shiftround = true -- Round indentation commands to next multiple of shiftwidth -opt.formatoptions = "rqj" -- r = insert comment leader when hitting in insert mode +-- r = insert comment leader when hitting in insert mode -- q = allow explicit formatting with gq -- j = remove comment leaders when joining lines if it makes sense +opt.formatoptions = "rqj" opt.virtualedit = "all" -- Allow the curser to be positioned on cells that have no actual character; -- Like moving beyond EOL or on any visual 'space' of a tab character diff --git a/users/myuser/neovim/lua/utils/icons.lua b/users/myuser/neovim/lua/utils/icons.lua index 33d24e8..a3275ea 100644 --- a/users/myuser/neovim/lua/utils/icons.lua +++ b/users/myuser/neovim/lua/utils/icons.lua @@ -1,44 +1,46 @@ local M = {} M.lspkind = { - Namespace = "", - Text = " ", - Method = " ", - Function = " ", - Constructor = " ", - Field = "ﰠ ", - Variable = " ", - Class = "ﴯ ", - Interface = " ", - Module = " ", - Property = "ﰠ ", - Unit = "塞 ", - Value = " ", - Enum = " ", - Keyword = " ", - Snippet = " ", - Color = " ", - File = " ", - Reference = " ", - Folder = " ", - EnumMember = " ", - Constant = " ", - Struct = "פּ ", - Event = " ", - Operator = " ", - TypeParameter = " ", + Namespace = "󰌗", + Text = "󰉿", + Method = "󰆧", + Function = "󰆧", + Constructor = "", + Field = "󰜢", + Variable = "󰀫", + Class = "󰠱", + Interface = "", + Module = "", + Property = "󰜢", + Unit = "󰑭", + Value = "󰎠", + Enum = "", + Keyword = "󰌋", + Snippet = "", + Color = "󰏘", + File = "󰈚", + Reference = "󰈇", + Folder = "󰉋", + EnumMember = "", + Constant = "󰏿", + Struct = "󰙅", + Event = "", + Operator = "󰆕", + TypeParameter = "󰊄", Table = "", - Object = " ", + Object = "󰅩", Tag = "", Array = "[]", - Boolean = " ", - Number = " ", - Null = "ﳠ", - String = " ", + Boolean = "", + Number = "", + Null = "󰟢", + String = "󰉿", Calendar = "", - Watch = " ", + Watch = "󰥔", Package = "", - Copilot = " ", + Copilot = "", + Codeium = "", + TabNine = "", } M.statusline_separators = { @@ -65,7 +67,7 @@ M.statusline_separators = { M.devicons = { default_icon = { - icon = "", + icon = "󰈚", name = "Default", }, @@ -79,6 +81,11 @@ M.devicons = { name = "css", }, + dart = { + icon = "", + name = "dart", + }, + deb = { icon = "", name = "deb", @@ -95,17 +102,17 @@ M.devicons = { }, jpeg = { - icon = "", + icon = "󰉏", name = "jpeg", }, jpg = { - icon = "", + icon = "󰉏", name = "jpg", }, js = { - icon = "", + icon = "󰌞", name = "js", }, @@ -115,7 +122,7 @@ M.devicons = { }, lock = { - icon = "", + icon = "󰌾", name = "lock", }, @@ -125,7 +132,7 @@ M.devicons = { }, mp3 = { - icon = "", + icon = "󰎆", name = "mp3", }, @@ -140,7 +147,7 @@ M.devicons = { }, png = { - icon = "", + icon = "󰉏", name = "png", }, @@ -150,7 +157,7 @@ M.devicons = { }, ["robots.txt"] = { - icon = "ﮧ", + icon = "󰚩", name = "robots", }, @@ -160,7 +167,7 @@ M.devicons = { }, ts = { - icon = "ﯤ", + icon = "󰛦", name = "ts", }, @@ -180,7 +187,7 @@ M.devicons = { }, vue = { - icon = "﵂", + icon = "󰡄", name = "vue", },