color rework, flake bump

This commit is contained in:
Lennart J. Kurzweg (Nx2)
2024-05-12 21:55:03 +02:00
parent 2db49fe4c6
commit d97010da0c
14 changed files with 424 additions and 278 deletions

149
flake.nix
View File

@@ -9,8 +9,9 @@
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland ={
url = "github:hyprwm/Hyprland";
hyprland = {
url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
# url = "github:hyprwm/Hyprland";
# inputs.nixpkgs.follows = "nixpkgs";
};
hyprland-plugins = {
@@ -75,35 +76,38 @@
};
secrets = import ./secrets/passwords-and-certificates.nix;
rice = rec {
lib = import ./nxlib/ricelib.nix { lib = nixpkgs.lib; };
transparency = 0.9;
rounding = 0;
gap-size = 0;
border-width = 2;
color = rec {
background = "#000000";
foreground = white;
border = red;
accent = magenta;
black = "#111111"; # "#000000" "#000000"
bright-black = "#444444"; # "#231a40" "#231a40"
blue = "#4411ff"; # "#9d00ff" "#432d59"
bright-blue = "#9977ff"; # "#c76eff" "#593380"
cyan = "#00ffff"; # "#00ddff" "#00ff00"
bright-cyan = "#88ffff"; # "#33f9ff" "#b08ae6"
green = "#00ff00"; # "#0048ff" "#9045e6"
bright-green = "#88ff88"; # "#1166ff" "#a366ff"
magenta = "#ff00ff"; # "#B21889" "#a82ee6"
bright-magenta = "#ff88ff"; # "#ff75f6" "#bb66cc"
red = "#ff0044"; # "#ff0044" "#f29df2"
bright-red = "#ff4499"; # "#ff4576" "#4595e6"
white = "#dddddd"; # "#939599" "#40dfff"
bright-white = "#ffffff"; # "#ffffff" "#4136d9"
yellow = "#ff4400"; # "#ff4000" "#7e5ce6"
bright-yellow = "#ff8844"; # "#ff8454" "#a886bf"
};
color =
let
dark = (-0.3);
bright = (0.3);
alter = let f = rice.lib.alter-luminace-hex; in color-name: color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; };
ccolor = builtins.mapAttrs alter {
black = "#000000";
grey = "#666666";
white = "#dddddd";
blue = "#4411ff";
cyan = "#00ffff";
green = "#00ff00";
magenta = "#ff00ff";
red = "#ff0044";
yellow = "#ff4400";
};
xcolor = with ccolor; {
background = black.base;
foreground = white.base;
border = red.base;
border2 = blue.base;
accent = magenta.base;
tertiary = blue.base;
};
in ccolor // xcolor;
font = {
code = {
name = "JetBrainsMono-NF";
@@ -121,72 +125,73 @@
in
{
nixosConfigurations = {
NxXPS = let
host = "NxXPS";
in
nixpkgs.lib.nixosSystem {
inherit system;
modules = [ ./configuration.nix ];
specialArgs = { inherit inputs user host pkgs-unstable allowed secrets rice nvidia; };
};
NxXPS =
let
host = "NxXPS";
in
nixpkgs.lib.nixosSystem {
inherit system;
modules = [ ./configuration.nix ];
specialArgs = { inherit inputs user host pkgs-unstable allowed secrets rice nvidia; };
};
NxNORTH = let host = "NxNORTH"; in nixpkgs.lib.nixosSystem {
inherit system;
modules = [ ./configuration.nix ];
specialArgs = { inherit inputs user host pkgs-unstable allowed secrets rice nvidia; };
};
NxACE =
let
host = "NxACE";
nvidia.enable = false;
in
nixpkgs.lib.nixosSystem {
inherit system;
modules = [ ./configuration.nix ];
specialArgs = { inherit inputs user host pkgs-unstable allowed secrets rice nvidia; };
};
NxACE =
let
host = "NxACE";
nvidia.enable = false;
in
nixpkgs.lib.nixosSystem {
inherit system;
modules = [ ./configuration.nix ];
specialArgs = { inherit inputs user host pkgs-unstable allowed secrets rice nvidia; };
};
};
homeConfigurations = {
"${user}@NxXPS" = let host = "NxXPS"; in home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [
modules = [
./home.nix
];
];
extraSpecialArgs = { inherit inputs system user host allowed secrets pkgs-unstable rice nvidia; };
};
"${user}@NxNORTH" = let host = "NxNORTH"; in home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [
modules = [
./home.nix
];
];
extraSpecialArgs = { inherit inputs system user host allowed secrets pkgs-unstable rice nvidia; };
};
"${user}@NxACE" =
let
host = "NxACE";
nvidia.enable = false;
in
home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [
./home.nix
];
extraSpecialArgs = { inherit inputs system user host allowed secrets pkgs-unstable rice nvidia; };
};
"tv@NxACE" =
let
host = "NxACE";
user = "tv";
nvidia.enable = pkgs.kib.mkForce false;
in
home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [
./home.nix
];
extraSpecialArgs = { inherit inputs system user host allowed secrets pkgs-unstable rice nvidia; };
};
"${user}@NxACE" =
let
host = "NxACE";
nvidia.enable = false;
in
home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [
./home.nix
];
extraSpecialArgs = { inherit inputs system user host allowed secrets pkgs-unstable rice nvidia; };
};
"tv@NxACE" =
let
host = "NxACE";
user = "tv";
nvidia.enable = pkgs.kib.mkForce false;
in
home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [
./home.nix
];
extraSpecialArgs = { inherit inputs system user host allowed secrets pkgs-unstable rice nvidia; };
};
};
};
}