packages

3 files changed, 20 insertions, 33 deletions

diff --git a/profiles/core/configuration.nix b/profiles/core/configuration.nix
index 1fcb139..65c3adb 100644
--- a/profiles/core/configuration.nix
+++ b/profiles/core/configuration.nix
@@ -36,12 +36,18 @@
     vim
     wget
     git
+    subversion
+    htop
     jq
     yq-go
     curl
+    fd
+    lf
+    ripgrep
+    parallel
     pinentry-curses
     gnused
-    htop
+    gnutls
     pciutils
     dnsutils
     iputils
diff --git a/profiles/core/neovim.nix b/profiles/core/neovim.nix
index f546e7a..eaebc2d 100644
--- a/profiles/core/neovim.nix
+++ b/profiles/core/neovim.nix
@@ -25,11 +25,6 @@
       };
     };
 
-    home.packages = with pkgs; [
-        neovide
-        ripgrep
-    ];
-
     programs.neovim = {
       enable = true;
       package = pkgs.neovim-unwrapped;
diff --git a/profiles/station/packages.nix b/profiles/station/packages.nix
index deea797..9dd6f20 100644
--- a/profiles/station/packages.nix
+++ b/profiles/station/packages.nix
@@ -3,14 +3,13 @@
   config,
   pkgs,
   ...
-}: let
-  core-packages = with pkgs;
-    [
+}: {
+  hm = {
+    home.packages = with pkgs; [
       krew
       dasel
       initool
       python311Packages.editorconfig
-      gnutls
       gcc
       pkgsi686Linux.glibc
       gnumake
@@ -20,7 +19,6 @@
       calcurse
       profanity
       file
-      lf
       ueberzug
       mypaint
       lynx
@@ -30,39 +28,27 @@
       k9s
       powershell
       azure-cli
-      subversion
-      ripgrep
       inotify-tools
       alejandra
       statix
       fzf
       github-cli
       lazygit
-      fd
       argocd
-      parallel
       bc
       sxiv
       nushell
       sent
+      (nerdfonts.override {fonts = ["FiraCode"];})
+      noto-fonts
+      noto-fonts-emoji
+      docker
+      k9s
+      dmenu
+      librewolf
+      firefox-wayland
+      xclip
+      libreoffice
     ];
-  mike-extra-packages = with pkgs; [
-    (nerdfonts.override {fonts = ["FiraCode"];})
-    noto-fonts
-    noto-fonts-emoji
-    docker
-    k9s
-    dmenu
-    librewolf
-    firefox-wayland
-    xclip
-    libreoffice
-  ];
-in {
-  hm = {
-    home.packages =
-      core-packages
-      ++
-      mike-extra-packages;
   };
 }