Skip to content

Commit

Permalink
treewide: remove matugen
Browse files Browse the repository at this point in the history
I'm tired of the extra time needed for rebuild due to IFD
  • Loading branch information
fufexan committed Oct 27, 2024
1 parent c86b51e commit f3723f5
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 94 deletions.
25 changes: 0 additions & 25 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,6 @@

lanzaboote.url = "github:nix-community/lanzaboote";

matugen = {
url = "github:InioX/matugen";
inputs = {
nixpkgs.follows = "nixpkgs";
systems.follows = "hyprland/systems";
};
};

nix-index-db = {
url = "github:Mic92/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs";
Expand Down
1 change: 0 additions & 1 deletion home/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
imports = [
./specialisations.nix
./terminal
inputs.matugen.nixosModules.default
inputs.nix-index-db.hmModules.nix-index
inputs.tailray.homeManagerModules.default
self.nixosModules.theme
Expand Down
12 changes: 5 additions & 7 deletions home/programs/wayland/hyprland/settings.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{config, ...}: let
variant = "dark";
c = config.programs.matugen.theme.colors.${variant};
pointer = config.home.pointerCursor;

cursorName = "Bibata-Modern-Classic-Hyprcursor";
Expand Down Expand Up @@ -71,11 +69,11 @@ in {
groupbar = {
font_size = 10;
gradients = false;
text_color = "rgb(${c.primary})";
text_color = "rgb(b6c4ff)";
};

"col.border_active" = "rgba(${c.primary_container}88);";
"col.border_inactive" = "rgba(${c.on_primary_container}88)";
"col.border_active" = "rgba(35447988)";
"col.border_inactive" = "rgba(dce1ff88)";
};

input = {
Expand Down Expand Up @@ -132,9 +130,9 @@ in {
# order is right-to-left
hyprbars-button = [
# close
"rgb(${c.error}), 15, , hyprctl dispatch killactive"
"rgb(ffb4ab), 15, , hyprctl dispatch killactive"
# maximize
"rgb(${c.primary}), 15, , hyprctl dispatch fullscreen 1"
"rgb(b6c4ff), 15, , hyprctl dispatch fullscreen 1"
];
};

Expand Down
15 changes: 6 additions & 9 deletions home/programs/wayland/hyprlock.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
pkgs,
...
}: let
variant = "dark";
c = config.programs.matugen.theme.colors.${variant};

font_family = "Inter";
in {
programs.hyprlock = {
Expand Down Expand Up @@ -36,12 +33,12 @@ in {

outline_thickness = 1;

outer_color = "rgb(${c.primary})";
inner_color = "rgb(${c.on_primary_container})";
font_color = "rgb(${c.primary_container})";
outer_color = "rgb(b6c4ff)";
inner_color = "rgb(dce1ff)";
font_color = "rgb(354479)";

fade_on_empty = false;
placeholder_text = ''<span font_family="${font_family}" foreground="##${c.primary_container}">Password...</span>'';
placeholder_text = ''<span font_family="${font_family}" foreground="##354479">Password...</span>'';

dots_spacing = 0.2;
dots_center = true;
Expand All @@ -54,7 +51,7 @@ in {
text = "$TIME";
inherit font_family;
font_size = 50;
color = "rgb(${c.primary})";
color = "rgb(b6c4ff)";

position = "0, 150";

Expand All @@ -66,7 +63,7 @@ in {
text = "cmd[update:3600000] date +'%a %b %d'";
inherit font_family;
font_size = 20;
color = "rgb(${c.primary})";
color = "rgb(b6c4ff)";

position = "0, 50";

Expand Down
32 changes: 0 additions & 32 deletions home/specialisations.nix
Original file line number Diff line number Diff line change
@@ -1,30 +1,4 @@
{
config,
pkgs,
...
}: {
# light/dark specialisations
# specialisation = let
# colorschemePath = "/org/gnome/desktop/interface/color-scheme";
# dconf = "${pkgs.dconf}/bin/dconf";

# dconfDark = lib.hm.dag.entryAfter ["dconfSettings"] ''
# ${dconf} write ${colorschemePath} "'prefer-dark'"
# '';
# dconfLight = lib.hm.dag.entryAfter ["dconfSettings"] ''
# ${dconf} write ${colorschemePath} "'prefer-light'"
# '';
# in {
# light.configuration = {
# theme.name = "light";
# home.activation = {inherit dconfLight;};
# };
# dark.configuration = {
# theme.name = "dark";
# home.activation = {inherit dconfDark;};
# };
# };

theme = {
wallpaper = let
url = "https://github.com/saint-13/Linux_Dynamic_Wallpapers/blob/main/Dynamic_Wallpapers/ChromeOSWind/ChromeOSWind-2.png?raw=true";
Expand All @@ -36,10 +10,4 @@
inherit url sha256;
};
};

programs.matugen = {
enable = true;
package = pkgs.matugen;
inherit (config.theme) wallpaper;
};
}
12 changes: 0 additions & 12 deletions system/hardware/specialisations.nix

This file was deleted.

0 comments on commit f3723f5

Please sign in to comment.