diff options
| -rwxr-xr-x | mut/bin/surf-open.sh | 32 | ||||
| -rw-r--r-- | mut/dwm/config.h | 2 | ||||
| -rw-r--r-- | mut/neovim/lua/my/packages/blink.lua | 1 | ||||
| -rw-r--r-- | mut/nushell/config.nu | 1 | ||||
| -rw-r--r-- | mut/nushell/env.nu | 6 | ||||
| -rw-r--r-- | mut/surf/config.def.h | 3 | ||||
| -rw-r--r-- | profiles/core/home.nix | 1 | ||||
| -rw-r--r-- | profiles/core/meta.nix | 2 | ||||
| -rw-r--r-- | profiles/core/neovim.nix | 34 | ||||
| -rw-r--r-- | profiles/graphical/suckless.nix | 1 |
10 files changed, 49 insertions, 34 deletions
diff --git a/mut/bin/surf-open.sh b/mut/bin/surf-open.sh new file mode 100755 index 0000000..c22edc2 --- /dev/null +++ b/mut/bin/surf-open.sh @@ -0,0 +1,32 @@ +#!/bin/sh +# +# See the LICENSE file for copyright and license details. +# + +xidfile="$HOME/tmp/tabbed-surf.xid" +uri="" + +if [ "$#" -gt 0 ]; +then + uri="$1" +fi + +runtabbed() { + tabbed -dn tabbed-surf -r 2 surf -e '' "$uri" >"$xidfile" \ + 2>/dev/null & +} + +if [ ! -r "$xidfile" ]; +then + runtabbed +else + xid=$(cat "$xidfile") + xprop -id "$xid" >/dev/null 2>&1 + if [ $? -gt 0 ]; + then + runtabbed + else + surf -e "$xid" "$uri" >/dev/null 2>&1 & + fi +fi + diff --git a/mut/dwm/config.h b/mut/dwm/config.h index 5adcb46..4086f31 100644 --- a/mut/dwm/config.h +++ b/mut/dwm/config.h @@ -3,7 +3,7 @@ /* Constants */ #define TERMINAL "ghostty" #define TERMCLASS "Ghostty" -#define BROWSER "surf" +#define BROWSER "surf-open.sh" /* appearance */ static unsigned int borderpx = 3; /* border pixel of windows */ diff --git a/mut/neovim/lua/my/packages/blink.lua b/mut/neovim/lua/my/packages/blink.lua index fbbe87d..31726dc 100644 --- a/mut/neovim/lua/my/packages/blink.lua +++ b/mut/neovim/lua/my/packages/blink.lua @@ -1,5 +1,6 @@ local blink = require('blink.cmp') blink.setup { + fuzzy = { prebuilt_binaries = { force_version = "v0.10.0" } }, -- 'default' for mappings similar to built-in completion -- 'super-tab' for mappings similar to vscode (tab to accept, arrow keys to navigate) -- 'enter' for mappings similar to 'super-tab' but with 'enter' to accept diff --git a/mut/nushell/config.nu b/mut/nushell/config.nu index 69b48d7..3fb5613 100644 --- a/mut/nushell/config.nu +++ b/mut/nushell/config.nu @@ -1,4 +1,3 @@ -try {xset r rate 230 30} if ($env | default "" DOCKER_NAME | get DOCKER_NAME | is-empty) { try {pnsh-nvim} } diff --git a/mut/nushell/env.nu b/mut/nushell/env.nu index 35fb30f..01f1fb7 100644 --- a/mut/nushell/env.nu +++ b/mut/nushell/env.nu @@ -90,12 +90,12 @@ $env.NU_PLUGIN_DIRS = [ # $env.PATH = ($env.PATH | split row (char esep) | prepend '/some/path') # An alternate way to add entries to $env.PATH is to use the custom command `path add` # which is built into the nushell stdlib: -# use std "path add" +use std "path add" # $env.PATH = ($env.PATH | split row (char esep)) # path add /some/path # path add ($env.CARGO_HOME | path join "bin") -# path add ($env.HOME | path join ".local" "bin") -# $env.PATH = ($env.PATH | uniq) +path add ($env.HOME | path join ".local" "bin") +$env.PATH = ($env.PATH | uniq) # To load from a custom file you can use: # source ($nu.default-config-dir | path join 'custom.nu') diff --git a/mut/surf/config.def.h b/mut/surf/config.def.h index 1d27a0e..d1fca18 100644 --- a/mut/surf/config.def.h +++ b/mut/surf/config.def.h @@ -166,6 +166,7 @@ static Key keys[] = { { MODKEY|GDK_SHIFT_MASK, GDK_KEY_q, zoom, { .i = 0 } }, { MODKEY, GDK_KEY_minus, zoom, { .i = -1 } }, { MODKEY, GDK_KEY_plus, zoom, { .i = +1 } }, + { MODKEY|GDK_SHIFT_MASK, GDK_KEY_plus, zoom, { .i = +1 } }, { MODKEY, GDK_KEY_p, clipboard, { .i = 1 } }, { MODKEY, GDK_KEY_y, clipboard, { .i = 0 } }, @@ -174,7 +175,7 @@ static Key keys[] = { { MODKEY|GDK_SHIFT_MASK, GDK_KEY_n, find, { .i = -1 } }, { MODKEY|GDK_SHIFT_MASK, GDK_KEY_p, print, { 0 } }, - { MODKEY, GDK_KEY_t, showcert, { 0 } }, + { MODKEY, GDK_KEY_o, showcert, { 0 } }, { MODKEY|GDK_SHIFT_MASK, GDK_KEY_a, togglecookiepolicy, { 0 } }, { 0, GDK_KEY_F11, togglefullscreen, { 0 } }, diff --git a/profiles/core/home.nix b/profiles/core/home.nix index b80749e..c47a95d 100644 --- a/profiles/core/home.nix +++ b/profiles/core/home.nix @@ -15,6 +15,7 @@ with lib; { }; }; home.file.".config/ghostty".source = config.lib.meta.mkMutableSymlink /mut/ghostty; + home.file.".config/nushell".source = config.lib.meta.mkMutableSymlink /mut/nushell; xdg = { enable = true; mime.enable = !machine.isDarwin; diff --git a/profiles/core/meta.nix b/profiles/core/meta.nix index afd3e55..0cf0c1c 100644 --- a/profiles/core/meta.nix +++ b/profiles/core/meta.nix @@ -1,6 +1,6 @@ {inputs,lib,config, ...}: with lib; { lib.meta = { - configPath = "${config.my.home}/nix-config"; + configPath = "/nix-config"; mkMutableSymlink = path: config.hm.lib.file.mkOutOfStoreSymlink (config.lib.meta.configPath + removePrefix (toString inputs.self) (toString path)); diff --git a/profiles/core/neovim.nix b/profiles/core/neovim.nix index 2fbdd8b..dc3bc6e 100644 --- a/profiles/core/neovim.nix +++ b/profiles/core/neovim.nix @@ -4,12 +4,7 @@ ... }: { hm = { - xdg = { - configFile = with config.lib.meta; { - "nvim".source = mkMutableSymlink /mut/neovim; - }; - }; - + xdg.configFile."nvim".source = config.lib.meta.mkMutableSymlink /mut/neovim; editorconfig = { enable = true; settings = { @@ -45,52 +40,37 @@ plugins = with pkgs.vimPlugins; [ # highlighting nvim-treesitter.withAllGrammars - playground gruvbox-material kanagawa-nvim lsp_lines-nvim gitsigns-nvim vim-helm - lualine-nvim # external oil-nvim vim-fugitive - venn-nvim gv-vim zoxide-vim obsidian-nvim go-nvim - # Coding - fzf-lua - nvim-lspconfig - null-ls-nvim - lsp_signature-nvim + # Debug adapter nvim-dap nvim-dap-ui nvim-nio nvim-dap-python + + # editing + fzf-lua + nvim-lspconfig + lsp_signature-nvim luasnip - vim-test nvim-lint vim-surround conform-nvim trouble-nvim vim-easy-align nvim-comment - - blink-cmp - - # trying out lisp - conjure - vim-racket - nvim-parinfer - - # ai :( - # render-markdown-nvim - # avante-nvim - # nui-nvim ]; }; }; diff --git a/profiles/graphical/suckless.nix b/profiles/graphical/suckless.nix index 4cf4c3a..5a51ebb 100644 --- a/profiles/graphical/suckless.nix +++ b/profiles/graphical/suckless.nix @@ -90,6 +90,7 @@ with lib; # librewolf ungoogled-chromium xclip + xorg.xwininfo xdotool maim asciinema |