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

flake.lock

@@ -1,66 +0,0 @@
-{
-  "nodes": {
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1766553861,
-        "narHash": "sha256-ZbnG01yA3O8Yr1vUm3+NQ2qk9iRhS5bloAnuXHHy7+c=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "0999ed8f965bbbd991437ad9c5ed3434cecbc30e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-25.11",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1766736597,
-        "narHash": "sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "f560ccec6b1116b22e6ed15f4c510997d99d5852",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1766747458,
-        "narHash": "sha256-m63jjuo/ygo8ztkCziYh5OOIbTSXUDkKbqw3Vuqu4a4=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "c633f572eded8c4f3c75b8010129854ed404a6ce",
-        "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

@@ -4,6 +4,10 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
     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";
@@ -12,19 +16,28 @@
 
   };
 
-  outputs = inputs@{ self, nixpkgs, home-manager, ... }:
+  outputs =
+    inputs@{
+      self,
+      nixpkgs,
+      antigravity-nix,
+      home-manager,
+      ...
+    }:
     let
       system = "x86_64-linux";
       lib = nixpkgs.lib;
       pkgs-unstable = import inputs.nixpkgs-unstable {
         system = system;
         config.allowUnfree = true;
-        config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+        config.allowUnfreePredicate =
-          "steam"
+          pkg:
-          "steam-original"
+          builtins.elem (lib.getName pkg) [
-          "steam-unwrapped"
+            "steam"
-          "steam-run"
+            "steam-original"
-        ];
+            "steam-unwrapped"
+            "steam-run"
+          ];
       };
     in
     {
@@ -37,19 +50,19 @@
           modules = [
             ./hosts/segfault-machine/configuration.nix
 
-            home-manager.nixosModules.home-manager {
+            home-manager.nixosModules.home-manager
+            {
               home-manager.backupFileExtension = "backup";
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
 
-
-
               home-manager.users.lukas.imports = [
                 ./home/lukas/laptop/default.nix
               ];
 
-              home-manager.extraSpecialArgs = { inherit inputs; };
+              home-manager.extraSpecialArgs = {
-
+                inherit inputs antigravity-nix;
+              };
             }
           ];
         };
@@ -60,8 +73,7 @@
           modules = [
             ./hosts/segfault-tower/configuration.nix
 
-
+            {
-            home-manager.nixosModules.home-manager {
               home-manager.backupFileExtension = "backup";
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
@@ -70,13 +82,13 @@
                 ./home/lukas/tower/default.nix
               ];
 
-              home-manager.extraSpecialArgs = { inherit inputs; };
+              home-manager.extraSpecialArgs = {
+                inherit inputs antigravity-nix;
+              };
             }
           ];
         };
 
       };
-  };
+    };
 }
-
-

home/lukas/laptop/default.nix

@@ -1,5 +1,6 @@
 {
   imports = [
+    ./packages.nix
     ../common/brave.nix
     ../common/direnv.nix
     ../common/emacs.nix
@@ -9,10 +10,6 @@
     ../common/tmux.nix
     ../common/xgd.nix
     ../common/libreoffice.nix
-    ./packages.nix
-    ./hyprland.nix
-    ./waybar.nix
-    ./rofi.nix
   ];
 
   home.username = "lukas";

home/lukas/laptop/packages.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, antigravity-nix, ... }:
 
 {
   fonts.fontconfig.enable = true;
@@ -9,6 +9,7 @@
     pkgs.keepassxc
     pkgs.telegram-desktop
     pkgs.element-desktop
+    pkgs.tidal-hifi
 
     pkgs.tree
     pkgs.htop
@@ -17,12 +18,10 @@
     pkgs.unzip
 
     pkgs.feather
-    pkgs.electrum
 
     pkgs.firefox
 
     pkgs.zathura
-    pkgs.xfce.thunar
     pkgs.ranger
 
     pkgs.nerd-fonts.fira-code
@@ -38,25 +37,18 @@
     pkgs.binutils
     pkgs.gcc
 
-    pkgs.scenebuilder
+    # pkgs.scenebuilder
 
     pkgs.nil
 
     pkgs.quickemu
 
     pkgs.zotero
-    pkgs.jabref
 
     (pkgs.aspellWithDicts
       (dicts: with dicts; [ de en en-computers ]))
 
-    # stuff for the waybar
+    antigravity-nix.packages.x86_64-linux.default
-    pkgs.nerd-fonts.jetbrains-mono
-    pkgs.brightnessctl
-    pkgs.bluez
-    pkgs.bluetui
-    pkgs.jq
-    pkgs.lm_sensors
   ];
 }
 

hosts/segfault-machine/configuration.nix

@@ -3,8 +3,9 @@
   imports = [
     ./hardware.nix
     ../../users/lukas.nix
-    ../../modules/desktop/hyprland.nix
+    ../../modules/desktop/gnome.nix
     ../../modules/input/katana.nix
+    ../../modules/input/qmk.nix
     ../../modules/networking/networkmanager.nix
     ../../modules/networking/bluetooth.nix
     ../../modules/system/locale.nix