From 06261b011e6d7c9656005a28b8a84de76d366449 Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Mon, 31 Jan 2022 10:54:01 +0100
Subject: [PATCH] remove xonsh

---
 flake.nix                  |  4 ----
 home-manager/work-wsl.nix  |  3 ---
 modules/cli/default.nix    |  6 +++++-
 modules/common/default.nix |  6 ------
 modules/xonsh/default.nix  | 20 --------------------
 5 files changed, 5 insertions(+), 34 deletions(-)
 delete mode 100644 modules/xonsh/default.nix

diff --git a/flake.nix b/flake.nix
index e1cfb43..ada0603 100644
--- a/flake.nix
+++ b/flake.nix
@@ -80,7 +80,6 @@
             ./modules/espanso
             ./modules/lockscreen
             ./modules/restic
-            ./modules/xonsh
           ];
         staubfinger = mkComputer
           ./systems/staubfinger
@@ -95,7 +94,6 @@
             ./modules/espanso
             ./modules/lockscreen
             ./modules/restic
-            ./modules/xonsh
           ];
         nixos-vm = mkComputer
           ./systems/desktop-vm
@@ -103,7 +101,6 @@
           [
             ./modules/desktop
             ./modules/espanso
-            ./modules/xonsh
           ];
         proxy = mkComputer
           (mkVM
@@ -120,7 +117,6 @@
             ./modules/code-server
             ./modules/docker
             ./modules/restic
-            ./modules/xonsh
           ];
         heimdall = mkComputer
           (mkVM
diff --git a/home-manager/work-wsl.nix b/home-manager/work-wsl.nix
index 404482e..665414e 100644
--- a/home-manager/work-wsl.nix
+++ b/home-manager/work-wsl.nix
@@ -9,9 +9,6 @@
   ];
 
   programs.git.userEmail = "zweili@contria.com";
-  home.packages = with pkgs; [
-    xonsh
-  ];
 
   programs.bash = {
     enable = true;
diff --git a/modules/cli/default.nix b/modules/cli/default.nix
index 17a4fa1..5d6064f 100644
--- a/modules/cli/default.nix
+++ b/modules/cli/default.nix
@@ -16,7 +16,11 @@
     wget
   ];
   environment.shellAliases = {
-    format = "nixpkgs-fmt **/*.nix";
+    format-modules = "nixpkgs-fmt **/*.nix";
+    nix-generations = "sudo nix-env --list-generations --profile /nix/var/nix/profiles/system";
+    rebuild = "sudo nixos-rebuild -j auto switch";
+    find-garbage = "ls -l /nix/var/nix/gcroots/auto/ | sort";
+    vm = "vim";
   };
 }
 
diff --git a/modules/common/default.nix b/modules/common/default.nix
index 0f259da..b6671fe 100644
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@@ -80,12 +80,6 @@
     trustedUsers = [ "root" "@wheel" ];
   };
 
-
-  environment.shellAliases = {
-    nix-generations = "sudo nix-env --list-generations --profile /nix/var/nix/profiles/system";
-    rebuild = "sudo nixos-rebuild -j auto switch";
-  };
-
   environment.variables = {
     EDITOR = "vim";
     HIGHLIGHT_STYLE = "solarized-light";
diff --git a/modules/xonsh/default.nix b/modules/xonsh/default.nix
deleted file mode 100644
index e932d2a..0000000
--- a/modules/xonsh/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ pkgs, username, ... }:
-{
-  programs.xonsh = {
-    enable = true;
-    config = ''
-      aliases['management-server'] = "mosh ${username}@10.7.89.150 tmux a"
-      aliases['nix-generations'] = "sudo nix-env --list-generations --profile /nix/var/nix/profiles/system"
-      aliases['rebuild'] = "sudo nixos-rebuild -j auto switch"
-      aliases['find-garbage'] = "ls -l /nix/var/nix/gcroots/auto/ | sort"
-      aliases['format-module'] = "nixpkgs-fmt **/*.nix"
-      aliases['vm'] = "vim"
-      $XONSH_COLOR_STYLE = 'solarized-light'
-      $XONSH_HISTORY_BACKEND = 'sqlite'
-    '';
-  };
-  users.users.${username} = {
-    shell = pkgs.xonsh;
-  };
-}
-