nix flake update

fix diff
added difftastic
2026-09-17 12:27:01 +02:00 · 2026-09-11 16:56:17 +02:00 · 2026-09-11 14:30:33 +02:00 · 2026-09-10 16:22:12 +02:00 · 2026-09-05 14:08:51 +02:00 · 2026-09-04 12:21:10 +02:00
15 changed files with 321 additions and 1872 deletions
@@ -1,5 +1,44 @@
 {
  "nodes": {
+    "codex-cli-nix": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ]
+      },
+      "locked": {
+        "lastModified": 1788995571,
+        "narHash": "sha256-I58IVp7HfT3TTKZJ5kh7/Lttu9DnRZFC0qmvxnIvIj4=",
+        "owner": "sadjow",
+        "repo": "codex-cli-nix",
+        "rev": "33542c7e7139127a4bac1cbe0fac8c81a570410a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sadjow",
+        "repo": "codex-cli-nix",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@@ -7,11 +46,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1785119570,
-        "narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=",
+        "lastModified": 1789267039,
+        "narHash": "sha256-LWiBv9yAYFi2LPbUhDGHPGKYskJQjj2fw12OlyO1uQo=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d",
+        "rev": "ec172013fa62135f58fb58dd17ae9651e8f39727",
        "type": "github"
      },
      "original": {
@@ -23,11 +62,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1785858998,
-        "narHash": "sha256-fKCq5jphd6l/Ms6gc3dptkw/TcKLYub9lQE5g6rbbkc=",
+        "lastModified": 1789542786,
+        "narHash": "sha256-ajQuqcxnj6RYnwCjA/9FTCnrdR2+BDzstE8UembXf60=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "04607e1165ac22c5fde6dcc54c9e0b3c0487c555",
+        "rev": "4c7870105e7f1fdf9c48688c8d7efc21abf0688a",
        "type": "github"
      },
      "original": {
@@ -39,11 +78,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1785747939,
-        "narHash": "sha256-D740uKsMbgsfK2oaDenJLLPIZfq7W0/g4KN/Fls8eKs=",
+        "lastModified": 1789370336,
+        "narHash": "sha256-6RSEDHIWQtesQKWSu5qRai8L2h4KgCgMEfJHstW99G4=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "104240a772428cc2e20d8fd86c9ddbb886bbaff2",
+        "rev": "c7def046b9a883d46974757852106483d741586f",
        "type": "github"
      },
      "original": {
@@ -55,10 +94,26 @@
    },
    "root": {
      "inputs": {
+        "codex-cli-nix": "codex-cli-nix",
        "home-manager": "home-manager",
        "nixpkgs": "nixpkgs",
        "nixpkgs-unstable": "nixpkgs-unstable"
      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
    }
  },
  "root": "root",
@@ -10,6 +10,11 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };

+    codex-cli-nix = {
+      url = "github:sadjow/codex-cli-nix";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
+
  };

  outputs =
@@ -17,6 +22,7 @@
      self,
      nixpkgs,
      home-manager,
+      codex-cli-nix,
      ...
    }:
    let
@@ -50,6 +56,7 @@
              home-manager.backupFileExtension = "backup";
              home-manager.useGlobalPkgs = true;
              home-manager.useUserPackages = true;
+              home-manager.extraSpecialArgs = { inherit codex-cli-nix pkgs-unstable; };

              home-manager.users.lukas.imports = [
                ./home/lukas/laptop/default.nix
@@ -69,6 +76,7 @@
              home-manager.backupFileExtension = "backup";
              home-manager.useGlobalPkgs = true;
              home-manager.useUserPackages = true;
+              home-manager.extraSpecialArgs = { inherit codex-cli-nix pkgs-unstable; };

              home-manager.users.lukas.imports = [
                ./home/lukas/tower/default.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 @@
    };
  };
 }
-
@@ -0,0 +1,8 @@
+{
+  programs.nh = {
+    enable = true;
+    clean.enable = true;
+    clean.extraArgs = "--keep-since 4d --keep 3";
+    flake = "/home/lukas/nixos"; # sets NH_OS_FLAKE variable for you
+  };
+}
@@ -0,0 +1,69 @@
+{
+  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
+      ]
+    ))
+  ];
+}
@@ -1,25 +1,154 @@
-{ 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.enable = true;

-    initContent = "source /etc/nixos/home/lukas/common/p10k.zsh";
-    sessionVariables = {
-      POWERLEVEL9K_DISABLE_CONFIGURATION_WIZARD = "true";
+    autosuggestion = {
+      enable = true;
+
+      strategy = [
+        "history"
+        "completion"
+      ];
    };

+    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'

-    zplug = {
-      enable = true;
-      plugins = [
-        { name = "romkatv/powerlevel10k"; tags = [ as:theme depth:1 ]; }
-      ];
+      # 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;
+
+      ignoreDups = true;
+      ignoreAllDups = true;
+      saveNoDups = true;
+      findNoDups = true;
+
+      # Make new commands visible in other open terminals.
+      share = true;
+
+      # Store timestamps and durations.
+      extended = true;
+    };
+
+    sessionVariables = {
+      ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE = "fg=8";
+      VIRTUAL_ENV_DISABLE_PROMPT = "1";
    };

    shellAliases = {
@@ -31,8 +160,21 @@

      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";
+
    };

  };
 }
-
@@ -16,6 +16,11 @@
      # split bindings: prefix+h = horizontal split (top/bottom)
      bind h split-window -v

+      # window navigation
+      bind -n M-n next-window
+      bind -n M-p previous-window
+      bind -n M-Tab last-window
+
      # hide the status bar
      set -g status off

@@ -1,6 +1,7 @@
 {
  imports = [
    ./packages.nix
+    ../common/packages.nix
    ../common/brave.nix
    ../common/direnv.nix
    ../common/emacs.nix
@@ -9,11 +10,11 @@
    ../common/alacritty.nix
    ../common/tmux.nix
    ../common/xgd.nix
+    ../common/nh.nix
    ../common/libreoffice.nix
  ];

  home.username = "lukas";
  home.homeDirectory = "/home/lukas";
-  home.stateVersion = "25.05";
+  home.stateVersion = "26.05";
 }
-
@@ -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 ]))
  ];
 }
@@ -1,6 +1,7 @@
 {
  imports = [
    ./packages.nix
+    ../common/packages.nix
    ../common/brave.nix
    ../common/direnv.nix
    ../common/emacs.nix
@@ -8,12 +9,12 @@
    ../common/shell.nix
    ../common/alacritty.nix
    ../common/tmux.nix
+    ../common/nh.nix
    ../common/xgd.nix
    ../common/libreoffice.nix
  ];

  home.username = "lukas";
  home.homeDirectory = "/home/lukas";
-  home.stateVersion = "25.05";
+  home.stateVersion = "26.05";
 }
-
@@ -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
-      ]
-    ))
  ];
 }
@@ -35,4 +35,3 @@
  nix.settings.experimental-features = [ "nix-command" "flakes" ];

 }
-
@@ -31,8 +31,6 @@
  boot.loader.systemd-boot.enable = true;
  boot.loader.efi.canTouchEfiVariables = true;

-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
  boot.initrd.luks.devices."luks-b10eb0c6-67b8-40b6-bba4-83d38267abad".device = "/dev/disk/by-uuid/b10eb0c6-67b8-40b6-bba4-83d38267abad";

  boot.resumeDevice = "/dev/mapper/luks-b10eb0c6-67b8-40b6-bba4-83d38267abad";
@@ -44,6 +42,6 @@
  nixpkgs.config.allowUnfree = true;

  # Version festlegen
-  system.stateVersion = "25.05";
+  system.stateVersion = "26.05";
  nix.settings.experimental-features = [ "nix-command" "flakes" ];
 }
@@ -1,5 +1,3 @@
-{ config, pkgs, ... }:
-
 {
  virtualisation.oci-containers.containers.codex-lb = {
    image = "ghcr.io/soju06/codex-lb:beta";
Author	SHA1	Message	Date
lukas	e80ade3740	nix flake update	2026-09-17 12:27:01 +02:00
lukas	5a1042065a	fix diff	2026-09-11 16:56:17 +02:00
lukas	bdbc221873	added difftastic	2026-09-11 14:30:33 +02:00
lukas	0b53e2759d	much nicer shell without powerlevel fuckup	2026-09-10 16:22:12 +02:00
lukas	66b35566e5	nix flake update	2026-09-05 14:08:51 +02:00
lukas	355afa1a7b	nix flake update	2026-09-04 12:21:10 +02:00
lukas	38500cc067	consolidate packages in common	2026-09-02 14:10:42 +02:00
lukas	1db5e10b56	nix flake update	2026-09-02 13:56:35 +02:00
lukas	8c18f31dc4	nice update	2026-09-02 11:51:49 +02:00
lukas	70541b2698	added nh	2026-08-27 20:44:59 +02:00
lukas	2613b5eb1e	Merge branch 'master' of ssh://git.lukas.services:2222/lukas/nixos	2026-08-20 12:35:10 +02:00
lukas	e33aef7b9c	added better window navigation to tmux	2026-07-31 12:26:45 +02:00