diff --git a/modules/home/core/apps.nix b/modules/home/core/apps.nix index b8e09d6..ea867c0 100644 --- a/modules/home/core/apps.nix +++ b/modules/home/core/apps.nix @@ -61,7 +61,7 @@ }) (prismlauncher.override { - jdks = with javaPackages.compiler.temurin-bin; [ jre-21 jdk-25 ]; + jdks = with javaPackages.compiler.temurin-bin; [ jre-25 jre-21 ]; }) ferium diff --git a/modules/home/core/cli.nix b/modules/home/core/cli.nix index 1714f16..17a6dfa 100644 --- a/modules/home/core/cli.nix +++ b/modules/home/core/cli.nix @@ -8,14 +8,7 @@ home.packages = with pkgs; [ bun ]; programs = { - tmux = { - enable = true; - extraConfig = '' - set -g set-clipboard on - set -ag terminal-overrides ",*:Ms=\\E[52;%p1%s;%p2%s\\007" - set -g allow-passthrough on - ''; - }; + tmux.enable = true; vim.enable = true; bat.enable = true; kitty = { @@ -56,11 +49,16 @@ initLua = '' vim.opt.clipboard = "unnamedplus" vim.opt.termguicolors = true - local osc52 = require("vim.ui.clipboard.osc52") vim.g.clipboard = { name = "OSC 52", - copy = { ["+"] = osc52.copy("+"), ["*"] = osc52.copy("*") }, - paste = { ["+"] = osc52.paste("+"), ["*"] = osc52.paste("*") }, + copy = { + ["+"] = require("vim.ui.clipboard.osc52").copy("+"), + ["*"] = require("vim.ui.clipboard.osc52").copy("*"), + }, + paste = { + ["+"] = require("vim.ui.clipboard.osc52").paste("+"), + ["*"] = require("vim.ui.clipboard.osc52").paste("*"), + }, } require("nvim-tree").setup() vim.api.nvim_create_autocmd("VimEnter", { diff --git a/modules/home/default.nix b/modules/home/default.nix index d3a590f..00bbbb6 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -6,11 +6,10 @@ catppuccin = { enable = true; + hyprlock.useDefaultConfig = false; + flavor = ctp-opt.flavor; accent = ctp-opt.accent; - - hyprlock.useDefaultConfig = false; - nvim.settings.transparent_background = true; }; home = { diff --git a/modules/home/rice/compositor.nix b/modules/home/rice/compositor.nix index dbf640e..17c16c0 100644 --- a/modules/home/rice/compositor.nix +++ b/modules/home/rice/compositor.nix @@ -87,15 +87,9 @@ blur = { enabled = true; - size = 7; - passes = 3; - ignore_opacity = true; - - noise = 0.05; - contrast = 1.5; - - xray = false; - new_optimizations = true; + size = 3; + passes = 1; + vibrancy = 0.1696; }; };