summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Vink <mike1994vink@gmail.com>2023-10-10 10:03:15 +0000
committerMike Vink <mike1994vink@gmail.com>2023-10-10 10:03:15 +0000
commit63aae9abf1f83a41ba92a4672277ba04c3bd48bf (patch)
treec66e39b6011d5e365e713b2c5967a901a34d5989
parentace3eae111b44892f873436c859e1aa8b14b32ab (diff)
changes on wsl machine
-rw-r--r--.gitignore1
-rw-r--r--mut/neovim/.hotpot.lua2
-rw-r--r--mut/neovim/fnl/conf/init.fnl14
-rw-r--r--mut/neovim/fnl/conf/settings.fnl2
-rw-r--r--profiles/core/configuration.nix11
-rw-r--r--profiles/core/neovim.nix5
6 files changed, 26 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index 826ecc4..231099c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/Session.vim
+/mut/neovim/lua/
diff --git a/mut/neovim/.hotpot.lua b/mut/neovim/.hotpot.lua
index 4b1d7f7..118f0ac 100644
--- a/mut/neovim/.hotpot.lua
+++ b/mut/neovim/.hotpot.lua
@@ -1,10 +1,10 @@
return {
build = {
{verbose = false},
- -- This will only compile init.fnl, all other fnl/ files will behave as normal.
{"fnl/**/*macro*.fnl", false}, -- dont compile macro files
{"init.fnl", true},
{"fnl/conf/**/*.fnl", true},
+ -- This will only compile init.fnl, all other fnl/ files will behave as normal.
-- Or you could enable other patterns too,
-- {"colors/*.fnl", true},
-- {"fnl/**/*.fnl", true},
diff --git a/mut/neovim/fnl/conf/init.fnl b/mut/neovim/fnl/conf/init.fnl
index 68cc26e..151f829 100644
--- a/mut/neovim/fnl/conf/init.fnl
+++ b/mut/neovim/fnl/conf/init.fnl
@@ -27,7 +27,7 @@
(map :n :<leader>l<BS> ":lclose<cr>")
(map :n :<M-space> ":cprev<cr>")
(map :n :<C-space> ":cnext<cr>")
- (map :n :<C-x> ":Compile ")
+ (map :n :<C-x> ":Compile<up><c-f>")
(map :n :<C-e> ":Recompile<CR>")
(map :n "[q" ":cprevious<cr>")
(map :n "]q" ":cnext<cr>")
@@ -76,10 +76,8 @@
(local title (table.concat cmd " "))
(vim.fn.setqflist [] " " {: title})
(local add2qf (qf (vim.fn.getqflist {:id 0 :title 1})))
- (set
- last_job
- {: cmd
- :id (vim.fn.jobstart
+ (local id
+ (vim.fn.jobstart
cmd
{:on_stdout (fn [id data]
(if data
@@ -89,7 +87,11 @@
(add2qf data)))
:on_exit (fn [id rc]
(if (= rc 0)
- (vim.cmd ":cope")))})})))
+ (vim.cmd ":cope")))}))
+ (set
+ last_job
+ {: cmd
+ : id})))
(vim.api.nvim_create_user_command
:Compile
diff --git a/mut/neovim/fnl/conf/settings.fnl b/mut/neovim/fnl/conf/settings.fnl
index f7b52a6..e670010 100644
--- a/mut/neovim/fnl/conf/settings.fnl
+++ b/mut/neovim/fnl/conf/settings.fnl
@@ -44,7 +44,7 @@
splitbelow on
magic on
showbreak "+++"
- listchars {:eol "󰁂"}
+ ; listchars {:eol "󰁂"}
list on
autoread on
autoindent on
diff --git a/profiles/core/configuration.nix b/profiles/core/configuration.nix
index 211522d..545d7fa 100644
--- a/profiles/core/configuration.nix
+++ b/profiles/core/configuration.nix
@@ -7,7 +7,16 @@
isNormalUser = true;
extraGroups = ["wheel" "networkmanager" "docker" "transmission"];
};
-
+ security = {
+ sudo = {
+ wheelNeedsPassword = false;
+ extraConfig = ''
+ Defaults env_keep+="EDITOR"
+ Defaults env_keep+="SSH_CONNECTION SSH_CLIENT SSH_TTY"
+ Defaults env_keep+="http_proxy https_proxy"
+ '';
+ };
+ };
environment.systemPackages = with pkgs; [
man-pages
man-pages-posix
diff --git a/profiles/core/neovim.nix b/profiles/core/neovim.nix
index 5cca7f0..b1aaff7 100644
--- a/profiles/core/neovim.nix
+++ b/profiles/core/neovim.nix
@@ -25,6 +25,11 @@
};
};
+ home.packages = with pkgs; [
+ neovide
+ ripgrep
+ ];
+
programs.neovim = {
enable = true;
package = pkgs.neovim-unwrapped;