Made a few changes
This commit is contained in:
Matei Adriel
parent
c7b01d9b6d
commit
7cbe73ad5b
1
.gitattributes
vendored
1
.gitattributes
vendored
|
|
@ -1 +0,0 @@
|
|||
secrets.nix filter=git-crypt diff=git-crypt
|
||||
|
|
@ -65,7 +65,7 @@ in
|
|||
};
|
||||
|
||||
|
||||
system.stateVersion = "22.05";
|
||||
system.stateVersion = "19.03";
|
||||
|
||||
# TODO: put nixpkgs stuff inside their own file
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
|
||||
- [Textobjects](https://blog.carbonfive.com/vim-text-objects-the-definitive-guide/)
|
||||
- [Registers](https://www.brianstorti.com/vim-registers/)
|
||||
- [Markers](https://vim.fandom.com/wiki/Using_marks)
|
||||
|
||||
## Keybinds
|
||||
|
||||
|
|
@ -14,13 +15,15 @@ Table of my own keybinds. Here as documentation for myself. I am yet to include
|
|||
|
||||
| Keybind | Description | Plugins |
|
||||
| ------------ | ----------------------------------- | ------------------ |
|
||||
| vv | Create vertical split | |
|
||||
| _vs_ | Create vertical split | |
|
||||
| _cp_ | Use system clipboard | |
|
||||
| _jl_ | Save | |
|
||||
| _jk_ | Exit insert mode | |
|
||||
| _\<leader>k_ | Insert digraph | |
|
||||
| _\<leader>a_ | Swap last 2 used buffers | |
|
||||
| C-n | Open tree | nvim-tree |
|
||||
| _vc_ | Clear vimux window | vimux |
|
||||
| _vl_ | Rerun last vimux command | vimux |
|
||||
| _vp_ | Run command in another tmux pane | vimux |
|
||||
| C-hjkl | Navigation between vim & tmux panes | vim-tmux-navigator |
|
||||
| J | Show line diagnostics | lspconfig |
|
||||
|
|
@ -65,6 +68,13 @@ The default brackets I load in each buffer are (), [], "", '', {} and \`\`. Diff
|
|||
| _rh_ | Refine hole |
|
||||
| _ac_ | Add clause |
|
||||
|
||||
### Purescript
|
||||
|
||||
| Keybind | Description |
|
||||
| ------- | ------------------------------------------- |
|
||||
| _vb_ | Make tmux run spago build in sepearate pane |
|
||||
| _vt_ | Make tmux run spago test in separate pane |
|
||||
|
||||
### Lean
|
||||
|
||||
- Extra brackets: ⟨⟩
|
||||
|
|
|
|||
11
dotfiles/neovim/ftplugin/purescript.lua
Normal file
11
dotfiles/neovim/ftplugin/purescript.lua
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
local arpeggio = require("my.plugins.arpeggio")
|
||||
|
||||
-- Use vt to test
|
||||
arpeggio.chordSilent("n", "vt", ":VimuxRunCommand \"clear && spago test\"<CR>",
|
||||
{settings = "b"})
|
||||
|
||||
-- Use vb to build
|
||||
arpeggio.chordSilent("n", "vb", ":VimuxRunCommand \"clear && spago build\"<CR>",
|
||||
{settings = "b"})
|
||||
|
||||
vim.opt.expandtab = true -- Use spaces for the tab char
|
||||
|
|
@ -22,11 +22,11 @@ function M.mapSilent(mode, lhs, rhs, opts)
|
|||
end
|
||||
|
||||
function M.setup()
|
||||
M.map("n", "vv", "<C-w>v") -- Create vertical split
|
||||
M.map("n", "qq", ":wq<cr>") -- Create vertical split
|
||||
|
||||
if arpeggio ~= nil then
|
||||
-- Create chords
|
||||
if arpeggio ~= nil then
|
||||
arpeggio.chord("n", "vs", "<C-w>v") -- Create vertical split
|
||||
arpeggio.chord("n", "ji", ":w<cr>") -- Saving
|
||||
arpeggio.chord("i", "jk", "<Esc>") -- Remap Esc to jk
|
||||
arpeggio.chord("i", "<Leader>k", "<C-k><cr>") -- Rebind digraph insertion to leader+k
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
local au = require("my.helpers.augroup")
|
||||
local M = {}
|
||||
|
||||
local syntaxFiles = {bkf = "bkf"}
|
||||
local syntaxFiles = {hkf = "hkf"}
|
||||
|
||||
function M.setup()
|
||||
au.augroup("myfiledetection", function()
|
||||
|
|
|
|||
|
|
@ -36,7 +36,9 @@ function M.setup()
|
|||
"hrsh7th/nvim-cmp", -- completion engine
|
||||
"L3MON4D3/LuaSnip", -- snippeting engine
|
||||
"saadparwaiz1/cmp_luasnip", -- snippet support for cmp
|
||||
"wakatime/vim-wakatime" -- track time usage
|
||||
"wakatime/vim-wakatime", -- track time usage
|
||||
"vmchale/dhall-vim", -- dhall syntax highlighting
|
||||
"folke/which-key.nvim"
|
||||
}
|
||||
|
||||
for _, v in ipairs(themePackages) do
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ function M.setup()
|
|||
local luasnip = require("luasnip")
|
||||
|
||||
local options = {
|
||||
formatting = {format = lspkind.cmp_format()},
|
||||
formatting = {format = lspkind.cmp_format({mode = "symbol"})},
|
||||
snippet = {
|
||||
-- REQUIRED - you must specify a snippet engine
|
||||
expand = function(args)
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ function M.setup()
|
|||
require('nvim-autopairs').setup()
|
||||
require("startup").setup()
|
||||
require("presence"):setup({}) -- wtf does the : do here?
|
||||
-- require("which-key").setup()
|
||||
|
||||
-- Plugins with their own configs:
|
||||
require("my.plugins.vim-tmux-navigator").setup()
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ end
|
|||
-- General server config
|
||||
local servers = {
|
||||
tsserver = {on_attach = on_attach_typescript},
|
||||
dhall_lsp_server = {},
|
||||
sumneko_lua = {
|
||||
settings = {
|
||||
Lua = {
|
||||
|
|
|
|||
|
|
@ -12,7 +12,8 @@ function M.setup()
|
|||
lualine_b = {'branch', 'diff', 'diagnostics'},
|
||||
lualine_c = {'filename'},
|
||||
lualine_x = {},
|
||||
lualine_y = {'encoding', 'fileformat', 'filetype'},
|
||||
-- lualine_y = {'encoding', 'fileformat', 'filetype'},
|
||||
lualine_y = {'filetype'},
|
||||
lualine_z = {'location'}
|
||||
},
|
||||
-- Integration with other plugins
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@ local M = {}
|
|||
function M.setup()
|
||||
vim.g.tmux_navigator_no_mappings = 1
|
||||
|
||||
map("n", "C-h", ":TmuxNavigateLeft<cr>")
|
||||
map("n", "C-j", ":TmuxNavigateDown<cr>")
|
||||
map("n", "C-k", ":TmuxNavigateUp<cr>")
|
||||
map("n", "C-l", ":TmuxNavigateRight<cr>")
|
||||
map("n", "<C-h>", ":TmuxNavigateLeft<cr>")
|
||||
map("n", "<C-j>", ":TmuxNavigateDown<cr>")
|
||||
map("n", "<C-k>", ":TmuxNavigateUp<cr>")
|
||||
map("n", "<C-l>", ":TmuxNavigateRight<cr>")
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ local M = {}
|
|||
|
||||
function M.setup()
|
||||
arpeggio.chordSilent("n", "vp", ":VimuxPromptCommand<CR>")
|
||||
arpeggio.chordSilent("n", "vc", ":VimuxRunCommand \"clear\"<CR>")
|
||||
arpeggio.chordSilent("n", "vl", ":VimuxRunLastCommand<CR>")
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
# editors
|
||||
# vscodium
|
||||
vscode
|
||||
# vscode
|
||||
# vim
|
||||
# emacs
|
||||
vimclip # use neovim anywhere
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
# browsers
|
||||
unstable.google-chrome
|
||||
# brave
|
||||
firefox
|
||||
# firefox
|
||||
|
||||
# other stuff
|
||||
obsidian # knowedge base
|
||||
|
|
@ -67,7 +67,7 @@
|
|||
# blueman # bluetooth manager
|
||||
# freesweep # minesweeper I can play w the keyboard.
|
||||
# multimc
|
||||
lmms # music software
|
||||
# lmms # music software
|
||||
|
||||
# Nes emulators and stuff
|
||||
# zsnes
|
||||
|
|
@ -75,9 +75,9 @@
|
|||
# fceux
|
||||
|
||||
# games
|
||||
# tetrio-desktop
|
||||
vassal
|
||||
# mindustry
|
||||
# edopro
|
||||
# tetrio-desktop # competitive tetris
|
||||
# vassal # wargame engine
|
||||
# mindustry # factory building game
|
||||
# edopro # yugioh sim
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
shellInit = "";
|
||||
shellInit = "export GITHUB_TOKEN=$(cat ~/water/gh-token)";
|
||||
# "neofetch --package_managers on --cpu_brand on --cpu_cores on --memory_percent on --memory_display infobar --os_arch on";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,9 @@
|
|||
{ pkgs, ... }:
|
||||
with import ../../../secrets.nix;
|
||||
let
|
||||
theme = pkgs.myThemes.current;
|
||||
variables = {
|
||||
# Configure github cli
|
||||
GITHUB_USERNAME = "Mateiadrielrafael";
|
||||
inherit GITHUB_TOKEN;
|
||||
|
||||
# Sets neovim as default editor
|
||||
EDITOR = "nvim";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ pkgs, ... }:
|
||||
with import ../secrets.nix; {
|
||||
{
|
||||
# Disable asking for password for sudo
|
||||
security.sudo.extraRules = [
|
||||
{
|
||||
|
|
@ -14,8 +14,7 @@ with import ../secrets.nix; {
|
|||
users = {
|
||||
mutableUsers = false;
|
||||
users.adrielus = {
|
||||
inherit hashedPassword;
|
||||
|
||||
passwordFile = "~/water/pass";
|
||||
extraGroups = [ "wheel" "networkmanager" "lp" "docker" ];
|
||||
isNormalUser = true;
|
||||
shell = pkgs.fish;
|
||||
|
|
|
|||
5
secrets.nix
Normal file
5
secrets.nix
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
hashedPassword =
|
||||
"$6$BRf2CtFq$xFyfiUjXpSLZSlbgmygv5JVxqiDy0U1Kn12lr3hTO07iHivu70kdASHm4Gg4EyVjNDMMJi8NlsEEH9HNtV9rA1";
|
||||
GITHUB_TOKEN = "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";
|
||||
}
|
||||
Loading…
Reference in a new issue