nix flake update

flake.lock

@@ -8,11 +8,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1787798436,
-        "narHash": "sha256-sgQx7yUo2I1c4McylOW1vRklIxDL3Kwzq35ilr7firc=",
+        "lastModified": 1788995571,
+        "narHash": "sha256-I58IVp7HfT3TTKZJ5kh7/Lttu9DnRZFC0qmvxnIvIj4=",
         "owner": "sadjow",
         "repo": "codex-cli-nix",
-        "rev": "18eb1cac4e17c8cbc40f3a2a83940d8f38ddace5",
+        "rev": "33542c7e7139127a4bac1cbe0fac8c81a570410a",
         "type": "github"
       },
       "original": {
@@ -46,11 +46,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1787377438,
-        "narHash": "sha256-Sxu1NLTD/Ern6hFGLlZmtKCSct3YQXZI/lls8RE1XeM=",
+        "lastModified": 1789267039,
+        "narHash": "sha256-LWiBv9yAYFi2LPbUhDGHPGKYskJQjj2fw12OlyO1uQo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "65258d5c65a250189fde2e35f490d15e064c4c62",
+        "rev": "ec172013fa62135f58fb58dd17ae9651e8f39727",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1787753485,
-        "narHash": "sha256-BZWCi9ZRJiARTuKTbbtvFTj7t1TK4G3UEckT3HyNfRg=",
+        "lastModified": 1789542786,
+        "narHash": "sha256-ajQuqcxnj6RYnwCjA/9FTCnrdR2+BDzstE8UembXf60=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "062346a6d85bc4b49dfaa61c986e9c5be21217d1",
+        "rev": "4c7870105e7f1fdf9c48688c8d7efc21abf0688a",
         "type": "github"
       },
       "original": {
@@ -78,11 +78,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1787631388,
-        "narHash": "sha256-vMiXptXarfSdJb1Gkc+FYVOAibuBRj7qxGa8z68q1Uw=",
+        "lastModified": 1789370336,
+        "narHash": "sha256-6RSEDHIWQtesQKWSu5qRai8L2h4KgCgMEfJHstW99G4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ac6b2166e7a9375683b8e98f860f273222337b16",
+        "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

@@ -1,8 +1,69 @@
-{ codex-cli-nix, pkgs, pkgs-unstable, ... }:
+{
+  codex-cli-nix,
+  pkgs,
+  pkgs-unstable,
+  ...
+}:
 
 {
+  fonts.fontconfig.enable = true;
+
   home.packages = [
     pkgs-unstable.rtk
     codex-cli-nix.packages.${pkgs.system}.default
+
+    pkgs.thunderbird
+    pkgs.nextcloud-client
+    pkgs.keepassxc
+    pkgs.telegram-desktop
+    pkgs.element-desktop
+    pkgs.tidal-hifi
+    pkgs.signal-desktop
+
+    pkgs.tree
+    pkgs.htop
+    pkgs.neovim
+    pkgs.wget
+    pkgs.unzip
+
+    pkgs.feather
+
+    pkgs.firefox
+
+    pkgs.zathura
+    pkgs.ranger
+
+    pkgs.nerd-fonts.fira-code
+    pkgs.fira-code
+    pkgs.fira-code-symbols
+    pkgs.meslo-lgs-nf
+
+    pkgs.eza
+    pkgs.bat
+    pkgs.ripgrep
+    pkgs.duf
+    pkgs.dust
+    pkgs.bottom
+    pkgs.gping
+    pkgs.difftastic
+
+    pkgs.sqlitebrowser
+
+    pkgs.seahorse
+
+    pkgs.binutils
+    pkgs.gcc
+
+    pkgs.nil
+
+    pkgs.zotero
+
+    (pkgs.aspellWithDicts (
+      dicts: with dicts; [
+        de
+        en
+        en-computers
+      ]
+    ))
   ];
 }

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";
-    };
-
-    zplug = {
-      enable = true;
-      plugins = [
-        {
-          name = "romkatv/powerlevel10k";
-          tags = [
-            "as:theme"
-            "depth:1"
-          ];
-        }
-      ];
+      VIRTUAL_ENV_DISABLE_PROMPT = "1";
     };
 
     shellAliases = {
@@ -63,6 +160,20 @@
 
       cat = "bat --style=plain --pager=cat"; # pretty ‘cat’
       less = "bat --style=plain --pager=less"; # pretty ‘less’
+
+      gs = "git status";
+      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";
+
+      du = "dust";
+      df = "duf";
+
+      top = "btm";
+
     };
 
   };

home/lukas/laptop/packages.nix

@@ -1,53 +1,7 @@
 { pkgs, ... }:
 
 {
-  fonts.fontconfig.enable = true;
-
   home.packages = [
-    pkgs.thunderbird
-    pkgs.nextcloud-client
-    pkgs.keepassxc
-    pkgs.telegram-desktop
-    pkgs.element-desktop
-    pkgs.tidal-hifi
-    pkgs.signal-desktop
-
-    pkgs.tree
-    pkgs.htop
-    pkgs.neovim
-    pkgs.wget
-    pkgs.unzip
-
-    pkgs.feather
-
-    pkgs.firefox
-
-    pkgs.zathura
-    pkgs.ranger
-
-    pkgs.nerd-fonts.fira-code
-    pkgs.fira-code
-    pkgs.fira-code-symbols
-    pkgs.meslo-lgs-nf
-
-    pkgs.eza
-    pkgs.bat
-    pkgs.ripgrep
-
-    pkgs.seahorse
-
-    pkgs.binutils
-    pkgs.gcc
-
-    # pkgs.scenebuilder
-
-    pkgs.nil
-
     pkgs.quickemu
-
-    pkgs.zotero
-
-    (pkgs.aspellWithDicts
-      (dicts: with dicts; [ de en en-computers ]))
   ];
 }

home/lukas/tower/packages.nix

@@ -1,60 +1,10 @@
 { pkgs, ... }:
 
 {
-  fonts.fontconfig.enable = true;
-
   home.packages = [
-    pkgs.thunderbird
-    pkgs.nextcloud-client
-    pkgs.keepassxc
-    pkgs.telegram-desktop
-    pkgs.element-desktop
-    pkgs.tidal-hifi
-    pkgs.signal-desktop
-
     pkgs.solaar
 
-    pkgs.tree
-    pkgs.htop
-    pkgs.neovim
-    pkgs.wget
-    pkgs.unzip
-
-    pkgs.feather
-
-    pkgs.firefox
-
-    pkgs.ranger
-    pkgs.zathura
-
-    pkgs.nerd-fonts.fira-code
-    pkgs.fira-code
-    pkgs.fira-code-symbols
-    pkgs.meslo-lgs-nf
-
-    pkgs.eza
-    pkgs.bat
-    pkgs.ripgrep
-    pkgs.sqlitebrowser
-
-    pkgs.seahorse
-
-    pkgs.binutils
-    pkgs.gcc
-
     pkgs.scenebuilder
-
-    pkgs.nil
-
-    pkgs.zotero
     pkgs.audacious
-
-    (pkgs.aspellWithDicts (
-      dicts: with dicts; [
-        de
-        en
-        en-computers
-      ]
-    ))
   ];
 }

modules/services/codex-lb.nix

@@ -11,10 +11,6 @@
     volumes = [
       "codex-lb-data:/var/lib/codex-lb"
     ];
-
-    environment = {
-      CODEX_LB_HTTP_RESPONSES_SESSION_BRIDGE_ENABLED = "false";
-    };
   };
 
   networking.firewall.allowedTCPPorts = [