Fix editor colors a bit
This commit is contained in:
parent
d066e930a4
commit
071577b83d
8 changed files with 73 additions and 9 deletions
|
@ -75,7 +75,7 @@ let inherit (builtins) mapAttrs map; in rec {
|
|||
yellow = {
|
||||
normal = "fcfc51";
|
||||
bright = "fcfc51";
|
||||
pastel = "";
|
||||
pastel = "e9ff87";
|
||||
};
|
||||
|
||||
purple = {
|
||||
|
|
|
@ -9,10 +9,10 @@
|
|||
../../modules
|
||||
|
||||
# Reverse proxy
|
||||
./nginx.nix
|
||||
./services/nginx.nix
|
||||
|
||||
# Website
|
||||
./website.nix
|
||||
./services/website.nix
|
||||
|
||||
];
|
||||
|
||||
|
|
|
@ -16,13 +16,23 @@ pkgs.writeTextFile (rec {
|
|||
face global module rgb:${yellow.normal}
|
||||
face global meta rgb:${green.bright}
|
||||
face global type rgb:${blue.bright}
|
||||
face global trait rgb:${purple.bright}
|
||||
face global macro +b@meta
|
||||
face global method function
|
||||
face global variant rgb:${blue.normal}
|
||||
|
||||
face global LineNumbers rgb:${background.slight}
|
||||
face global BufferPadding rgb:${background.slight}
|
||||
face global LineNumberCursor rgb:${foreground.primary}
|
||||
face global crosshairs_line "default,rgb:212121"
|
||||
face global MenuForeground "default,rgb:${blue.normal}"
|
||||
face global MenuBackground "default,rgb:313131"
|
||||
face global crosshairs_line default,rgb:212121
|
||||
face global MenuForeground default,rgb:${blue.normal}
|
||||
face global MenuBackground default,rgb:313131
|
||||
|
||||
face global DiagnosticWarning default,default,yellow+c
|
||||
face global DiagnosticError default,default,red+c
|
||||
face global DiagnosticHint default,default,green+c
|
||||
|
||||
face global Reference default,rgb:323232,default
|
||||
|
||||
'';
|
||||
})
|
||||
|
|
|
@ -47,6 +47,7 @@ let semantic-tokens =
|
|||
"comparison" = "operator";
|
||||
"logical" = "operator";
|
||||
"macro" = "macro";
|
||||
"macroBang" = "macro";
|
||||
"lifetime" = "lifetime";
|
||||
"variable" = "variable";
|
||||
"attribute" = "attribute";
|
||||
|
|
|
@ -62,10 +62,13 @@ let keybinds = ''
|
|||
|
||||
hook -once -always window WinSetOption filetype=.* %{ remove-hooks window semtok }
|
||||
|
||||
map global normal <a-down> ': lsp-next-function<ret>'
|
||||
map global normal <a-up> ': lsp-previous-function<ret>'
|
||||
map global normal <up> ': lsp-previous-symbol<ret>'
|
||||
map global normal <down> ': lsp-next-symbol<ret>'
|
||||
map global normal <a-down> ': lsp-hover-next-symbol<ret>'
|
||||
map global normal <a-up> ': lsp-hover-previous-symbol<ret>'
|
||||
|
||||
map global normal <a-left> ': lsp-previous-location *goto*<ret>'
|
||||
map global normal <a-right> ': lsp-next-location *goto*<ret>'
|
||||
map global normal <a-right> ': lsp-next-location *goto*<ret>'
|
||||
|
||||
''; in
|
||||
|
||||
|
@ -147,6 +150,29 @@ let nix-config = (lib.optionalString nix ''
|
|||
|
||||
}
|
||||
|
||||
hook global NormalIdle .* %{ lsp-highlight-references }
|
||||
hook global InsertMove .* %{ lsp-highlight-references }
|
||||
|
||||
face global meta white
|
||||
face global type rgb:${theme.blue.bright}
|
||||
face global trait rgb:${theme.pink.normal}
|
||||
face global macro rgb:${theme.green.bright}
|
||||
face global format rgb:${theme.green.bright}
|
||||
face global attribute rgb:${theme.orange.bright}
|
||||
face global operator rgb:${theme.yellow.normal}
|
||||
face global keyword rgb:${theme.purple.pastel}
|
||||
face global function rgb:${theme.green.bright}
|
||||
face global keyword rgb:${theme.misc.blueGrey}
|
||||
|
||||
face global alias rgb:${theme.orange.normal}
|
||||
face global enum type
|
||||
face global struct type
|
||||
face global union type
|
||||
|
||||
face global lifetime rgb:${theme.pink.pastel}
|
||||
|
||||
face global module rgb:ffffff
|
||||
|
||||
}
|
||||
'');
|
||||
|
||||
|
|
27
modules/mpd.nix
Normal file
27
modules/mpd.nix
Normal file
|
@ -0,0 +1,27 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
let cfg = config.riley.mpd; in
|
||||
|
||||
with lib; {
|
||||
|
||||
options.riley.mpd = {
|
||||
enable = mkEnableOption "music player daemon";
|
||||
};
|
||||
|
||||
config = mkIf (cfg.enable) {
|
||||
|
||||
# Enable the service
|
||||
home-manager.users."riley" = {
|
||||
services.mpd = {
|
||||
enable = true;
|
||||
musicDirectory = "$HOME/media/music";
|
||||
};
|
||||
};
|
||||
|
||||
users.users."riley".packages = with pkgs; [
|
||||
mpc_cli
|
||||
];
|
||||
|
||||
};
|
||||
|
||||
}
|
Loading…
Reference in a new issue