do you think I remember what I changed?
This commit is contained in:
Steph
parent
e4a51f1b14
commit
292bdbe5b2
@ -118,6 +118,13 @@
|
||||
# Allow unfree packages
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
fonts.fonts = with pkgs; [
|
||||
(nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ]; })
|
||||
noto-fonts
|
||||
noto-fonts-cjk
|
||||
noto-fonts-emoji
|
||||
];
|
||||
|
||||
# List packages installed in system profile. To search, run:
|
||||
# $ nix search wget
|
||||
environment.systemPackages = with pkgs; [
|
||||
@ -172,11 +179,14 @@
|
||||
|
||||
home-manager.users.steph = {
|
||||
|
||||
home.stateVersion = "22.05";
|
||||
|
||||
};
|
||||
home.stateVersion = "22.05";
|
||||
|
||||
programs.bash.interactiveShellInit = ''
|
||||
home.packages = [ pkgs.fortune ];
|
||||
|
||||
programs.home-manager.enable = true;
|
||||
|
||||
programs.bash.enable = true;
|
||||
programs.bash.bashrcExtra = ''
|
||||
# Prompt
|
||||
if [ -n "$PS1" ]; then
|
||||
# A temporary variable to contain our prompt command
|
||||
@ -198,7 +208,8 @@
|
||||
# If there's an existing prompt command, let's not
|
||||
# clobber it
|
||||
if [ -n "''${PROMPT_COMMAND// /}" ]; then
|
||||
PROMPT_COMMAND="$PROMPT_COMMAND;$NEW_PROMPT_COMMAND"
|
||||
PROMPT_COMMAND="$PROMPT_COMMAND
|
||||
$NEW_PROMPT_COMMAND"
|
||||
else
|
||||
PROMPT_COMMAND="$NEW_PROMPT_COMMAND"
|
||||
fi
|
||||
@ -211,7 +222,23 @@
|
||||
# PS1='\u@\h:$TRIMMED_PWD\$ '
|
||||
export PS1="[\t \[\e[32m\]\u\[\e[m\]\[\e[32m\]@\[\e[m\]\[\e[32m\]\h\[\e[m\]]"'$SHELL_PREFIX'" \[\e[36m\]"'$TRIMMED_PWD'"\[\e[m\] \$ "
|
||||
fi
|
||||
'';
|
||||
programs.bash.shellAliases = {
|
||||
chmod = "chmod --preserve-root";
|
||||
chown = "chown --preserve-root";
|
||||
ls = "ls -Isnap --color";
|
||||
df = "df -h -x squashfs -x tmpfs -x devtmpfs -x overlay -x revokefs-fuse";
|
||||
free = "free -h";
|
||||
toupper = "tr [:lower:] [:upper:]";
|
||||
tolower = "tr [:upper:] [:lower:]";
|
||||
rebuild = "{ cd $HOME/.local/os && nixos-rebuild switch --flake .#iota --use-remote-sudo; };";
|
||||
};
|
||||
programs.bash.sessionVariables = {
|
||||
NIX_SHELL_PRESERVE_PROMPT = 1;
|
||||
};
|
||||
|
||||
'';
|
||||
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
102
kakoune.nix
102
kakoune.nix
@ -24,6 +24,22 @@ let
|
||||
set-option global kaktree_file_icon '⠀⠀🖺'
|
||||
remove-highlighter buffer/show-whitespaces
|
||||
}
|
||||
|
||||
hook global WinSetOption filetype=(javascript|typescript) %{
|
||||
map buffer normal <tab> ': lsp-code-actions<ret>'
|
||||
map buffer normal <ret> ': lsp-hover<ret>'
|
||||
|
||||
lsp-enable-window
|
||||
hook window ModeChange .*:.*:insert %{
|
||||
lsp-inlay-diagnostics-disable window
|
||||
remove-highlighter window/lsp_diagnostics
|
||||
}
|
||||
hook window ModeChange .*:insert:normal %{
|
||||
lsp-inlay-diagnostics-enable window
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
kaktree-enable
|
||||
'';
|
||||
});
|
||||
@ -40,29 +56,29 @@ let
|
||||
colors = writeTextFile (rec {
|
||||
name = "colors.kak";
|
||||
destination = "/share/kak/colors/${name}";
|
||||
text = ''
|
||||
# One-dark theme for Kakoune
|
||||
text = ''# Kanagawa theme for Kakoune
|
||||
|
||||
# Color palette
|
||||
# declare-option str black 'rgb:282c34'
|
||||
# declare-option str black 'rgb:0a0e14'
|
||||
declare-option str black default
|
||||
declare-option str gray 'rgb:5C6370'
|
||||
declare-option str dark 'rgb:1e2127'
|
||||
declare-option str white 'rgb:abb2bf'
|
||||
declare-option str blue 'rgb:61afef'
|
||||
declare-option str cyan 'rgb:50cacd'
|
||||
declare-option str aqua 'rgb:5accaf'
|
||||
declare-option str green 'rgb:98c379'
|
||||
declare-option str amber 'rgb:e5c07b'
|
||||
declare-option str orange 'rgb:d19a66'
|
||||
declare-option str pink 'rgb:de6a73'
|
||||
declare-option str purple 'rgb:c678dd'
|
||||
declare-option str red 'rgb:efa6a2'
|
||||
declare-option str yellow 'rgb:c8c874'
|
||||
declare-option str azure 'rgb:74c3e4'
|
||||
declare-option str dimgray 'rgb:454b4e'
|
||||
declare-option str psel 'rgba:46465080'
|
||||
declare-option str ssel 'rgba:3c3c5080'
|
||||
declare-option str dark 'rgb:090618'
|
||||
declare-option str gray 'rgb:727169'
|
||||
declare-option str aqua 'rgb:6A9589'
|
||||
declare-option str white 'rgb:DCD7BA'
|
||||
declare-option str blue 'rgb:7E9CD8'
|
||||
declare-option str cyan 'rgb:7FB4CA'
|
||||
declare-option str blue_green 'rgb:7AA89F'
|
||||
declare-option str green 'rgb:98BB6C'
|
||||
declare-option str light_orange 'rgb:DCA561'
|
||||
declare-option str orange 'rgb:FFA066'
|
||||
declare-option str pink 'rgb:D27E99'
|
||||
declare-option str purple 'rgb:957fb8'
|
||||
declare-option str red 'rgb:C34043'
|
||||
declare-option str yellow 'rgb:E6C384'
|
||||
declare-option str lime 'rgb:C0A36E'
|
||||
declare-option str psel 'rgba:2D4F6780'
|
||||
declare-option str ssel 'rgba:22324980'
|
||||
declare-option str dimgray 'rgb:54546D'
|
||||
|
||||
declare-option str background %opt{black}
|
||||
declare-option str dimmed_background %opt{gray}
|
||||
@ -71,25 +87,23 @@ let
|
||||
# Reference
|
||||
# https://github.com/mawww/kakoune/blob/master/colors/default.kak
|
||||
# For code
|
||||
set-face global value "%opt{orange}"
|
||||
set-face global value "%opt{yellow}"
|
||||
set-face global type "%opt{cyan}"
|
||||
set-face global variable "%opt{orange}"
|
||||
set-face global variable "%opt{yellow}"
|
||||
set-face global module "%opt{white}"
|
||||
set-face global function "%opt{blue}"
|
||||
set-face global string "%opt{green}"
|
||||
set-face global keyword "%opt{purple}"
|
||||
set-face global operator "%opt{purple}"
|
||||
set-face global attribute "%opt{blue}"
|
||||
set-face global bracket "%opt{white}"
|
||||
set-face global arguement "%opt{orange}"
|
||||
set-face global operator "%opt{lime}"
|
||||
set-face global attribute "%opt{blue_green}"
|
||||
set-face global bracket "%opt{white}+b"
|
||||
set-face global arguement "%opt{light_orange}"
|
||||
set-face global comma "%opt{white}"
|
||||
set-face global constant "%opt{blue_green}+b"
|
||||
set-face global class "%opt{pink}"
|
||||
set-face global comment "%opt{gray}+i"
|
||||
set-face global docstring "%opt{gray}+i"
|
||||
set-face global meta "%opt{purple}"
|
||||
set-face global builtin "%opt{cyan}"
|
||||
set-face global class "%opt{amber}"
|
||||
set-face global self "%opt{pink}"
|
||||
set-face global constant "%opt{white}+b"
|
||||
set-face global meta "%opt{aqua}"
|
||||
set-face global builtin "%opt{cyan}+b"
|
||||
|
||||
# For markup
|
||||
set-face global title "%opt{pink}"
|
||||
@ -107,28 +121,30 @@ let
|
||||
# set-face global Default "%opt{white},default"
|
||||
set-face global PrimarySelection "default,%opt{psel}"
|
||||
set-face global SecondarySelection "default,%opt{ssel}"
|
||||
set-face global PrimaryCursor "%opt{dark},%opt{purple}"
|
||||
set-face global SecondaryCursor "%opt{dark},%opt{blue}"
|
||||
set-face global PrimaryCursorEol "%opt{dark},%opt{cyan}"
|
||||
set-face global SecondaryCursorEol "%opt{dark},%opt{amber}"
|
||||
set-face global PrimaryCursor "%opt{dark},%opt{cyan}"
|
||||
set-face global SecondaryCursor "%opt{dark},%opt{aqua}"
|
||||
set-face global PrimaryCursorEol "%opt{dark},%opt{light_orange}"
|
||||
set-face global SecondaryCursorEol "%opt{dark},%opt{blue}"
|
||||
set-face global LineNumbers "%opt{gray},%opt{black}"
|
||||
set-face global LineNumberCursor "%opt{white},%opt{black}+b"
|
||||
set-face global LineNumberCursor "%opt{purple},%opt{black}+b"
|
||||
set-face global LineNumbersWrapped "%opt{gray},%opt{black}+i"
|
||||
set-face global MenuForeground "%opt{dark},%opt{aqua}+b"
|
||||
set-face global MenuForeground "%opt{dark},%opt{white}+b"
|
||||
set-face global MenuBackground "%opt{white},%opt{dark}"
|
||||
set-face global MenuInfo "%opt{orange},%opt{dark}"
|
||||
set-face global MenuInfo "%opt{dark},%opt{orange}"
|
||||
set-face global Information "%opt{yellow},%opt{black}"
|
||||
set-face global Error "%opt{red},%opt{black}"
|
||||
set-face global StatusLine "%opt{white},%opt{black}"
|
||||
set-face global StatusLineMode "%opt{green},%opt{black}"
|
||||
set-face global StatusLineMode "%opt{aqua},%opt{black}"
|
||||
set-face global StatusLineInfo "%opt{purple},%opt{black}"
|
||||
set-face global StatusLineValue "%opt{orange},%opt{black}"
|
||||
set-face global StatusCursor "%opt{white},%opt{blue}"
|
||||
set-face global Prompt "%opt{green},%opt{black}"
|
||||
set-face global MatchingChar "%opt{black},%opt{blue}"
|
||||
set-face global MatchingChar "%opt{blue},%opt{black}"
|
||||
set-face global Whitespace "%opt{dimgray},%opt{black}+f"
|
||||
set-face global WrapMarker Whitespace
|
||||
set-face global BufferPadding "%opt{gray},%opt{black}"
|
||||
set-face global BufferPadding "%opt{black},%opt{black}"
|
||||
|
||||
|
||||
|
||||
'';
|
||||
});
|
||||
@ -172,6 +188,8 @@ let
|
||||
text = ''
|
||||
tmux -L editor new-session -d -s editor 'kak -e kaktree-toggle'
|
||||
tmux -L editor set -g status off
|
||||
tmux -L editor set -g pane-border-style fg=#0c0c0c
|
||||
tmux -L editor set -g pane-active-border-style "bg=default fg=#0c0c0c"
|
||||
tmux -L editor attach -t editor
|
||||
'';
|
||||
});
|
||||
|
||||
Loading…
Reference in New Issue
Block a user