treewide: format using nixfmt-rfc-style
This commit is contained in:
		
							parent
							
								
									dba047b845
								
							
						
					
					
						commit
						399eafe9ed
					
				
					 98 changed files with 1930 additions and 990 deletions
				
			
		| 
						 | 
				
			
			@ -1,4 +1,9 @@
 | 
			
		|||
{ pkgs, lib, color, accent }:
 | 
			
		||||
{
 | 
			
		||||
  pkgs,
 | 
			
		||||
  lib,
 | 
			
		||||
  color,
 | 
			
		||||
  accent,
 | 
			
		||||
}:
 | 
			
		||||
let
 | 
			
		||||
  colors = lib.mapAttrs (_: lib.replaceStrings [ "#" ] [ "rgb:" ]) {
 | 
			
		||||
    accent_fg = accent.fg;
 | 
			
		||||
| 
						 | 
				
			
			@ -94,8 +99,9 @@ with colors;
 | 
			
		|||
  face global InlayHint ${bg_light}+buif
 | 
			
		||||
 | 
			
		||||
  # Lsp
 | 
			
		||||
'' + (
 | 
			
		||||
  lib.concatStringsSep "\n" (lib.mapAttrsToList
 | 
			
		||||
''
 | 
			
		||||
+ (lib.concatStringsSep "\n" (
 | 
			
		||||
  lib.mapAttrsToList
 | 
			
		||||
    (name: color: ''
 | 
			
		||||
      face global HighlightDiagnostic${name} ${color},default+bu
 | 
			
		||||
      face global Diagnostic${name} ${color},default+bu
 | 
			
		||||
| 
						 | 
				
			
			@ -106,6 +112,5 @@ with colors;
 | 
			
		|||
      Error = "red";
 | 
			
		||||
      Warning = "yellow";
 | 
			
		||||
      Hint = "blue";
 | 
			
		||||
    })
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
))
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,6 +1,17 @@
 | 
			
		|||
{ config, pkgs, lib, ... }:
 | 
			
		||||
{
 | 
			
		||||
  config,
 | 
			
		||||
  pkgs,
 | 
			
		||||
  lib,
 | 
			
		||||
  ...
 | 
			
		||||
}:
 | 
			
		||||
let
 | 
			
		||||
  inherit (pkgs.uservars) key dmenu editor theme accent;
 | 
			
		||||
  inherit (pkgs.uservars)
 | 
			
		||||
    key
 | 
			
		||||
    dmenu
 | 
			
		||||
    editor
 | 
			
		||||
    theme
 | 
			
		||||
    accent
 | 
			
		||||
    ;
 | 
			
		||||
  inherit (theme) color;
 | 
			
		||||
  inherit (pkgs) kakounePlugins;
 | 
			
		||||
  inherit (pkgs.kakouneUtils) buildKakounePlugin;
 | 
			
		||||
| 
						 | 
				
			
			@ -74,26 +85,39 @@ in
 | 
			
		|||
        })
 | 
			
		||||
      ];
 | 
			
		||||
      extraConfig =
 | 
			
		||||
        lib.concatStringsSep "\n"
 | 
			
		||||
          (map (lib.readFile) ([
 | 
			
		||||
            ./filetypes.kak
 | 
			
		||||
            ./hooks.kak
 | 
			
		||||
            ./indent.kak
 | 
			
		||||
            ./keys.kak
 | 
			
		||||
            ./lsp-config.kak
 | 
			
		||||
            ./usermode.kak
 | 
			
		||||
            ./git-mode.kak
 | 
			
		||||
          ] ++ lib.optional (dmenu == "rofi") ./rofi-commands.kak)) + ''
 | 
			
		||||
        lib.concatStringsSep "\n" (
 | 
			
		||||
          map (lib.readFile) (
 | 
			
		||||
            [
 | 
			
		||||
              ./filetypes.kak
 | 
			
		||||
              ./hooks.kak
 | 
			
		||||
              ./indent.kak
 | 
			
		||||
              ./keys.kak
 | 
			
		||||
              ./lsp-config.kak
 | 
			
		||||
              ./usermode.kak
 | 
			
		||||
              ./git-mode.kak
 | 
			
		||||
            ]
 | 
			
		||||
            ++ lib.optional (dmenu == "rofi") ./rofi-commands.kak
 | 
			
		||||
          )
 | 
			
		||||
        )
 | 
			
		||||
        + ''
 | 
			
		||||
 | 
			
		||||
        set global scrolloff 10,20
 | 
			
		||||
        set global autoreload yes
 | 
			
		||||
        set global startup_info_version 99999999
 | 
			
		||||
          set global scrolloff 10,20
 | 
			
		||||
          set global autoreload yes
 | 
			
		||||
          set global startup_info_version 99999999
 | 
			
		||||
 | 
			
		||||
      '' + (import ./colors.nix {
 | 
			
		||||
          inherit pkgs lib color accent;
 | 
			
		||||
        ''
 | 
			
		||||
        + (import ./colors.nix {
 | 
			
		||||
          inherit
 | 
			
		||||
            pkgs
 | 
			
		||||
            lib
 | 
			
		||||
            color
 | 
			
		||||
            accent
 | 
			
		||||
            ;
 | 
			
		||||
        });
 | 
			
		||||
    };
 | 
			
		||||
    home.file = { ".config/kak-lsp/kak-lsp.toml".source = ./kak-lsp.toml; };
 | 
			
		||||
    home.file = {
 | 
			
		||||
      ".config/kak-lsp/kak-lsp.toml".source = ./kak-lsp.toml;
 | 
			
		||||
    };
 | 
			
		||||
    home.packages = with pkgs; [
 | 
			
		||||
      terminal
 | 
			
		||||
      ranger
 | 
			
		||||
| 
						 | 
				
			
			@ -123,4 +147,3 @@ in
 | 
			
		|||
    };
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue