From f972be9375e8ff82a6fbc3402ec47d4c8b611fcf Mon Sep 17 00:00:00 2001 From: sils Date: Sun, 25 Jun 2023 11:44:10 +0200 Subject: Feat: Disable grades, as this would stop config from building. --- users/sils/default.nix | 2 +- users/sils/neovim/default.nix | 29 +---------------------------- users/sils/neovim/lua/options.lua | 25 +++++++++++++++++++++++++ users/sils/packages/default.nix | 6 ++++-- 4 files changed, 31 insertions(+), 31 deletions(-) create mode 100644 users/sils/neovim/lua/options.lua (limited to 'users') 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 vnoremap jj 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 ]; } -- cgit 1.4.1