nix flake update

flake.lock

@@ -8,11 +8,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1788304374,
+        "lastModified": 1788995571,
-        "narHash": "sha256-K5JXIpkGEj2QXnapaeWsQJ9Io00N7Sf8p+ym9yAtx88=",
+        "narHash": "sha256-I58IVp7HfT3TTKZJ5kh7/Lttu9DnRZFC0qmvxnIvIj4=",
         "owner": "sadjow",
         "repo": "codex-cli-nix",
-        "rev": "bde8e6641e076855e84e47b5e4b5ff4a106004bc",
+        "rev": "33542c7e7139127a4bac1cbe0fac8c81a570410a",
         "type": "github"
       },
       "original": {
@@ -46,11 +46,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1787377438,
+        "lastModified": 1789267039,
-        "narHash": "sha256-Sxu1NLTD/Ern6hFGLlZmtKCSct3YQXZI/lls8RE1XeM=",
+        "narHash": "sha256-LWiBv9yAYFi2LPbUhDGHPGKYskJQjj2fw12OlyO1uQo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "65258d5c65a250189fde2e35f490d15e064c4c62",
+        "rev": "ec172013fa62135f58fb58dd17ae9651e8f39727",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1788187754,
+        "lastModified": 1789542786,
-        "narHash": "sha256-bu1QxmXKmPuvBLN7bHP355OV9Qo13x9WCiRDH62CqRM=",
+        "narHash": "sha256-ajQuqcxnj6RYnwCjA/9FTCnrdR2+BDzstE8UembXf60=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5dfba6236110080a54247d6460bc2ff5dda939cc",
+        "rev": "4c7870105e7f1fdf9c48688c8d7efc21abf0688a",
         "type": "github"
       },
       "original": {
@@ -78,11 +78,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1787964612,
+        "lastModified": 1789370336,
-        "narHash": "sha256-0N9nghg3nwzX6b6qc77EzjR9cu/Z+UR66FlfsCqiURs=",
+        "narHash": "sha256-6RSEDHIWQtesQKWSu5qRai8L2h4KgCgMEfJHstW99G4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e8be7818e19ada32105a8af937a6a473b38167ca",
+        "rev": "c7def046b9a883d46974757852106483d741586f",
         "type": "github"
       },
       "original": {

home/lukas/common/alacritty.nix

@@ -4,6 +4,7 @@
   programs.alacritty = {
     enable = true;
     settings = {
+      font.normal.family = "FiraCode Nerd Font";
 
       terminal.shell = {
         program = "${pkgs.tmux}/bin/tmux";
@@ -16,4 +17,3 @@
     };
   };
 }
-

home/lukas/common/packages.nix

@@ -45,6 +45,8 @@
     pkgs.dust
     pkgs.bottom
     pkgs.gping
+    pkgs.difftastic
+
     pkgs.sqlitebrowser
 
     pkgs.seahorse

home/lukas/common/shell.nix

@@ -1,10 +1,93 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
+  programs.fzf = {
+    enable = true;
+    enableZshIntegration = true;
+  };
+
+  programs.starship = {
+    enable = true;
+    enableZshIntegration = true;
+    settings = {
+      add_newline = true;
+      format = "$directory$git_branch$git_status$line_break$character";
+      right_format = "$status$cmd_duration$jobs$direnv$python$nix_shell";
+
+      character = {
+        success_symbol = "[❯](bold fg:#a6e3a1)";
+        error_symbol = "[❯](bold fg:#f38ba8)";
+        vimcmd_symbol = "[❮](bold fg:#cba6f7)";
+      };
+
+      directory = {
+        style = "bold fg:#1e1e2e bg:#89b4fa";
+        format = "[](fg:#89b4fa)[  $path$read_only ]($style)[](fg:#89b4fa) ";
+        truncation_length = 3;
+        truncation_symbol = "…/";
+        truncate_to_repo = false;
+        read_only = " ";
+      };
+      git_branch = {
+        symbol = " ";
+        style = "fg:#1e1e2e bg:#cba6f7";
+        format = "[](fg:#cba6f7)[ $symbol$branch ]($style)[](fg:#cba6f7) ";
+      };
+      git_status = {
+        style = "fg:#f9e2af";
+        format = "[($all_status$ahead_behind )]($style)";
+        conflicted = "~$count ";
+        stashed = "*$count ";
+        staged = "+$count ";
+        modified = "!$count ";
+        renamed = "»$count ";
+        deleted = "✘$count ";
+        untracked = "?$count ";
+        ahead = "⇡$count ";
+        behind = "⇣$count ";
+      };
+      status = {
+        disabled = false;
+        style = "bold fg:#f38ba8";
+        symbol = "✘ ";
+        format = "[ $symbol$status ]($style)";
+      };
+      cmd_duration = {
+        min_time = 3000;
+        style = "fg:#f9e2af";
+        format = "[ $duration  ]($style)";
+      };
+      jobs = {
+        style = "fg:#f9e2af";
+        symbol = "⚙ ";
+        format = "[ $symbol$number ]($style)";
+        number_threshold = 1;
+      };
+      direnv = {
+        disabled = false;
+        style = "fg:#f9e2af";
+        format = "[ $symbol$allowed ]($style)";
+      };
+      python = {
+        style = "fg:#a6e3a1";
+        format = "[ $symbol$virtualenv ]($style)";
+        detect_extensions = [ ];
+        detect_files = [ ];
+        detect_folders = [ ];
+      };
+      nix_shell = {
+        style = "fg:#89b4fa";
+        symbol = "";
+        format = "[ $state $symbol ]($style)";
+      };
+    };
+  };
+
   programs.zsh = {
     enable = true;
     dotDir = config.home.homeDirectory;
     enableCompletion = true;
+    defaultKeymap = "emacs";
     syntaxHighlighting.enable = true;
 
     autosuggestion = {
@@ -18,6 +101,35 @@
 
     historySubstringSearch.enable = true;
 
+    initContent = ''
+      # Tab opens a menu; arrows navigate it and matching ignores case.
+      zmodload zsh/complist
+      zstyle ':completion:*' menu select
+      zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}'
+      zstyle ':completion:*' group-name '''
+      zstyle ':completion:*:descriptions' format '%F{yellow}%d%f'
+
+      # Accept ghost text at the end of the line, or one word with Alt+Right.
+      bindkey '^[[C' forward-char
+      bindkey '^[OC' forward-char
+      bindkey '^[[1;3C' forward-word
+      bindkey '^F' autosuggest-accept
+
+      # Pos1/Home and Ende/End in Alacritty and tmux terminal modes.
+      bindkey '^[[H' beginning-of-line
+      bindkey '^[OH' beginning-of-line
+      bindkey '^[[1~' beginning-of-line
+      bindkey '^[[F' end-of-line
+      bindkey '^[OF' end-of-line
+      bindkey '^[[4~' end-of-line
+
+      # Search history for the text already typed (both terminal arrow modes).
+      bindkey '^[[A' history-substring-search-up
+      bindkey '^[OA' history-substring-search-up
+      bindkey '^[[B' history-substring-search-down
+      bindkey '^[OB' history-substring-search-down
+    '';
+
     history = {
       size = 100000;
       save = 100000;
@@ -34,24 +146,9 @@
       extended = true;
     };
 
-    initContent = "source /etc/nixos/home/lukas/common/p10k.zsh";
     sessionVariables = {
-      POWERLEVEL9K_DISABLE_CONFIGURATION_WIZARD = "true";
       ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE = "fg=8";
-      ZSH_AUTOSUGGEST_STRATEGY = "history completion";
+      VIRTUAL_ENV_DISABLE_PROMPT = "1";
-    };
-
-    zplug = {
-      enable = true;
-      plugins = [
-        {
-          name = "romkatv/powerlevel10k";
-          tags = [
-            "as:theme"
-            "depth:1"
-          ];
-        }
-      ];
     };
 
     shellAliases = {
@@ -68,6 +165,7 @@
       gl = "git log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(auto)%d%C(reset)' --all";
       gc = "git commit -m ";
       gaa = "git add .";
+      gd = "git -c diff.external=difft diff";
 
       ping = "gping";