diff --git a/README.md b/README.md index 349bff8..8da5597 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ## ✨ Main Applications -- [X] Hyprland (uwsm support) +- [X] Hyprland - [X] Neovim - ✅ [lazyvim](https://github.com/LazyVim/LazyVim) - ✅ [treesitter](https://github.com/nvim-treesitter/nvim-treesitter) diff --git a/home/config/nvim/lua/config/options.lua b/home/config/nvim/lua/config/options.lua index 5074de5..3cde4d6 100644 --- a/home/config/nvim/lua/config/options.lua +++ b/home/config/nvim/lua/config/options.lua @@ -24,3 +24,7 @@ vim.g.lazyvim_python_lsp = "pyright" vim.g.lazyvim_python_ruff = "ruff" vim.g.lazyvim_eslint_auto_format = true vim.o.background = "dark" + +-- Markdown preview +vim.g.mkdp_auto_close = 0 +vim.g.mkdp_combine_preview = 0 diff --git a/home/user/environment.nix b/home/user/environment.nix index 40c6d0e..f2e1fa2 100644 --- a/home/user/environment.nix +++ b/home/user/environment.nix @@ -1,6 +1,6 @@ { home.sessionVariables = { - BROWSER = "firefox"; + BROWSER = "firefox-nightly"; EDITOR = "nvim"; TERMINAL = "ghostty"; NIXOS_OZONE_WL = "1"; diff --git a/home/user/hypr/bind.nix b/home/user/hypr/bind.nix index 96e8033..8f91f45 100644 --- a/home/user/hypr/bind.nix +++ b/home/user/hypr/bind.nix @@ -11,6 +11,9 @@ let # freezeShot = "--freeze"; freezeShot = ""; + # clipboard-only = "${clipboardOnly}"; + screenshotFolder = "--output-folder ~/Pictures/Screenshots"; + clipboardOnly = "${screenshotFolder}"; in [ ''${mainMod}, F, exec, ${browser}'' @@ -27,9 +30,13 @@ in ''${mainMod}, P, pseudo, # dwindle'' ''${mainMod}, S, togglesplit, # dwindle'' ''CTRL ${mainMod} SHIFT, L, exec, hyprlock'' - ''${mainMod} SHIFT, s, exec, hyprshot -m region --clipboard-only ${freezeShot}'' - ''CTRL SHIFT, s, exec, hyprshot -m window --clipboard-only ${freezeShot}'' - ''CTRL SHIFT ${mainMod}, s, exec, hyprshot -m output --clipboard-only ${freezeShot}'' + + # Screenshot + ''${mainMod} SHIFT, s, exec, hyprshot -m region ${clipboardOnly} ${freezeShot}'' + ''CTRL SHIFT, s, exec, hyprshot -m window ${clipboardOnly} ${freezeShot}'' + ''CTRL SHIFT ${mainMod}, s, exec, hyprshot -m output ${clipboardOnly} ${freezeShot}'' + ''CTRL ALT, s, exec, hyprshot -m active -m window ${clipboardOnly} ${freezeShot}'' + ''${mainMod}, PERIOD, exec, rofi -modi emoji -show emoji'' ''CTRL ${mainMod}, c, exec, rofi -show calc -modi calc -no-show-match -no-sort'' ''${mainMod}, X, exec, sleep 0.1 && swaync-client -t -sw'' diff --git a/home/user/hyprland.nix b/home/user/hyprland.nix index e579487..8fc4480 100644 --- a/home/user/hyprland.nix +++ b/home/user/hyprland.nix @@ -60,7 +60,8 @@ in enable = true; xwayland.enable = true; systemd.enable = false; - package = inputs.hyprland.packages.${system}.hyprland; + package = null; + portalPackage = null; plugins = (with inputs.hyprland-plugins.packages.${system}; [ diff --git a/home/user/nvim.nix b/home/user/nvim.nix index d3322c2..2f56f9e 100644 --- a/home/user/nvim.nix +++ b/home/user/nvim.nix @@ -126,8 +126,9 @@ in nvim-nio one-small-step-for-vimkind none-ls-nvim - markdown-preview-nvim render-markdown-nvim + markdown-preview-nvim + markdown-nvim image-nvim hover-nvim diff --git a/home/user/packages.nix b/home/user/packages.nix index 8108faf..98c50b0 100644 --- a/home/user/packages.nix +++ b/home/user/packages.nix @@ -1,6 +1,7 @@ { pkgs, lib, + nvidia-offload-enabled, ... }: let @@ -11,6 +12,7 @@ let (lib.head oldAttrs.desktopItems).override { name = "discord"; desktopName = "Discord"; + exec = if nvidia-offload-enabled == true then "offload vesktop %U" else "vesktop %U"; } ); diff --git a/system/modules/hyprland.nix b/system/modules/hyprland.nix index ca7763c..69d5c32 100644 --- a/system/modules/hyprland.nix +++ b/system/modules/hyprland.nix @@ -8,7 +8,7 @@ enable = true; withUWSM = false; package = inputs.hyprland.packages."${pkgs.system}".hyprland; - # portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland; + portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland; }; xdg.portal = {