From 352d1dcb301be80a5c30ee05d1f0edde51f10357 Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Fri, 1 Mar 2024 03:17:14 +0800
Subject: [PATCH] nixos: clean up unused applications

---
 home/applications/helix/default.nix           |  2 +-
 home/applications/neovim/default.nix          |  2 +
 home/default.nix                              |  5 --
 hosts/aristotle/default.nix                   | 26 +++++++++-
 .../common/graphical/home/default.nix         | 29 ++++++-----
 .../common/graphical/home/packages.nix        | 51 -------------------
 .../common/opt-in/gaming/home/default.nix     |  3 ++
 7 files changed, 47 insertions(+), 71 deletions(-)
 delete mode 100644 nixos/profiles/common/graphical/home/packages.nix

diff --git a/home/applications/helix/default.nix b/home/applications/helix/default.nix
index 8353698..a8f2fc4 100644
--- a/home/applications/helix/default.nix
+++ b/home/applications/helix/default.nix
@@ -5,7 +5,7 @@
 }: {
   programs.helix = {
     enable = true;
-    defaultEditor = true;
+    # defaultEditor = true;
     settings = {
       theme =
         lib.mkIf (config.myFlake.home-manager.colorScheme == "tokyonight")
diff --git a/home/applications/neovim/default.nix b/home/applications/neovim/default.nix
index 77b3165..86e2ad0 100644
--- a/home/applications/neovim/default.nix
+++ b/home/applications/neovim/default.nix
@@ -12,6 +12,8 @@
     (pkgs.writeShellScriptBin "vim" ''nvim "$@"'')
   ];
 
+  home.sessionVariables."EDITOR" = "nvim";
+
   # TODO: couldn't make it work
   #programs.neovim = {
   #  enable = true;
diff --git a/home/default.nix b/home/default.nix
index 659c92e..a024a7f 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -36,18 +36,13 @@
     ./applications/eza
     ./applications/skim
     ./applications/bat
-    ./applications/bottom
     ./applications/zoxide
     ./applications/ripgrep
     ./applications/wget
     ./applications/fd
-    ./applications/hyperfine
     ./applications/atuin
     ./applications/zellij
-
-    ./applications/ydict
     ./applications/fastfetch
-    ./applications/android-tools
     ./applications/tealdeer
   ];
 
diff --git a/hosts/aristotle/default.nix b/hosts/aristotle/default.nix
index 0652f79..32c83a9 100644
--- a/hosts/aristotle/default.nix
+++ b/hosts/aristotle/default.nix
@@ -1,4 +1,4 @@
-{...}: {
+{pkgs, ...}: {
   imports = [
     # OS
     ../../nixos/profiles/laptop
@@ -22,4 +22,28 @@
     enable = true;
     openFirewall = true;
   };
+
+  # Stuff that I only want on my main machine
+  home-manager.users.guanranwang = {
+    imports = map (n: ../../home/applications/${n}) [
+      "spotify/spicetify.nix"
+      "amberol"
+      "mousai"
+      "thunderbird"
+      "telegram-desktop"
+      "hyperfine"
+      "ydict"
+      "android-tools"
+    ];
+
+    home.packages = with pkgs; [
+      fractal
+      gnome.gnome-calculator
+    ];
+
+    programs.obs-studio.enable = true;
+  };
+
+  # for udev rules
+  programs.adb.enable = true;
 }
diff --git a/nixos/profiles/common/graphical/home/default.nix b/nixos/profiles/common/graphical/home/default.nix
index 49ac70f..bf43d32 100644
--- a/nixos/profiles/common/graphical/home/default.nix
+++ b/nixos/profiles/common/graphical/home/default.nix
@@ -1,11 +1,10 @@
-{...}: {
+{pkgs, ...}: {
   imports =
     [
       ./fonts
       ./scripts
       ./wallpapers
 
-      ./packages.nix
       ./theme.nix
       ./xdg-mime.nix
     ]
@@ -18,14 +17,14 @@
       "bash"
 
       # Editor
-      "helix"
       "neovim"
-      "vscode"
+      # "helix"
+      # "vscode"
 
       # Browser
-      "chromium"
-      #"librewolf"
       "firefox"
+      # "chromium"
+      # "librewolf"
 
       # Language
       "nix"
@@ -34,20 +33,13 @@
       # Media
       "loupe"
       "mpv"
-      "spotify/spicetify.nix"
-      "amberol"
-      "mousai"
 
       # WM
       "sway"
 
       # Misc
-      "thunderbird"
-      "telegram-desktop"
       "nautilus"
       "fcitx5"
-      "irssi"
-      "mumble"
     ];
 
   # https://wiki.archlinux.org/title/Fish#Start_X_at_login
@@ -56,4 +48,15 @@
       exec sway
     end
   '';
+
+  home.packages = with pkgs.gnome; [
+    seahorse
+    file-roller
+    gnome-calculator
+    dconf-editor
+  ];
+
+  services = {
+    ssh-agent.enable = true;
+  };
 }
diff --git a/nixos/profiles/common/graphical/home/packages.nix b/nixos/profiles/common/graphical/home/packages.nix
deleted file mode 100644
index 8b29d74..0000000
--- a/nixos/profiles/common/graphical/home/packages.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{pkgs, ...}: {
-  home.packages =
-    (with pkgs; [
-      # Messaging
-      ### Matrix
-      #libsForQt5.neochat # kinda buggy with window resizing, but it works and its not electron
-      #nheko # wont let me login for some reason
-      fractal # does not work with Mozilla's SAML login
-
-      ##                 # vvv 3 UI libraries I dislike vvv
-      #cinny-desktop #   # Tauri
-      #element-desktop # # Electron
-      #fluffychat #      # Flutter
-
-      ### Misc
-      #discord
-      #qq
-
-      # Misc
-      #bitwarden
-      #gparted
-      #timeshift
-      #tuba
-      #piper
-      #gradience
-      #dippi
-    ])
-    ++ (with pkgs.gnome; [
-      zenity
-      seahorse
-      file-roller
-      gnome-weather
-      gnome-calculator
-      dconf-editor
-    ]);
-
-  programs = {
-    obs-studio.enable = true;
-  };
-
-  services = {
-    ssh-agent.enable = true;
-  };
-
-  #programs.boxxy = {
-  #  enable = true;
-  #  #rules = {
-  #  #
-  #  #};
-  #};
-}
diff --git a/nixos/profiles/common/opt-in/gaming/home/default.nix b/nixos/profiles/common/opt-in/gaming/home/default.nix
index 6e21cf6..eca11ab 100644
--- a/nixos/profiles/common/opt-in/gaming/home/default.nix
+++ b/nixos/profiles/common/opt-in/gaming/home/default.nix
@@ -5,5 +5,8 @@
     "osu-lazer"
     #"osu-stable"
     "mangohud"
+
+    # VOIP
+    "mumble"
   ];
 }