Removing jetbrains mono with ligatures

This commit is contained in:
Zoe Roux
2022-02-06 00:28:19 +01:00
parent 0d550e5c37
commit fac87d1476
20 changed files with 38 additions and 32 deletions

View File

@@ -4,7 +4,7 @@
<string>monospace</string>
</test>
<edit binding="strong" mode="prepend" name="family">
<string>JetBrains Mono Nerd Font</string>
<string>JetBrainsMonoNL Nerd Font</string>
</edit>
</match>
</fontconfig>
</fontconfig>

View File

@@ -64,6 +64,7 @@ local function lsp_keymaps(bufnr)
local opts = { noremap = true, silent = true }
vim.api.nvim_buf_set_keymap(bufnr, "n", "gD", "<cmd>lua vim.lsp.buf.declaration()<CR>", opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "gd", "<cmd>lua vim.lsp.buf.definition()<CR>", opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "K", "<cmd>lua vim.lsp.buf.hover()<CR>", opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>", opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "<C-k>", "<cmd>lua vim.lsp.buf.signature_help()<CR>", opts)

View File

@@ -48,6 +48,7 @@ return packer.startup(function(use)
use "tpope/vim-repeat"
use "tpope/vim-surround"
use "wellle/targets.vim"
use "justinmk/vim-sneak"
use "mg979/vim-visual-multi"
use {"RRethy/vim-hexokinase", run = "make hexokinase"}
use "windwp/nvim-autopairs" -- Autopairs, integrates with both cmp and treesitter

View File

@@ -10,13 +10,15 @@ import XMonad.Layout.NoBorders (noBorders)
import XMonad.Util.WorkspaceCompare (getSortByIndex)
import XMonad.Hooks.StatusBar.PP (PP(..))
import XMonad.Hooks.StatusBar (StatusBarConfig, statusBarPipe, dynamicSBs)
import XMonad.Util.Loggers (logTitleOnScreen, logLayoutOnScreen, shortenL)
import XMonad.Actions.UpdatePointer (updatePointer)
main :: IO ()
main = xmonad
-- . ewmhFullscreen
-- . ewmh
-- . docks
. ewmhFullscreen
. ewmh
. docks
. polybarEnable
$ xConfig
@@ -24,7 +26,7 @@ polybarEnable :: XConfig a -> XConfig a
polybarEnable = dynamicSBs barSpawner
where
barSpawner :: ScreenId -> IO StatusBarConfig
barSpawner x = statusBarPipe (barScript x) (pure basicPP)
barSpawner x = statusBarPipe (barScript x) (polyPP x)
barScript (S x) = "~/.config/polybar/launch.sh " ++ show x
@@ -33,36 +35,37 @@ basicPP = def
{ ppSep = " "
, ppWsSep = " "
, ppTitleSanitize = filter (`notElem` ['%','{','}'])
, ppOrder = layoutFirstOrder
, ppSort = getSortByIndex
, ppExtras = []
, ppOutput = const mempty
}
where
layoutFirstOrder (workspaces : layout : title : extras) =
[layout] ++ extras ++ [workspaces, title]
layoutFirstOrder other = other
-- polyPP :: ScreenId -> X PP
-- polyPP sid = pure $ basicPP
-- { ppCurrent = lemonbarFormat [ Foreground accent, Background white, Underline magenta ]
-- , ppVisible = lemonbarFormat [ Foreground blue, Background white, Underline magenta ]
-- , ppVisibleNoWindows = Just $
-- lemonbarFormat [ Foreground blue, Background white, Underline magenta ]
-- , ppHidden = lemonbarFormat [ Foreground blue, Underline magenta ]
-- , ppHiddenNoWindows = lemonbarFormat [ Foreground magenta ]
-- , ppUrgent = lemonbarFormat [ Foreground blue, Background magenta ]
-- , ppTitle = lemonbarFormat [ Foreground blue ] . shorten 50
-- , ppLayout = lemonbarFormat [ Foreground blue ]
-- }
-- -- { ppCurrent = lemonbarFormat [Background accent]
-- -- -- , ppExtras = [logTitlesOnScreen sid formatFocused formatUnfocused]
-- -- --, ppSep = magenta " • "
-- -- }
-- where
-- -- formatFocused, formatUnfocused :: String -> String
-- -- formatFocused = wrap (white "[") (white "]") . magenta . ppWindow
-- -- formatUnfocused = wrap (lowWhite "[") (lowWhite "]") . blue . ppWindow
polyPP :: ScreenId -> X PP
polyPP sid = pure $ basicPP
{ ppExtras =
[ shortenL 40 $ logLayoutOnScreen sid
, logTitleOnScreen sid
]
, ppLayout = const mempty
, ppTitle = const $ show sid
}
-- { ppCurrent = lemonbarFormat [ Foreground accent, Background white, Underline magenta ]
-- , ppVisible = lemonbarFormat [ Foreground blue, Background white, Underline magenta ]
-- , ppVisibleNoWindows = Just $
-- lemonbarFormat [ Foreground blue, Background white, Underline magenta ]
-- , ppHidden = lemonbarFormat [ Foreground blue, Underline magenta ]
-- , ppHiddenNoWindows = lemonbarFormat [ Foreground magenta ]
-- , ppUrgent = lemonbarFormat [ Foreground blue, Background magenta ]
-- , ppTitle = lemonbarFormat [ Foreground blue ] . shorten 50
-- , ppLayout = lemonbarFormat [ Foreground blue ]
-- }
-- { ppCurrent = lemonbarFormat [Background accent]
-- -- , ppExtras = [logTitlesOnScreen sid formatFocused formatUnfocused]
-- --, ppSep = magenta " • "
-- }
-- where
-- formatFocused, formatUnfocused :: String -> String
-- formatFocused = wrap (white "[") (white "]") . magenta . ppWindow
-- formatUnfocused = wrap (lowWhite "[") (lowWhite "]") . blue . ppWindow
-- -- | Windows should have *some* title, which should not not exceed a
-- -- sane length.
@@ -79,6 +82,7 @@ xConfig = def
{ modMask = mod4Mask -- Rebind Mod to the Super key
, terminal = "kitty"
, layoutHook = layouts
, logHook = updatePointer (0.5, 0.5) (0, 0)
}
layouts = named "[]=" (avoidStruts $ Tall nmaster delta ratio)