summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvin <git@vineetk.net>2024-08-12 21:58:23 -0400
committervin <git@vineetk.net>2024-08-12 21:58:23 -0400
commit610531670c37084c76033d191e3a267e86f3b46c (patch)
treee59b06322ccc3a7360c1f50118304d01f3895274
parent2838ec11c9fd8a2e26e1b82138ead65a3524afa6 (diff)
fail at trying add external flake derivation for everblush gtk theme
-rw-r--r--flake.lock74
-rw-r--r--flake.nix16
-rw-r--r--home.nix59
-rw-r--r--hosts/lappy/default.nix3
4 files changed, 114 insertions, 38 deletions
diff --git a/flake.lock b/flake.lock
index d9d9d8d..8b8268d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,45 @@
1{ 1{
2 "nodes": { 2 "nodes": {
3 "everblush-gtk": {
4 "inputs": {
5 "flake-parts": "flake-parts",
6 "nix-filter": "nix-filter",
7 "nixpkgs": [
8 "nixpkgs"
9 ]
10 },
11 "locked": {
12 "lastModified": 1701784264,
13 "narHash": "sha256-bVMwXCNncv47Ksjyq6pc1EU4Ede6PCefd1+I62wM0Lk=",
14 "owner": "everblush",
15 "repo": "gtk",
16 "rev": "eee79dee1ae58c3c919fd4a6a0de67c12183b8e3",
17 "type": "github"
18 },
19 "original": {
20 "owner": "everblush",
21 "repo": "gtk",
22 "type": "github"
23 }
24 },
25 "flake-parts": {
26 "inputs": {
27 "nixpkgs-lib": "nixpkgs-lib"
28 },
29 "locked": {
30 "lastModified": 1688466019,
31 "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=",
32 "owner": "hercules-ci",
33 "repo": "flake-parts",
34 "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec",
35 "type": "github"
36 },
37 "original": {
38 "owner": "hercules-ci",
39 "repo": "flake-parts",
40 "type": "github"
41 }
42 },
3 "home-manager": { 43 "home-manager": {
4 "inputs": { 44 "inputs": {
5 "nixpkgs": [ 45 "nixpkgs": [
@@ -21,6 +61,21 @@
21 "type": "github" 61 "type": "github"
22 } 62 }
23 }, 63 },
64 "nix-filter": {
65 "locked": {
66 "lastModified": 1687178632,
67 "narHash": "sha256-HS7YR5erss0JCaUijPeyg2XrisEb959FIct3n2TMGbE=",
68 "owner": "numtide",
69 "repo": "nix-filter",
70 "rev": "d90c75e8319d0dd9be67d933d8eb9d0894ec9174",
71 "type": "github"
72 },
73 "original": {
74 "owner": "numtide",
75 "repo": "nix-filter",
76 "type": "github"
77 }
78 },
24 "nixpkgs": { 79 "nixpkgs": {
25 "locked": { 80 "locked": {
26 "lastModified": 1722987190, 81 "lastModified": 1722987190,
@@ -37,8 +92,27 @@
37 "type": "github" 92 "type": "github"
38 } 93 }
39 }, 94 },
95 "nixpkgs-lib": {
96 "locked": {
97 "dir": "lib",
98 "lastModified": 1688049487,
99 "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=",
100 "owner": "NixOS",
101 "repo": "nixpkgs",
102 "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9",
103 "type": "github"
104 },
105 "original": {
106 "dir": "lib",
107 "owner": "NixOS",
108 "ref": "nixos-unstable",
109 "repo": "nixpkgs",
110 "type": "github"
111 }
112 },
40 "root": { 113 "root": {
41 "inputs": { 114 "inputs": {
115 "everblush-gtk": "everblush-gtk",
42 "home-manager": "home-manager", 116 "home-manager": "home-manager",
43 "nixpkgs": "nixpkgs" 117 "nixpkgs": "nixpkgs"
44 } 118 }
diff --git a/flake.nix b/flake.nix
index 51f2d12..8269b27 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,23 +8,23 @@
8 url = "github:nix-community/home-manager/release-24.05"; 8 url = "github:nix-community/home-manager/release-24.05";
9 inputs.nixpkgs.follows = "nixpkgs"; 9 inputs.nixpkgs.follows = "nixpkgs";
10 }; 10 };
11
12 everblush-gtk = {
13 url = "github:everblush/gtk";
14 inputs.nixpkgs.follows = "nixpkgs";
15 };
11 }; 16 };
12 17
13 outputs = { self, home-manager, nixpkgs, ... }@attrs: { 18 outputs = { self, home-manager, nixpkgs, everblush-gtk, ... }@inputs: {
14 # TODO: deduplicate this 19 # TODO: deduplicate this
15 nixosConfigurations = { 20 nixosConfigurations = {
16 demiurge = nixpkgs.lib.nixosSystem {
17 system = "x86_64-linux";
18 specialArgs = attrs;
19 modules = [ ./hosts/demiurge ];
20 };
21
22 lappy = nixpkgs.lib.nixosSystem { 21 lappy = nixpkgs.lib.nixosSystem {
23 system = "x86_64-linux"; 22 system = "x86_64-linux";
24 specialArgs = attrs; 23 specialArgs = inputs;
25 modules = [ 24 modules = [
26 ./hosts/lappy 25 ./hosts/lappy
27 home-manager.nixosModules.home-manager { 26 home-manager.nixosModules.home-manager {
27 home-manager.extraSpecialArgs = { inherit inputs; };
28 home-manager.useGlobalPkgs = true; 28 home-manager.useGlobalPkgs = true;
29 home-manager.useUserPackages = true; 29 home-manager.useUserPackages = true;
30 home-manager.users.vin = import ./home.nix; 30 home-manager.users.vin = import ./home.nix;
diff --git a/home.nix b/home.nix
index 5848c17..a42ea5b 100644
--- a/home.nix
+++ b/home.nix
@@ -1,4 +1,4 @@
1{ config, lib, pkgs, ... }: 1{ config, lib, pkgs, inputs, ... }:
2 2
3{ 3{
4 home = { 4 home = {
@@ -15,6 +15,7 @@
15 hsetroot 15 hsetroot
16 kicad 16 kicad
17 librewolf 17 librewolf
18 mlocate
18 mpv 19 mpv
19 mupdf 20 mupdf
20 neofetch 21 neofetch
@@ -81,8 +82,8 @@
81 font.name = "monospace 10"; 82 font.name = "monospace 10";
82 iconTheme.name = "rose-pine"; 83 iconTheme.name = "rose-pine";
83 iconTheme.package = pkgs.rose-pine-icon-theme; 84 iconTheme.package = pkgs.rose-pine-icon-theme;
84 theme.name = "rose-pine"; 85 theme.name = "Everblush";
85 theme.package = pkgs.rose-pine-gtk-theme; 86 #theme.package = inputs.everblush-gtk.packages.x86_64-linux.default;
86 }; 87 };
87 88
88 programs = { 89 programs = {
@@ -378,22 +379,22 @@
378 # TODO import nix file that defines colorscheme 379 # TODO import nix file that defines colorscheme
379 bars = [ { 380 bars = [ {
380 colors = { 381 colors = {
381 background = "#0e0c06"; 382 background = "#191724";
382 statusline = "#d4b782"; 383 statusline = "#908caa";
383 focusedWorkspace = { 384 focusedWorkspace = {
384 background = "#1b1918"; 385 background = "#26233a";
385 border = "#1b1918"; 386 border = "#26233a";
386 text = "#d4b782"; 387 text = "#c4a7e7";
387 }; 388 };
388 activeWorkspace = { 389 activeWorkspace = {
389 background = "#0e0c06"; 390 background = "#26233a";
390 border = "#1b1918"; 391 border = "#26233a";
391 text = "#d4b782"; 392 text = "#e0def4";
392 }; 393 };
393 inactiveWorkspace = { 394 inactiveWorkspace = {
394 background = "#0e0c06"; 395 background = "#191724";
395 border = "#0e0c06"; 396 border = "#191724";
396 text = "#cfb688"; 397 text = "#6e6a86";
397 }; 398 };
398 }; 399 };
399 command = "${pkgs.i3}/bin/i3bar"; 400 command = "${pkgs.i3}/bin/i3bar";
@@ -402,25 +403,25 @@
402 } ]; 403 } ];
403 colors = { 404 colors = {
404 focused = { 405 focused = {
405 background = "#0e0c06"; 406 background = "#191724";
406 border = "#0e0c06"; 407 border = "#191724";
407 childBorder = "#0e0c06"; 408 childBorder = "#191724";
408 indicator = "#1b1918"; 409 indicator = "#26233a";
409 text = "#d4b782"; 410 text = "#e0def4";
410 }; 411 };
411 focusedInactive = { 412 focusedInactive = {
412 background = "#0e0c06"; 413 background = "#191724";
413 border = "#0e0c06"; 414 border = "#191724";
414 childBorder = "#0e0c06"; 415 childBorder = "#191724";
415 indicator = "#1b1918"; 416 indicator = "#26233a";
416 text = "#cfb688"; 417 text = "#6e6a86";
417 }; 418 };
418 unfocused = { 419 unfocused = {
419 background = "#1b1918"; 420 background = "#26233a";
420 border = "#1b1918"; 421 border = "#26233a";
421 childBorder = "#1b1918"; 422 childBorder = "#26233a";
422 indicator = "#0e0c06"; 423 indicator = "#191724";
423 text = "#cfb688"; 424 text = "#6e6a86";
424 }; 425 };
425 }; 426 };
426 focus.mouseWarping = true; 427 focus.mouseWarping = true;
diff --git a/hosts/lappy/default.nix b/hosts/lappy/default.nix
index c309f93..8b9ca71 100644
--- a/hosts/lappy/default.nix
+++ b/hosts/lappy/default.nix
@@ -2,7 +2,7 @@
2# your system. Help is available in the configuration.nix(5) man page, on 2# your system. Help is available in the configuration.nix(5) man page, on
3# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). 3# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
4 4
5{ config, home-manager, lib, pkgs, ... }: 5{ config, home-manager, lib, pkgs, inputs, ... }:
6 6
7{ 7{
8 imports = 8 imports =
@@ -91,6 +91,7 @@
91 neovim 91 neovim
92 vis # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. 92 vis # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
93 wget 93 wget
94 inputs.everblush-gtk.packages.x86_64-linux.default
94 ]; 95 ];
95 environment.pathsToLink = [ "/share/zsh" ]; 96 environment.pathsToLink = [ "/share/zsh" ];
96 97