diff --git a/flake.nix b/flake.nix
index 6eac2dc..144afd7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,6 +6,8 @@
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     home-manager.url = "github:nix-community/home-manager/release-26.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    nix-index-database.url = "github:nix-community/nix-index-database";
+    nix-index-database.inputs.nixpkgs.follows = "nixpkgs-unstable";
   };
 
   outputs = inputs @ {
@@ -13,6 +15,7 @@
     nixpkgs,
     nixpkgs-unstable,
     home-manager,
+    nix-index-database,
     ...
   }: {
     nixosConfigurations.phostron = nixpkgs.lib.nixosSystem {
@@ -29,6 +32,8 @@
           home-manager.extraSpecialArgs = {inherit inputs;};
           home-manager.users.coyote = import ./users/coyote/home.nix;
         }
+        nix-index-database.nixosModules.default
+        { programs.nix-index-database.comma.enable = true; }
       ];
     };
   };
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index ecba32a..827b4c8 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -53,7 +53,6 @@
     # Nix
     nh
     alejandra
-    comma
     # system utils
     firmware-updater
     mtr
@@ -97,14 +96,31 @@
     starship.enable = true;
     starship.transientPrompt.enable = true;
     starship.transientPrompt.left = "starship module character";
+    starship.settings = {
+      "$schema" = "https://starship.rs/config-schema.json";
+      git_status = {
+        ahead = ">";
+        behind = "<";
+        diverged = "<>";
+        renamed = "r";
+        deleted = "x";
+      };
+      character.success_symbol = "[λ](bold green)";
+      character.error_symbol = "[λ](bold red)";
+    };
 
     obs-studio.enableVirtualCamera = true;
     ssh.startAgent = true;
 
     nix-ld.enable = true;
-    nix-ld.libraries = with pkgs; [fuse e2fsprogs];
+    nix-ld.libraries = with pkgs; [
+      fuse
+      e2fsprogs
+    ];
   };
 
+  fonts.fontconfig.antialias = true;
+  fonts.fontconfig.subpixel.rgba = "rgb";
   fonts.packages = with pkgs; [
     # GUI fonts
     inter
@@ -124,14 +140,8 @@
     # terminal fonts
     nerd-fonts.iosevka
   ];
-  fonts.fontconfig = {
-    antialias = true;
-    subpixel.rgba = "rgb";
-  };
 
-  xdg.portal = {
-    enable = true;
-    config.common.default = ["gtk"];
-    extraPortals = with pkgs; [xdg-desktop-portal-wlr];
-  };
+  xdg.portal.enable = true;
+  xdg.portal.config.common.default = ["gtk"];
+  xdg.portal.extraPortals = with pkgs; [xdg-desktop-portal-wlr];
 }
diff --git a/result b/result
new file mode 120000
index 0000000..8aff17f
--- /dev/null
+++ b/result
@@ -0,0 +1 @@
+/nix/store/qy6mbm33y6vmn45j4gm884mn78xxhf1h-nixos-system-phostron-26.05.20260708.74cc63f
\ No newline at end of file
diff --git a/users/coyote/home.nix b/users/coyote/home.nix
index a9e6ecb..97d9407 100644
--- a/users/coyote/home.nix
+++ b/users/coyote/home.nix
@@ -34,7 +34,7 @@
     # games
     osu-lazer-bin
     # emulation
-    (unstable.bottles.override {removeWarningPopup = true;})
+    # (unstable.bottles.override {removeWarningPopup = true;})
     # lisps
     chicken
     guile
@@ -90,20 +90,6 @@
     };
     starship = {
       package = pkgs.unstable.starship;
-      settings = {
-        "$schema" = "https://starship.rs/config-schema.json";
-        "git_status" = {
-          ahead = ">";
-          behind = "<";
-          diverged = "<>";
-          renamed = "r";
-          deleted = "x";
-        };
-        character = {
-          success_symbol = "[λ](bold green)";
-          error_symbol = "[λ](bold red)";
-        };
-      };
     };
     obs-studio = {
       enable = true;