WIP: integrate nix-colors into setup #2

Draft
stupidcomputer wants to merge 1 commits from colors.nix into master
4 changed files with 82 additions and 5 deletions
Showing only changes of commit 0e1a9f2369 - Show all commits

View File

@ -1,6 +1,8 @@
{ lib, config, pkgs, ...}: { lib, config, pkgs, inputs, ...}:
{ let
nix-color-lib = inputs.nix-colors.lib.contrib { inherit pkgs; };
in {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
./special-ssh-magic.nix ./special-ssh-magic.nix

View File

@ -8,11 +8,12 @@
, freetype , freetype
, ncurses , ncurses
, extraLibs ? [ ] , extraLibs ? [ ]
, colorscheme ? null
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "st"; pname = "st";
version = "1.02"; version = "1.03";
src = fetchgit { src = fetchgit {
url = "https://git.beepboop.systems/rndusr/st"; url = "https://git.beepboop.systems/rndusr/st";
@ -22,7 +23,26 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config fontconfig freetype ncurses ]; nativeBuildInputs = [ pkg-config fontconfig freetype ncurses ];
buildInputs = [ libX11 libXft ] ++ extraLibs; buildInputs = [ libX11 libXft ] ++ extraLibs;
buildPhase = '' buildPhase = if colorscheme == null then ''
make
'' else ''
mv normal_colors.h colors.h
sed -i colors.h "s/base00/${colorscheme.palette.base00}/g"
sed -i colors.h "s/base01/${colorscheme.palette.base01}/g"
sed -i colors.h "s/base02/${colorscheme.palette.base02}/g"
sed -i colors.h "s/base03/${colorscheme.palette.base03}/g"
sed -i colors.h "s/base04/${colorscheme.palette.base04}/g"
sed -i colors.h "s/base05/${colorscheme.palette.base05}/g"
sed -i colors.h "s/base06/${colorscheme.palette.base06}/g"
sed -i colors.h "s/base07/${colorscheme.palette.base07}/g"
sed -i colors.h "s/base08/${colorscheme.palette.base08}/g"
sed -i colors.h "s/base09/${colorscheme.palette.base09}/g"
sed -i colors.h "s/base0A/${colorscheme.palette.base0A}/g"
sed -i colors.h "s/base0B/${colorscheme.palette.base0B}/g"
sed -i colors.h "s/base0C/${colorscheme.palette.base0C}/g"
sed -i colors.h "s/base0D/${colorscheme.palette.base0D}/g"
sed -i colors.h "s/base0E/${colorscheme.palette.base0E}/g"
sed -i colors.h "s/base0F/${colorscheme.palette.base0F}/g"
make make
''; '';

51
flake.lock generated
View File

@ -1,5 +1,21 @@
{ {
"nodes": { "nodes": {
"base16-schemes": {
"flake": false,
"locked": {
"lastModified": 1696158499,
"narHash": "sha256-5yIHgDTPjoX/3oDEfLSQ0eJZdFL1SaCfb9d6M0RmOTM=",
"owner": "tinted-theming",
"repo": "base16-schemes",
"rev": "a9112eaae86d9dd8ee6bb9445b664fba2f94037a",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-schemes",
"type": "github"
}
},
"blobs": { "blobs": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -112,6 +128,25 @@
"type": "github" "type": "github"
} }
}, },
"nix-colors": {
"inputs": {
"base16-schemes": "base16-schemes",
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1707825078,
"narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=",
"owner": "misterio77",
"repo": "nix-colors",
"rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1",
"type": "github"
},
"original": {
"owner": "misterio77",
"repo": "nix-colors",
"type": "github"
}
},
"nix-formatter-pack": { "nix-formatter-pack": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -224,6 +259,21 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib": {
"locked": {
"lastModified": 1697935651,
"narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1705856552, "lastModified": 1705856552,
@ -308,6 +358,7 @@
"firefox-addons": "firefox-addons", "firefox-addons": "firefox-addons",
"home-manager": "home-manager", "home-manager": "home-manager",
"home-manager-phone": "home-manager-phone", "home-manager-phone": "home-manager-phone",
"nix-colors": "nix-colors",
"nix-on-droid": "nix-on-droid", "nix-on-droid": "nix-on-droid",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"phone-nixpkgs": "phone-nixpkgs", "phone-nixpkgs": "phone-nixpkgs",

View File

@ -7,7 +7,11 @@
environment.systemPackages = [ environment.systemPackages = [
(pkgs.callPackage ../builds/rebuild.nix {}) (pkgs.callPackage ../builds/rebuild.nix {})
(pkgs.callPackage ../builds/st.nix {}) (pkgs.callPackage ../builds/st.nix {
colorscheme = {
base01 = "amongus";
};
})
(pkgs.callPackage ../builds/utils.nix {}) (pkgs.callPackage ../builds/utils.nix {})
pkgs.man-pages pkgs.man-pages
]; ];