dln/dotfiles
0
0
Code Issues Pull requests 1 Activity

Compare commits

base: dln:9b9389592e0251da7f61ef604f0ea5ff36a58e59
Branches Tags
dln:main
dln:mybookmark
dln:nvim-mini
dln:dln/push-uukkorqwopqy
dln:master
dln:dark-mode
dln:porky
dln:pre-home-manager
...
compare: dln:7954844ff624cb73fce3cfa0f450e35f2258cf8c
Branches Tags
dln:main
dln:mybookmark
dln:nvim-mini
dln:dln/push-uukkorqwopqy
dln:master
dln:dark-mode
dln:porky
dln:pre-home-manager

2 commits
9b9389592e ... 7954844ff6

Author SHA1 Message Date
Daniel Lundin
7954844ff6
fish: colorings 2025-01-03 13:38:56 +01:00
Daniel Lundin
afa495919c
nvim: colorings 2025-01-03 13:38:53 +01:00
4 changed files with 14 additions and 11 deletions
Show stats Expand all files Collapse all files

2
files/config/fish/config.fish
View file

@ -12,7 +12,7 @@ set fish_emoji_width 2
# Colors # Colors
set fish_color_command --bold set fish_color_command --bold
set fish_color_comment --italics --dim set fish_color_comment --italics --dim
set fish_color_autosuggestion --italics --bold red set fish_color_autosuggestion --italics --bold --dim
set fish_color_cancel set fish_color_cancel
set fish_color_command --bold set fish_color_command --bold
set fish_color_comment --italics --dim set fish_color_comment --italics --dim

2
home/common/fish.nix
View file

@ -107,7 +107,7 @@
fish_prompt.body = '' fish_prompt.body = ''
echo -e "\033[s\033[$LINES;1H\033[1;2;38;5;238m$(string pad -c '┄' -w $COLUMNS (fish_jj_prompt || fish_vcs_prompt))\033[0m\033[u" echo -e "\033[s\033[$LINES;1H\033[1;2;38;5;238m$(string pad -c '┄' -w $COLUMNS (fish_jj_prompt || fish_vcs_prompt))\033[0m\033[u"
string join "" -- (set_color --italics) (prompt_hostname) ':' (prompt_pwd --full-length-dirs=4) (set_color --bold) ' ❯ ' (set_color normal) string join "" -- (set_color --dim) (prompt_hostname) ':' (prompt_pwd --full-length-dirs=4) (set_color --bold normal) ' ❯ ' (set_color normal)
''; '';
transient_prompt_func.body = '' transient_prompt_func.body = ''

13
home/common/nvim/dieter/lua/dieter/init.lua
View file

@ -29,7 +29,6 @@ local colors = {
change = hsl(41, 80, 80), change = hsl(41, 80, 80),
change_quarter = hsl(224, 100, 85), change_quarter = hsl(224, 100, 85),
delete = hsl(350, 100, 40), delete = hsl(350, 100, 40),
delete_quarter = hsl(350, 100, 85),
dialog_bg = hsl(224, 5, 92), dialog_bg = hsl(224, 5, 92),
selection = hsl(270, 75, 92), selection = hsl(270, 75, 92),
@ -80,7 +79,10 @@ local colors = {
delete = hsl(350, 100, 40), delete = hsl(350, 100, 40),
delete_quarter = hsl(350, 100, 15), delete_quarter = hsl(350, 100, 15),
selection = hsl(213, 60, 40), selection = hsl(218, 30, 20),
search_bg = hsl(43, 100, 8),
search_fg = hsl(43, 100, 85),
cmp_bg = hsl(218, 30, 13), cmp_bg = hsl(218, 30, 13),
cmp_fg = hsl(218, 30, 80), cmp_fg = hsl(218, 30, 80),
@ -114,6 +116,9 @@ local setupGroups = function(c)
Visual = { bg = c.selection }, Visual = { bg = c.selection },
Search = { bg = c.search_bg, fg = c.search_fg },
CurSearch = { link = "Search" },
Comment = { fg = c.comment, italic = true, bold = true }, Comment = { fg = c.comment, italic = true, bold = true },
CommentError = { fg = c.comment_error, italic = true, bold = true }, CommentError = { fg = c.comment_error, italic = true, bold = true },
["@comment.note"] = { link = "Comment" }, ["@comment.note"] = { link = "Comment" },
@ -157,8 +162,8 @@ local setupGroups = function(c)
DiagnosticSignHint = { fg = c.diagnostic_hint }, DiagnosticSignHint = { fg = c.diagnostic_hint },
DiagnosticSignInfo = { fg = c.diagnostic_info }, DiagnosticSignInfo = { fg = c.diagnostic_info },
DiagnosticSignWarn = { fg = c.diagnostic_warning }, DiagnosticSignWarn = { fg = c.diagnostic_warning },
LineNr = { fg = c.dimmed, italic = true }, LineNr = { fg = c.dimmed },
CursorLineNr = { fg = c.dimmed_subtle, bg = c.highlight_subtle, bold = true }, CursorLineNr = { fg = c.dimmed_subtle, bg = c.highlight_subtle },
IndentLine = { fg = c.dimmed }, IndentLine = { fg = c.dimmed },
IndentLineCurrent = { fg = c.dimmed_subtle }, IndentLineCurrent = { fg = c.dimmed_subtle },

2
home/common/nvim/init.lua
View file

@ -69,7 +69,6 @@ vim.o.timeoutlen = 10
vim.o.timeout = true vim.o.timeout = true
vim.o.updatetime = 50 vim.o.updatetime = 50
-- Use rg -- Use rg
vim.o.grepprg = [[rg --glob "!.jj" --glob "!.git" --no-heading --vimgrep --follow $*]] vim.o.grepprg = [[rg --glob "!.jj" --glob "!.git" --no-heading --vimgrep --follow $*]]
vim.opt.grepformat = vim.opt.grepformat ^ { "%f:%l:%c:%m" } vim.opt.grepformat = vim.opt.grepformat ^ { "%f:%l:%c:%m" }
@ -163,4 +162,3 @@ vim.keymap.set("n", "<Leader>uc", function()
end, opts("Toggle Dieter colors")) end, opts("Toggle Dieter colors"))
vim.keymap.set("n", "<Leader>uh", "<cmd>InlayHintsToggle<cr>", opts("Toggle inlay hints")) vim.keymap.set("n", "<Leader>uh", "<cmd>InlayHintsToggle<cr>", opts("Toggle inlay hints"))
vim.keymap.set("n", "<Leader>uw", "<cmd>set invwrap<cr>", opts("Toggle line wrapping")) vim.keymap.set("n", "<Leader>uw", "<cmd>set invwrap<cr>", opts("Toggle line wrapping"))