update nvim

This commit is contained in:
zack 2024-10-17 02:05:02 -04:00
parent 36cccf8207
commit 697b6eb97c
No known key found for this signature in database
GPG key ID: 5F873416BCF59F35
12 changed files with 87 additions and 37 deletions

View file

@ -59,7 +59,7 @@ in {
Description = "Aylur's Gtk Shell";
PartOf = [
"tray.target"
"graphical-session.target"
"hyprland-session.target"
];
};
Service = {
@ -67,7 +67,7 @@ in {
ExecStart = "${config.programs.ags.package}/bin/ags";
Restart = "on-failure";
};
Install.WantedBy = ["graphical-session.target"];
Install.WantedBy = ["hyprland-session.target"];
};
};
}

View file

@ -11,6 +11,7 @@
"lazyvim.plugins.extras.lang.docker",
"lazyvim.plugins.extras.lang.haskell",
"lazyvim.plugins.extras.lang.java",
"lazyvim.plugins.extras.lang.toml",
"lazyvim.plugins.extras.lang.json",
"lazyvim.plugins.extras.lang.markdown",
"lazyvim.plugins.extras.lang.nix",

View file

@ -1,3 +1,8 @@
-- Options are automatically loaded before lazy.nvim startup
-- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua
-- Add any additional options here
if vim.g.neovide then
-- Put anything you want to happen only in Neovide here
vim.o.guifont = "Iosevka,Noto_Color_Emoji:h14:b"
end

View file

@ -17,11 +17,14 @@ return {
})
end,
},
"direnv/direnv.vim",
{
"stevearc/conform.nvim",
opts = {
formatters_by_ft = {
nix = { "alejandra" },
typescript = { "prettierd" },
javascript = { "prettierd" },
},
},
},
@ -32,22 +35,25 @@ return {
-- optional: provides snippets for the snippet source
dependencies = "rafamadriz/friendly-snippets",
-- use a release tag to download pre-built binaries
version = "v0.*",
-- OR build from source, requires nightly: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust
-- build = 'cargo build --release',
build = "cargo build --release",
opts = {
keymap = {
show = "<C-S-space>",
accept = "<Enter>",
select_prev = { "<S-Tab>", "<C-j>" },
select_next = { "<C-Tab>", "<C-k>" },
select_prev = { "<S-Tab>", "<C-j>", "<C-p>" },
select_next = { "<C-Tab>", "<C-k>", "<C-n>" },
snippet_forward = "<Tab>",
snippet_backward = "<C-S-Tab>",
},
windows = {
documentation = {
auto_show = true,
},
},
highlight = {
-- sets the fallback highlight groups to nvim-cmp's highlight groups
-- useful for when your theme doesn't support blink.cmp

View file

@ -52,6 +52,8 @@ in {
# LSP
lua-language-server
nixd
(pkgs.rust-bin.selectLatestNightlyWith
(toolchain: toolchain.minimal))
rust-analyzer
vscode-langservers-extracted
nodePackages.vscode-json-languageserver

View file

@ -12,9 +12,9 @@ with lib.custom; let
cfg = config.wms.hyprland;
mkService = recursiveUpdate {
Unit.PartOf = ["graphical-session.target"];
Unit.After = ["graphical-session.target"];
Install.WantedBy = ["graphical-session.target"];
Unit.PartOf = ["hyprland-session.target"];
Unit.After = ["hyprland-session.target"];
Install.WantedBy = ["hyprland-session.target"];
};
mod = "SUPER";
@ -47,21 +47,20 @@ in {
enable = true;
xwayland.enable = true;
systemd = {
enable = true;
variables = ["--all"];
extraCommands = [
"systemctl --user stop graphical-session.target"
"systemctl --user start hyprland-session.target"
];
};
# systemd = {
# enable = true;
# enableXdgAutostart = true;
# variables = ["-all"];
# };
};
wayland.windowManager.hyprland.settings = with colors; {
exec-once = [
# "pw-loopback -C \"alsa_input.pci-0000_0d_00.4.analog-stereo\" -P \"Scarlett Solo (3rd Gen.) Headphones / Line 1-2\""
"sway-audio-idle-inhibit"
"zen-browser"
# "systemctl --user import-environment DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
"dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
"systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
"zen"
"sleep 6;telegram-desktop"
"sleep 10;thunderbird"
"vesktop"
@ -69,6 +68,12 @@ in {
"slack"
];
env = [
"XDG_SESSION_TYPE,wayland"
"XDG_SESSION_DESKTOP,Hyprland"
"XDG_CURRENT_DESKTOP,Hyprland"
];
bind =
[
''${mod},RETURN,exec,${pkgs.kitty}/bin/kitty''
@ -174,7 +179,7 @@ in {
no_hardware_cursors = true;
};
monitor = ["DP-1,2560x1440@240,0x0,1,bitdepth,10" "HDMI-A-1,disable" "DP-2,disable"];
monitor = ["DP-1,2560x1440@240,0x0,1" "HDMI-A-1,disable" "DP-2,disable"];
layerrule = [
"blur, ^(gtk-layer-shell)$"