feat: make neovim config from scratch
This commit is contained in:
parent
e00412252a
commit
ce6e287ca6
10 changed files with 132 additions and 3 deletions
|
@ -4,7 +4,7 @@ while true
|
||||||
do
|
do
|
||||||
while killall -0 .blueman-manage > /dev/null 2>&1
|
while killall -0 .blueman-manage > /dev/null 2>&1
|
||||||
do
|
do
|
||||||
if [[ $(bluetoothctl show | grep Powered | grep yes) ]]; then
|
if bluetoothctl show | grep Powered | grep -q yes; then
|
||||||
if [[ $(hyprctl activewindow | grep blueman-manager) == "" && $(hyprctl clients | grep blueman-manager) != "" ]]; then
|
if [[ $(hyprctl activewindow | grep blueman-manager) == "" && $(hyprctl clients | grep blueman-manager) != "" ]]; then
|
||||||
killall .blueman-manage
|
killall .blueman-manage
|
||||||
break
|
break
|
||||||
|
|
|
@ -157,7 +157,6 @@
|
||||||
rsync
|
rsync
|
||||||
killall
|
killall
|
||||||
ripgrep-all
|
ripgrep-all
|
||||||
neovim # TODO: use nix
|
|
||||||
imagemagick
|
imagemagick
|
||||||
usbutils
|
usbutils
|
||||||
evtest
|
evtest
|
||||||
|
|
8
nixos/home/.nvim/base.vim
Normal file
8
nixos/home/.nvim/base.vim
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
" make tabs only 2 spaces
|
||||||
|
set tabstop=2
|
||||||
|
set shiftwidth=2
|
||||||
|
set expandtab
|
||||||
|
set smartindent
|
||||||
|
|
||||||
|
set number
|
||||||
|
set relativenumber
|
2
nixos/home/.nvim/config.lua
Normal file
2
nixos/home/.nvim/config.lua
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
vim.opt.fillchars = {eob = " "}
|
||||||
|
vim.cmd[[colorscheme dracula]]
|
3
nixos/home/.nvim/lsp.lua
Normal file
3
nixos/home/.nvim/lsp.lua
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
local lspconfig = require('lspconfig')
|
||||||
|
lspconfig.bashls.setup {}
|
||||||
|
lspconfig.nixd.setup {}
|
|
@ -27,6 +27,7 @@
|
||||||
./dotfiles.nix
|
./dotfiles.nix
|
||||||
./packages.nix
|
./packages.nix
|
||||||
./misc.nix
|
./misc.nix
|
||||||
|
./nvim.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
home.stateVersion = "23.05";
|
home.stateVersion = "23.05";
|
||||||
|
|
62
nixos/home/nvim.nix
Normal file
62
nixos/home/nvim.nix
Normal file
|
@ -0,0 +1,62 @@
|
||||||
|
# https://breuer.dev/blog/nixos-home-manager-neovim
|
||||||
|
{ config, pkgs, lib, ... }:
|
||||||
|
let
|
||||||
|
# installs a vim plugin from git with a given tag / branch
|
||||||
|
pluginGit = ref: repo: pkgs.vimUtils.buildVimPluginFrom2Nix {
|
||||||
|
pname = "${lib.strings.sanitizeDerivationName repo}";
|
||||||
|
version = ref;
|
||||||
|
src = builtins.fetchGit {
|
||||||
|
url = "https://github.com/${repo}.git";
|
||||||
|
ref = ref;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# always installs latest version
|
||||||
|
plugin = pluginGit "HEAD";
|
||||||
|
in {
|
||||||
|
programs.neovim = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.neovim-nightly;
|
||||||
|
|
||||||
|
# read in the vim config from filesystem
|
||||||
|
# this enables syntaxhighlighting when editing those
|
||||||
|
extraConfig = builtins.concatStringsSep "\n" [
|
||||||
|
(lib.strings.fileContents ./.nvim/base.vim)
|
||||||
|
# (lib.strings.fileContents ./.nvim/plugins.vim)
|
||||||
|
# (lib.strings.fileContents ./.nvim/lsp.vim)
|
||||||
|
''
|
||||||
|
lua << EOF
|
||||||
|
${lib.strings.fileContents ./.nvim/config.lua}
|
||||||
|
${lib.strings.fileContents ./.nvim/lsp.lua}
|
||||||
|
EOF
|
||||||
|
''
|
||||||
|
];
|
||||||
|
|
||||||
|
extraPackages = with pkgs; [
|
||||||
|
# used to compile tree-sitter grammar
|
||||||
|
tree-sitter
|
||||||
|
|
||||||
|
# https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md
|
||||||
|
nodePackages.bash-language-server
|
||||||
|
shellcheck
|
||||||
|
nixd
|
||||||
|
];
|
||||||
|
plugins = with pkgs.vimPlugins; [
|
||||||
|
# you can use plugins from the pkgs
|
||||||
|
vim-which-key
|
||||||
|
clangd_extensions-nvim
|
||||||
|
|
||||||
|
nvim-treesitter.withAllGrammars
|
||||||
|
nvim-treesitter
|
||||||
|
|
||||||
|
# or you can use our function to directly fetch plugins from git
|
||||||
|
(plugin "hrsh7th/nvim-cmp") # completion
|
||||||
|
(plugin "neovim/nvim-lspconfig")
|
||||||
|
(plugin "Mofiqul/dracula.nvim")
|
||||||
|
(plugin "nvim-neo-tree/neo-tree.nvim")
|
||||||
|
|
||||||
|
# this installs the plugin from 'lua' branch
|
||||||
|
(plugin "lukas-reineke/indent-blankline.nvim")
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
|
@ -124,7 +124,6 @@
|
||||||
grim
|
grim
|
||||||
slurp
|
slurp
|
||||||
swappy
|
swappy
|
||||||
neovim
|
|
||||||
fontfor
|
fontfor
|
||||||
qt5ct
|
qt5ct
|
||||||
lxappearance
|
lxappearance
|
||||||
|
|
|
@ -16,5 +16,9 @@
|
||||||
(final: prev: {
|
(final: prev: {
|
||||||
dracula-plymouth = final.callPackage ./pkgs/dracula-plymouth.nix {};
|
dracula-plymouth = final.callPackage ./pkgs/dracula-plymouth.nix {};
|
||||||
})
|
})
|
||||||
|
|
||||||
|
(import (builtins.fetchTarball {
|
||||||
|
url = "https://github.com/nix-community/neovim-nightly-overlay/archive/master.tar.gz";
|
||||||
|
}))
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
51
nixos/overlays/pkgs/utterly-sddm.nix
Normal file
51
nixos/overlays/pkgs/utterly-sddm.nix
Normal file
|
@ -0,0 +1,51 @@
|
||||||
|
### test package
|
||||||
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, pkgs
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
|
||||||
|
wallpaper = fetchFromGitHub {
|
||||||
|
repo = "wallpaper";
|
||||||
|
owner = "dracula";
|
||||||
|
rev = "3bd5b95d4ae08d2adfb2931e090bb657fd9a6a4f";
|
||||||
|
hash = "sha256-3p7PCMZHIytkOH3BBUMqaYBFcrSef3YHthyJY6KDArg=";
|
||||||
|
};
|
||||||
|
|
||||||
|
in
|
||||||
|
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
name = "utterly-sddm";
|
||||||
|
version = "unstable-2022-11-06";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
repo = "Utterly-Sweet-Plasma";
|
||||||
|
owner = "HimDek";
|
||||||
|
rev = "4bb007e865d559de8dd43bbffb93778ea136f957";
|
||||||
|
hash = "sha256-oEyf6FI5XSjXPZjzBiGypwZY89ulhwAwk9QIJ3pMw/M=";
|
||||||
|
};
|
||||||
|
|
||||||
|
dontConfigure = true;
|
||||||
|
dontBuild = true;
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
rm ./sddm/background.jpg
|
||||||
|
cp ${wallpaper}/first-collection/nixos.png ./sddm/background.jpg
|
||||||
|
|
||||||
|
mkdir -p $out/share/sddm/themes/Utterly-Sweet
|
||||||
|
mv ./sddm/* $out/share/sddm/themes/Utterly-Sweet
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A dark theme for SDDM";
|
||||||
|
homepage = "https://github.com/dracula/gtk";
|
||||||
|
maintainers = with maintainers; [ matt1432 ];
|
||||||
|
platforms = platforms.all;
|
||||||
|
};
|
||||||
|
}
|
Loading…
Reference in a new issue