geoffrey/dotfiles
geoffrey/dotfiles
1
0
Fork 0
Code Issues 8 Pull requests Releases Activity

Fix nvim color scheme being different from system

Browse source
This commit is contained in:
Geoffrey Frogeye 2023-12-05 20:57:05 +01:00
parent f12ff6a989
commit 56544fe947
Signed by: geoffrey
GPG key ID: C72403E7F82E6AD8
4 changed files with 30 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
hm/desktop.nix
View file

@ -593,6 +593,7 @@
}; };
services = { services = {
unclutter.enable = true; unclutter.enable = true;
# FIXME Not starting on curacao_test
dunst = dunst =
{ {
enable = true; enable = true;

10
hm/style.nix
View file

@ -1,10 +1,7 @@
{ pkgs, config, ... }: { pkgs, config, fetchFromGitHub, ... }:
let let
stylix = builtins.fetchGit { # Currently last commit in https://github.com/danth/stylix/pull/194
url = "https://github.com/danth/stylix.git"; stylix = builtins.fetchTarball "https://github.com/willemml/stylix/archive/2ed2b0086b41d582aca26e083c19c0e47c8991e3.tar.gz";
# No 23.11 branch last I checked
rev = "8b3f61727f3b86c27096c3c014ae602aa40670ba";
};
in in
{ {
imports = [ (import stylix).homeManagerModules.stylix ]; imports = [ (import stylix).homeManagerModules.stylix ];
@ -28,7 +25,6 @@ in
}; };
targets = { targets = {
vim.enable = false; # FIXME Not compatible with nixvim for now (there's a MR)
i3.enable = false; # I prefer my own styles i3.enable = false; # I prefer my own styles
tmux.enable = false; # Using another theme tmux.enable = false; # Using another theme
}; };

15
hm/vim.nix
View file

@ -68,12 +68,6 @@ in
globals = { globals = {
netrw_fastbrowse = 0; # Close the file explorer once you select a file netrw_fastbrowse = 0; # Close the file explorer once you select a file
}; };
colorschemes.base16 = {
# FIXME Dynamic... or use stylix
enable = true;
colorscheme = "solarized-light";
};
plugins = { plugins = {
# Catches attention when cursor changed position # Catches attention when cursor changed position
# TODO Unmapped, do I still want to use it? # TODO Unmapped, do I still want to use it?
@ -339,14 +333,15 @@ in
''; '';
autoCmd = [ autoCmd = [
# Turn off relativenumber only for insert mode # Turn off relativenumber only for insert mode
{ event = "InsertEnter *"; command = "set norelativenumber"; } { event = "InsertEnter"; pattern = "*"; command = "set norelativenumber"; }
{ event = "InsertLeave *"; command = "set relativenumber"; } { event = "InsertLeave"; pattern = "*"; command = "set relativenumber"; }
# Additional extensions # Additional extensions
{ event = "BufNewFile,BufRead"; pattern = "*.jinja"; command = "set filetype=jinja2"; } # TODO Probably GH-specific? { event = "BufRead"; pattern = "*.jinja"; command = "set filetype=jinja2"; } # TODO Probably GH-specific?
{ event = "BufNewFile"; pattern = "*.jinja"; command = "set filetype=jinja2"; }
# vim-easy-align: Align Markdown tables # vim-easy-align: Align Markdown tables
{ event = "FileType markdown"; command = "vmap <Bar> :EasyAlign*<Bar><Enter>"; } { event = "FileType"; pattern = "markdown"; command = "vmap <Bar> :EasyAlign*<Bar><Enter>"; }
]; ];
userCommands = { userCommands = {

44
hm/vim/feline.lua
View file

@ -2,32 +2,30 @@ vim.cmd([[
set noshowmode set noshowmode
set laststatus=2 set laststatus=2
]]) ]])
-- local base16_colors = require('base16-colorscheme').colors local base16_colors = require('base16-colorscheme').colors
-- FIXME Color setting doesn't work, see ./feline_test.vim for a reproducible use case
-- that works on Arch but not on Nix (with Plug stuff removed)
local vi_mode_utils = require('feline.providers.vi_mode') local vi_mode_utils = require('feline.providers.vi_mode')
local lsp = require('feline.providers.lsp') local lsp = require('feline.providers.lsp')
require('feline').setup({ require('feline').setup({
-- default_bg = 'base01', default_bg = 'base01',
-- default_fg = 'base04', default_fg = 'base04',
-- theme = { theme = {
-- base00 = base16_colors.base00, base00 = base16_colors.base00,
-- base01 = base16_colors.base01, base01 = base16_colors.base01,
-- base02 = base16_colors.base02, base02 = base16_colors.base02,
-- base03 = base16_colors.base03, base03 = base16_colors.base03,
-- base04 = base16_colors.base04, base04 = base16_colors.base04,
-- base05 = base16_colors.base05, base05 = base16_colors.base05,
-- base06 = base16_colors.base06, base06 = base16_colors.base06,
-- base07 = base16_colors.base07, base07 = base16_colors.base07,
-- base08 = base16_colors.base08, base08 = base16_colors.base08,
-- base09 = base16_colors.base09, base09 = base16_colors.base09,
-- base0A = base16_colors.base0A, base0A = base16_colors.base0A,
-- base0B = base16_colors.base0B, base0B = base16_colors.base0B,
-- base0C = base16_colors.base0C, base0C = base16_colors.base0C,
-- base0D = base16_colors.base0D, base0D = base16_colors.base0D,
-- base0E = base16_colors.base0E, base0E = base16_colors.base0E,
-- base0F = base16_colors.base0F, base0F = base16_colors.base0F,
-- }, },
components = { components = {
active = { active = {
{ {