diff --git a/flake.lock b/flake.lock index 3422e28..6b47370 100644 --- a/flake.lock +++ b/flake.lock @@ -90,7 +90,8 @@ "home-manager": "home-manager", "nixgl": "nixgl", "nixpkgs": "nixpkgs_2", - "rose-pine": "rose-pine" + "rose-pine": "rose-pine", + "rose-pine-amfora": "rose-pine-amfora" } }, "rose-pine": { @@ -107,6 +108,22 @@ "type": "git", "url": "https://git.punkfairie.net/punkfairie/rose-pine-nix" } + }, + "rose-pine-amfora": { + "flake": false, + "locked": { + "lastModified": 1645462324, + "narHash": "sha256-HUgdRxDKwXFubvCg5OWAwWF6fi8HEhH9xcOPpPonBKg=", + "owner": "rose-pine", + "repo": "amfora", + "rev": "65afcf6c162cd1d960499c657e83603878b91c2d", + "type": "github" + }, + "original": { + "owner": "rose-pine", + "repo": "amfora", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index d3fc912..bbad653 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,12 @@ nixgl.url = "github:nix-community/nixGL"; rose-pine.url = "git+https://git.punkfairie.net/punkfairie/rose-pine-nix"; + + # Rose pine themes that aren't included in the above flake: + rose-pine-amfora = { + url = "github:rose-pine/amfora"; + flake = false; + }; }; outputs = @@ -31,6 +37,7 @@ extraSpecialArgs = with inputs; { inherit nixgl; + inherit inputs; }; modules = [ diff --git a/home/amfora/default.nix b/home/amfora/default.nix new file mode 100644 index 0000000..01c07ae --- /dev/null +++ b/home/amfora/default.nix @@ -0,0 +1,63 @@ +{ pkgs, inputs, ... }: +{ + home.packages = with pkgs; [ + amfora + ]; + + # TODO: Change this based on current theme. + # Possibly set this in rose-pine-nix as well? + # There is no programs.amfora so it would require adding attl opts to base + # rose-pine. + xdg.configFile."amfora/theme.toml".source = "${inputs.rose-pine-amfora}/themes/rose-pine.toml"; + + # https://github.com/makeworld-the-better-one/amfora/blob/master/default-config.toml + # Amfora requires a number of options to run - omitting everything didn't care + # to customize resulted in go panic errors. + xdg.configFile."amfora/config.toml".text = # toml + '' + include = "./theme.toml" + + [a-general] + # Defaults {{{ + home = "gemini://geminiprotocol.net" + auto_redirect = false + http = 'default' + search = "gemini://geminispace.info/search" + color = true + ansi = true + highlight_code = true + bullets = true + show_link = false + max_width = 80 + downloads = "" + page_max_size = 2097152 # 2 MiB + page_max_time = 10 + scrollbar = "auto" + underline = true + }}} + + # TODO: Change based on current theme. + highlight_style = "rose-pine" + + [url-handlers] + # Defaults {{{ + other = 'default' + # }}} + + [cache] + # Defaults {{{ + max_size = 0 + max_pages = 30 + timeout = 1800 + # }}} + + [subscriptions] + # Defaults {{{ + popup = true + update_interval = 1800 + workers = 3 + entries_per_page = 20 + header = true + # }}} + ''; +} diff --git a/home/default.nix b/home/default.nix index d9deeaf..ccceb27 100644 --- a/home/default.nix +++ b/home/default.nix @@ -45,6 +45,7 @@ fonts.fontconfig.defaultFonts.monospace = [ "Maple Mono NF" ]; imports = [ + ./amfora ./bat ./btop ./cava diff --git a/home/tmux/default.nix b/home/tmux/default.nix index b27a577..13e23c4 100644 --- a/home/tmux/default.nix +++ b/home/tmux/default.nix @@ -67,12 +67,19 @@ yank + { + plugin = jump; + extraConfig = # tmux + '' + set -g @jump-key 's' + ''; + } + { plugin = fingers; extraConfig = # tmux '' - set -g @fingers-jump-key 's' - set -g @fingers-key 'S' + set -g @fingers-jump-key 'f' ''; }