commit 610531670c37084c76033d191e3a267e86f3b46c
parent 2838ec11c9fd8a2e26e1b82138ead65a3524afa6
Author: vin <git@vineetk.net>
Date: Mon, 12 Aug 2024 21:58:23 -0400
fail at trying add external flake derivation for everblush gtk theme
Diffstat:
4 files changed, 114 insertions(+), 38 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -1,5 +1,45 @@
{
"nodes": {
+ "everblush-gtk": {
+ "inputs": {
+ "flake-parts": "flake-parts",
+ "nix-filter": "nix-filter",
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1701784264,
+ "narHash": "sha256-bVMwXCNncv47Ksjyq6pc1EU4Ede6PCefd1+I62wM0Lk=",
+ "owner": "everblush",
+ "repo": "gtk",
+ "rev": "eee79dee1ae58c3c919fd4a6a0de67c12183b8e3",
+ "type": "github"
+ },
+ "original": {
+ "owner": "everblush",
+ "repo": "gtk",
+ "type": "github"
+ }
+ },
+ "flake-parts": {
+ "inputs": {
+ "nixpkgs-lib": "nixpkgs-lib"
+ },
+ "locked": {
+ "lastModified": 1688466019,
+ "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "type": "github"
+ }
+ },
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -21,6 +61,21 @@
"type": "github"
}
},
+ "nix-filter": {
+ "locked": {
+ "lastModified": 1687178632,
+ "narHash": "sha256-HS7YR5erss0JCaUijPeyg2XrisEb959FIct3n2TMGbE=",
+ "owner": "numtide",
+ "repo": "nix-filter",
+ "rev": "d90c75e8319d0dd9be67d933d8eb9d0894ec9174",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "nix-filter",
+ "type": "github"
+ }
+ },
"nixpkgs": {
"locked": {
"lastModified": 1722987190,
@@ -37,8 +92,27 @@
"type": "github"
}
},
+ "nixpkgs-lib": {
+ "locked": {
+ "dir": "lib",
+ "lastModified": 1688049487,
+ "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9",
+ "type": "github"
+ },
+ "original": {
+ "dir": "lib",
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
"root": {
"inputs": {
+ "everblush-gtk": "everblush-gtk",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs"
}
diff --git a/flake.nix b/flake.nix
@@ -8,23 +8,23 @@
url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs";
};
+
+ everblush-gtk = {
+ url = "github:everblush/gtk";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
};
- outputs = { self, home-manager, nixpkgs, ... }@attrs: {
+ outputs = { self, home-manager, nixpkgs, everblush-gtk, ... }@inputs: {
# TODO: deduplicate this
nixosConfigurations = {
- demiurge = nixpkgs.lib.nixosSystem {
- system = "x86_64-linux";
- specialArgs = attrs;
- modules = [ ./hosts/demiurge ];
- };
-
lappy = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
- specialArgs = attrs;
+ specialArgs = inputs;
modules = [
./hosts/lappy
home-manager.nixosModules.home-manager {
+ home-manager.extraSpecialArgs = { inherit inputs; };
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.vin = import ./home.nix;
diff --git a/home.nix b/home.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, inputs, ... }:
{
home = {
@@ -15,6 +15,7 @@
hsetroot
kicad
librewolf
+ mlocate
mpv
mupdf
neofetch
@@ -81,8 +82,8 @@
font.name = "monospace 10";
iconTheme.name = "rose-pine";
iconTheme.package = pkgs.rose-pine-icon-theme;
- theme.name = "rose-pine";
- theme.package = pkgs.rose-pine-gtk-theme;
+ theme.name = "Everblush";
+ #theme.package = inputs.everblush-gtk.packages.x86_64-linux.default;
};
programs = {
@@ -378,22 +379,22 @@
# TODO import nix file that defines colorscheme
bars = [ {
colors = {
- background = "#0e0c06";
- statusline = "#d4b782";
+ background = "#191724";
+ statusline = "#908caa";
focusedWorkspace = {
- background = "#1b1918";
- border = "#1b1918";
- text = "#d4b782";
+ background = "#26233a";
+ border = "#26233a";
+ text = "#c4a7e7";
};
activeWorkspace = {
- background = "#0e0c06";
- border = "#1b1918";
- text = "#d4b782";
+ background = "#26233a";
+ border = "#26233a";
+ text = "#e0def4";
};
inactiveWorkspace = {
- background = "#0e0c06";
- border = "#0e0c06";
- text = "#cfb688";
+ background = "#191724";
+ border = "#191724";
+ text = "#6e6a86";
};
};
command = "${pkgs.i3}/bin/i3bar";
@@ -402,25 +403,25 @@
} ];
colors = {
focused = {
- background = "#0e0c06";
- border = "#0e0c06";
- childBorder = "#0e0c06";
- indicator = "#1b1918";
- text = "#d4b782";
+ background = "#191724";
+ border = "#191724";
+ childBorder = "#191724";
+ indicator = "#26233a";
+ text = "#e0def4";
};
focusedInactive = {
- background = "#0e0c06";
- border = "#0e0c06";
- childBorder = "#0e0c06";
- indicator = "#1b1918";
- text = "#cfb688";
+ background = "#191724";
+ border = "#191724";
+ childBorder = "#191724";
+ indicator = "#26233a";
+ text = "#6e6a86";
};
unfocused = {
- background = "#1b1918";
- border = "#1b1918";
- childBorder = "#1b1918";
- indicator = "#0e0c06";
- text = "#cfb688";
+ background = "#26233a";
+ border = "#26233a";
+ childBorder = "#26233a";
+ indicator = "#191724";
+ text = "#6e6a86";
};
};
focus.mouseWarping = true;
diff --git a/hosts/lappy/default.nix b/hosts/lappy/default.nix
@@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
-{ config, home-manager, lib, pkgs, ... }:
+{ config, home-manager, lib, pkgs, inputs, ... }:
{
imports =
@@ -91,6 +91,7 @@
neovim
vis # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
wget
+ inputs.everblush-gtk.packages.x86_64-linux.default
];
environment.pathsToLink = [ "/share/zsh" ];
