modules/home/programs/fish/default.nix

@@ -17,27 +17,25 @@ in
   options.marleyos.programs.fish.enable = mkEnableOption "fish";
 
   config = mkIf cfg.enable {
-    home.packages =
+    home.packages = with pkgs; [
-      with pkgs;
+      # general
-      [
+      babelfish
-        # general
-        babelfish
 
-        # for fish_greeting()
+      # for fish_greeting()
-        marleyos.figlet-xero-fonts
+      marleyos.figlet-xero-fonts
-        lolcat
+      lolcat
 
-        # for extract()
+      # for extract()
-        gnutar
+      gnutar
-        bzip2
+      bzip2
-        bzip3
+      bzip3
-        gzip
+      gzip
-        unzip
+      unzip
-        pax
+      pax
-      ]
+    ]
-      # unrar-free is broken on darwin :(
+    # unrar-free is broken on darwin :(
-      ++ (optionals (is-linux system) [ unrar-free ])
+    ++ (optionals (is-linux system) [ unrar-free ])
-      ++ (optionals (is-darwin system) [ unrar ]);
+    ++ (optionals (is-darwin system) [ unrar ]);
 
     programs.fish = {
       enable = true;
@@ -74,7 +72,7 @@ in
         cp = "cp -iv";
         mkdir = "mkdir -pv";
         mv = "mv -iv";
-        rm = "rm -rf";
+        rm = "rm -r";
         grep = "grep --color=auto";
       };
 

readme.md

@@ -27,12 +27,9 @@ publicly released, therefore things are likely to break.
 
 ## 🐣 Outputs
 
-- _systems:_ System config
-  - _systems/aarch64-darwin/mairley:_ My Macbook Air 2022ish. Main laptop.
 - _homes:_ Home manager config
-  - _homes/x86_64-linux/marley@nyx:_ My main desktop. Currently running Arch Linux
+  - _homes/\<system>/marley@nyx:_ My main desktop. Currently running Arch Linux
     but will be switched to NixOS once I've finished migrating my dotfiles.
-  - _homes/aarch64-darwin/marley@mairley:_ Home configuration for mairley.
 - _modules:_ Most config is done here. The file structure is pretty
   self-explanatory.
   - _modules/{home,nixos,darwin}/base:_ Anything in a base folder directly under
@@ -47,10 +44,3 @@ publicly released, therefore things are likely to break.
 
 - [jakehamilton/config](https://github.com/jakehamilton/config)
 - [the nix logo used in this readme](https://lix.systems/)
-
-## ✅ Todo - Preparing to Switch to NixOS
-
-- [x] Migrate Chezmoi dotfiles
-- [x] Migrate ~/.config dotfiles
-- [ ] Migrate ~ dotfiles
-- [ ] Check for any personal files not in ~/data