From 5e31b3dd64f090f9405d9ab9e8e63093b8ad3cc2 Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Mon, 16 Dec 2024 10:12:58 -0800
Subject: some more cleanup

---
 nix/users/fcuny/home-manager.nix | 21 +++++-------------
 nix/users/fcuny/shell.nix        | 47 ++++++++++++++++++++++++----------------
 2 files changed, 34 insertions(+), 34 deletions(-)

(limited to 'nix/users')

diff --git a/nix/users/fcuny/home-manager.nix b/nix/users/fcuny/home-manager.nix
index a344151..7752328 100644
--- a/nix/users/fcuny/home-manager.nix
+++ b/nix/users/fcuny/home-manager.nix
@@ -1,8 +1,6 @@
 { darwin, ... }:
 
-{ config, lib, pkgs, ... }:
-let isLinux = pkgs.stdenv.isLinux;
-in {
+{ config, lib, pkgs, ... }: {
   home.stateVersion = "23.05";
 
   xdg.enable = true;
@@ -15,16 +13,6 @@ in {
       # encryption
       age
 
-      # media
-      mpv
-      ffmpeg
-
-      # dicts
-      aspell
-      aspellDicts.en
-      aspellDicts.en-computers
-      aspellDicts.en-science
-
       # nix
       nil
       nix-direnv
@@ -32,11 +20,14 @@ in {
       nixfmt-classic
       nixpkgs-fmt
       nil # nix lsp
-
-    ] ++ (lib.optionals (isLinux) [ htop ]) ++ (lib.optionals (darwin) [
+    ] ++ (lib.optionals (darwin) [
       # hashicorp
       boundary
       nomad-pack
       tfswitch
+
+      # media
+      mpv
+      ffmpeg
     ]);
 }
diff --git a/nix/users/fcuny/shell.nix b/nix/users/fcuny/shell.nix
index 09fbc40..bfedc45 100644
--- a/nix/users/fcuny/shell.nix
+++ b/nix/users/fcuny/shell.nix
@@ -1,25 +1,34 @@
-{ config, pkgs, ... }: {
-  home.packages = with pkgs; [
-    # shell
-    shellcheck
+{ config, pkgs, ... }:
+let isLinux = pkgs.stdenv.isLinux;
+in {
+  home.packages = with pkgs;
+    [
+      # shell
+      shellcheck
 
-    # shell utils
-    coreutils
-    direnv
-    dust
-    procs
-    ripgrep
-    tree
-    wget
+      # shell utils
+      coreutils
+      direnv
+      dust
+      procs
+      ripgrep
+      tree
+      wget
 
-    # network
-    bandwhich
+      # network
+      bandwhich
 
-    # data manipulation
-    jless
-    jq
-    yq
-  ];
+      # data manipulation
+      jless
+      jq
+      yq
+
+      # dicts
+      aspell
+      aspellDicts.en
+      aspellDicts.en-computers
+      aspellDicts.en-science
+    ] ++ (lib.optionals (isLinux) [ htop ]);
 
   programs.fish = {
     enable = true;
-- 
cgit 1.4.1