From 470b3d97825e55bce4a39f859c3dd74d39238db2 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Fri, 15 Nov 2024 22:55:51 +0800 Subject: [PATCH] flake: bump --- flake.lock | 60 +++++++++++++++--------------- home/applications/tmux/default.nix | 44 +++++++++++----------- 2 files changed, 53 insertions(+), 51 deletions(-) diff --git a/flake.lock b/flake.lock index e75f182..cdf6508 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ ] }, "locked": { - "lastModified": 1731037643, - "narHash": "sha256-N8gaV5bngMQPGyuo/RVdEsHTXvOeqjUhhxXpGea12DE=", + "lastModified": 1731527002, + "narHash": "sha256-dI9I6suECoIAmbS4xcrqF8r2pbmed8WWm5LIF1yWPw8=", "owner": "zhaofengli", "repo": "colmena", - "rev": "03f1a18a6fba9ad9c4edb1cc7cf394390c304198", + "rev": "e3ad42138015fcdf2524518dd564a13145c72ea1", "type": "github" }, "original": { @@ -34,11 +34,11 @@ }, "crane": { "locked": { - "lastModified": 1730652660, - "narHash": "sha256-+XVYfmVXAiYA0FZT7ijHf555dxCe+AoAT5A6RU+6vSo=", + "lastModified": 1731098351, + "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", "owner": "ipetkov", "repo": "crane", - "rev": "a4ca93905455c07cb7e3aca95d4faf7601cba458", + "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", "type": "github" }, "original": { @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1731026109, - "narHash": "sha256-X1/F4qNzKuhnWwO32b774nPVLnNLnJILyT61zsjk3FA=", + "lastModified": 1731549112, + "narHash": "sha256-c9I3i1CwZ10SoM5npQQVnfwgvB86jAS3lT4ZqkRoSOI=", "owner": "nix-community", "repo": "disko", - "rev": "f3f8254fccc321f4cac0d716f73203bfd5e02477", + "rev": "5fd852c4155a689098095406500d0ae3d04654a8", "type": "github" }, "original": { @@ -109,11 +109,11 @@ ] }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1730837930, - "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", + "lastModified": 1731604581, + "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", + "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", "type": "github" }, "original": { @@ -260,11 +260,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1730919458, - "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=", + "lastModified": 1731403644, + "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e1cc1f6483393634aee94514186d21a4871e78d7", + "rev": "f6581f1c3b137086e42a08a906bdada63045f991", "type": "github" }, "original": { @@ -275,11 +275,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731044552, - "narHash": "sha256-yW3lHfJv+3xN0wXlKxXxzwIy9/GAhcOE/pczwExmGhM=", + "lastModified": 1731682420, + "narHash": "sha256-sfhttUzz6O9YdpoEMJCCw6jjYQ2EVBjM/owcXHoMk/4=", "owner": "Guanran928", "repo": "nixpkgs", - "rev": "ea61949b8f73610fdd5636620385147e6fe3232d", + "rev": "a5443503ff2c9f1491bda1298f35dae196773ccc", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1730814269, - "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "d70155fdc00df4628446352fc58adc640cd705c2", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -363,11 +363,11 @@ ] }, "locked": { - "lastModified": 1731032894, - "narHash": "sha256-dQSyYPmrQiPr+PGEd+K8038rubFGz7G/dNXVeaGWE0w=", + "lastModified": 1731637922, + "narHash": "sha256-6iuzRINXyPX4DfUQZIGafpJnzjFXjVRYMymB10/jFFY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d52f2a4c103a0acf09ded857b9e2519ae2360e59", + "rev": "db10c66da18e816030b884388545add8cf096647", "type": "github" }, "original": { @@ -386,11 +386,11 @@ ] }, "locked": { - "lastModified": 1731008979, - "narHash": "sha256-yN1NxvmqV8UltLkqYBWTeZNgpD/eyh/7LM58caHiEfE=", + "lastModified": 1731364708, + "narHash": "sha256-HC0anOL+KmUQ2hdRl0AtunbAckasxrkn4VLmxbW/WaA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "fe63071416471abdab06caa234122932a7c4b980", + "rev": "4c91d52db103e757fc25b58998b0576ae702d659", "type": "github" }, "original": { diff --git a/home/applications/tmux/default.nix b/home/applications/tmux/default.nix index e5e311b..e45d53d 100644 --- a/home/applications/tmux/default.nix +++ b/home/applications/tmux/default.nix @@ -2,29 +2,31 @@ { home.packages = [ pkgs.tmux ]; - xdg.configFile."tmux/tmux.conf".text = '' - run-shell ${pkgs.tmuxPlugins.sensible.rtp} - run-shell ${pkgs.tmuxPlugins.prefix-highlight.rtp} + xdg.configFile."tmux/tmux.conf".text = + '' + run-shell ${pkgs.tmuxPlugins.sensible.rtp} + run-shell ${pkgs.tmuxPlugins.prefix-highlight.rtp} - set-option -s default-terminal "tmux-256color" + set-option -s default-terminal "tmux-256color" - set-option -g base-index 1 - set-option -w -g pane-base-index 1 - set-option -g renumber-windows on + set-option -g base-index 1 + set-option -w -g pane-base-index 1 + set-option -g renumber-windows on - set-option -g status-keys vi - set-option -w -g mode-keys vi - set-option -g mouse on - set-option -s set-clipboard on - set-option -w -g aggressive-resize on + set-option -g status-keys vi + set-option -w -g mode-keys vi + set-option -g mouse on + set-option -s set-clipboard on + set-option -w -g aggressive-resize on - bind-key -N "Select pane to the left of the active pane" h select-pane -L - bind-key -N "Select pane below the active pane" j select-pane -D - bind-key -N "Select pane above the active pane" k select-pane -U - bind-key -N "Select pane to the right of the active pane" l select-pane -R - bind-key -r -N "Resize the pane left by 5" H resize-pane -L 5 - bind-key -r -N "Resize the pane down by 5" J resize-pane -D 5 - bind-key -r -N "Resize the pane up by 5" K resize-pane -U 5 - bind-key -r -N "Resize the pane right by 5" L resize-pane -R 5 - '' + builtins.readFile ./tokyonight_night.tmux; + bind-key -N "Select pane to the left of the active pane" h select-pane -L + bind-key -N "Select pane below the active pane" j select-pane -D + bind-key -N "Select pane above the active pane" k select-pane -U + bind-key -N "Select pane to the right of the active pane" l select-pane -R + bind-key -r -N "Resize the pane left by 5" H resize-pane -L 5 + bind-key -r -N "Resize the pane down by 5" J resize-pane -D 5 + bind-key -r -N "Resize the pane up by 5" K resize-pane -U 5 + bind-key -r -N "Resize the pane right by 5" L resize-pane -R 5 + '' + + builtins.readFile ./tokyonight_night.tmux; }