Switch to bash, misc

1 files changed, 28 insertions, 25 deletions

diff --git a/hosts/moyo/container.nix b/hosts/moyo/container.nix
index d4e503b..d3483b5 100644
--- a/hosts/moyo/container.nix
+++ b/hosts/moyo/container.nix
@@ -1,23 +1,11 @@
-{ config, lib, pkgs, modulesPath, ... }:
-let
-  inherit (import ../../nix/utils.nix) disks;
-in {
+{ config, lib, pkgs, modulesPath, ... }: {
   imports = [
     "${modulesPath}/virtualisation/lxc-container.nix"
     ../../nix/system.nix
   ];
 
-  system.stateVersion = "24.05";
-
   boot.isContainer = true;
 
-  nix.settings.system-features = [ "gccarch-znver1" ];
-#  nixpkgs.hostPlatform = {
-#    gcc.arch = "znver1";
-#    gcc.tune = "znver1";
-#    system = "x86_64-linux";
-#  };
-
   users.users.andrew = {
     isNormalUser = true;
     uid = 1000;
@@ -25,10 +13,17 @@ in {
   };
   nix.settings.trusted-users = [ "andrew" ];
 
+  nix.settings.system-features = [ "gccarch-znver1" ];
+  nixpkgs.hostPlatform = {
+    #gcc.arch = "znver1";
+    #gcc.tune = "znver1";
+    system = "x86_64-linux";
+  };
+
   networking = {
     hostName = "the-p";
-    dhcpcd.enable = false;
     useDHCP = false;
+    dhcpcd.enable = false;
     useHostResolvConf = false;
     wireless.enable = false;
     firewall = {
@@ -50,22 +45,30 @@ in {
     };
   };
 
-  environment.shellAliases = {
-    vi = "nvim";
-    top = "htop";
-  };
-
-  programs.zsh.enable = true;
-  environment.shells = [ pkgs.zsh ];
-  environment.pathsToLink = [ "/share/zsh" ];
-  users.defaultUserShell = pkgs.zsh;
+  users.defaultUserShell = pkgs.bashInteractive;
 
   environment.systemPackages = with pkgs; [
     kitty.terminfo
-    neovim
     screen
     htop
-    jdk17
+    ((vim-full.override {
+      features = "small";
+      guiSupport = "off";
+      luaSupport = false;
+      pythonSupport = false;
+      rubySupport = false;
+      cscopeSupport = false;
+      netbeansSupport = false;
+      ximSupport = false;
+      ftNixSupport = false;
+      sodiumSupport = false;
+    }).customize {
+      name = "vi";
+      vimrcConfig = { customRC = ""; };
+    })
+    jdk23
     #graalvm-oracle
   ];
+
+  system.stateVersion = "25.05";
 }