From f2c75dd6fb52626150e11d6a32cf6fea1df80a8e Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Sun, 27 Apr 2025 10:56:59 -0400 Subject: Checking in various updates --- nix/gaming.nix | 5 ++++- nix/programs/firefox.nix | 4 ++-- nix/programs/kitty.nix | 5 ++++- nix/programs/nvim.nix | 5 ++--- nix/programs/sway.nix | 4 ++-- nix/user.nix | 4 ++-- 6 files changed, 16 insertions(+), 11 deletions(-) (limited to 'nix') diff --git a/nix/gaming.nix b/nix/gaming.nix index 462e5bb..f43a21f 100644 --- a/nix/gaming.nix +++ b/nix/gaming.nix @@ -7,6 +7,8 @@ in { }; environment.systemPackages = with pkgs; lib.lists.flatten [ mangohud + (asNeeded "gamepad-tool" ["gamepad-tool"]) + (asNeeded "sdl-jstest" ["sdl-jstest" "sdl2-jstest"]) (asNeeded "protontricks" ["protontricks" "protontricks-launch"]) (asNeeded "[lutris umu-launcher]" ["lutris"]) (asNeeded "prismlauncher" ["prismlauncher"]) @@ -30,7 +32,8 @@ in { export DXVK_HUD=compiler export DXVK_LOG_LEVEL=none export DXVK_DEBUG=none - export VKD3D_CONFIG=dxr,small_vram_rebar + export VKD3D_HUD=compiler + export VKD3D_CONFIG=dxr export VKD3D_DEBUG=none export VKD3D_SHADER_DEBUG=none export mesa_glthread=true diff --git a/nix/programs/firefox.nix b/nix/programs/firefox.nix index da5aa09..6ee2751 100644 --- a/nix/programs/firefox.nix +++ b/nix/programs/firefox.nix @@ -19,8 +19,8 @@ in { source = (pkgs.fetchFromGitHub { owner = "rafaelmardojai"; repo = "firefox-gnome-theme"; - rev = "a1795946debb5f21dfa5d328a6f1b68984f810fc"; - hash = "sha256-CoGE9+8oVnnOOTStPQ9C87gp0C6vgf0tN3ls7MuKZiE="; + rev = "59e3de00f01e5adb851d824cf7911bd90c31083a"; + hash = "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4="; }); }; home.file."customChrome.css" = { diff --git a/nix/programs/kitty.nix b/nix/programs/kitty.nix index 5f0c91b..624c0b0 100644 --- a/nix/programs/kitty.nix +++ b/nix/programs/kitty.nix @@ -25,6 +25,8 @@ in { allow_remote_control yes linux_display_server wayland remember_window_size no + initial_window_width 720 + initial_window_height 480 resize_debounce_time 0.025 0.5 placement_strategy top-left scrollback_lines 3000 @@ -35,7 +37,7 @@ in { cursor_shape block #cursor_blink_interval -1 linear ease-out #cursor_stop_blinking_after 20.0 - cursor_trail 35 + cursor_trail 50 cursor_trail_decay 0.1 0.5 cursor_trail_start_threshold 2 foreground #${colo.foreground} @@ -74,6 +76,7 @@ in { mod1 = "Mod1"; in { "${mod1}+Return" = "exec ${terminal}"; + "${mod1}+backslash" = "exec ${terminal} --class=\"kitty-popup\""; }; }; }; diff --git a/nix/programs/nvim.nix b/nix/programs/nvim.nix index 5ff902f..d60b752 100644 --- a/nix/programs/nvim.nix +++ b/nix/programs/nvim.nix @@ -64,7 +64,7 @@ let hi NormalFloat guibg=#${colo.color4} hi Pmenu guibg=#${colo.color4} hi PmenuThumb guibg=#${colo.color5} - hi PmenuSel guibg=#${colo.color3} + hi PmenuSel guibg=#${colo.color4} " Font color. hi PmenuSbar guibg=#${colo.color4} hi Question guifg=#${colo.color3} hi QuickFixLine guifg=#${colo.color3} @@ -82,7 +82,7 @@ let hi StatusLine guifg=#${colo.background} guibg=#${colo.color5} hi StatusLineNC guifg=#${colo.background} guibg=#${colo.color4} hi Title guifg=#${colo.foreground} gui=bold - hi Visual guibg=#${colo.color6} + hi Visual guibg=#${colo.color3} hi WarningMsg guifg=#${colo.color3} hi WinBar guifg=#${colo.color5} guibg=#${colo.background} gui=bold hi WinBarNC guifg=#${colo.color5} guibg=#${colo.background} @@ -116,7 +116,6 @@ let hi Number guifg=#${colo.foreground} " ----- hi link Boolean Number - hi link Character Number hi link Character String hi link SpecialChar Character diff --git a/nix/programs/sway.nix b/nix/programs/sway.nix index 49efdf6..33660bc 100644 --- a/nix/programs/sway.nix +++ b/nix/programs/sway.nix @@ -270,9 +270,9 @@ in { titlebar = false; commands = [ { command = "move to scratchpad"; criteria.app_id = "kitty-server"; } - #{ command = "max_render_time 1"; criteria.app_id = "kitty"; } + { command = "floating enable; allow_tearing yes"; criteria.app_id = "kitty-popup"; } { command = "allow_tearing yes"; criteria.app_id = "kitty"; } - { command = "inhibit_idle fullscreen; floating enable; max_render_time 1; allow_tearing yes"; criteria.app_id = "cmv"; } + { command = "inhibit_idle fullscreen; floating enable; allow_tearing yes"; criteria.app_id = "cmv"; } { command = "floating enable"; criteria.class = "cmv.exe"; } { command = "floating enable"; criteria.app_id = "mauri"; } { command = "inhibit_idle fullscreen"; criteria.title = "Parsec"; } diff --git a/nix/user.nix b/nix/user.nix index 89b6fe1..d81e6c2 100644 --- a/nix/user.nix +++ b/nix/user.nix @@ -147,7 +147,7 @@ in { desktop = "${homeDir}/tmp"; documents = "${homeDir}/docs"; download = "${homeDir}/dl"; - music = "${homeDir}/music"; + music = "${homeDir}/tmp"; pictures = "${homeDir}/pics"; publicShare = "${homeDir}/tmp"; templates = "${homeDir}/tmp"; @@ -161,7 +161,7 @@ in { userEmail = "andrew@akon.city"; userName = "Andrew Opalach"; signing = { - key = "99659CB58598BDDB"; + key = "99659CB58598BDDB"; # The last digits of the key. signByDefault = true; }; extraConfig = { -- cgit v1.2.3-101-g0448