From a29306fdf97ab9076af0cde375d6c77e8f3f0a85 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Fri, 16 Apr 2021 22:29:47 -0400
Subject: [PATCH] ..

---
 features/desktopish/fonts.nix |  5 +----
 features/emacs.nix            |  6 ------
 features/self-ide.nix         | 14 ++++++++++++++
 flake.nix                     |  1 +
 home.nix                      |  1 -
 hosts/x1c7.nix                | 16 ----------------
 6 files changed, 16 insertions(+), 27 deletions(-)
 delete mode 100644 features/emacs.nix
 create mode 100644 features/self-ide.nix

diff --git a/features/desktopish/fonts.nix b/features/desktopish/fonts.nix
index b5a5d28..d3e9d82 100644
--- a/features/desktopish/fonts.nix
+++ b/features/desktopish/fonts.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 {
-   fonts = {
+  fonts = {
     enableDefaultFonts = true;
 
     fonts = with pkgs; [
@@ -15,9 +15,6 @@
       # For fish powerline plugin
       powerline-fonts
       cascadia-code
-
-      # Doom emacs
-      emacs-all-the-icons-fonts
     ];
   };
 }
diff --git a/features/emacs.nix b/features/emacs.nix
deleted file mode 100644
index 1782a13..0000000
--- a/features/emacs.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ pkgs, inputs, ... }: {
-  nixpkgs.overlays = [ inputs.emacs-overlay.overlay ];
-  environment.systemPackages = with pkgs; [
-    emacsUnstable
-  ];
-}
diff --git a/features/self-ide.nix b/features/self-ide.nix
new file mode 100644
index 0000000..f85b295
--- /dev/null
+++ b/features/self-ide.nix
@@ -0,0 +1,14 @@
+{ pkgs, inputs, ... }: {
+  # For no-prompt Ctrl+Shift+B in VSCode
+  security.sudo.extraRules = [
+    {
+      users = [ "srid" ];
+      commands = [
+        {
+          command = "/run/current-system/sw/bin/nixos-rebuild";
+          options = [ "NOPASSWD" ];
+        }
+      ];
+    }
+  ];
+}
diff --git a/flake.nix b/flake.nix
index 7e28301..02e6571 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,6 +27,7 @@
           configurationNix
 
           # Features common to all of my machines
+          ./features/self-ide.nix
           ./features/current-location.nix
           ./features/passwordstore.nix
           ./features/syncthing.nix
diff --git a/home.nix b/home.nix
index 8ba18c2..b69fe0c 100644
--- a/home.nix
+++ b/home.nix
@@ -117,7 +117,6 @@ in
         t = "tig";
         l = "ls --color=always";
         h = "${himalaya}/bin/himalaya";
-        em = "TERM=xterm-direct emacs -nw";
       };
       sessionVariables = { };
     };
diff --git a/hosts/x1c7.nix b/hosts/x1c7.nix
index 30d9f37..a25a0b0 100644
--- a/hosts/x1c7.nix
+++ b/hosts/x1c7.nix
@@ -68,31 +68,15 @@
     gnome3.gnome-tweaks
     google-chrome
     htop
-    obsidian
-    psmisc
     ripgrep
     signal-desktop
     vscode
-    opera
   ];
 
   services = {
     openssh.enable = true;
   };
 
-  security.sudo.extraRules = [
-    {
-      users = [ "srid" ];
-      commands = [
-        {
-          command = "/run/current-system/sw/bin/nixos-rebuild";
-          options = [ "NOPASSWD" ];
-        }
-      ];
-    }
-  ];
-
-
   # Open ports in the firewall.
   # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];