moved to neovim

home-manager/bspwm.nix

@@ -10,7 +10,7 @@
       "xsetroot -cursor_name left_ptr"
       "xsetroot -solid \"#000000\""
       "flashfocus"
-      "polkit-gnome-authentication-agent-1"
+      "polkit-gnome"
     ];
     settings = {
       border_width = 0;
@@ -25,7 +25,7 @@
     };
     monitors = {
       HDMI-0 = [ "I" "II" "III" "IV" "V" ];
-#      eDP-1 =  [ "VI" "VII" "VIII" "IX" "X" ];
+      eDP-1 =  [ "VI" "VII" "VIII" "IX" "X" ];
     };
   };
 }

home-manager/config/polybar/scripts/tray

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-u=$(xprop -name "Polybar tray window" _NET_WM_PID | awk '{print $3}')
-if [ $u -Z ]
-then polybar tray &
-else kill $u
-fi

home-manager/git.nix

@@ -1,6 +1,8 @@
+{ pkgs, ... }:
 {
   programs.git = {
     enable = true;
+    package = pkgs.gitFull;
     userName = "ISnortPennies";
     userEmail = "ISnortPennies@protonmail.com";
   };

home-manager/home-manager.nix

@@ -1,7 +1,6 @@
 {config, pkgs, home-manager, ...}:
 {
   imports = [
-    ./zsh.nix
     ./firefox.nix
     ./bspwm.nix
     ./sxhkd.nix
@@ -12,6 +11,7 @@
     ./theme.nix
     ./picom.nix
     ./git.nix
+    ./neovim.nix
   ];
   xsession.numlock.enable = true;
   programs.home-manager.enable = true;

home-manager/neovim.nix

@@ -0,0 +1,34 @@
+{ pkgs, ... }:
+{
+  programs.neovim = {
+    enable = true;
+    viAlias = true;
+    vimAlias = true;
+    withNodeJs = true;
+    withPython3 = true;
+    withRuby = true;
+    coc = {
+      enable = true;
+      package = pkgs.vimPlugins.coc-nvim;
+    };
+    plugins = with pkgs.vimPlugins; [
+      vim-nix
+      vim-polyglot
+      vim-smoothie
+      tokyonight-nvim
+      rainbow
+      indentLine
+      undotree
+    ];
+    extraConfig = ''
+      set tabstop=2
+      set expandtab
+      set shiftwidth=2
+      set ignorecase
+      set incsearch
+      set number 
+      set noswapfile
+      let mapleader = "'"
+    '';
+  };
+}

home-manager/polybar.nix

@@ -199,7 +199,7 @@
       "module/tray" = {
         type = "custom/text";
         content = " ";
-        click.left = "\$HOME/.config/polybar/scripts/tray";
+        click.left = "polybar-tray";
         label = {
           padding = 3;
           background = "\${colors.background}";

home-manager/zsh.nix

@@ -1,32 +0,0 @@
-{
- programs = {
-    zsh = {
-     enable = true;
-     enableAutosuggestions = true;
-     enableSyntaxHighlighting = true;
-     completionInit = "neofetch";
-    };
-    starship = {
-      enable = true;
-      enableZshIntegration = true;
-      settings = {
-        add_newline = false;
-        format="$sudo \n $directory$git_branch$character";
-        character = {
-          success_symbol = "[](#9ece6a bold)";
-          error_symbol = "[](#db4b4b bold)";
-        };
-        directory = {
-          read_only = " ";
-        };
-        git_branch = {
-          style = "bold red";
-        };
-        sudo ={
-        format = "[ ](#7aa2f7)";
-        disabled = false;
-        };
-      };
-    };
-  };
-}