From f1c97bd095078dc0c9a746c576ec42b71de75a4b Mon Sep 17 00:00:00 2001
From: Riley Apeldoorn <me@riley.lgbt>
Date: Tue, 6 Jun 2023 15:38:06 +0200
Subject: [PATCH] Rename `thor` to `strawberry`

---
 flake.nix                            | 6 +++---
 shared/core/default.nix              | 2 +-
 shared/home/bash.nix                 | 6 +++---
 system/{thor => strawberry}/core.nix | 2 +-
 system/{thor => strawberry}/home.nix | 0
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename system/{thor => strawberry}/core.nix (97%)
 rename system/{thor => strawberry}/home.nix (100%)

diff --git a/flake.nix b/flake.nix
index 97465b5..ee77043 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,11 +28,11 @@
         in {
 
           # Desktop system
-          "thor" = lib.nixosSystem {
+          "strawberry" = lib.nixosSystem {
             system = "x86_64-linux";
             modules = [
-              (mkUserConfig ./system/thor)
-              ./system/thor/core.nix
+              (mkUserConfig ./system/strawberry)
+              ./system/strawberry/core.nix
               ./shared/core
             ];
             specialArgs = args;
diff --git a/shared/core/default.nix b/shared/core/default.nix
index 75c2891..3b46f2c 100644
--- a/shared/core/default.nix
+++ b/shared/core/default.nix
@@ -16,7 +16,7 @@
 
       isNormalUser = true;
       extraGroups = ["wheel"];
-      packages = [ pkgs.helix ];
+      packages = [ pkgs.helix pkgs.neovim ];
 
     };
 
diff --git a/shared/home/bash.nix b/shared/home/bash.nix
index 791e975..93df54f 100644
--- a/shared/home/bash.nix
+++ b/shared/home/bash.nix
@@ -15,6 +15,8 @@ in with lib; {
 
   config = {
 
+    home.packages = [ pkgs.perl ];
+
     # Configure the shell itself
     programs.bash = with pkgs; {
       enable = true;
@@ -33,9 +35,6 @@ in with lib; {
         "ignoredups"
       ];
       historySize = 100000;
-      sessionVariables = {
-        "EDITOR" = "${helix}/bin/hx";
-      };
       shellAliases = {
         # General aliases
         ":q" = "exit";
@@ -62,6 +61,7 @@ in with lib; {
       } // cfg.extraAliases;
       bashrcExtra = ''
         export PATH=${../../script}:/home/riley/.nix-profile/bin:$PATH
+        export EDITOR=${helix}/bin/hx
       '';
     };
 
diff --git a/system/thor/core.nix b/system/strawberry/core.nix
similarity index 97%
rename from system/thor/core.nix
rename to system/strawberry/core.nix
index a12c928..666ece4 100644
--- a/system/thor/core.nix
+++ b/system/strawberry/core.nix
@@ -8,7 +8,7 @@
   home-manager.users.riley.home.stateVersion = "21.11";
 
   networking = {
-    hostName = "thor";
+    hostName = "strawberry";
     interfaces."enp9s0".useDHCP = true;
   };
 
diff --git a/system/thor/home.nix b/system/strawberry/home.nix
similarity index 100%
rename from system/thor/home.nix
rename to system/strawberry/home.nix