consolidate packages in common

flake.lock

@@ -0,0 +1,121 @@
+{
+  "nodes": {
+    "codex-cli-nix": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ]
+      },
+      "locked": {
+        "lastModified": 1788304374,
+        "narHash": "sha256-K5JXIpkGEj2QXnapaeWsQJ9Io00N7Sf8p+ym9yAtx88=",
+        "owner": "sadjow",
+        "repo": "codex-cli-nix",
+        "rev": "bde8e6641e076855e84e47b5e4b5ff4a106004bc",
+        "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": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1787377438,
+        "narHash": "sha256-Sxu1NLTD/Ern6hFGLlZmtKCSct3YQXZI/lls8RE1XeM=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "65258d5c65a250189fde2e35f490d15e064c4c62",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-26.05",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1788187754,
+        "narHash": "sha256-bu1QxmXKmPuvBLN7bHP355OV9Qo13x9WCiRDH62CqRM=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5dfba6236110080a54247d6460bc2ff5dda939cc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-26.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1787964612,
+        "narHash": "sha256-0N9nghg3nwzX6b6qc77EzjR9cu/Z+UR66FlfsCqiURs=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "e8be7818e19ada32105a8af937a6a473b38167ca",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "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",
+  "version": 7
+}

flake.nix

@@ -2,16 +2,17 @@
   description = "NixOS + Home Manager config";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    antigravity-nix = {
-      url = "github:jacopone/antigravity-nix";
+
+    home-manager = {
+      url = "github:nix-community/home-manager/release-26.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    home-manager = {
-      url = "github:nix-community/home-manager/release-25.11";
-      inputs.nixpkgs.follows = "nixpkgs";
+    codex-cli-nix = {
+      url = "github:sadjow/codex-cli-nix";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
 
   };
@@ -20,8 +21,8 @@
     inputs@{
       self,
       nixpkgs,
-      antigravity-nix,
       home-manager,
+      codex-cli-nix,
       ...
     }:
     let
@@ -55,14 +56,11 @@
               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
               ];
-
-              home-manager.extraSpecialArgs = {
-                inherit inputs antigravity-nix;
-              };
             }
           ];
         };
@@ -73,18 +71,16 @@
           modules = [
             ./hosts/segfault-tower/configuration.nix
 
+            home-manager.nixosModules.home-manager
             {
               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
               ];
-
-              home-manager.extraSpecialArgs = {
-                inherit inputs antigravity-nix;
-              };
             }
           ];
         };

home/lukas/common/git.nix

@@ -9,10 +9,9 @@ in {
 
   programs.git = {
     enable = true;
-    userName= "Lukas";
-    userEmail = "mail@lukas.contact";
-
-    extraConfig = {
+    settings = {
+      user.name = "Lukas";
+      user.email = "mail@lukas.contact";
       commit.gpgsign = true;
       gpg.format = "ssh";
       gpg.ssh.allowedSignersFile = "~/.ssh/allowed_signers";
@@ -26,4 +25,3 @@ in {
 
 
 
-

home/lukas/common/nh.nix

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

home/lukas/common/packages.nix

@@ -0,0 +1,67 @@
+{
+  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.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,38 +1,82 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
   programs.zsh = {
     enable = true;
+    dotDir = config.home.homeDirectory;
     enableCompletion = true;
     syntaxHighlighting.enable = true;
-    autosuggestion.enable = true;
+
+    autosuggestion = {
+      enable = true;
+
+      strategy = [
+        "history"
+        "completion"
+      ];
+    };
+
+    historySubstringSearch.enable = true;
+
+    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;
+    };
 
     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 ]; }
+        {
+          name = "romkatv/powerlevel10k";
+          tags = [
+            "as:theme"
+            "depth:1"
+          ];
+        }
       ];
     };
 
     shellAliases = {
       ".." = "cd ..";
-      ls = "eza --icons";                               # plain directory listing
-      ll = "eza --icons -alh --git";                    # long list, all, human, git status
-      la = "eza --icons -a";                            # show all dot-files, short
-      lt = "eza -T --icons --git-ignore --level=4";     # pretty tree, two levels deep
+      ls = "eza --icons"; # plain directory listing
+      ll = "eza --icons -alh --git"; # long list, all, human, git status
+      la = "eza --icons -a"; # show all dot-files, short
+      lt = "eza -T --icons --git-ignore --level=4"; # pretty tree, two levels deep
+
+      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 .";
+
+      ping = "gping";
+
+      du = "dust";
+      df = "duf";
+
+      top = "btm";
 
-      cat  ="bat --style=plain --pager=cat";            # pretty ‘cat’
-      less ="bat --style=plain --pager=less";           # pretty ‘less’
     };
 
   };
 }
-
-

home/lukas/common/tmux.nix

@@ -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
 

home/lukas/laptop/default.nix

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

home/lukas/laptop/packages.nix

@@ -1,54 +1,7 @@
-{ pkgs, antigravity-nix, ... }:
+{ pkgs, ... }:
 
 {
-  fonts.fontconfig.enable = true;
-
   home.packages = [
-    pkgs.thunderbird
-    pkgs.nextcloud-client
-    pkgs.keepassxc
-    pkgs.telegram-desktop
-    pkgs.element-desktop
-    pkgs.tidal-hifi
-
-    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.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 ]))
-
-    antigravity-nix.packages.x86_64-linux.default
   ];
 }
-

home/lukas/tower/default.nix

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

home/lukas/tower/packages.nix

@@ -1,54 +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.solaar
 
-    pkgs.tree
-    pkgs.htop
-    pkgs.neovim
-    pkgs.wget
-    pkgs.unzip
-
-    pkgs.open-webui
-    pkgs.librechat
-
-    pkgs.feather
-
-    pkgs.firefox
-
-    pkgs.ranger
-    pkgs.zathura
-
-    pkgs.nerd-fonts.fira-code
-    pkgs.fira-code
-    pkgs.meslo-lgs-nf
-
-    pkgs.eza
-    pkgs.bat
-    pkgs.ripgrep
-
-    pkgs.seahorse
-
-    pkgs.binutils
-    pkgs.gcc
-
-    # pkgs.scenebuilder
-
-    pkgs.nil
-
-    pkgs.zotero
-    pkgs.jabref
-
-    (pkgs.aspellWithDicts
-      (dicts: with dicts; [ de en en-computers ]))
+    pkgs.scenebuilder
+    pkgs.audacious
   ];
 }
-

hosts/segfault-machine/configuration.nix

@@ -15,6 +15,7 @@
     ../../modules/system/gpg.nix
     ../../modules/system/virtualbox.nix
     ../../modules/system/mullvad.nix
+    ../../modules/services/codex-lb.nix
   ];
 
   networking.hostName = "segfault-machine";
@@ -34,4 +35,3 @@
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
 }
-

hosts/segfault-tower/configuration.nix

@@ -23,6 +23,7 @@
     ../../modules/system/mullvad.nix
     ../../modules/services/ollama.nix
     ../../modules/services/steam.nix
+    ../../modules/services/codex-lb.nix
   ];
 
 
@@ -30,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";
@@ -43,6 +42,6 @@
   nixpkgs.config.allowUnfree = true;
 
   # Version festlegen
-  system.stateVersion = "25.05";
+  system.stateVersion = "26.05";
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 }

modules/desktop/gnome.nix

@@ -1,10 +1,8 @@
 { pkgs, ... }:
 
 {
-  services.xserver = {
-    displayManager.gdm.enable = true;
-    desktopManager.gnome.enable = true;
-  };
+  services.displayManager.gdm.enable = true;
+  services.desktopManager.gnome.enable = true;
 
 
   # To disable installing GNOME's suite of applications

modules/networking/networkmanager.nix

@@ -1,4 +1,14 @@
 {
   networking.networkmanager.enable = true;
-}
 
+  services.resolved = {
+    enable = true;
+    settings.Resolve = {
+      DNSSEC = false;
+      FallbackDNS = [
+        "1.1.1.1"
+        "8.8.8.8"
+      ];
+    };
+  };
+}

modules/services/codex-lb.nix

@@ -0,0 +1,20 @@
+{
+  virtualisation.oci-containers.containers.codex-lb = {
+    image = "ghcr.io/soju06/codex-lb:beta";
+    autoStart = true;
+
+    ports = [
+      "2455:2455"
+      "1455:1455"
+    ];
+
+    volumes = [
+      "codex-lb-data:/var/lib/codex-lb"
+    ];
+  };
+
+  networking.firewall.allowedTCPPorts = [
+    2455
+    1455
+  ];
+}

modules/services/ollama.nix

@@ -3,8 +3,7 @@
 {
   services.ollama = {
     enable = true;
-    package = pkgs.ollama;
-    acceleration = "cuda";
+    package = pkgs.ollama-cuda;
     environmentVariables = {
       OLLAMA_CONTEXT_LENGTH="32000";
     };
@@ -14,22 +13,22 @@
     Environment = [ "OLLAMA_HOST=0.0.0.0:11434" ];
   };
 
-  services.open-webui = {
-    package = pkgs.open-webui;
-    enable = true;
-    port = 8081;
-    environment = {
-      ANONYMIZED_TELEMETRY = "False";
-      DO_NOT_TRACK = "True";
-      SCARF_NO_ANALYTICS = "True";
-      OLLAMA_API_BASE_URL = "http://127.0.0.1:11434/api";
-      OLLAMA_BASE_URL = "http://127.0.0.1:11434";
-      WEBUI_AUTH = "False";
-      FRONTEND_BUILD_DIR = "${config.services.open-webui.stateDir}/build";
-      DATA_DIR = "${config.services.open-webui.stateDir}/data";
-      STATIC_DIR = "${config.services.open-webui.stateDir}/static";
-    };
-  };
+  # services.open-webui = {
+  #   package = pkgs.open-webui;
+  #   enable = true;
+  #   port = 8081;
+  #   environment = {
+  #     ANONYMIZED_TELEMETRY = "False";
+  #     DO_NOT_TRACK = "True";
+  #     SCARF_NO_ANALYTICS = "True";
+  #     OLLAMA_API_BASE_URL = "http://127.0.0.1:11434/api";
+  #     OLLAMA_BASE_URL = "http://127.0.0.1:11434";
+  #     WEBUI_AUTH = "False";
+  #     FRONTEND_BUILD_DIR = "${config.services.open-webui.stateDir}/build";
+  #     DATA_DIR = "${config.services.open-webui.stateDir}/data";
+  #     STATIC_DIR = "${config.services.open-webui.stateDir}/static";
+  #   };
+  # };
 
   services.searx = {
     enable = true;

modules/system/nvidia.nix

@@ -1,20 +1,19 @@
-{config, pkgs, ...}:
 {
 
-   nixpkgs.config.allowUnfree = true;
+  nixpkgs.config.allowUnfree = true;
 
-   services.xserver.videoDrivers = ["nvidia"];
-   hardware.graphics = {
-     enable = true;
-     enable32Bit = true;
-   };
+  services.xserver.videoDrivers = [ "nvidia" ];
+  hardware.graphics = {
+    enable = true;
+    enable32Bit = true;
+  };
 
-   hardware.nvidia = {
+  hardware.nvidia = {
     modesetting.enable = true;
 
     # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
     # Enable this if you have graphical corruption issues or application crashes after waking
-    # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead 
+    # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
     # of just the bare essentials.
     powerManagement.enable = true;
 
@@ -25,7 +24,6 @@
 
     open = false;
     nvidiaSettings = true;
-    package = config.boot.kernelPackages.nvidiaPackages.stable;
   };
 
 }