diff --git a/flake.lock b/flake.lock index 3ef44bc..fa1bec7 100644 --- a/flake.lock +++ b/flake.lock @@ -683,11 +683,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1737857294, - "narHash": "sha256-bzC+anLF/NlgolaMoB4uTFgSejLJlTzPcNF1Kbq/BP0=", + "lastModified": 1738097047, + "narHash": "sha256-GcgcCYhAkxU9BtzsUImFRIEFK0WqgjKrMqMySImGLK4=", "ref": "refs/heads/main", - "rev": "4af6b5ed9f8f2412bef5331b8e3b93f3ad305ea1", - "revCount": 16694, + "rev": "3a41bf32a78550f7373b51d39c07a4bb91bb9f2e", + "revCount": 16702, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -832,11 +832,11 @@ ] }, "locked": { - "lastModified": 1737926801, - "narHash": "sha256-un7IETRNjUm83jM5Gd/7BO4rCzzkom46O0FDMo5toaI=", + "lastModified": 1738033138, + "narHash": "sha256-qlIM8A3bdL9c6PexhpS+QyZLO9y/8a3V75HVyJgDE5Q=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "62ba0a22426721c94e08f0779ed8235d5672869b", + "rev": "349a74c66c596ef97ee97b4d80a3ca61227b6120", "type": "github" }, "original": { @@ -1045,11 +1045,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1738003704, - "narHash": "sha256-9VC5icfSf0tI8HSRjzsvOjrJZcLvNy/LKkQYsd14tSY=", + "lastModified": 1738090407, + "narHash": "sha256-X6BvM495ef4Rk+7WFhvYFwJoKteQYgvSaRERLGofZ+s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "24cc55b1d2d585dd57ce24f26ad96dd7fd73af39", + "rev": "2c00621e9692affa61da62f82e76648c5a07e6a0", "type": "github" }, "original": { @@ -1082,11 +1082,11 @@ ] }, "locked": { - "lastModified": 1737995534, - "narHash": "sha256-in2EtlH84FJ5+7l2vBWhUiknmDFAHTuHIPSBiMhICyw=", + "lastModified": 1738106190, + "narHash": "sha256-woDlUpfK4n1znQfGREKDLMVOQ4JZo7L6YY/sTPZGw0g=", "owner": "nix-community", "repo": "nixvim", - "rev": "af4483c025ecf02ba36b2013eed0062ccd629809", + "rev": "eeafe2a7153197982ccd6ad6678192bca1df446e", "type": "github" }, "original": { @@ -1240,11 +1240,11 @@ ] }, "locked": { - "lastModified": 1737944843, - "narHash": "sha256-ZSXR/po/slqpsk3JLVjXbE04Vqrb4k7yCGHjyMj3tOk=", + "lastModified": 1738117527, + "narHash": "sha256-GFviGfaezjGLFUlxdv3zyC7rSZvTXqwcG/YsF6MDkOw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "27bb917a41480b6ceee8e42d32dfcc9ecc6fa6c6", + "rev": "6a3dc6ce4132bd57359214d986db376f2333c14d", "type": "github" }, "original": { @@ -1310,11 +1310,11 @@ ] }, "locked": { - "lastModified": 1737483750, - "narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=", + "lastModified": 1738070913, + "narHash": "sha256-j6jC12vCFsTGDmY2u1H12lMr62fnclNjuCtAdF1a4Nk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f", + "rev": "bebf27d00f7d10ba75332a0541ac43676985dea3", "type": "github" }, "original": { diff --git a/home/niri/default.nix b/home/niri/default.nix index 0c72563..ea9acb9 100644 --- a/home/niri/default.nix +++ b/home/niri/default.nix @@ -50,7 +50,7 @@ in natural-scroll = true; click-method = "clickfinger"; }; - warp-mouse-to-focus = true; + warp-mouse-to-focus = false; focus-follows-mouse.enable = false; }; @@ -79,6 +79,11 @@ in } { app-id = "mpv"; } { app-id = "Bitwarden"; } + { + app-id = "ghidra-Ghidra"; + # pop-up windows + title = "^win(.*)"; + } ]; open-floating = true; } diff --git a/home/nixvim/default.nix b/home/nixvim/default.nix index 77586b6..89bfd94 100644 --- a/home/nixvim/default.nix +++ b/home/nixvim/default.nix @@ -171,7 +171,11 @@ plugins.treesitter = { enable = true; nixGrammars = true; - settings.indent.enable = true; + settings = { + indent.enable = true; + auto_install = true; + highlight.enable = true; + }; }; plugins.fzf-lua = { enable = true; diff --git a/home/yt/common.nix b/home/yt/common.nix index 4d7acca..e919d4b 100644 --- a/home/yt/common.nix +++ b/home/yt/common.nix @@ -61,4 +61,5 @@ }; programs.ripgrep.enable = true; programs.man.generateCaches = true; + programs.fd.enable = true; } diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 97cefe9..fa26fd2 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -103,6 +103,10 @@ github-cli fuzzel nixpkgs-review + just + hugo + ghidra + sequoia ]; programs.waybar.enable = true; @@ -155,4 +159,9 @@ commit.gpgsign = true; core.sshCommand = "ssh -i ~/.ssh/id.key"; }; + + home.sessionVariables = { + # to make ghidra work on xwayland + _JAVA_AWT_WM_NONREPARENTING = 1; + }; } diff --git a/hosts/titan/Caddyfile b/hosts/titan/Caddyfile index 5969134..c306399 100644 --- a/hosts/titan/Caddyfile +++ b/hosts/titan/Caddyfile @@ -13,14 +13,16 @@ cything.io { import common - redir https://cy7.sh/posts{uri} permanent header /.well-known/matrix/* Content-Type application/json header /.well-known/matrix/* Access-Control-Allow-Origin * header /.well-known/matrix/* Access-Control-Allow-Methods GET,POST,PUT,DELETE,OPTIONS,PATCH,HEAD header /.well-known/matrix/* Access-Control-Allow-Headers X-Requested-With,Content-Type,Authorization,Origin,Accept - respond /.well-known/matrix/server {"m.server":"chat.cything.io:443"} - respond /.well-known/matrix/client {"m.server":{"base_url":"https://chat.cything.io"},"m.homeserver":{"base_url":"https://chat.cything.io"},"org.matrix.msc3575.proxy":{"url":"https://chat.cything.io"}} + route { + respond /.well-known/matrix/server {"m.server":"chat.cything.io:443"} + respond /.well-known/matrix/client {"m.server":{"base_url":"https://chat.cything.io"},"m.homeserver":{"base_url":"https://chat.cything.io"},"org.matrix.msc3575.proxy":{"url":"https://chat.cything.io"}} + redir https://cy7.sh/posts{uri} permanent + } } www.cything.io {