From 8f6b049129c86a44a3d7d0518c19d9c1adf15851 Mon Sep 17 00:00:00 2001 From: Hadi <112569860+anotherhadi@users.noreply.github.com> Date: Fri, 4 Oct 2024 10:58:53 +0200 Subject: [PATCH] Update --- docs/TODO.md | 2 - flake.lock | 80 +++++++++++++++--------------- home/programs/kitty/default.nix | 7 +-- home/programs/shell/tmux.nix | 47 +++--------------- home/programs/shell/zsh.nix | 15 +++++- home/scripts/default.nix | 1 + home/scripts/hyprfocus/default.nix | 19 +++++++ home/scripts/hyprpanel/default.nix | 7 ++- hosts/themes/nixy.nix | 2 +- 9 files changed, 91 insertions(+), 89 deletions(-) create mode 100644 home/scripts/hyprfocus/default.nix diff --git a/docs/TODO.md b/docs/TODO.md index c8ad265..41d83ca 100644 --- a/docs/TODO.md +++ b/docs/TODO.md @@ -15,8 +15,6 @@ feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md)) - Tagbar (actually not working) - Markdown - [ ] -- [ ] Scrips: - - [ ] Toggle hyprpanel - [ ] Update docs ## Server diff --git a/flake.lock b/flake.lock index bc12f85..937008e 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1725841979, - "narHash": "sha256-SXYqzpHPuXFR6w/cUKo3VN8XRn6XA2mGbdRXs9oLk6k=", + "lastModified": 1727303518, + "narHash": "sha256-lO5JMynTxNZxg/+E4/Y9reeLGIz/M8cEue+Re4cP6qo=", "owner": "Aylur", "repo": "ags", - "rev": "aaef50bb2c80ef4b4a359329d72669a95e7c4796", + "rev": "cd543afec4d9ed708990e5ba52184716809bf248", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -219,11 +219,11 @@ ] }, "locked": { - "lastModified": 1727514110, - "narHash": "sha256-0YRcOxJG12VGDFH8iS8pJ0aYQQUAgo/r3ZAL+cSh9nk=", + "lastModified": 1727805723, + "narHash": "sha256-b8flytpuc4Ey/g3mcvpS/ICORcD4h56QDZeP5LogevY=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "85f7a7177c678de68224af3402ab8ee1bcee25c8", + "rev": "2f5ae3fc91db865eff2c5a418da85a0fbe6238a3", "type": "github" }, "original": { @@ -261,11 +261,11 @@ ] }, "locked": { - "lastModified": 1727383923, - "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", + "lastModified": 1727817100, + "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", "owner": "nix-community", "repo": "home-manager", - "rev": "ffe2d07e771580a005e675108212597e5b367d2d", + "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", "type": "github" }, "original": { @@ -337,11 +337,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1727714556, - "narHash": "sha256-l4cPDA3xGtGdQmdSCAO2VyWg9xwW6//KwDYefdWtovQ=", + "lastModified": 1727900725, + "narHash": "sha256-yS4oC5G/FKrsrRjk03cGzTEXHAwfjP7azFHoKvlFfD8=", "ref": "refs/heads/main", - "rev": "5c6c300abfea2539ffad9bcbf857325eec5ab765", - "revCount": 5285, + "rev": "de68e065fe861d7ca01eca267df4c305bc6e73c2", + "revCount": 5287, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -469,11 +469,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1727568555, - "narHash": "sha256-dk2CSFCCLRuGMQFRYuEvFD96i5we2zaU6gluuJhvtA8=", + "lastModified": 1727926924, + "narHash": "sha256-gU95rYV2ulL1T+UcdPb3uljFcmjbwE7aevLqaL3sec4=", "owner": "Jas-SinghFSU", "repo": "HyprPanel", - "rev": "19a0ccf150da329266ebff95e5117f2405d48bad", + "rev": "fe53b3ebf1767faafbc02016969b0b5da233572d", "type": "github" }, "original": { @@ -540,11 +540,11 @@ ] }, "locked": { - "lastModified": 1727507295, - "narHash": "sha256-I/FrX1peu4URoj5T5odfuKR2rm4GjYJJpCGF9c0/lDA=", + "lastModified": 1727707210, + "narHash": "sha256-8XZp5XO2FC6INZEZ2WlwErtvFVpl45ACn8CJ2hfTA0Y=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "f2e1c4aa29fc211947c3a7113cba1dd707433b70", + "rev": "f61d5f2051a387a15817007220e9fb3bbead57b3", "type": "github" }, "original": { @@ -651,11 +651,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1726463316, - "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", + "lastModified": 1727634051, + "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", + "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", "type": "github" }, "original": { @@ -667,11 +667,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1727634051, - "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { @@ -696,11 +696,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1727645871, - "narHash": "sha256-Os3PAThU5XliKkKa+SHsFyV/EsCHogHcYONmpzb6500=", + "lastModified": 1727871072, + "narHash": "sha256-t+YLQwBB1soQnVjT6d7nQq4Tidaw7tpB8i6Zvpc+Zbs=", "owner": "nix-community", "repo": "nixvim", - "rev": "5f4a4b47597d3b9ac26c41ff4e8da28fa662f200", + "rev": "0ca98d02104f7f0a703787a7a080a570b7f1bedd", "type": "github" }, "original": { @@ -718,11 +718,11 @@ ] }, "locked": { - "lastModified": 1727452028, - "narHash": "sha256-ehl/A4HQFRyqj1Fk7cl+dgSf/2Fb1jLwWJtZaMU6RfU=", + "lastModified": 1727599661, + "narHash": "sha256-0R+1ih0Rfqrz/lcduvpNSnUw3uthUHiaGh0aWPyIqeQ=", "owner": "NuschtOS", "repo": "search", - "rev": "9f7426e532ef8dfc839c4a3fcc567b13a20a70d3", + "rev": "c3c3928b8de7d300c34e9d90fdc19febd1a32062", "type": "github" }, "original": { @@ -831,11 +831,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1727423009, - "narHash": "sha256-+4B/dQm2EnORIk0k2wV3aHGaE0WXTBjColXjj7qWh10=", + "lastModified": 1727734513, + "narHash": "sha256-i47LQwoGCVQq4upV2YHV0OudkauHNuFsv306ualB/Sw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "127a96f49ddc377be6ba76964411bab11ae27803", + "rev": "3198a242e547939c5e659353551b0668ec150268", "type": "github" }, "original": { @@ -852,11 +852,11 @@ ] }, "locked": { - "lastModified": 1727669861, - "narHash": "sha256-Qb9DGXner4NnvSfO6IdvqoNgg8jUkIz7i8l+PSDviDk=", + "lastModified": 1727929035, + "narHash": "sha256-buGueZsmGX/TKzSIO8alIK4QWcm0ciZ6j6veO1nxVKM=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "ec53a68450d888d245dbf0d4b0f9365217d0ed5d", + "rev": "829a81049fb019d12be8daf867c03de2ee52d49f", "type": "github" }, "original": { diff --git a/home/programs/kitty/default.nix b/home/programs/kitty/default.nix index aa46eca..47fc6d7 100644 --- a/home/programs/kitty/default.nix +++ b/home/programs/kitty/default.nix @@ -1,13 +1,14 @@ -{ config, pkgs, ... }: { +{ config, ... }: { programs.kitty = { enable = true; - # Reset existing mappings keybindings = { + # Reset existing mappings "ctrl+alt+tab" = "next_tab"; "ctrl+alt+shift+tab" = "previous_tab"; # Send Ctrl Tab and Ctrl + Shift + Tab for Tmux navigation "ctrl+tab" = "send_text all \\x1b[27;5;9~"; "ctrl+shift+tab" = "send_text all \\x1b[27;6;9~"; + "alt+tab" = "send_text all \\x1b[27;3;9~"; }; settings = { scrollback_lines = 10000; @@ -18,7 +19,7 @@ confirm_os_window_close = "0"; remember_window_size = "no"; disable_ligatures = "never"; - shell = "${pkgs.tmux}/bin/tmux"; + # shell = "${pkgs.tmux}/bin/tmux"; url_style = "curly"; cursor_shape = "Underline"; cursor_underline_thickness = config.var.theme.border-size; diff --git a/home/programs/shell/tmux.nix b/home/programs/shell/tmux.nix index 79b2b79..9a326ad 100644 --- a/home/programs/shell/tmux.nix +++ b/home/programs/shell/tmux.nix @@ -12,53 +12,20 @@ bind-key j select-pane -D bind-key k select-pane -U bind-key l select-pane -R + set -gq allow-passthrough on + bind-key x kill-pane # skip "kill-pane 1? (y/n)" prompt + set -g detach-on-destroy off # don't exit from tmux when closing a session - bind-key -n C-Tab select-window -n + bind-key -n C-Tab next-window bind-key -n C-S-Tab previous-window - - bind-key "t" run-shell "sesh connect \"$( - sesh list -t | fzf-tmux -p 65%,70% \ - --no-sort --ansi --border-label ' sesh ' --prompt 'โšก ' \ - --header ' ^a all ^t tmux ^g configs ^x zoxide ^d tmux kill ^f find' \ - --bind 'tab:down,btab:up' \ - --bind 'ctrl-a:change-prompt(โšก )+reload(sesh list)' \ - --bind 'ctrl-t:change-prompt(๐ŸชŸ )+reload(sesh list -t)' \ - --bind 'ctrl-g:change-prompt(โš™๏ธ )+reload(sesh list -c)' \ - --bind 'ctrl-x:change-prompt(๐Ÿ“ )+reload(sesh list -z)' \ - --bind 'ctrl-f:change-prompt(๐Ÿ”Ž )+reload(fd -H -d 2 -t d -E .Trash . ~)' \ - --bind 'ctrl-d:execute(tmux kill-session -t {})+change-prompt(โšก )+reload(sesh list)' - )\"" + bind-key -n M-Tab new-window ''; plugins = with pkgs; [ tmuxPlugins.vim-tmux-navigator - { - plugin = tmuxPlugins.catppuccin; - extraConfig = '' - set-option -g status-position top - set -g @catppuccin_window_left_separator "๎‚ถ" - set -g @catppuccin_window_right_separator "๎‚ดย " - set -g @catppuccin_window_middle_separator " โ–ˆ" - set -g @catppuccin_window_number_position "right" - - set -g @catppuccin_window_default_fill "number" - set -g @catppuccin_window_default_text "#W" - - set -g @catppuccin_window_current_fill "number" - set -g @catppuccin_window_current_text "#W" - - set -g @catppuccin_status_modules_right "" - set -g @catppuccin_status_left_separator " ๎‚ถ" - set -g @catppuccin_status_right_separator "๎‚ด" - set -g @catppuccin_status_fill "icon" - set -g @catppuccin_status_connect_separator "no" - - set -g @catppuccin_directory_text "#{pane_current_path}" - set -g @catppuccin_status_background "default" - set-option -g default-terminal "screen-256color" - ''; - } + tmuxPlugins.resurrect + tmuxPlugins.nord ]; }; } diff --git a/home/programs/shell/zsh.nix b/home/programs/shell/zsh.nix index 9d3593b..8fd6a40 100644 --- a/home/programs/shell/zsh.nix +++ b/home/programs/shell/zsh.nix @@ -21,12 +21,23 @@ "echo; ${pkgs.pfetch}/bin/pfetch" else ""} + + function sesh-sessions() { + session=$(sesh list -t -c | fzf --height 70% --reverse) + [[ -z "$session" ]] && return + sesh connect $session + } + + zle -N sesh-sessions + bindkey -M emacs '\es' sesh-sessions + bindkey -M vicmd '\es' sesh-sessions + bindkey -M viins '\es' sesh-sessions ''; history = { ignoreDups = true; - save = 1000000; - size = 1000000; + save = 10000; + size = 10000; }; profileExtra = lib.optionalString (config.home.sessionPath != [ ]) '' diff --git a/home/scripts/default.nix b/home/scripts/default.nix index a6e684a..dacc8e4 100644 --- a/home/scripts/default.nix +++ b/home/scripts/default.nix @@ -5,6 +5,7 @@ ./brightness ./caffeine ./hyprpanel + ./hyprfocus ./night-shift ./screenshot ./nerdfont_fzf diff --git a/home/scripts/hyprfocus/default.nix b/home/scripts/hyprfocus/default.nix new file mode 100644 index 0000000..e72f2af --- /dev/null +++ b/home/scripts/hyprfocus/default.nix @@ -0,0 +1,19 @@ +{ pkgs, ... }: +let + hyprfocus = pkgs.writeShellScriptBin "hyprfocus" '' + hyprctl keyword "general:gaps_in" 0 + hyprctl keyword "general:gaps_out" 0 + # TODO: Fix this: + hyprpanel-toggle + hyprctl keyword "general:border_size" 1 + hyprctl keyword "decoration:rounding" 0 + hyprctl keyword "decoration:drop_shadow" false + hyprctl keyword "decoration:inactive_opacity" 0.98 + hyprctl keyword "decoration:active_opacity" 1 + ''; + + hyprfocus-kill = pkgs.writeShellScriptBin "hyprfocus-kill" '' + hyprctl reload + hyprpanel-reload + ''; +in { home.packages = [ hyprfocus hyprfocus-kill ]; } diff --git a/home/scripts/hyprpanel/default.nix b/home/scripts/hyprpanel/default.nix index acfdd3e..932abed 100644 --- a/home/scripts/hyprpanel/default.nix +++ b/home/scripts/hyprpanel/default.nix @@ -6,8 +6,13 @@ let hyprpanel -t bar-2 hyprpanel -t bar-3 ''; + hyprpanel-reload = pkgs.writeShellScriptBin "hyprpanel-reload" '' [ $(pgrep "ags") ] && pkill ags hyprctl dispatch exec hyprpanel ''; -in { home.packages = [ hyprpanel-toggle hyprpanel-reload ]; } + + hyprpanel-kill = pkgs.writeShellScriptBin "hyprpanel-kill" '' + [ $(pgrep "ags") ] && pkill ags + ''; +in { home.packages = [ hyprpanel-toggle hyprpanel-reload hyprpanel-kill ]; } diff --git a/hosts/themes/nixy.nix b/hosts/themes/nixy.nix index 81d0488..94664b0 100644 --- a/hosts/themes/nixy.nix +++ b/hosts/themes/nixy.nix @@ -2,7 +2,7 @@ wallpaper = "the-road-black.png"; font = "SFProDisplay Nerd Font"; - font-mono = "FiraCode Nerd Font Mono"; + font-mono = "MesloLGM Nerd Font Mono"; font-size = 14; rounding = 15;