summary refs log tree commit diff stats
path: root/users
diff options
context:
space:
mode:
Diffstat (limited to 'users')
-rw-r--r--users/sils/default.nix2
-rw-r--r--users/sils/neovim/default.nix29
-rw-r--r--users/sils/neovim/lua/options.lua25
-rw-r--r--users/sils/packages/default.nix6
4 files changed, 31 insertions, 31 deletions
diff --git a/users/sils/default.nix b/users/sils/default.nix
index e091a2d..25eb1c3 100644
--- a/users/sils/default.nix
+++ b/users/sils/default.nix
@@ -3,7 +3,7 @@
     ./direnv
     ./git
     ./gpg
-    ./grades
+    #./grades
     ./mako
     ./neovim
     ./packages
diff --git a/users/sils/neovim/default.nix b/users/sils/neovim/default.nix
index 2ac065c..c9e5ed5 100644
--- a/users/sils/neovim/default.nix
+++ b/users/sils/neovim/default.nix
@@ -5,34 +5,7 @@
     viAlias = true;
     vimAlias = true;
     vimdiffAlias = true;
-    extraLuaConfig = ''
-      local set = vim.opt;
-
-      set.autoindent = true;
-      set.cindent = true;
-      set.incsearch = true;
-      set.ignorecase = true;
-      set.smartcase = true;
-      set.showmatch = true;
-      set.hlsearch = false;
-
-      set.mouse = "";
-      set.number = true;
-      set.relativenumber = true;
-      set.shell = zsh;
-
-      set.spell = true;
-      set.spelllang = "en_us,de_de";
-      set.spelloptions = "camel";
-
-      set.syntax = "ON";
-
-      set.shiftwidth = 2;
-      set.tabstop = 2;
-      set.expandtab = true;
-      set.so = 999;
-
-    '';
+    extraLuaConfig = builtins.readFile ./lua/options.lua;
     extraConfig = ''
       inoremap jj <esc>
       vnoremap jj <esc>
diff --git a/users/sils/neovim/lua/options.lua b/users/sils/neovim/lua/options.lua
new file mode 100644
index 0000000..2d9fa2d
--- /dev/null
+++ b/users/sils/neovim/lua/options.lua
@@ -0,0 +1,25 @@
+      local set = vim.opt;
+
+      set.autoindent = true;
+      set.cindent = true;
+      set.incsearch = true;
+      set.ignorecase = true;
+      set.smartcase = true;
+      set.showmatch = true;
+      set.hlsearch = false;
+
+      set.mouse = "";
+      set.number = true;
+      set.relativenumber = true;
+      set.shell = zsh;
+
+      set.spell = true;
+      set.spelllang = "en_us,de_de";
+      set.spelloptions = "camel";
+
+      set.syntax = "ON";
+
+      set.shiftwidth = 2;
+      set.tabstop = 2;
+      set.expandtab = true;
+      set.so = 999;
diff --git a/users/sils/packages/default.nix b/users/sils/packages/default.nix
index 527d529..c2bf342 100644
--- a/users/sils/packages/default.nix
+++ b/users/sils/packages/default.nix
@@ -1,9 +1,10 @@
 {
-  grades,
   system,
   pkgs,
+  polymc,
   ...
 }: {
+  nixpkgs.overlays = [ polymc.overlay ];
   home.packages = with pkgs; [
     # core tools
     neofetch # a must-have
@@ -93,9 +94,10 @@
     river
     yambar
     swaylock
+    polymc # minecraft-launcher
 
     # soispha
 
-    grades.outputs.packages.${system}.default
+    #grades.outputs.packages.${system}.default
   ];
 }