From 03deac14c992e4a5f377192d7d31c13d1be7d9a0 Mon Sep 17 00:00:00 2001
From: "christoph.hollizeck" <christoph.hollizeck@web.de>
Date: Wed, 27 Mar 2024 14:23:25 +0100
Subject: [PATCH] init starship on launch

---
 flake.nix                                        |  2 +-
 homes/x86_64-linux/cholli@yggdrasil/default.nix  |  6 ++----
 modules/home/apps/cli-apps/fish/default.nix      |  5 ++++-
 .../home/apps/cli-apps/home-manager/default.nix  |  6 ++----
 modules/home/tools/git/default.nix               |  2 +-
 modules/nixos/apps/_1password/default.nix        |  2 +-
 modules/nixos/apps/cli-apps/nixvim/default.nix   |  2 --
 modules/nixos/archetypes/gaming/default.nix      | 16 +++++++++++-----
 systems/x86_64-linux/yggdrasil/default.nix       | 12 ------------
 9 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/flake.nix b/flake.nix
index f2356bc..0ae84b9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -63,7 +63,7 @@
       systems.modules.nixos = with inputs; [
         home-manager.nixosModules.home-manager
         nix-ld.nixosModules.nix-ld
-	nixvim.nixosModules.nixvim
+        nixvim.nixosModules.nixvim
       ];
     };
 }
diff --git a/homes/x86_64-linux/cholli@yggdrasil/default.nix b/homes/x86_64-linux/cholli@yggdrasil/default.nix
index 82708cc..8a954b9 100644
--- a/homes/x86_64-linux/cholli@yggdrasil/default.nix
+++ b/homes/x86_64-linux/cholli@yggdrasil/default.nix
@@ -8,13 +8,11 @@
 }:
 with lib.wyrdgard; {
   wyrdgard = {
-    apps.cli-apps = {
-      fish = enabled;
-      home-manager = enabled;
+    apps = {
+      kitty = enabled;
     };
 
     tools = {
-      git = enabled;
       direnv = enabled;
     };
   };
diff --git a/modules/home/apps/cli-apps/fish/default.nix b/modules/home/apps/cli-apps/fish/default.nix
index 7ceef08..afe6750 100644
--- a/modules/home/apps/cli-apps/fish/default.nix
+++ b/modules/home/apps/cli-apps/fish/default.nix
@@ -22,7 +22,10 @@ in {
     programs = {
       fish = {
         enable = true;
-        shellInit = "zoxide init fish | source";
+        shellInit = "
+	zoxide init fish | source
+	starship init fish | source
+	";
         shellAliases = {
           vim = "nvim";
           ls = "colorls --gs";
diff --git a/modules/home/apps/cli-apps/home-manager/default.nix b/modules/home/apps/cli-apps/home-manager/default.nix
index 511606e..05b98c6 100644
--- a/modules/home/apps/cli-apps/home-manager/default.nix
+++ b/modules/home/apps/cli-apps/home-manager/default.nix
@@ -2,11 +2,9 @@
   lib,
   config,
   ...
-}: 
+}:
 with lib;
-with lib.wyrdgard;
-let
-
+with lib.wyrdgard; let
   cfg = config.wyrdgard.apps.cli-apps.home-manager;
 in {
   options.wyrdgard.apps.cli-apps.home-manager = {
diff --git a/modules/home/tools/git/default.nix b/modules/home/tools/git/default.nix
index 6af8826..7a9f190 100644
--- a/modules/home/tools/git/default.nix
+++ b/modules/home/tools/git/default.nix
@@ -4,7 +4,7 @@
   config,
   pkgs,
   ...
-}: 
+}:
 with lib;
 with lib.wyrdgard; let
   cfg = config.wyrdgard.tools.git;
diff --git a/modules/nixos/apps/_1password/default.nix b/modules/nixos/apps/_1password/default.nix
index 8c3faf4..c1afc8a 100644
--- a/modules/nixos/apps/_1password/default.nix
+++ b/modules/nixos/apps/_1password/default.nix
@@ -10,7 +10,7 @@ with lib.wyrdgard; let
   cfg = config.wyrdgard.apps._1password;
 in {
   options.wyrdgard.apps._1password = with types; {
-    enable = mkBoolOpt false "Enable 1Password";
+    enable = mkBoolOpt true "Enable 1Password";
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/nixos/apps/cli-apps/nixvim/default.nix b/modules/nixos/apps/cli-apps/nixvim/default.nix
index 17490eb..10d83e3 100644
--- a/modules/nixos/apps/cli-apps/nixvim/default.nix
+++ b/modules/nixos/apps/cli-apps/nixvim/default.nix
@@ -26,8 +26,6 @@ in {
         relativenumber = true;
         shiftwidth = 2;
       };
-      
-      
     };
   };
 }
diff --git a/modules/nixos/archetypes/gaming/default.nix b/modules/nixos/archetypes/gaming/default.nix
index c9d0d1c..fe75efc 100644
--- a/modules/nixos/archetypes/gaming/default.nix
+++ b/modules/nixos/archetypes/gaming/default.nix
@@ -14,11 +14,17 @@ in {
   };
 
   config = mkIf cfg.enable {
-    wyrdgard.submodules = {
-      basics = enabled;
-      graphical-interface = enabled;
-      games = enabled;
-      socials = enabled;
+    wyrdgard = {
+      submodules = {
+        basics = enabled;
+        graphical-interface = enabled;
+        games = enabled;
+        socials = enabled;
+      };
+
+      apps = {
+        vivaldi = enabled;
+      };
     };
   };
 }
diff --git a/systems/x86_64-linux/yggdrasil/default.nix b/systems/x86_64-linux/yggdrasil/default.nix
index 03ca2de..e3417bf 100644
--- a/systems/x86_64-linux/yggdrasil/default.nix
+++ b/systems/x86_64-linux/yggdrasil/default.nix
@@ -9,7 +9,6 @@ with lib.wyrdgard; {
   imports = [./hardware.nix];
 
   environment.systemPackages = with pkgs; [
-    filelight
   ];
 
   # nvidia
@@ -36,9 +35,6 @@ with lib.wyrdgard; {
     };
 
     apps = {
-      cli-apps = {
-        fish = enabled;
-      };
       vivaldi = enabled;
       discord = enabled;
       _1password = enabled;
@@ -48,13 +44,5 @@ with lib.wyrdgard; {
   services.xserver.videoDrivers = ["nvidia"];
   services.xserver.displayManager.sddm.wayland.enable = lib.mkForce false;
 
-  # Configure Home-Manager options from NixOS.
-  snowfallorg.user.cholli.home.config = {
-    programs.kitty = {
-      theme = "Tokyo Night";
-      shellIntegration.enableFishIntegration = true;
-    };
-  };
-
   system.stateVersion = "23.11";
 }