Nvim config, umu input -> pkgs.umu-launcher

11 files changed, 82 insertions, 87 deletions

diff --git a/files/nvim/init.vim b/files/nvim/init.vim
index e304e94..e679f4d 100644
--- a/files/nvim/init.vim
+++ b/files/nvim/init.vim
@@ -58,7 +58,7 @@ set ssop=skiprtp,blank,buffers,folds,winsize,terminal
 set vop-=curdir
 let view_dir = expand('~/c/sessions/views')
 if !isdirectory(view_dir)
-  call mkdir(view_dir, "p", 0700)
+  call mkdir(view_dir, 'p', 0700)
 endif
 let &viewdir=view_dir
 
@@ -73,10 +73,10 @@ set backup
 " Swap file directory.
 set directory=~/c/sessions/swaps//
 
-if has("persistent_undo")
+if has('persistent_undo')
   let undo_dir = expand('~/c/sessions/undo')
   if !isdirectory(undo_dir)
-    call mkdir(undo_dir, "p", 0700)
+    call mkdir(undo_dir, 'p', 0700)
   endif
   let &undodir=undo_dir
   set undofile
@@ -87,7 +87,7 @@ set termguicolors
 colo wal-gui
 
 " Cursor blink.
-set guicursor=a:blinkon1
+"set guicursor=a:blinkon1
 
 " Highlight whitespace.
 au BufEnter * match ExtraWhitespace /\s\+$/
@@ -111,7 +111,7 @@ let g:fzf_colors = {
  \'header': ['fg', 'Type']
 \}
 let g:fzf_preview_window = ['right,47%']
-let g:fzf_layout = { 'window': { 'width': 0.70, 'height': 0.50 } }
+let g:fzf_layout = { 'window': { 'width': 0.75, 'height': 0.60 } }
 
 function! StatuslineMode() abort
   if mode() == nr2char(22)
@@ -185,7 +185,7 @@ if os.getenv('NIX_SHELL') ~= nil then
     }
   })
   lsp.ruff.setup({})
-  require("inc_rename").setup({})
+  require('inc_rename').setup({})
 end
 
 -- Try to make treesitter suck less.
@@ -211,13 +211,14 @@ require('mini.sessions').setup({
 require('mini.completion').setup({})
 
 -- Disable icons in diffview.
-require("diffview").setup({
+require('diffview').setup({
   diff_binaries = false,
   use_icons = false
 })
 
 -- Don't use tabs in Neogit.
 require('neogit').setup({
+  disable_hint = true,
   kind = 'vsplit',
   commit_editor = { kind = 'split' },
   commit_select_view = { kind = 'vsplit' },
@@ -229,13 +230,19 @@ require('neogit').setup({
   refs_view = { kind = 'split' },
   -- Allow basic movement in Neogit without mapping conflicts.
   mappings = {
-    popup = { ["l"] = false, ["L"] = "LogPopup" },
-    status = { ["$"] = false, ["#"] = "CommandHistory" }
+    popup = { ['l'] = false, ['L'] = 'LogPopup' },
+    status = { ['$'] = false, ['#'] = 'CommandHistory' }
    }
 })
 
 -- Preview colors in #<hex> format.
-require('ccc').setup({ highlighter = { auto_enable = true, lsp = true } })
+require('ccc').setup({ highlighter = { auto_enable = false, lsp = true } })
+
+--require("perfanno").setup({
+--    telescope = {
+--        enabled = false,
+--    },
+--})
 
 -- Make shift + nav keys no-ops.
 vim.keymap.set('n', 'H', '<nop>', { silent = true })
@@ -273,7 +280,7 @@ vim.keymap.set('i', '<Down>', [[pumvisible() ? '<C-n>' : '<Down>']], { expr = tr
 -- Lsp Binds.
 vim.keymap.set('n', '<C-d>', '<C-]>', {})
 vim.keymap.set('n', '<C-n>', function()
-  return ":IncRename " .. vim.fn.expand("<cword>")
+  return ':IncRename ' .. vim.fn.expand('<cword>')
 end, { expr = true })
 -- Fzf binds.
 vim.keymap.set('n', '\\', [[:Buffers<CR>]], { silent = true })
@@ -298,6 +305,13 @@ command! -bang -nargs=* GGrep
   \   'git grep --line-number -- '.fzf#shellescape(<q-args>),
   \   fzf#vim#with_preview({'dir': systemlist('git rev-parse --show-toplevel')[0]}), <bang>0)
 
+" https://vim.fandom.com/wiki/Replace_a_builtin_command_using_cabbrev
+function! CommandCabbr(abbreviation, expansion)
+  execute 'cabbr ' . a:abbreviation . ' <C-R>=getcmdpos() == 1 && getcmdtype() == ":" ? "' . a:expansion . '" : "' . a:abbreviation . '"<CR>'
+endfunction
+command! -nargs=+ CommandCabbr call CommandCabbr(<f-args>)
+CommandCabbr no nohlsearch
+
 call Juliana#Init() " Custom insert mode tab behavior inherited from Emacs.
 inoremap <silent><Tab> <C-R>=Juliana#CompleteTab('START')<CR>
  \<C-R>=Juliana#CompleteTab('TAB')<CR>
diff --git a/flake.lock b/flake.lock
index 93b8988..d2f876f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,18 +5,20 @@
         "home-manager": [
           "home-manager"
         ],
-        "nixos-hardware": "nixos-hardware",
+        "nixos-hardware": [
+          "nixos-hardware"
+        ],
         "nixos-wsl": "nixos-wsl",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1737301762,
-        "narHash": "sha256-kh8BgBAbbbacgkQYcEZL8p3bTUoSayGBgg8vrXkdFwc=",
+        "lastModified": 1738722957,
+        "narHash": "sha256-rMS8n7eDSSYrcyX37qmkxip8wKnzh7GZAtpWudNpd0Y=",
         "ref": "refs/heads/master",
-        "rev": "474ccfd0534e03cfcde94fe0f94e3028ed65366a",
-        "revCount": 83,
+        "rev": "b36f022defd8d4ec5a8c29578bb583bea05dfbb6",
+        "revCount": 95,
         "type": "git",
         "url": "https://git.akon.city/camu"
       },
@@ -86,11 +88,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737630279,
-        "narHash": "sha256-wJQCxyMRc4P26zDrHmZiRD5bbfcJpqPG3e2djdGG3pk=",
+        "lastModified": 1738789832,
+        "narHash": "sha256-HdlMPfObPu5y7oDfH/w3vvlU3UTQ/bQjSULChZARm5M=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0db5c8bfcce78583ebbde0b2abbc95ad93445f7c",
+        "rev": "30ea6fed4e4b41693cebc2263373dd810de4de49",
         "type": "github"
       },
       "original": {
@@ -122,27 +124,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1736978406,
-        "narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=",
-        "owner": "NixOS",
-        "repo": "nixos-hardware",
-        "rev": "b678606690027913f3434dea3864e712b862dde5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "master",
-        "repo": "nixos-hardware",
-        "type": "github"
-      }
-    },
-    "nixos-hardware_2": {
-      "locked": {
-        "lastModified": 1737590910,
-        "narHash": "sha256-qM/y6Dtpu9Wmf5HqeZajQdn+cS0aljdYQQQnrvx+LJE=",
+        "lastModified": 1738638143,
+        "narHash": "sha256-ZYMe4c4OCtIUBn5hx15PEGr0+B1cNEpl2dsaLxwY2W0=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "9368027715d8dde4b84c79c374948b5306fdd2db",
+        "rev": "9bdd53f5908453e4d03f395eb1615c3e9a351f70",
         "type": "github"
       },
       "original": {
@@ -190,11 +176,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1737469691,
-        "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
+        "lastModified": 1738680400,
+        "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
+        "rev": "799ba5bffed04ced7067a91798353d360788b30d",
         "type": "github"
       },
       "original": {
@@ -213,11 +199,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1737634574,
-        "narHash": "sha256-kGPyJ3pBCxwt6++9luTfDrFuX5RBMdwS9rNj4ruFr28=",
+        "lastModified": 1738804022,
+        "narHash": "sha256-2oP3MF4w9r4+98nNmg0NCvcaH9yrCuulHLmHkfGvaws=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "7f4bc29df560d9f07e3c0495d52b59c3dbd9d832",
+        "rev": "b2d6e7199fc41cc3ea2eb07a95d02bafbf1f8ff9",
         "type": "github"
       },
       "original": {
@@ -231,10 +217,9 @@
         "camu": "camu",
         "home-manager": "home-manager",
         "mauri": "mauri",
-        "nixos-hardware": "nixos-hardware_2",
+        "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
-        "nur": "nur",
-        "umu": "umu"
+        "nur": "nur"
       }
     },
     "systems": {
@@ -272,30 +257,6 @@
         "repo": "treefmt-nix",
         "type": "github"
       }
-    },
-    "umu": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "dir": "packaging/nix",
-        "lastModified": 1737484151,
-        "narHash": "sha256-u9zy+68jgOM5C6UwQLziSZrcixp+wTYnEI5uGcn/fs4=",
-        "ref": "refs/heads/main",
-        "rev": "0cac244cc89ee69bf33ad60a3953cfde188ee8a6",
-        "revCount": 907,
-        "submodules": true,
-        "type": "git",
-        "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
-      },
-      "original": {
-        "dir": "packaging/nix",
-        "submodules": true,
-        "type": "git",
-        "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 6053a76..54ad07a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,14 +14,11 @@
       url = "github:nix-community/NUR";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    umu = {
-      url = "git+https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging\/nix&submodules=1";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     camu = {
       url = "git+https://git.akon.city/camu";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.home-manager.follows = "home-manager";
+      inputs.nixos-hardware.follows = "nixos-hardware";
     };
     mauri = {
       url = "git+https://git.akon.city/mauri";
@@ -29,7 +26,7 @@
     };
   };
 
-  outputs = { self, nixpkgs, nixos-hardware, home-manager, nur, umu, camu, mauri }: let
+  outputs = { self, nixpkgs, nixos-hardware, home-manager, nur, camu, mauri }: let
     local-fonts = {
       name = "Local Fonts";
       src = self;
@@ -135,7 +132,6 @@
           (self: super: { local-fonts = super.stdenv.mkDerivation local-fonts; })
           (self: super: { camu = camu.packages.${system}.default; })
           (self: super: { mauri = mauri.packages.${system}.default; })
-          (self: super: { umu = umu.packages.${super.system}.umu.override { version = "${umu.shortRev}"; }; })
           (self: super: {
             mpv-unwrapped = super.mpv-unwrapped.override { cddaSupport = true; };
           })
@@ -227,6 +223,7 @@
         ({ ... }: { nixpkgs.overlays = [
           nur.overlays.default
           (self: super: { local-fonts = super.stdenv.mkDerivation local-fonts; })
+          (self: super: { camu = camu.packages.${system}.default; })
           (self: super: {
             sway-unwrapped = super.sway-unwrapped.overrideAttrs (old: {
               patches = old.patches ++ [];
diff --git a/hosts/soy/Scripts/set-keyboard.sh b/hosts/soy/Scripts/set-keyboard.sh
index c4d3db2..8651486 100755
--- a/hosts/soy/Scripts/set-keyboard.sh
+++ b/hosts/soy/Scripts/set-keyboard.sh
@@ -1,4 +1,3 @@
 #! /usr/bin/env sh
 gsettings set org.gnome.desktop.peripherals.keyboard delay 220
 gsettings set org.gnome.desktop.peripherals.keyboard repeat-interval 45
-gsettings set org.gnome.shell.extensions.dash-to-dock hot-keys false
diff --git a/hosts/yashinoki/configuration.nix b/hosts/yashinoki/configuration.nix
index 8e8b262..09656b2 100644
--- a/hosts/yashinoki/configuration.nix
+++ b/hosts/yashinoki/configuration.nix
@@ -66,13 +66,22 @@ in {
   boot.supportedFilesystems = [ ];
   boot.loader.systemd-boot.enable = true;
   boot.kernelParams = [ "mitigations=off" "file_caps=1" ];
-  boot.extraModulePackages = [
-    config.boot.kernelPackages.v4l2loopback.out
-  ];
-  boot.kernelModules = [ "v4l2loopback" ];
+  #boot.extraModulePackages = [
+  #  config.boot.kernelPackages.v4l2loopback.out
+  #];
+  #boot.kernelModules = [ "v4l2loopback" ];
   boot.initrd.kernelModules = [ ];
   services.fwupd.enable = true;
 
+  security.wrappers = {
+    "mount.nfs" = {
+      owner = "root";
+      group = "root";
+      source = "${pkgs.nfs-utils.out}/bin/mount.nfs";
+      setuid = true;
+    };
+  };
+
   services.thermald.enable = true;
   services.tlp = {
     enable = true;
diff --git a/hosts/yashinoki/programs.nix b/hosts/yashinoki/programs.nix
index 2c17018..30136ef 100644
--- a/hosts/yashinoki/programs.nix
+++ b/hosts/yashinoki/programs.nix
@@ -7,5 +7,6 @@
     cabextract
     (pkgs.discord.override { withOpenASAR = true; })
     mpv
+    camu
   ];
 }
diff --git a/nix/gaming.nix b/nix/gaming.nix
index 4c8687c..338ed5b 100644
--- a/nix/gaming.nix
+++ b/nix/gaming.nix
@@ -7,7 +7,7 @@ in {
   };
   environment.systemPackages = with pkgs; [
     mangohud
-    umu
+    umu-launcher
     protontricks
     lutris
     #legendary-gl
@@ -33,12 +33,13 @@ in {
       export STEAM_COMPAT_LAUNCHER_SERVICE=proton
       export DXVK_HUD=compiler
       export DXVK_LOG_LEVEL=none
+      export DXVK_DEBUG=none
       export VKD3D_CONFIG=dxr,small_vram_rebar
       export VKD3D_DEBUG=none
       export VKD3D_SHADER_DEBUG=none
       export mesa_glthread=true
       xrandr --output ${s.monitors.monitor1} --primary
-      exec env --unset=SDL_VIDEODRIVER MANGOHUD=1 gamemoderun "$@"
+      exec env --unset=SDL_VIDEODRIVER --unset=SDL_VIDEO_DRIVER MANGOHUD=1 gamemoderun "$@"
     '')
   ];
   #hardware.xone.enable = true;
diff --git a/nix/programs/kitty.nix b/nix/programs/kitty.nix
index 0ab75c6..e3238eb 100644
--- a/nix/programs/kitty.nix
+++ b/nix/programs/kitty.nix
@@ -32,8 +32,8 @@ in {
         modify_font baseline ${toString s.font.baseline}
         cursor #${s.scheme.foreground}
         cursor_shape block
-        cursor_blink_interval -1 linear ease-out
-        cursor_stop_blinking_after 20.0
+        #cursor_blink_interval -1 linear ease-out
+        #cursor_stop_blinking_after 20.0
         cursor_trail 35
         cursor_trail_decay 0.1 0.5
         cursor_trail_start_threshold 2
diff --git a/nix/programs/nvim.nix b/nix/programs/nvim.nix
index 78b1b6b..fcffe02 100644
--- a/nix/programs/nvim.nix
+++ b/nix/programs/nvim.nix
@@ -237,6 +237,17 @@ in {
         neogit
         plenary-nvim
         diffview-nvim
+        (pkgs.vimUtils.buildVimPlugin {
+          pname = "perfanno.nvim";
+          version = "git-8640d66";
+          src = pkgs.fetchFromGitHub {
+            owner = "t-troebst";
+            repo = "perfanno.nvim";
+            rev = "8640d6655f17a79af8de3153af2ce90c03f65e86";
+            hash = "sha256-AfmmeLeUwYY9c3ISwt6/EHwCE4uhzKCvVoFwze7VJ4E=";
+          };
+          meta.homepage = "https://github.com/t-troebst/perfanno.nvim/";
+        })
       ];
     };
   };
diff --git a/themes/miia_new_years_2025/miia.nix b/themes/miia_new_years_2025/miia.nix
index 0dc6bbd..45864fd 100644
--- a/themes/miia_new_years_2025/miia.nix
+++ b/themes/miia_new_years_2025/miia.nix
@@ -19,5 +19,5 @@ rec {
   color13 = "${color5}";
   color14 = "${color6}";
   color15 = "${color7}";
-  alpha = 0.850;
+  alpha = 0.925;
 }
diff --git a/themes/miia_new_years_2025/sources.txt b/themes/miia_new_years_2025/sources.txt
new file mode 100644
index 0000000..1dc057e
--- /dev/null
+++ b/themes/miia_new_years_2025/sources.txt
@@ -0,0 +1,2 @@
+https://www.pixiv.net/en/artworks/51776387
+https://www.pixiv.net/en/artworks/52773311