Merge branch 'master' of ssh://git.lukas.services:2222/lukas/nixos

flake.lock

@@ -0,0 +1,66 @@
+{
+  "nodes": {
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1785119570,
+        "narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-26.05",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1785858998,
+        "narHash": "sha256-fKCq5jphd6l/Ms6gc3dptkw/TcKLYub9lQE5g6rbbkc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "04607e1165ac22c5fde6dcc54c9e0b3c0487c555",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-26.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1785747939,
+        "narHash": "sha256-D740uKsMbgsfK2oaDenJLLPIZfq7W0/g4KN/Fls8eKs=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "104240a772428cc2e20d8fd86c9ddbb886bbaff2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "home-manager": "home-manager",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-unstable": "nixpkgs-unstable"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -2,15 +2,11 @@
   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";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.11";
+      url = "github:nix-community/home-manager/release-26.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -20,7 +16,6 @@
     inputs@{
       self,
       nixpkgs,
-      antigravity-nix,
       home-manager,
       ...
     }:
@@ -59,10 +54,6 @@
               home-manager.users.lukas.imports = [
                 ./home/lukas/laptop/default.nix
               ];
-
-              home-manager.extraSpecialArgs = {
-                inherit inputs antigravity-nix;
-              };
             }
           ];
         };
@@ -73,6 +64,7 @@
           modules = [
             ./hosts/segfault-tower/configuration.nix
 
+            home-manager.nixosModules.home-manager
             {
               home-manager.backupFileExtension = "backup";
               home-manager.useGlobalPkgs = true;
@@ -81,10 +73,6 @@
               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";
+    settings = {
-    userEmail = "mail@lukas.contact";
+      user.name = "Lukas";
-
+      user.email = "mail@lukas.contact";
-    extraConfig = {
       commit.gpgsign = true;
       gpg.format = "ssh";
       gpg.ssh.allowedSignersFile = "~/.ssh/allowed_signers";
@@ -26,4 +25,3 @@ in {
 
 
 
-

home/lukas/common/shell.nix

@@ -1,8 +1,9 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
   programs.zsh = {
     enable = true;
+    dotDir = config.home.homeDirectory;
     enableCompletion = true;
     syntaxHighlighting.enable = true;
     autosuggestion.enable = true;
@@ -35,4 +36,3 @@
   };
 }
 
-

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/packages.nix

@@ -1,4 +1,4 @@
-{ pkgs, antigravity-nix, ... }:
+{ pkgs, ... }:
 
 {
   fonts.fontconfig.enable = true;
@@ -10,6 +10,7 @@
     pkgs.telegram-desktop
     pkgs.element-desktop
     pkgs.tidal-hifi
+    pkgs.signal-desktop
 
     pkgs.tree
     pkgs.htop
@@ -26,6 +27,7 @@
 
     pkgs.nerd-fonts.fira-code
     pkgs.fira-code
+    pkgs.fira-code-symbols
     pkgs.meslo-lgs-nf
 
     pkgs.eza
@@ -47,8 +49,5 @@
 
     (pkgs.aspellWithDicts
       (dicts: with dicts; [ de en en-computers ]))
-
-    antigravity-nix.packages.x86_64-linux.default
   ];
 }
-

home/lukas/tower/packages.nix

@@ -10,6 +10,9 @@
     pkgs.telegram-desktop
     pkgs.element-desktop
     pkgs.tidal-hifi
+    pkgs.signal-desktop
+
+    pkgs.solaar
 
     pkgs.tree
     pkgs.htop
@@ -17,9 +20,6 @@
     pkgs.wget
     pkgs.unzip
 
-    pkgs.open-webui
-    pkgs.librechat
-
     pkgs.feather
 
     pkgs.firefox
@@ -29,26 +29,32 @@
 
     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.scenebuilder
 
     pkgs.nil
 
     pkgs.zotero
-    pkgs.jabref
+    pkgs.audacious
 
-    (pkgs.aspellWithDicts
+    (pkgs.aspellWithDicts (
-      (dicts: with dicts; [ de en en-computers ]))
+      dicts: with dicts; [
+        de
+        en
+        en-computers
+      ]
+    ))
   ];
 }
-

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

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
   ];
 
 

modules/desktop/gnome.nix

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

modules/system/nvidia.nix

@@ -1,9 +1,8 @@
-{config, pkgs, ...}:
 {
 
   nixpkgs.config.allowUnfree = true;
 
-   services.xserver.videoDrivers = ["nvidia"];
+  services.xserver.videoDrivers = [ "nvidia" ];
   hardware.graphics = {
     enable = true;
     enable32Bit = true;
@@ -25,7 +24,6 @@
 
     open = false;
     nvidiaSettings = true;
-    package = config.boot.kernelPackages.nvidiaPackages.stable;
   };
 
 }