consolidate packages in common

nix flake update
nice update
2026-09-02 14:10:42 +02:00 · 2026-09-02 13:56:35 +02:00 · 2026-09-02 11:51:49 +02:00 · 2026-08-27 20:44:59 +02:00 · 2026-08-20 12:35:10 +02:00 · 2026-08-05 11:31:17 +02:00
18 changed files with 343 additions and 169 deletions
@@ -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
+}
@@ -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;
-              };
            }
          ];
        };
@@ -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 {



-
@@ -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,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
+      ]
+    ))
+  ];
+}
@@ -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’
    };

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

 }
-
@@ -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" ];
 }
@@ -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
@@ -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"
+      ];
+    };
+  };
+}
@@ -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
+  ];
+}
@@ -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;
@@ -1,15 +1,14 @@
-{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.
@@ -25,7 +24,6 @@

    open = false;
    nvidiaSettings = true;
-    package = config.boot.kernelPackages.nvidiaPackages.stable;
  };

 }
Author	SHA1	Message	Date
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	1c76f61e0d	update	2026-08-05 11:31:17 +02:00
lukas	51dd7bb4b8	remove antigravity shit	2026-08-04 13:53:19 +02:00
lukas	e33aef7b9c	added better window navigation to tmux	2026-07-31 12:26:45 +02:00
lukas	95fa47ad09	update	2026-07-31 12:26:40 +02:00
lukas	15f46c0338	update to 26.05	2026-07-27 12:44:12 +02:00
lukas	a76b2c2878	suff	2026-07-10 14:10:53 +02:00
lukas	19ab808148	Merge branch 'master' of ssh://git.lukas.services:2222/lukas/nixos	2026-05-12 11:59:53 +02:00
lukas	1841fe3a41	codex-lb and fira-code	2026-05-12 11:57:38 +02:00
lukas	99f4614227	remove insecure librechat	2026-05-11 14:28:13 +02:00
lukas	f39bf6f46d	update	2026-05-11 14:28:10 +02:00
lukas	18b080b98b	added signal-desktop	2026-05-11 14:24:46 +02:00
lukas	8cacb192e0	enable nvidia powermanagement again	2026-05-11 14:24:32 +02:00
lukas	ff60475db9	back to old nvidia and update locks	2026-04-26 13:16:29 +02:00
lukas	e852954628	flake update	2026-02-27 16:13:14 +01:00
lukas	5d5f98ad90	apply nvidia fix weil diese hurensöhne es nicht schaffen software zu compilen	2026-02-20 13:54:02 +01:00
lukas	24df8085f0	update	2026-02-20 13:53:57 +01:00
lukas	4665bc0fbb	added tower stuff	2026-02-15 12:28:15 +01:00
lukas	6522f7ea0b	stuff	2026-02-04 18:45:32 +01:00