bertof/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update rice

Browse source
This commit is contained in:
Filippo Berto 2022-06-05 17:27:17 +02:00
parent 601cd4d429
commit 26a4a16638
6 changed files with 66 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

24
flake.lock generated
View file

@ -43,11 +43,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1654113406, "lastModified": 1654422613,
"narHash": "sha256-70esZvhal+FsyU89mJRcAb+cDGHKt0sgZ6MlRr9Cplg=", "narHash": "sha256-ZxkMM13AnrMwYOV99ohzcqeTkAOqD9Q2SBdZ9WoFE9Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "684e85d01d333be91c4875baebb05b93c7d2ffaa", "rev": "20703892473d01c70fb10248442231fe94f4ceb4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -65,11 +65,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1654188574, "lastModified": 1654440289,
"narHash": "sha256-wl87aE0JGd2viY7io0FLS4nHKAa8f9MVZWXohUvEbDU=", "narHash": "sha256-Mgm0eUNDb9td3aVImg7jYq/0W0XWPJo1g6K4ONgr31U=",
"owner": "bertof", "owner": "bertof",
"repo": "nix-rice", "repo": "nix-rice",
"rev": "0ce38b26d5fc9392cc2972f77e42549075a8e78d", "rev": "9faf7bdc8935577f48eb80d4625a01a024e82489",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -111,11 +111,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1654252671, "lastModified": 1654435734,
"narHash": "sha256-R5kyXCUC8wy4tsCbXppfyvk/q0CgiHtq7zbvR7SXoZ4=", "narHash": "sha256-5heW64p01GTp3vhOlTKVsZSRlQlqM37cCYcVByfg0WA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d06103277d3982e86d7eea927706376b42085c61", "rev": "e56f11391a431fa1063cd8ae9784c2efd4516619",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -211,11 +211,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1654019511, "lastModified": 1654230545,
"narHash": "sha256-s3fcwUxa2rV2ZmSbdOtisNmXqeqnF9IFrvhPQL5GCBU=", "narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "692517bf851f2d8d999f0ad50f53fa1d2dd5c8f9", "rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
home_manager/modules/kitty.nix
View file

@ -23,6 +23,7 @@ in
{ {
programs.kitty = { programs.kitty = {
enable = true; enable = true;
package = pkgs.unstable.kitty;
settings = { settings = {
scrollback_lines = 10000; scrollback_lines = 10000;
enable_audio_bell = false; enable_audio_bell = false;

21
home_manager/modules/polybar.nix
View file

@ -1,6 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
inherit (pkgs.rice) colorPalette; inherit (pkgs.rice) colorPalette opacity;
grep = "${pkgs.gnugrep}/bin/grep"; grep = "${pkgs.gnugrep}/bin/grep";
cut = "${pkgs.coreutils}/bin/cut"; cut = "${pkgs.coreutils}/bin/cut";
head = "${pkgs.coreutils}/bin/head"; head = "${pkgs.coreutils}/bin/head";
@ -16,20 +16,27 @@ let
session=`${loginctl} session-status | ${pkgs.coreutils}/bin/head -n 1 | ${pkgs.gawk}/bin/awk '{print $1}'` session=`${loginctl} session-status | ${pkgs.coreutils}/bin/head -n 1 | ${pkgs.gawk}/bin/awk '{print $1}'`
${loginctl} terminate-session $session ${loginctl} terminate-session $session
''; '';
colors = with pkgs.lib.rice; palette.toARGBHex rec { colors = with pkgs.lib.rice; let
alpha = 255 * opacity;
in
palette.toARGBHex rec {
normal = { normal = {
foreground = colorPalette.normal.white; foreground = colorPalette.normal.white;
background = colorPalette.normal.black; background = color.setAlphaRgba alpha (colorPalette.normal.black);
underline = colorPalette.normal.blue; underline = colorPalette.dark.blue;
}; };
active = palette.brighten "50%" normal; active = {
foreground = colorPalette.bright.white;
background = color.setAlphaRgba alpha (colorPalette.normal.black);
underline = colorPalette.bright.blue;
};
selected = { selected = {
foreground = colorPalette.bright.white; foreground = colorPalette.bright.white;
background = colorPalette.bright.black; background = color.setAlphaRgba alpha (color.brighten 10 colorPalette.bright.black);
underline = colorPalette.normal.white; underline = builtins.trace colorPalette.bright.red colorPalette.bright.red;
}; };
alert = colorPalette.bright.red; alert = colorPalette.bright.red;

2
home_manager/modules/sxhkd.nix
View file

@ -2,7 +2,7 @@
{ {
imports = [ ./thunar.nix ]; imports = [ ./thunar.nix ];
home.packages = with pkgs; [ home.packages = with pkgs; [
kitty unstable.kitty
lockscreen lockscreen
pamixer pamixer
playerctl playerctl

41
rice.nix
View file

@ -1,39 +1,30 @@
final: prev: final: prev:
let let
# nord = prev.lib.rice.palette.tPalette prev.lib.rice.color.hexToRgba (import ./themes/nord.nix); # nord = prev.lib.rice.palette.tPalette prev.lib.rice.color.hexToRgba (import ./themes/nord.nix);
onedark = prev.lib.rice.palette.tPalette prev.lib.rice.color.hexToRgba (import ./themes/onedark.nix); # onedark = prev.lib.rice.palette.tPalette prev.lib.rice.color.hexToRgba (import ./themes/onedark.nix);
# tomorrow-night = prev.lib.rice.palette.tPalette prev.lib.rice.color.hexToRgba (import ./themes/tomorrow-night.nix); # tomorrow-night = prev.lib.rice.palette.tPalette prev.lib.rice.color.hexToRgba (import ./themes/tomorrow-night.nix);
mkpm = with prev.lib.rice; palette.tPalette color.hexToRgba (import ./themes/monokai-pro-machine.nix);
in in
( (
rec { rec {
rice = { rice = {
colorPalette = with prev.lib.rice; palette.defaultPalette // rec { colorPalette = with prev.lib.rice; rec {
normal = { normal = palette.defaultPalette // {
black = onedark.black; black = mkpm.base2;
blue = onedark.blue; blue = mkpm.blue;
cyan = onedark.cyan; green = mkpm.green;
green = onedark.green; red = mkpm.red;
magenta = onedark.magenta; white = mkpm.base7;
red = onedark.darkRed; yellow = mkpm.yellow;
white = onedark.white;
yellow = onedark.darkYellow;
}; };
bright = palette.brighten 10 normal // { bright = palette.brighten 10 normal // {
red = onedark.lightRed; red = mkpm.orange;
yellow = onedark.lightYellow; black = mkpm.base3;
# blue = nord.n9; white = mkpm.base8;
# black = nord.n2; };
# red = nord.n12; dark = palette.darken 10 normal // {
# white = nord.n6; black = mkpm.base0;
}; };
dark = palette.darken 10 normal
# // {
# # black = nord.n0;
# # blue = nord.n3;
# # cyan = nord.n7;
# # white = nord.n4;
# }
;
}; };
font = { font = {
normal = { normal = {

22
themes/monokai-pro-machine.nix Normal file
View file

@ -0,0 +1,22 @@
# Monokai Pro Machine palette (https://github.com/helix-editor/helix/blob/9be810fd01f495c795ab5e5b7240a32708d19f5c/runtime/themes/monokai_pro_machine.toml)
{
# primary colors
red = "#ff6d7e";
orange = "#ffb270";
yellow = "#ffed72";
green = "#a2e57b";
blue = "#7cd5f1";
purple = "#baa0f8";
# base colors
base0 = "#161b1e";
base1 = "#1d2528";
base2 = "#273136";
base3 = "#3a4449";
base4 = "#545f62";
base5 = "#6b7678";
base6 = "#798384";
base7 = "#b8c4c3";
base8 = "#f2fffc";
# variants
base8x0c = "#303a3e";
}