From e4ab300f2260edc6f2effef3776cc8ac2bd27577 Mon Sep 17 00:00:00 2001
From: William <baduhai@proton.me>
Date: Wed, 16 Aug 2023 18:28:35 -0300
Subject: [PATCH] Emacs learning curve is too steep, back to vim

---
 users/common/default.nix       |  2 +-
 users/common/home.nix          |  5 ++++-
 users/common/programs.nix      |  6 +++---
 users/common/services.nix      | 10 ----------
 users/desktops/common/home.nix | 25 -------------------------
 5 files changed, 8 insertions(+), 40 deletions(-)
 delete mode 100644 users/common/services.nix

diff --git a/users/common/default.nix b/users/common/default.nix
index 89d0d0e..f9dfb30 100644
--- a/users/common/default.nix
+++ b/users/common/default.nix
@@ -1,5 +1,5 @@
 { ... }:
 
 {
-  imports = [ ./home.nix ./programs.nix ./services.nix ];
+  imports = [ ./home.nix ./programs.nix ];
 }
diff --git a/users/common/home.nix b/users/common/home.nix
index bda25e9..8fb9978 100644
--- a/users/common/home.nix
+++ b/users/common/home.nix
@@ -5,7 +5,10 @@
     username = "user";
     homeDirectory = "/home/user";
     stateVersion = "22.05";
-    sessionVariables = { TZ = ":/etc/localtime"; };
+    sessionVariables = {
+      TZ = ":/etc/localtime";
+      EDITOR = "nvim";
+    };
     file = {
       ".config/starship.toml".source =
         "${inputs.dotfiles}/.config/starship.toml";
diff --git a/users/common/programs.nix b/users/common/programs.nix
index 60fb60d..0854e47 100644
--- a/users/common/programs.nix
+++ b/users/common/programs.nix
@@ -47,9 +47,8 @@
         mkparents = true;
         scrollbar = true;
         tabstospaces = true;
-        tabsize = 4;
+        tabsize = 2;
         colorscheme = "simple";
-        relativeruler = true;
       };
     };
     fish = {
@@ -57,7 +56,8 @@
       interactiveShellInit = "nix-your-shell fish | source";
       loginShellInit = "nix-your-shell fish | source";
       shellAliases = {
-        emacs = "${config.home.sessionVariables.EDITOR} -nw";
+        vi = "nvim";
+        vim = "nvim";
         wget = ''wget --hsts-file="$XDG_DATA_HOME/wget-hsts"'';
       };
       functions = {
diff --git a/users/common/services.nix b/users/common/services.nix
deleted file mode 100644
index 9c716f3..0000000
--- a/users/common/services.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ inputs, config, pkgs, lib, ... }:
-
-{
-  services.emacs = {
-    enable = true;
-    defaultEditor = true;
-    package = pkgs.emacs29-pgtk;
-    socketActivation.enable = true;
-  };
-}
diff --git a/users/desktops/common/home.nix b/users/desktops/common/home.nix
index 39f778f..76eaf47 100644
--- a/users/desktops/common/home.nix
+++ b/users/desktops/common/home.nix
@@ -25,29 +25,4 @@
         "/var/run/current-system/sw/share/applications/koi.desktop";
     };
   };
-  xdg.desktopEntries.emacsd = {
-    name = "Emacs";
-    exec = "${config.services.emacs.package}/bin/emacsclient -c";
-    icon = "emacs";
-    comment = "More than just a text editor";
-    genericName = "Text Editor";
-    mimeType = [
-      "text/english"
-      "text/plain"
-      "text/x-makefile"
-      "text/x-c++hdr"
-      "text/x-c++src"
-      "text/x-chdr"
-      "text/x-csrc"
-      "text/x-java"
-      "text/x-moc"
-      "text/x-pascal"
-      "text/x-tcl"
-      "text/x-tex"
-      "application/x-shellscript"
-      "text/x-c"
-      "text/x-c++"
-    ];
-    categories = [ "Development" "TextEditor" ];
-  };
 }