[user/malte] Change kakoune comment header style

This commit is contained in:
Malte Tammena 2022-06-13 13:50:54 +02:00
parent 71f8c06a28
commit 7a4ef02598
3 changed files with 13 additions and 23 deletions

View file

@ -60,7 +60,7 @@ in {
openFirewall = true;
};
#### TASKSERVER ####
# === TASKSERVER ===
services.taskserver = {
enable = true;
dataDir = "/srv/hnd/taskserver";
@ -77,8 +77,7 @@ in {
};
};
# Everything related to the binary cache and hydra
# ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
# === Everything related to the binary cache and hydra ===
services.nix-serve = {
enable = true;
secretKeyFile = config.sops.secrets."nix-store-signing-key".path;

View file

@ -4,8 +4,7 @@
config,
...
}: let
# Setup
# ‾‾‾‾‾
# === Setup ===
cataclysm-dda-wayland-sdl = pkgs.symlinkJoin {
name = "cataclysm-tiles";
buildInputs = [pkgs.makeWrapper];
@ -17,8 +16,7 @@
jsonConfig = pkgs.formats.json {};
configDir = "${config.xdg.configHome}/cataclysm-dda";
# Font
# ‾‾‾‾
# === Font ===
fontSingleton = lib.singleton "${pkgs.iosevka}/share/fonts/truetype/iosevka-bold.ttf";
fontsConfigPath = "${configDir}/fonts.json";
fontsConfig = jsonConfig.generate "fonts.json" {
@ -27,8 +25,7 @@
overmap_typeface = fontSingleton;
};
# Color
# ‾‾‾‾‾
# === Color ===
col = config.colors;
mkCol = color: [col.${color}.red col.${color}.green col.${color}.blue];
colorConfigPath = "${configDir}/base_colors.json";
@ -56,8 +53,7 @@
}
];
# Sound
# ‾‾‾‾‾
# === Sound ===
soundPack = pkgs.fetchFromGitHub {
owner = "Fris0uman";
repo = "CDDA-Soundpacks";

View file

@ -8,8 +8,7 @@
kakBin = "${pkgs.kakoune}/bin/kak";
configDir = "~/.config/kak";
# Configuration for kakoune plugins
# ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
# === Configuration for kakoune plugins ===
pluginConfigs = with pkgs.kakounePlugins; [
{
# FZF for kakoune
@ -104,8 +103,7 @@
}
];
# Additional mappings for kakoune
# ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
# === Additional mappings for kakoune ===
additionalMappings = [
{
# Switch to last buffer
@ -123,8 +121,7 @@
}
];
# Light/Dark mode
# ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
# === Light/Dark mode ===
lightModeConfig = config.myLib.mkKakouneTheme config.colorsLight;
darkModeConfig = config.myLib.mkKakouneTheme config.colorsDark;
currentThemeName = "current-theme";
@ -132,14 +129,13 @@
ln -sf ${file} ${configDir}/colors/${currentThemeName}.kak
'';
# Additional configuration for kakoune
# ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
# === Additional configuration for kakoune ===
additionalConfig = ''
add-highlighter global/ number-lines -relative
add-highlighter global/ wrap -word -indent
add-highlighter global/ regex '\h*(//|#|;|%)\h*(TODO:|FIXME:)([^\n]*)' 2:black,bright-red+Fb 3:default+b
# Highlighter for headers in the nix config
add-highlighter global/ regex '^\h*#\h*([^\n]+)\n\h*#\h*(‾+)$' 1:bright-yellow+bf 2:yellow+bf
# Highlighter for headers in the comments
add-highlighter global/ regex '^\h*(//|#|;|%)\h*=== ([^\n]+) ===' 2:yellow+bf
# Do something about tabs..
map global insert <tab> ' '
@ -170,8 +166,7 @@
colorscheme ${currentThemeName}
'';
# Configuration for kakoune LSP
# ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
# === Configuration for kakoune LSP ===
kakLspConfigGen = pkgs.formats.toml {};
kakLspConfig = {
language = {