Compare commits
29 Commits
lunarvim
...
2b021cc0a4
Author | SHA1 | Date | |
---|---|---|---|
2b021cc0a4
|
|||
93ac4b1185
|
|||
544c511341
|
|||
bffc9ba70d
|
|||
8b10d9d2d9
|
|||
1d8e43c06b
|
|||
0be5b217b0
|
|||
dd4455eafe
|
|||
310956acad
|
|||
c4e97e81c5
|
|||
f957ea84e8
|
|||
44369bfa89
|
|||
f193aab3d7
|
|||
e7078d2aac
|
|||
00bfff1dec
|
|||
8adb4f4089
|
|||
8763a70bac
|
|||
87de19d6ae
|
|||
0b021819d3
|
|||
f2cbd869de
|
|||
661c148504
|
|||
2cea68ce91
|
|||
4839356310
|
|||
9a48913133
|
|||
80d5f09640
|
|||
d291a97ccd
|
|||
5d3a4606fe
|
|||
def3fbca47
|
|||
da17da719f
|
56
flake.lock
generated
56
flake.lock
generated
@ -50,11 +50,11 @@
|
||||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1708091384,
|
||||
"narHash": "sha256-dTGGw2y8wvfjr+J9CjQbfdulOq72hUG17HXVNxpH1yE=",
|
||||
"lastModified": 1711733382,
|
||||
"narHash": "sha256-XuKlYhc9Hk6jMIIwWTP6CTQVUWi0Sq3nJApnUJk6bu8=",
|
||||
"owner": "serokell",
|
||||
"repo": "deploy-rs",
|
||||
"rev": "0a0187794ac7f7a1e62cda3dabf8dc041f868790",
|
||||
"rev": "2bad21828ee2c5d1e42588d5f4c53f5b10300c6a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -70,11 +70,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709439398,
|
||||
"narHash": "sha256-MW0zp3ta7SvdpjvhVCbtP20ewRwQZX2vRFn14gTc4Kg=",
|
||||
"lastModified": 1711588700,
|
||||
"narHash": "sha256-vBB5HoQVnA6c/UrDOhLXKAahEwSRccw2YXYHxD7qoi4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "1f76b318aa11170c8ca8c225a9b4c458a5fcbb57",
|
||||
"rev": "502241afa3de2a24865ddcbe4c122f4546e32092",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -86,11 +86,11 @@
|
||||
"firefox-gnome-theme": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1708965002,
|
||||
"narHash": "sha256-gIBZCPB0sA8Gagrxd8w4+y9uUkWBnXJBmq9Ur5BYTQU=",
|
||||
"lastModified": 1711290399,
|
||||
"narHash": "sha256-e1xuHAHgeC8EU7cAIa3XfvzgI4Y7rzyTkAt9sBsgrfc=",
|
||||
"owner": "rafaelmardojai",
|
||||
"repo": "firefox-gnome-theme",
|
||||
"rev": "4e966509c180f93ba8665cd73cad8456bf44baab",
|
||||
"rev": "33015314c12190230295cff61ced148e0f7ffe1c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -143,11 +143,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1706981411,
|
||||
"narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
|
||||
"lastModified": 1710888565,
|
||||
"narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "652fda4ca6dafeb090943422c34ae9145787af37",
|
||||
"rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -159,11 +159,11 @@
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1709410583,
|
||||
"narHash": "sha256-esOSUoQ7mblwcsSea0K17McZuwAIjoS6dq/4b83+lvw=",
|
||||
"lastModified": 1711352745,
|
||||
"narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "59e37017b9ed31dee303dbbd4531c594df95cfbc",
|
||||
"rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -190,11 +190,11 @@
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1709237383,
|
||||
"narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
|
||||
"lastModified": 1711703276,
|
||||
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
|
||||
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -221,11 +221,11 @@
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1709309926,
|
||||
"narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=",
|
||||
"lastModified": 1711668574,
|
||||
"narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "79baff8812a0d68e24a836df0a364c678089e2c7",
|
||||
"rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -251,11 +251,11 @@
|
||||
"secrets": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1709495020,
|
||||
"narHash": "sha256-eiz0qUjUbdeb6m28XPY7OVnrGMZ45JiT2dZZ0Bmq2X0=",
|
||||
"lastModified": 1711910722,
|
||||
"narHash": "sha256-QrXfLiCYVQXD18rkmrJPTJYhjoP+DsDhJlPRtWIEg/o=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "d135b4d6d5f0079999188895f8b5f35e821b0d4b",
|
||||
"revCount": 14,
|
||||
"rev": "b64a65c725e4cb63811fca53b60073d4c47802e4",
|
||||
"revCount": 15,
|
||||
"type": "git",
|
||||
"url": "ssh://git@git.vimium.com/jordan/nix-secrets.git"
|
||||
},
|
||||
@ -297,11 +297,11 @@
|
||||
"thunderbird-gnome-theme": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1701889124,
|
||||
"narHash": "sha256-K+6oh7+J6RDBFkxphY/pzf0B+q5+IY54ZMKZrFSKXlc=",
|
||||
"lastModified": 1710774977,
|
||||
"narHash": "sha256-nQBz2PW3YF3+RTflPzDoAcs6vH1PTozESIYUGAwvSdA=",
|
||||
"owner": "rafaelmardojai",
|
||||
"repo": "thunderbird-gnome-theme",
|
||||
"rev": "966e9dd54bd2ce9d36d51cd6af8c3bac7a764a68",
|
||||
"rev": "65d5c03fc9172d549a3ea72fd366d544981a002b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -36,7 +36,6 @@
|
||||
};
|
||||
editors = {
|
||||
neovim.enable = true;
|
||||
vscode.enable = true;
|
||||
};
|
||||
security = {
|
||||
gpg.enable = true;
|
||||
|
@ -49,6 +49,7 @@
|
||||
max-free = 1000000000;
|
||||
fallback = true;
|
||||
allowed-users = [ "@wheel" ];
|
||||
trusted-users = [ "@wheel" ];
|
||||
auto-optimise-store = true;
|
||||
substituters = [
|
||||
"http://odyssey.mesh.vimium.net"
|
||||
|
@ -70,7 +70,6 @@
|
||||
};
|
||||
editors = {
|
||||
neovim.enable = true;
|
||||
vscode.enable = true;
|
||||
};
|
||||
hardware.presonus-studio.enable = true;
|
||||
security = {
|
||||
|
@ -62,6 +62,7 @@
|
||||
headscale.enable = true;
|
||||
matrix-synapse.enable = true;
|
||||
nginx.enable = true;
|
||||
photoprism.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -36,6 +36,7 @@
|
||||
./services/headscale
|
||||
./services/matrix-synapse
|
||||
./services/nginx
|
||||
./services/photoprism
|
||||
./shell/git
|
||||
./shell/zsh
|
||||
];
|
||||
|
@ -54,11 +54,11 @@ in {
|
||||
};
|
||||
|
||||
config = {
|
||||
user.packages = with pkgs.unstable; [
|
||||
user.packages = with pkgs; [
|
||||
(lib.mkIf cfg.ps1.enable duckstation)
|
||||
(lib.mkIf cfg.ps2.enable pcsx2)
|
||||
(lib.mkIf cfg.ps2.enable unstable.pcsx2)
|
||||
(lib.mkIf cfg.ps3.enable rpcs3)
|
||||
(lib.mkIf cfg.psp.enable ppsspp)
|
||||
(lib.mkIf cfg.psp.enable unstable.ppsspp)
|
||||
(lib.mkIf cfg.ds.enable desmume)
|
||||
(lib.mkIf (cfg.gba.enable ||
|
||||
cfg.gb.enable ||
|
||||
@ -68,7 +68,7 @@ in {
|
||||
(lib.mkIf (cfg.wii.enable ||
|
||||
cfg.gamecube.enable)
|
||||
dolphin-emu)
|
||||
(lib.mkIf cfg.xbox.enable xemu)
|
||||
(lib.mkIf cfg.xbox.enable unstable.xemu)
|
||||
];
|
||||
};
|
||||
}
|
||||
|
@ -135,6 +135,8 @@ in {
|
||||
};
|
||||
"org/gnome/Console" = {
|
||||
font-scale = 1.4;
|
||||
use-system-font = false;
|
||||
custom-font = "ComicShannsMono Nerd Font 10";
|
||||
};
|
||||
"org/gnome/mutter" = {
|
||||
center-new-windows = true;
|
||||
@ -144,7 +146,7 @@ in {
|
||||
"org/gnome/desktop/interface" = {
|
||||
color-scheme = "prefer-dark";
|
||||
enable-hot-corners = false;
|
||||
monospace-font-name = "Ubuntu Mono 11";
|
||||
monospace-font-name = "UbuntuMono Nerd Font 11";
|
||||
};
|
||||
"org/gnome/desktop/wm/keybindings" = {
|
||||
switch-group = [ "<Super>grave" ];
|
||||
@ -157,28 +159,28 @@ in {
|
||||
|
||||
fonts.packages = with pkgs; [
|
||||
noto-fonts
|
||||
ubuntu_font_family
|
||||
(nerdfonts.override { fonts = [ "BigBlueTerminal" "ComicShannsMono" "UbuntuMono" ]; })
|
||||
];
|
||||
|
||||
user.packages = with pkgs; [
|
||||
authenticator
|
||||
bottles
|
||||
bustle
|
||||
# bottles
|
||||
# bustle
|
||||
celluloid
|
||||
d-spy
|
||||
drawing
|
||||
fragments
|
||||
# d-spy
|
||||
# drawing
|
||||
# fragments
|
||||
gnome.ghex
|
||||
# gnome-builder
|
||||
gnome-decoder
|
||||
gnome-firmware
|
||||
gnome-frog
|
||||
gnome-obfuscate
|
||||
# gnome-obfuscate
|
||||
gnome-podcasts
|
||||
identity
|
||||
mission-center
|
||||
newsflash
|
||||
schemes
|
||||
# schemes
|
||||
shortwave
|
||||
];
|
||||
|
||||
|
@ -2,7 +2,6 @@
|
||||
|
||||
let
|
||||
cfg = config.modules.editors.neovim;
|
||||
dev = config.modules.dev;
|
||||
in {
|
||||
options.modules.editors.neovim = {
|
||||
enable = lib.mkOption {
|
||||
@ -12,124 +11,15 @@ in {
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
user.packages = with pkgs; [
|
||||
(neovim.override {
|
||||
configure = {
|
||||
customRC = ''
|
||||
luafile ~/.config/nvim/init.lua
|
||||
'';
|
||||
packages.myPlugins = with pkgs.vimPlugins; {
|
||||
start = [
|
||||
(nvim-treesitter.withPlugins (
|
||||
plugins: with plugins; [
|
||||
bash
|
||||
c
|
||||
cmake
|
||||
cpp
|
||||
css
|
||||
dockerfile
|
||||
elm
|
||||
glsl
|
||||
graphql
|
||||
haskell
|
||||
http
|
||||
html
|
||||
java
|
||||
javascript
|
||||
jsdoc
|
||||
json
|
||||
json5
|
||||
latex
|
||||
lua
|
||||
markdown
|
||||
ninja
|
||||
nix
|
||||
org
|
||||
perl
|
||||
php
|
||||
pug
|
||||
python
|
||||
regex
|
||||
rst
|
||||
ruby
|
||||
rust
|
||||
scala
|
||||
scss
|
||||
toml
|
||||
tsx
|
||||
typescript
|
||||
vim
|
||||
yaml
|
||||
zig
|
||||
]
|
||||
))
|
||||
nvim-treesitter-context
|
||||
nvim-treesitter-textobjects
|
||||
nvim-lspconfig
|
||||
];
|
||||
};
|
||||
};
|
||||
})
|
||||
] ++
|
||||
user.packages = with pkgs.unstable; [
|
||||
lunarvim
|
||||
];
|
||||
|
||||
# Install appropriate language servers
|
||||
(if dev.cc.enable then [
|
||||
ccls # C/C++
|
||||
] else []) ++
|
||||
(if dev.java.enable then [
|
||||
java-language-server # Java
|
||||
ltex-ls # LaTeX
|
||||
] else []) ++
|
||||
(if dev.lua.enable then [
|
||||
sumneko-lua-language-server # Lua
|
||||
] else []) ++
|
||||
(if dev.node.enable then [
|
||||
nodePackages.bash-language-server # Bash
|
||||
nodePackages.dockerfile-language-server-nodejs # Dockerfile
|
||||
nodePackages.graphql-language-service-cli # GraphQL
|
||||
nodePackages.purescript-language-server # PureScript
|
||||
nodePackages.svelte-language-server # Svelte
|
||||
nodePackages.typescript-language-server # JavaScript/TypeScript
|
||||
nodePackages.vim-language-server # Vim
|
||||
nodePackages.vscode-langservers-extracted # HTML, CSS, JSON, ESLint
|
||||
nodePackages.vue-language-server # Vue.js
|
||||
nodePackages.yaml-language-server # YAML
|
||||
] else []) ++
|
||||
(if dev.python.enable then [
|
||||
cmake-language-server # CMake
|
||||
python310Packages.python-lsp-server # Python
|
||||
] else []) ++
|
||||
(if dev.rust.enable then [
|
||||
rust-analyzer # Rust
|
||||
] else []) ++
|
||||
(if dev.scala.enable then [
|
||||
metals # Scala
|
||||
] else []) ++
|
||||
(if dev.zig.enable then [
|
||||
zls # Zig
|
||||
] else []);
|
||||
|
||||
home.configFile = {
|
||||
"nvim/init.lua".source = ./init.lua;
|
||||
"nvim/lua" = { source = ./lua; recursive = true; };
|
||||
"nvim/lua/config/lsp.lua".text = ''
|
||||
-- This file is autogenerated, do not edit.
|
||||
${if dev.cc.enable then "require('config.lsp.cc')\n" else ""}
|
||||
${if dev.java.enable then "require('config.lsp.java')\n" else ""}
|
||||
${if dev.lua.enable then "require('config.lsp.lua')\n" else ""}
|
||||
${if dev.node.enable then "require('config.lsp.node')\n" else ""}
|
||||
${if dev.python.enable then "require('config.lsp.python')\n" else ""}
|
||||
${if dev.rust.enable then "require('config.lsp.rust')\n" else ""}
|
||||
${if dev.scala.enable then "require('config.lsp.scala')\n" else ""}
|
||||
${if dev.zig.enable then "require('config.lsp.zig')\n" else ""}
|
||||
'';
|
||||
};
|
||||
|
||||
env.EDITOR = "nvim";
|
||||
env.EDITOR = "lvim";
|
||||
|
||||
environment.shellAliases = {
|
||||
vim = "nvim";
|
||||
v = "nvim";
|
||||
vim = "lvim";
|
||||
v = "lvim";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@ -1,6 +0,0 @@
|
||||
require("config.core")
|
||||
require("config.keymap")
|
||||
require("config.treesitter")
|
||||
require("config.plugins")
|
||||
require("config.lsp")
|
||||
|
@ -1,36 +0,0 @@
|
||||
local o = vim.opt
|
||||
local wo = vim.wo
|
||||
local bo = vim.bo
|
||||
|
||||
-- Global dirs
|
||||
local cachedir = os.getenv("XDG_CACHE_HOME")
|
||||
o.backupdir = cachedir .. "/nvim/backup/"
|
||||
o.directory = cachedir .. "/nvim/swap/"
|
||||
o.undodir = cachedir .. "/nvim/undo/"
|
||||
|
||||
-- Global
|
||||
o.breakindent = true
|
||||
o.clipboard = "unnamedplus"
|
||||
o.compatible = false
|
||||
o.encoding = "utf-8"
|
||||
o.expandtab = true
|
||||
o.foldlevel = 99
|
||||
o.hidden = true
|
||||
o.hlsearch = false
|
||||
o.ignorecase = true
|
||||
o.laststatus = 2
|
||||
o.listchars = { eol = '↲', tab = '▸ ', trail = '·' }
|
||||
o.relativenumber = true
|
||||
o.shiftwidth = 2
|
||||
o.showmode = false
|
||||
o.smartcase = true
|
||||
o.smarttab = true
|
||||
o.softtabstop = 2
|
||||
o.synmaxcol = 150
|
||||
o.tabstop = 4
|
||||
o.undofile = true
|
||||
o.wildmenu = true
|
||||
|
||||
-- Window
|
||||
|
||||
-- Buffer
|
@ -1,35 +0,0 @@
|
||||
local keymap = vim.keymap.set
|
||||
local opts = { noremap = true, silent = true }
|
||||
|
||||
vim.g.mapleader = ","
|
||||
|
||||
-- Modes
|
||||
-- Normal = "n",
|
||||
-- Insert = "i",
|
||||
-- Visual = "v",
|
||||
-- Visual Block = "x",
|
||||
-- Term = "t",
|
||||
-- Command = "c"
|
||||
|
||||
keymap("n", "<Left>", "<Nop>", opts)
|
||||
keymap("n", "<Right>", "<Nop>", opts)
|
||||
keymap("n", "<Up>", "<Nop>", opts)
|
||||
keymap("n", "<Down>", "<Nop>", opts)
|
||||
|
||||
keymap("n", "<C-h>", "<C-w>h", { noremap = true })
|
||||
keymap("n", "<C-j>", "<C-w>j", { noremap = true })
|
||||
keymap("n", "<C-k>", "<C-w>k", { noremap = true })
|
||||
keymap("n", "<C-l>", "<C-w>l", { noremap = true })
|
||||
|
||||
keymap("n", "gV", "`[v`]", opts)
|
||||
|
||||
keymap("n", ";", ":", { noremap = true })
|
||||
|
||||
-- Bubble single lines with vim-unimpaired
|
||||
keymap("n", "<C-Up>", "[e", opts)
|
||||
keymap("n", "<C-Down>", "]e", opts)
|
||||
|
||||
-- Bubble multiple lines with vim-unimpaired
|
||||
keymap("v", "<C-Up>", "[egv", opts)
|
||||
keymap("v", "<C-Down>", "]egv", opts)
|
||||
|
@ -1,5 +0,0 @@
|
||||
lspconfig = require('lspconfig')
|
||||
|
||||
-- Requires C/C++
|
||||
lspconfig.ccls.setup{}
|
||||
|
@ -1,6 +0,0 @@
|
||||
lspconfig = require('lspconfig')
|
||||
|
||||
-- Requires Java
|
||||
lspconfig.java_language_server.setup{}
|
||||
lspconfig.ltex.setup{}
|
||||
|
@ -1,22 +0,0 @@
|
||||
lspconfig = require('lspconfig')
|
||||
|
||||
-- Requires Lua
|
||||
lspconfig.sumneko_lua.setup {
|
||||
settings = {
|
||||
Lua = {
|
||||
runtime = {
|
||||
-- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
|
||||
version = 'LuaJIT',
|
||||
},
|
||||
diagnostics = {
|
||||
-- Get the language server to recognize the `vim` global
|
||||
globals = {'vim'},
|
||||
},
|
||||
-- Do not send telemetry data containing a randomized but unique identifier
|
||||
telemetry = {
|
||||
enable = false,
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
@ -1,17 +0,0 @@
|
||||
lspconfig = require('lspconfig')
|
||||
|
||||
-- Requires Node.js
|
||||
lspconfig.bashls.setup{}
|
||||
lspconfig.cssls.setup{}
|
||||
lspconfig.dockerls.setup{}
|
||||
lspconfig.eslint.setup{}
|
||||
lspconfig.graphql.setup{}
|
||||
lspconfig.html.setup{}
|
||||
lspconfig.jsonls.setup{}
|
||||
lspconfig.purescriptls.setup{}
|
||||
lspconfig.svelte.setup{}
|
||||
lspconfig.tsserver.setup{}
|
||||
lspconfig.vimls.setup{}
|
||||
lspconfig.vuels.setup{}
|
||||
lspconfig.yamlls.setup{}
|
||||
|
@ -1,6 +0,0 @@
|
||||
lspconfig = require('lspconfig')
|
||||
|
||||
-- Requires Python
|
||||
lspconfig.cmake.setup{}
|
||||
lspconfig.pylsp.setup{}
|
||||
|
@ -1,5 +0,0 @@
|
||||
lspconfig = require('lspconfig')
|
||||
|
||||
-- Requires Rust
|
||||
lspconfig.rls.setup{}
|
||||
|
@ -1,5 +0,0 @@
|
||||
lspconfig = require('lspconfig')
|
||||
|
||||
-- Requires Scala
|
||||
lspconfig.metals.setup{}
|
||||
|
@ -1,5 +0,0 @@
|
||||
lspconfig = require('lspconfig')
|
||||
|
||||
-- Requires Zig
|
||||
lspconfig.zls.setup{}
|
||||
|
@ -1,77 +0,0 @@
|
||||
local fn = vim.fn
|
||||
|
||||
local install_path = fn.stdpath "data" .. "/site/pack/packer/start/packer.nvim"
|
||||
if fn.empty(fn.glob(install_path)) > 0 then
|
||||
PACKER_BOOTSTRAP = fn.system {
|
||||
"git",
|
||||
"clone",
|
||||
"--depth",
|
||||
"1",
|
||||
"https://github.com/wbthomason/packer.nvim",
|
||||
install_path,
|
||||
}
|
||||
print "Installing packer close and reopen Neovim..."
|
||||
vim.cmd [[packadd packer.nvim]]
|
||||
end
|
||||
|
||||
vim.cmd [[
|
||||
augroup packer_user_config
|
||||
autocmd!
|
||||
autocmd BufWritePost plugins.lua source <afile> | PackerSync
|
||||
augroup end
|
||||
]]
|
||||
|
||||
local status_ok, packer = pcall(require, "packer")
|
||||
if not status_ok then
|
||||
return
|
||||
end
|
||||
|
||||
packer.init {
|
||||
display = {
|
||||
open_fn = function()
|
||||
return require("packer.util").float { border = "rounded" }
|
||||
end,
|
||||
},
|
||||
}
|
||||
|
||||
return packer.startup(function(use)
|
||||
-- Utilities
|
||||
use { "wbthomason/packer.nvim", opt = true }
|
||||
use { "mbbill/undotree" }
|
||||
use { "nvim-lua/plenary.nvim" }
|
||||
use { "tpope/vim-fugitive", event = "User InGitRepo" }
|
||||
|
||||
-- Editing
|
||||
use { "andymass/vim-matchup" }
|
||||
use { "godlygeek/tabular" }
|
||||
use { "JoosepAlviste/nvim-ts-context-commentstring" }
|
||||
use { "kana/vim-textobj-user" }
|
||||
use { "mg979/vim-visual-multi", branch = "master" }
|
||||
use { "p00f/nvim-ts-rainbow" }
|
||||
use { "terryma/vim-expand-region" }
|
||||
use { "tommcdo/vim-exchange", event = "VimEnter" }
|
||||
use { "tpope/vim-abolish" }
|
||||
use { "tpope/vim-commentary", event = "VimEnter" }
|
||||
use { "tpope/vim-repeat", event = "VimEnter" }
|
||||
use { "tpope/vim-surround", event = "VimEnter" }
|
||||
use { "windwp/nvim-autopairs" }
|
||||
use { "windwp/nvim-ts-autotag" }
|
||||
|
||||
-- UI
|
||||
use { "junegunn/goyo.vim" }
|
||||
use { "junegunn/limelight.vim" }
|
||||
use { "markonm/traces.vim" }
|
||||
|
||||
-- Searching
|
||||
use { "nvim-telescope/telescope.nvim", config = [[require('config.telescope')]] }
|
||||
use { "cljoly/telescope-repo.nvim", requires = "telescope.nvim" }
|
||||
use { "dyng/ctrlsf.vim" }
|
||||
|
||||
-- LSP
|
||||
use { "jose-elias-alvarez/null-ls.nvim" }
|
||||
|
||||
if PACKER_BOOTSTRAP then
|
||||
require("packer").sync()
|
||||
end
|
||||
end)
|
||||
|
@ -1,46 +0,0 @@
|
||||
local status_ok, telescope = pcall(require, "telescope")
|
||||
if not status_ok then
|
||||
return
|
||||
end
|
||||
|
||||
local actions = require("telescope.actions")
|
||||
|
||||
telescope.setup({
|
||||
defaults = {
|
||||
file_ignore_patterns = { ".git/", "node_modules" },
|
||||
},
|
||||
mappings = {
|
||||
i = {
|
||||
["<Down>"] = actions.cycle_history_next,
|
||||
["<Up>"] = actions.cycle_history_prev,
|
||||
["<C-j>"] = actions.move_selection_next,
|
||||
["<C-k>"] = actions.move_selection_previous,
|
||||
},
|
||||
},
|
||||
extensions = {
|
||||
repo = {
|
||||
list = {
|
||||
fd_opts = {
|
||||
"--no-ignore-vcs",
|
||||
},
|
||||
search_dirs = {
|
||||
"~/projects",
|
||||
"~/repos",
|
||||
"~/workspace",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
telescope.load_extension("repo")
|
||||
|
||||
local keymap = vim.keymap.set
|
||||
local opts = { noremap = true, silent = true }
|
||||
|
||||
keymap("n", "<Leader>ff", "<cmd>Telescope find_files<cr>", opts)
|
||||
keymap("n", "<Leader>fg", "<cmd>Telescope live_grep<cr>", opts)
|
||||
keymap("n", "<Leader>fb", "<cmd>Telescope buffers<cr>", opts)
|
||||
keymap("n", "<Leader>fh", "<cmd>Telescope help_tags<cr>", opts)
|
||||
keymap("n", "<Leader>fr", "<cmd>Telescope repo list<cr>", opts)
|
||||
|
@ -1,35 +0,0 @@
|
||||
require("nvim-treesitter.configs").setup({
|
||||
ignore_install = {},
|
||||
highlight = {
|
||||
enable = true,
|
||||
disable = {},
|
||||
},
|
||||
indent = { enable = true },
|
||||
incremental_selection = {
|
||||
enable = true,
|
||||
keymaps = {
|
||||
init_selection = "gnn",
|
||||
node_incremental = "grn",
|
||||
scope_incremental = "grc",
|
||||
node_decremental = "grm",
|
||||
},
|
||||
},
|
||||
-- Extensions
|
||||
autotag = { enable = true },
|
||||
context_commentstring = { enable = true },
|
||||
matchup = { enable = true },
|
||||
rainbow = { enable = true },
|
||||
textobjects = {
|
||||
select = {
|
||||
enable = true,
|
||||
keymaps = {
|
||||
["af"] = "@function.outer",
|
||||
["if"] = "@function.inner",
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
vim.opt.foldmethod = "expr"
|
||||
vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
|
||||
|
43
modules/services/photoprism/default.nix
Normal file
43
modules/services/photoprism/default.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{ config, lib, pkgs, inputs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let cfg = config.modules.services.photoprism;
|
||||
in {
|
||||
options.modules.services.photoprism = {
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
example = true;
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.nginx = {
|
||||
virtualHosts = {
|
||||
"gallery.vimium.com" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/".proxyPass = "http://localhost:${config.services.photoprism.port}";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
age.secrets."passwords/services/photoprism/admin" = {
|
||||
file = "${inputs.secrets}/passwords/services/photoprism/admin.age";
|
||||
};
|
||||
|
||||
services.photoprism = {
|
||||
enable = true;
|
||||
address = "localhost";
|
||||
passwordFile = config.age.secrets."passwords/services/photoprism/admin".path;
|
||||
settings = {
|
||||
PHOTOPRISM_APP_NAME = "Vimium Gallery";
|
||||
PHOTOPRISM_SITE_AUTHOR = "Vimium";
|
||||
PHOTOPRISM_SITE_TITLE = "Vimium Gallery";
|
||||
PHOTOPRISM_SITE_CAPTION = "See your photos and videos on gallery.vimium.com";
|
||||
PHOTOPRISM_DISABLE_TLS = true;
|
||||
PHOTOPRISM_SPONSOR = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
Reference in New Issue
Block a user