Skip to content

Commit

Permalink
bump neovim
Browse files Browse the repository at this point in the history
  • Loading branch information
@ksevelyar
ksevelyar committed May 28, 2023
1 parent 545e79d commit 7c04969
Show file tree
Hide file tree
Showing 15 changed files with 135 additions and 75 deletions.
30 changes: 7 additions & 23 deletions flake.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion hardware/bios.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
efiSupport = false;
device = lib.mkDefault "/dev/sda"; # MBR/BIOS

version = 2;
backgroundColor = "#21202D";
configurationLimit = 30;

Expand Down
1 change: 0 additions & 1 deletion hardware/efi.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
efiSupport = true;
device = "nodev";

version = 2;
backgroundColor = "#21202D";
configurationLimit = 30;

Expand Down
4 changes: 2 additions & 2 deletions hosts/bubaleh.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ args@{ config, lib, pkgs, ... }:
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
boot.cleanTmpDir = true;
boot.tmpOnTmpfs = true;
boot.tmp.cleanOnBoot = true;
boot.tmp.useTmpfs = true;

fileSystems."/" = {
device = "/dev/disk/by-label/nixos";
Expand Down
4 changes: 2 additions & 2 deletions hosts/catch-22.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ args@{ config, lib, pkgs, ... }:

boot.loader.grub.splashImage = ../assets/wallpapers/akira.png;
boot.loader.grub.splashMode = "stretch";
boot.cleanTmpDir = true;
boot.tmpOnTmpfs = true;
boot.tmp.cleanOnBoot = true;
boot.tmp.useTmpfs = true;
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
Expand Down
4 changes: 2 additions & 2 deletions hosts/cyberdemon.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
../services/vpn.nix
];

boot.cleanTmpDir = true;
boot.tmpOnTmpfs = true;
boot.tmp.cleanOnBoot = true;
boot.tmp.useTmpfs = true;
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
Expand Down
4 changes: 2 additions & 2 deletions hosts/hk47.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ args@{ config, lib, pkgs, ... }:
boot.loader.grub.splashMode = "stretch";
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.cleanTmpDir = true;
boot.tmpOnTmpfs = true;
boot.tmp.cleanOnBoot = true;
boot.tmp.useTmpfs = true;
boot.initrd.luks.devices = {
nixos = {
device = "/dev/disk/by-label/enc-nixos";
Expand Down
4 changes: 2 additions & 2 deletions hosts/pepes.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@
boot.loader.grub.splashImage = lib.mkForce ../assets/wallpapers/akira.png;
boot.loader.grub.splashMode = "stretch";
boot.loader.grub.backgroundColor = lib.mkForce "#09090B";
boot.cleanTmpDir = true;
boot.tmpOnTmpfs = true;
boot.tmp.cleanOnBoot = true;
boot.tmp.useTmpfs = true;
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ "dm-snapshot" ];
boot.kernelModules = [ "kvm-amd" "amdgpu" ];
Expand Down
4 changes: 2 additions & 2 deletions hosts/prism.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@
boot.loader.grub.splashImage = ../assets/wallpapers/fractal.png;
boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod" "sdhci_pci" ];
boot.initrd.kernelModules = [ "dm-snapshot" ];
boot.cleanTmpDir = true;
boot.tmpOnTmpfs = true;
boot.tmp.cleanOnBoot = true;
boot.tmp.useTmpfs = true;
boot.kernelModules = [ "kvm-intel" ];

# vpn
Expand Down
4 changes: 2 additions & 2 deletions hosts/skynet.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@
# Intel Atom D2700 (F10 for boot menu)
# DDR2 4GB
boot.loader.grub.splashImage = lib.mkForce ../assets/wallpapers/fractal.png;
boot.cleanTmpDir = true;
boot.tmpOnTmpfs = true;
boot.tmp.cleanOnBoot = true;
boot.tmp.useTmpfs = true;
boot.kernelModules = [ "kvm-intel" "tcp_bbr" ];
boot.kernelPackages = pkgs.linuxPackages_hardened;
boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "xhci_pci" "usb_storage" "usbhid" "sd_mod" ];
Expand Down
4 changes: 2 additions & 2 deletions hosts/sobanya.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ args@{ config, lib, pkgs, ... }:
boot.loader.grub.splashMode = "stretch";
boot.blacklistedKernelModules = [ ];
boot.initrd.kernelModules = [ "dm-snapshot" ];
boot.cleanTmpDir = true;
boot.tmpOnTmpfs = true;
boot.tmp.cleanOnBoot = true;
boot.tmp.useTmpfs = true;
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" ];
boot.kernelModules = [ "kvm-intel" "wl" ];
boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
Expand Down
4 changes: 2 additions & 2 deletions hosts/tv.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ args@{ config, lib, pkgs, ... }:
boot.loader.grub.splashMode = "stretch";
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
boot.extraModulePackages = [ config.boot.kernelPackages.rtl88x2bu ]; # tp-link archer t3u
boot.cleanTmpDir = true;
boot.tmpOnTmpfs = true;
boot.tmp.cleanOnBoot = true;
boot.tmp.useTmpfs = true;
boot.initrd.luks.devices = {
nixos = {
device = "/dev/disk/by-label/enc-nixos";
Expand Down
10 changes: 5 additions & 5 deletions services/net/sshd.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
services.openssh = {
enable = true;
ports = [ 9922 ];
};

services.openssh.settings = {
permitRootLogin = "no";
passwordAuthentication = false; # temporarily override in your host config in order to use ssh-copy-id
extraConfig = ''
permitRootLogin = no
# temporarily override in your host config in order to use ssh-copy-id
passwordAuthentication = no
'';
};
}
11 changes: 5 additions & 6 deletions sys/debug.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@
systemd.services.sshd.wantedBy = lib.mkOverride 40 [ "multi-user.target" ];

services.openssh = {
enable = lib.mkForce true;
};

services.openssh.settings = {
permitRootLogin = lib.mkForce "yes";
passwordAuthentication = lib.mkForce true;
enable = true;
extraConfig = ''
permitRootLogin = yes
passwordAuthentication = yes
'';
};
}
121 changes: 100 additions & 21 deletions users/shared/nvim/lua/config.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ local on_attach = function(_, bufnr)
vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, bufopts)
vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
vim.keymap.set('n', '<space>=', vim.lsp.buf.formatting, bufopts)
vim.keymap.set('n', '<space>=', function()
vim.lsp.buf.format { async = true }
end, opts)
end

lspconfig.rust_analyzer.setup{
Expand Down Expand Up @@ -115,34 +117,111 @@ require'lualine'.setup {
}

-- # nvim-tree
local tree_cb = require'nvim-tree.config'.nvim_tree_callback
local list = {
{key = {"<CR>", "o", "<2-LeftMouse>"}, cb = tree_cb("edit")}, {key = {"g"}, cb = tree_cb("cd")},
{key = "<C-v>", cb = tree_cb("vsplit")}, {key = "<C-x>", cb = tree_cb("split")},
{key = "<C-t>", cb = tree_cb("tabnew")}, {key = "<", cb = tree_cb("prev_sibling")},
{key = ">", cb = tree_cb("next_sibling")}, {key = "P", cb = tree_cb("parent_node")},
{key = "<BS>", cb = tree_cb("close_node")}, {key = "<Tab>", cb = tree_cb("preview")},
{key = "K", cb = tree_cb("first_sibling")}, {key = "J", cb = tree_cb("last_sibling")},
{key = "I", cb = tree_cb("toggle_ignored")}, {key = "H", cb = tree_cb("toggle_dotfiles")},
{key = "R", cb = tree_cb("refresh")}, {key = "a", cb = tree_cb("create")},
{key = "d", cb = tree_cb("remove")}, {key = "D", cb = tree_cb("trash")},
{key = "r", cb = tree_cb("rename")}, {key = "<C-r>", cb = tree_cb("full_rename")},
{key = "x", cb = tree_cb("cut")}, {key = "c", cb = tree_cb("copy")},
{key = "p", cb = tree_cb("paste")}, {key = "y", cb = tree_cb("copy_name")},
{key = "Y", cb = tree_cb("copy_path")}, {key = "<Space>y", cb = tree_cb("copy_absolute_path")},
{key = "[c", cb = tree_cb("prev_git_item")}, {key = "]c", cb = tree_cb("next_git_item")},
{key = "u", cb = tree_cb("dir_up")}, {key = "s", cb = tree_cb("system_open")},
{key = "q", cb = tree_cb("close")}, {key = "?", cb = tree_cb("toggle_help")}
}
local function on_nvim_tree_attach(bufnr)
local api = require('nvim-tree.api')

local function opts(desc)
return { desc = 'nvim-tree: ' .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true }
end

-- Default mappings. Feel free to modify or remove as you wish.
vim.keymap.set('n', '<C-]>', api.tree.change_root_to_node, opts('CD'))
vim.keymap.set('n', '<C-e>', api.node.open.replace_tree_buffer, opts('Open: In Place'))
vim.keymap.set('n', '<C-k>', api.node.show_info_popup, opts('Info'))
vim.keymap.set('n', '<C-r>', api.fs.rename_sub, opts('Rename: Omit Filename'))
vim.keymap.set('n', '<C-t>', api.node.open.tab, opts('Open: New Tab'))
vim.keymap.set('n', '<C-v>', api.node.open.vertical, opts('Open: Vertical Split'))
vim.keymap.set('n', '<C-x>', api.node.open.horizontal, opts('Open: Horizontal Split'))
vim.keymap.set('n', '<BS>', api.node.navigate.parent_close, opts('Close Directory'))
vim.keymap.set('n', '<CR>', api.node.open.edit, opts('Open'))
vim.keymap.set('n', '<Tab>', api.node.open.preview, opts('Open Preview'))
vim.keymap.set('n', '>', api.node.navigate.sibling.next, opts('Next Sibling'))
vim.keymap.set('n', '<', api.node.navigate.sibling.prev, opts('Previous Sibling'))
vim.keymap.set('n', '.', api.node.run.cmd, opts('Run Command'))
vim.keymap.set('n', '-', api.tree.change_root_to_parent, opts('Up'))
vim.keymap.set('n', 'a', api.fs.create, opts('Create'))
vim.keymap.set('n', 'bmv', api.marks.bulk.move, opts('Move Bookmarked'))
vim.keymap.set('n', 'B', api.tree.toggle_no_buffer_filter, opts('Toggle No Buffer'))
vim.keymap.set('n', 'c', api.fs.copy.node, opts('Copy'))
vim.keymap.set('n', 'C', api.tree.toggle_git_clean_filter, opts('Toggle Git Clean'))
vim.keymap.set('n', '[c', api.node.navigate.git.prev, opts('Prev Git'))
vim.keymap.set('n', ']c', api.node.navigate.git.next, opts('Next Git'))
vim.keymap.set('n', 'd', api.fs.remove, opts('Delete'))
vim.keymap.set('n', 'D', api.fs.trash, opts('Trash'))
vim.keymap.set('n', 'E', api.tree.expand_all, opts('Expand All'))
vim.keymap.set('n', 'e', api.fs.rename_basename, opts('Rename: Basename'))
vim.keymap.set('n', ']e', api.node.navigate.diagnostics.next, opts('Next Diagnostic'))
vim.keymap.set('n', '[e', api.node.navigate.diagnostics.prev, opts('Prev Diagnostic'))
vim.keymap.set('n', 'F', api.live_filter.clear, opts('Clean Filter'))
vim.keymap.set('n', 'f', api.live_filter.start, opts('Filter'))
vim.keymap.set('n', 'g?', api.tree.toggle_help, opts('Help'))
vim.keymap.set('n', 'gy', api.fs.copy.absolute_path, opts('Copy Absolute Path'))
vim.keymap.set('n', 'H', api.tree.toggle_hidden_filter, opts('Toggle Dotfiles'))
vim.keymap.set('n', 'I', api.tree.toggle_gitignore_filter, opts('Toggle Git Ignore'))
vim.keymap.set('n', 'J', api.node.navigate.sibling.last, opts('Last Sibling'))
vim.keymap.set('n', 'K', api.node.navigate.sibling.first, opts('First Sibling'))
vim.keymap.set('n', 'm', api.marks.toggle, opts('Toggle Bookmark'))
vim.keymap.set('n', 'o', api.node.open.edit, opts('Open'))
vim.keymap.set('n', 'O', api.node.open.no_window_picker, opts('Open: No Window Picker'))
vim.keymap.set('n', 'p', api.fs.paste, opts('Paste'))
vim.keymap.set('n', 'P', api.node.navigate.parent, opts('Parent Directory'))
vim.keymap.set('n', 'q', api.tree.close, opts('Close'))
vim.keymap.set('n', 'r', api.fs.rename, opts('Rename'))
vim.keymap.set('n', 'R', api.tree.reload, opts('Refresh'))
vim.keymap.set('n', 's', api.node.run.system, opts('Run System'))
vim.keymap.set('n', 'S', api.tree.search_node, opts('Search'))
vim.keymap.set('n', 'U', api.tree.toggle_custom_filter, opts('Toggle Hidden'))
vim.keymap.set('n', 'W', api.tree.collapse_all, opts('Collapse'))
vim.keymap.set('n', 'x', api.fs.cut, opts('Cut'))
vim.keymap.set('n', 'y', api.fs.copy.filename, opts('Copy Name'))
vim.keymap.set('n', 'Y', api.fs.copy.relative_path, opts('Copy Relative Path'))
vim.keymap.set('n', '<2-LeftMouse>', api.node.open.edit, opts('Open'))
vim.keymap.set('n', '<2-RightMouse>', api.tree.change_root_to_node, opts('CD'))

-- Mappings migrated from view.mappings.list
vim.keymap.set('n', '<CR>', api.node.open.edit, opts('Open'))
vim.keymap.set('n', 'o', api.node.open.edit, opts('Open'))
vim.keymap.set('n', '<2-LeftMouse>', api.node.open.edit, opts('Open'))
vim.keymap.set('n', 'g', api.tree.change_root_to_node, opts('CD'))
vim.keymap.set('n', '<C-v>', api.node.open.vertical, opts('Open: Vertical Split'))
vim.keymap.set('n', '<C-x>', api.node.open.horizontal, opts('Open: Horizontal Split'))
vim.keymap.set('n', '<C-t>', api.node.open.tab, opts('Open: New Tab'))
vim.keymap.set('n', '<', api.node.navigate.sibling.prev, opts('Previous Sibling'))
vim.keymap.set('n', '>', api.node.navigate.sibling.next, opts('Next Sibling'))
vim.keymap.set('n', 'P', api.node.navigate.parent, opts('Parent Directory'))
vim.keymap.set('n', '<BS>', api.node.navigate.parent_close, opts('Close Directory'))
vim.keymap.set('n', '<Tab>', api.node.open.preview, opts('Open Preview'))
vim.keymap.set('n', 'K', api.node.navigate.sibling.first, opts('First Sibling'))
vim.keymap.set('n', 'J', api.node.navigate.sibling.last, opts('Last Sibling'))
vim.keymap.set('n', 'H', api.tree.toggle_hidden_filter, opts('Toggle Dotfiles'))
vim.keymap.set('n', 'R', api.tree.reload, opts('Refresh'))
vim.keymap.set('n', 'a', api.fs.create, opts('Create'))
vim.keymap.set('n', 'd', api.fs.remove, opts('Delete'))
vim.keymap.set('n', 'D', api.fs.trash, opts('Trash'))
vim.keymap.set('n', 'r', api.fs.rename, opts('Rename'))
vim.keymap.set('n', '<C-r>', api.fs.rename_sub, opts('Rename: Omit Filename'))
vim.keymap.set('n', 'x', api.fs.cut, opts('Cut'))
vim.keymap.set('n', 'c', api.fs.copy.node, opts('Copy'))
vim.keymap.set('n', 'p', api.fs.paste, opts('Paste'))
vim.keymap.set('n', 'y', api.fs.copy.filename, opts('Copy Name'))
vim.keymap.set('n', 'Y', api.fs.copy.relative_path, opts('Copy Relative Path'))
vim.keymap.set('n', '<Space>y', api.fs.copy.absolute_path, opts('Copy Absolute Path'))
vim.keymap.set('n', '[c', api.node.navigate.git.prev, opts('Prev Git'))
vim.keymap.set('n', ']c', api.node.navigate.git.next, opts('Next Git'))
vim.keymap.set('n', 'u', api.tree.change_root_to_parent, opts('Up'))
vim.keymap.set('n', 's', api.node.run.system, opts('Run System'))
vim.keymap.set('n', 'q', api.tree.close, opts('Close'))
vim.keymap.set('n', '?', api.tree.toggle_help, opts('Help'))
end

require'nvim-tree'.setup {
on_attach = on_nvim_tree_attach,
view = {
hide_root_folder = false,
side = 'left',
number = false,
relativenumber = false,
signcolumn = "yes",
mappings = {custom_only = false, list = list}
},
renderer = {
icons = {show = {file = false, folder = true, folder_arrow = false, git = true}}
Expand Down

0 comments on commit 7c04969

Please sign in to comment.