From 2e0b3d5179fbe4a086018308c6070f36327424a5 Mon Sep 17 00:00:00 2001 From: Ricard Illa Date: Fri, 26 May 2023 15:07:11 +0200 Subject: [PATCH] feat: updated flake --- capibara.nix | 2 - flake.lock | 36 ++++++++--------- home/desktop-river/zathura.nix | 72 ++++++++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+), 20 deletions(-) create mode 100644 home/desktop-river/zathura.nix diff --git a/capibara.nix b/capibara.nix index ed615fe..fe1ef20 100644 --- a/capibara.nix +++ b/capibara.nix @@ -28,7 +28,6 @@ in { home-manager = { users.rilla.imports = [ home/capibara.nix "${impermanence}/home-manager.nix" ]; - extraSpecialArgs.stablePkgs = stablePkgs; }; fileSystems = { @@ -141,7 +140,6 @@ in { efiSupport = false; efiInstallAsRemovable = false; enable = true; - version = 2; device = "/dev/disk/by-id/ata-KINGSTON_SKC600MS512G_50026B7783FC3D2F"; }; }; diff --git a/flake.lock b/flake.lock index e706d6c..12661b0 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1682009832, - "narHash": "sha256-QdNOeFE7sI+0ddqVfn9vQDCUs7OdxhJ7evo9sdyP82Y=", + "lastModified": 1684774948, + "narHash": "sha256-hJTaw4dYzcB+lsasKejnafq0CxPsVetn9RLXrcL+4jE=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a1ee4d333b092bc055655fb06229eb3013755812", + "rev": "b8c286c82c6b47826a6c0377e7017052ad91353c", "type": "github" }, "original": { @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1682419509, - "narHash": "sha256-+/HI3RbJcEKQ5+55dECzh8geginsbabsA0R3ORKi2Us=", + "lastModified": 1685019994, + "narHash": "sha256-81o6SKZPALvib21hIOMx2lIhFSs0mRy0PfPvg0zsfTk=", "owner": "nix-community", "repo": "home-manager", - "rev": "6142193635ecdafb9a231bd7d1880b9b7b210d19", + "rev": "d1f04b0f365a34896a37d9015637796537ec88a3", "type": "github" }, "original": { @@ -44,11 +44,11 @@ }, "impermanence": { "locked": { - "lastModified": 1682268411, - "narHash": "sha256-ICDKQ7tournRVtfM8C2II0qHiOZOH1b3dXVOCsgr11o=", + "lastModified": 1684264534, + "narHash": "sha256-K0zr+ry3FwIo3rN2U/VWAkCJSgBslBisvfRIPwMbuCQ=", "owner": "nix-community", "repo": "impermanence", - "rev": "df1692e2d9f1efc4300b1ea9201831730e0b817d", + "rev": "89253fb1518063556edd5e54509c30ac3089d5e6", "type": "github" }, "original": { @@ -59,11 +59,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1680876084, - "narHash": "sha256-eP9yxP0wc7XuVaODugh+ajgbFGaile2O1ihxiLxOuvU=", + "lastModified": 1684899633, + "narHash": "sha256-NtwerXX8UFsoNy6k+DukJMriWtEjQtMU/Urbff2O2Dg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3006d2860a6ed5e01b0c3e7ffb730e9b293116e2", + "rev": "4cc688ee711159b9bcb5a367be44007934e1a49d", "type": "github" }, "original": { @@ -75,11 +75,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1682453498, - "narHash": "sha256-WoWiAd7KZt5Eh6n+qojcivaVpnXKqBsVgpixpV2L9CE=", + "lastModified": 1684935479, + "narHash": "sha256-6QMMsXMr2nhmOPHdti2j3KRHt+bai2zw+LJfdCl97Mk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8018361fa1d1650ee8d4b96294783cf564e8a7f", + "rev": "f91ee3065de91a3531329a674a45ddcb3467a650", "type": "github" }, "original": { @@ -90,11 +90,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1682303062, - "narHash": "sha256-x+KAADp27lbxeoPXLUMxKcRsUUHDlg+qVjt5PjgBw9A=", + "lastModified": 1684936879, + "narHash": "sha256-BOSq/QiX7MDs8tUnAt4+nYTJctgYkzVSNL95qlfMYeM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f5364316e314436f6b9c8fd50592b18920ab18f9", + "rev": "99fe1b870522d6ee3e692c2b6e663d6868a3fde4", "type": "github" }, "original": { diff --git a/home/desktop-river/zathura.nix b/home/desktop-river/zathura.nix new file mode 100644 index 0000000..5f5308d --- /dev/null +++ b/home/desktop-river/zathura.nix @@ -0,0 +1,72 @@ +{ config, pkgs, fontSize ? "10", monoFontSize ? "9", ... }: +let + gruvbox-dark = { + bg = "#282828"; + bg1 = "#3c3836"; + bg2 = "#504945"; + + fg = "#ebdbb2"; + fg0 = "#fbf1c7"; + fg3 = "#bdae93"; + + red = "#cc241d"; + green = "#98971a"; + yellow = "#d79921"; + blue = "#458588"; + purple = "#b16286"; + aqua = "#689d6a"; + gray = "#a89984"; + + gray2 = "#928374"; + red-light = "#fb4934"; + green-light = "#b8bb26"; + yellow-light = "#fabd2f"; + blue-light = "#83a598"; + purple-light = "#d3869b"; + aqua-light = "#8ec07c"; + + }; + colors = { + fg = gruvbox-dark.fg; + selFg = gruvbox-dark.fg0; + bg = gruvbox-dark.bg; + sel = gruvbox-dark.blue; + inactive = gruvbox-dark.gray; + inactiveBorder = gruvbox-dark.bg2; + urgent = gruvbox-dark.red; + }; + monoFont = { + name = "Hack"; + size = monoFontSize; + }; +in { + + programs.zathura = { + enable = true; + options = { + font = "${monoFont.name} ${monoFont.size}"; + default-bg = colors.bg; + default-fg = gruvbox-dark.bg1; + statusbar-fg = gruvbox-dark.fg3; + statusbar-bg = gruvbox-dark.bg2; + inputbar-bg = colors.bg; + inputbar-fg = colors.sel; + notification-bg = colors.bg; + notification-fg = colors.sel; + notification-error-bg = colors.bg; + notification-error-fg = gruvbox-dark.red-light; + notification-warning-bg = colors.bg; + notification-warning-fg = gruvbox-dark.red-light; + highlight-color = gruvbox-dark.yellow-light; + highlight-active-color = gruvbox-dark.blue-light; + completion-bg = gruvbox-dark.bg1; + completion-fg = gruvbox-dark.blue-light; + completion-highlight-fg = colors.selFg; + completion-highlight-bg = gruvbox-dark.blue-light; + recolor-lightcolor = colors.bg; + recolor-darkcolor = colors.fg; + recolor = false; + recolor-keephue = false; + }; + }; +}