Good commit.

dotfiles/fish.fish

@@ -30,22 +30,80 @@ end
 #        paste (printf "\n\n%b" $A | psub) (echo $anime | psub) | column -s '$'\t -t
 #    end
 #end
+#set FZF_DEFAULT_OPTS "--height=40"
+#set FZF_DISABLE_KEYBINDINGS "0"
+#set FZF_LEGACY_KEYBINDINGS "0"
+#set FZF_PREVIEW_DIR_CMD "exa"
+#set FZF_PREVIEW_FILE_CMD "head -n 10"
+#set FZF_TMUX_HEIGHT "40"
+set fish_color_autosuggestion "brblack" #292D3E"
+set fish_color_cancel "-r"
+set fish_color_command "green"
+set fish_color_comment "brblack"
+set fish_color_cwd "yellow"
+set fish_color_cwd_root "red"
+set fish_color_end "magenta"
+set fish_color_error "red"
+set fish_color_escape "magenta"
+set fish_color_history_current "--bold"
+set fish_color_host "normal"
+set fish_color_host_remote "yellow"
+set fish_color_match "--background=brblue"
+set fish_color_normal "normal"
+set fish_color_operator "cyan"
+set fish_color_param "normal"
+set fish_color_quote "yellow"
+set fish_color_redirection "blue"
+set fish_color_search_match "bryellow --background=brblack"
+set fish_color_selection "-r"
+set fish_color_status "red"
+set fish_color_user "brgreen"
+set fish_color_valid_path "--underline"
+set fish_cursor_default "block"
+set fish_cursor_insert "line"
+set fish_cursor_replace_one "underscore"
+set fish_cursor_visual "block"
+set fish_greeting ""
+set fish_key_bindings "fish_vi_key_bindings"
+set fish_pager_color_completion "white"
+set fish_pager_color_description "yellow"
+set fish_pager_color_prefix "white"
+set fish_pager_color_progress "white"
+set fish_term24bit "1"
+set fish_vi_force_cursor ""
+
+function fish_mode_prompt
+end
+set SPACEFISH_PROMPT_ADD_NEWLINE true
+set SPACEFISH_PROMPT_FIRST_PREFIX_SHOW false
+set SPACEFISH_PROMPT_PREFIXES_SHOW true
+set SPACEFISH_PROMPT_SUFFIXES_SHOW true
+set SPACEFISH_PROMPT_DEFAULT_PREFIX "via "
+set SPACEFISH_PROMPT_DEFAULT_SUFFIX " "
+set SPACEFISH_PROMPT_ORDER time user dir host git package node ruby golang php rust haskell julia elixir docker aws venv conda pyenv dotnet kubecontext exec_time line_sep battery vi_mode jobs exit_code char
+set SPACEFISH_CHAR_SYMBOL "›"
+set SPACEFISH_CHAR_SUFFIX ""
+set SPACEFISH_VI_MODE_SHOW false
+set SPACEFISH_GIT_STATUS_PREFIX ""
+set SPACEFISH_GIT_STATUS_SUFFIX ""
+
+function fish_prompt
+    # Store the exit code of the last command
+    set -g sf_exit_code $status
+    set -g SPACEFISH_VERSION 2.7.0
+
+    # Keep track of whether the prompt has already been opened
+    set -g sf_prompt_opened $SPACEFISH_PROMPT_FIRST_PREFIX_SHOW
+
+    if test "$SPACEFISH_PROMPT_ADD_NEWLINE" = "true"
+        echo
+    end
 
-
-# alias ls='exa --group-directories-first'
-# alias ll='exa --group-directories-first -l --no-user --no-time'
-# alias la='exa --group-directories-first -la --no-user --no-time'
-# alias vifm='vifmrun'
-# alias rm='rm -i'
-# alias cp='cp -i'
-# alias mv='mv -i'
-# alias racket='rlwrap racket'
-# alias vim='nvim'
-# alias apl='apl -q --LX "]BOXING 8"'
-# alias ranger='200iqfix & command ranger'
-# alias info='info --vi-keys'
-
-# alias code='code -r && code'
+    for i in $SPACEFISH_PROMPT_ORDER
+        eval __sf_section_$i
+    end
+    set_color normal
+end
 
 # abbr -g r 'ranger'
 # 
@@ -64,14 +122,14 @@ end
 # export LS_COLORS="rs=0:di=34:ln=36:mh=00:pi=40;33:so=35:do=35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=32:*.tar=31:*.tgz=31:*.arc=31:*.arj=31:*.taz=31:*.lha=31:*.lz4=31:*.lzh=31:*.lzma=31:*.tlz=31:*.txz=31:*.tzo=31:*.t7z=31:*.zip=31:*.z=31:*.dz=31:*.gz=31:*.lrz=31:*.lz=31:*.lzo=31:*.xz=31:*.zst=31:*.tzst=31:*.bz2=31:*.bz=31:*.tbz=31:*.tbz2=31:*.tz=31:*.deb=31:*.rpm=31:*.jar=31:*.war=31:*.ear=31:*.sar=31:*.rar=31:*.alz=31:*.ace=31:*.zoo=31:*.cpio=31:*.7z=31:*.rz=31:*.cab=31:*.wim=31:*.swm=31:*.dwm=31:*.esd=31:*.jpg=35:*.jpeg=35:*.mjpg=35:*.mjpeg=35:*.gif=35:*.bmp=35:*.pbm=35:*.pgm=35:*.ppm=35:*.tga=35:*.xbm=35:*.xpm=35:*.tif=35:*.tiff=35:*.png=35:*.svg=35:*.svgz=35:*.mng=35:*.pcx=35:*.mov=35:*.mpg=35:*.mpeg=35:*.m2v=35:*.mkv=35:*.webm=35:*.webp=35:*.ogm=35:*.mp4=35:*.m4v=35:*.mp4v=35:*.vob=35:*.qt=35:*.nuv=35:*.wmv=35:*.asf=35:*.rm=35:*.rmvb=35:*.flc=35:*.avi=35:*.fli=35:*.flv=35:*.gl=35:*.dl=35:*.xcf=35:*.xwd=35:*.yuv=35:*.cgm=35:*.emf=35:*.ogv=35:*.ogx=35:*.aac=36:*.au=36:*.flac=36:*.m4a=36:*.mid=36:*.midi=36:*.mka=36:*.mp3=36:*.mpc=36:*.ogg=36:*.ra=36:*.wav=36:*.oga=36:*.opus=36:*.spx=36:*.xspf=36:*.djvu=33:*.doc=33:*.docx=33:*.dvi=33:*.eml=33:*.eps=33:*.fotd=33:*.odp=33:*.odt=33:*.pdf=33:*.ppt=33:*.pptx=33:*.rtf=33:*.xls=33:*.xlsx=33:*#=01;30:*~=01;30:*.tmp=01;30:*.swp=01;30:*.swo=01;30:*.swn=01;30:*.bak=01;30:*.bk=01;30:"
 # export EXA_COLORS="ur=34:uw=34:ux=34:ue=34:gr=36:gw=36:gx=36:tr=35:tw=35:tx=35:uu=37:da=37:xx=30:sn=32"
 # 
-# export FZF_DEFAULT_COMMAND="fd -d5 --color=always -E VSCodium -E discord -E firefox -E Steam -E .steam -E .cache -E Downloads -E .stack -E .racket -E cargo"
-# export FZF_DEFAULT_OPTS='--no-extended --multi --ansi --color 16,bg+:#343b51,hl+:6,hl:6 --bind "tab:down,btab:up,ctrl-alt-j:toggle+down,ctrl-alt-k:toggle+up,ctrl-l:toggle" --cycle'
-# export FZF_FIND_FILE_COMMAND="$FZF_DEFAULT_COMMAND --type f"
-# export FZF_FIND_FILE_OPTS="--sort"
-# export FZF_OPEN_COMMAND="$FZF_DEFAULT_COMMAND --hidden --type f"
-# export FZF_CD_COMMAND="$FZF_DEFAULT_COMMAND --type d"
-# export FZF_CD_WITH_HIDDEN_COMMAND="$FZF_CD_COMMAND --hidden"
-# export FZF_REVERSE_ISEARCH_OPTS="+s"
+#export FZF_DEFAULT_COMMAND="fd -d5 --color=always -E VSCodium -E discord -E firefox -E Steam -E .steam -E .cache -E Downloads -E .stack -E .racket -E cargo"
+export FZF_DEFAULT_OPTS='--no-extended --multi --ansi --color 16,bg+:#343b51,hl+:6,hl:6 --bind "tab:down,btab:up,ctrl-alt-j:toggle+down,ctrl-alt-k:toggle+up,ctrl-l:toggle" --cycle'
+#export FZF_FIND_FILE_COMMAND="$FZF_DEFAULT_COMMAND --type f"
+#export FZF_FIND_FILE_OPTS="--sort"
+#export FZF_OPEN_COMMAND="$FZF_DEFAULT_COMMAND --hidden --type f"
+#export FZF_CD_COMMAND="$FZF_DEFAULT_COMMAND --type d"
+#export FZF_CD_WITH_HIDDEN_COMMAND="$FZF_CD_COMMAND --hidden"
+#export FZF_REVERSE_ISEARCH_OPTS="+s"
 
 # # export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
 

dotfiles/tmux.conf

@@ -1,13 +1,12 @@
-set -g default-terminal "xterm-256color"
-set -ga terminal-overrides ",*:Tc"
+set -g default-terminal "st-256color"
+set -sa terminal-overrides ",*:Tc"
 set -g history-limit 10000
 set -g status off
-# set -s escape-time 0
 set -g pane-active-border-style fg=magenta
 
 set -g destroy-unattached
 set -g exit-empty off
-# set -ga terminal-overrides ',*:smcup@:rmcup@'
+#set -ga terminal-overrides ',*:smcup@:rmcup@'
 
 #Prefix is Ctrl-a
 set -g prefix C-a

hosts/hp-laptop.nix

@@ -78,13 +78,14 @@
     Option "metamodes" "nvidia-auto-select +0+0 { ForceCompositionPipeline = On }"
   '';
 
-  environment.systemPackages = with pkgs; [(
-    pkgs.writeShellScriptBin "screen-toggle" ''
-      MONITORS=$(xrandr --listactivemonitors | wc -l)
-      STATE=$(test $MONITORS -gt 2 && echo '--off' || echo '--auto')
-      xrandr --output eDP-1-1 $STATE
-    ''
-  )];
+  environment.systemPackages = with pkgs; [
+    ( pkgs.writeShellScriptBin "screen-toggle" ''
+        MONITORS=$(xrandr --listactivemonitors | wc -l)
+        STATE=$(test $MONITORS -gt 2 && echo '--off' || echo '--auto')
+        xrandr --output eDP-1-1 $STATE
+      ''
+    )
+  ];
 
   # Laptop powersaving, or something.
   services.tlp.enable = true;

kana.nix

@@ -3,7 +3,7 @@
 let
 profile = {
   home.packages = with pkgs; [
-    fortune neofetch gparted st rofi vivaldi discord steam flameshot
+    fortune neofetch gparted st rofi vivaldi discord steam flameshot libreoffice
   ];
 
   programs = {
@@ -19,12 +19,26 @@ profile = {
         syu = "sudo nixos-rebuild switch";
         syr = "sudo nixos-rebuild switch --rollback";
       };
+      plugins = [
+        { name = "spacefish";
+          src = pkgs.fetchFromGitHub {
+            owner = "matchai";
+            repo = "spacefish";
+            rev = "adbb02a9866547f235380ea9db8c71424bd6e611";
+            sha256 = "Asz+m17DsPRPAFLb9mU+L7rubwAxe4CvvSZpxCdTiMU=";
+          };
+        }
+      ];
     };
     git = {
       enable = true;
       userEmail = "[email protected]";
       userName = "Nikita Ursol";
     };
+    fzf = {
+      enable = true;
+      enableFishIntegration = true;
+    };
   };
 
   xsession.windowManager = {

overlays.nix

@@ -19,7 +19,7 @@ st = self: super: {
       };
     in builtins.map super.fetchurl [ boxdraw ligatures ];
   };
-};
+};	
 
 neofetch = self: super: {
   neofetch = super.neofetch.overrideAttrs (old: {
@@ -48,7 +48,6 @@ haskellPackages = self: super: {
     };
   };
 };
-
 in
 {
   nixpkgs.overlays = [

system.nix

@@ -5,7 +5,7 @@
 
   nix.package = pkgs.nixFlakes;
   environment.systemPackages = with pkgs; [
-    htop kakoune fd ripgrep git pciutils glxinfo unstable.manix tree dash linuxPackages.perf inxi xsel xorg.xev
+    htop kakoune fd ripgrep git pciutils glxinfo unstable.manix tree dash linuxPackages.perf inxi xsel xorg.xev argyllcms xcalib
   ];
 
   nix.extraOptions = "experimental-features = nix-command flakes";
@@ -29,13 +29,14 @@
       enable = false;
       user = "kana";
     };
-    desktopManager.session = [{
-      name = "home-manager";
-      start = ''
-        ${pkgs.runtimeShell} $HOME/.hm-xsession
-        waitPID=$!
-      '';
-    }];
+    desktopManager.session = [
+      { name = "home-manager";
+        start = ''
+          ${pkgs.runtimeShell} $HOME/.hm-xsession
+          waitPID=$!
+        '';
+      }
+    ];
     # windowManager.xmonad = {
     #   enable = true;
     #   enableContribAndExtras = true;
@@ -82,8 +83,8 @@
     useXkbConfig = true;
   };
 
-  services.xserver.layout = "us";
-  services.xserver.xkbOptions = "caps:swapescape, terminate:ctrl_alt_bksp";
+  services.xserver.layout = "us, ru";
+  services.xserver.xkbOptions = "caps:swapescape, grp:rctrl_rshift_toggle, terminate:ctrl_alt_bksp";
   services.xserver.dpi = 96;
 
   fonts.fontconfig.dpi = 96;