Merge pull request #6 from elythh/dev

Dev

home/shared/gtk/gruv.nix → derivs/gruv.nix

@@ -1,5 +1,4 @@
-
-{ lib, stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub, ... }:
 
 stdenv.mkDerivation rec {
   pname = "gruvbox-dark-gtk";
@@ -21,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Gruvbox theme for GTK based desktop environments";
     homepage = "https://github.com/jmattheis/gruvbox-dark-gtk";
-      
+
     license = licenses.gpl3Only;
     platforms = platforms.unix;
     maintainers = [ maintainers.nomisiv ];

flake.nix

@@ -121,7 +121,6 @@
       };
     in
     {
-      overlays = import ./overlays { inherit inputs; };
       # NixOS configuration entrypoint
       # Available through 'nixos-rebuild --flake .#your-hostname'
       nixosConfigurations = {

home/gwen/conf/ui/hyprland/default.nix

@@ -1,5 +1,6 @@
-{ inputs, pkgs, colors, ... }:
+{ inputs, pkgs, nix-colors, ... }:
 let
+  colors = config.colorscheme.colors;
   hyprland = inputs.hyprland.packages.${pkgs.system}.hyprland;
   plugins = inputs.hyprland-plugins.packages.${pkgs.system};
   split-monitor-workspaces = inputs.split-monitor-workspaces;
@@ -15,6 +16,11 @@ in
 {
   home.packages = [ launcher ];
 
+  eww-hyprland = {
+    enable = true;
+    package = inputs.eww.packages.${pkgs.system}.eww-wayland;
+  };
+
   xdg.desktopEntries."org.gnome.Settings" = {
     name = "Settings";
     comment = "Gnome Control Center";

home/gwen/home.nix

@@ -24,10 +24,6 @@ in
       nix-direnv.enable = true;
     };
     bash.enable = true; # see note on other shells below
-    #   eww-hyprland = {
-    #     enable = true;
-    #     package = inputs.eww.packages.${pkgs.system}.eww-wayland;
-    #   };
   };
 
   home.file.".icons/default".source =
@@ -36,13 +32,15 @@ in
   gtk = {
     enable = true;
     gtk3.extraConfig.gtk-decoration-layout = "menu:";
-    iconTheme.name = "WhiteSur";
+    iconTheme.name = "Reversal-dark";
     theme.name = "phocus";
     font = {
       name = "Lexend";
       size = 11;
     };
   };
+
+  # The global colorScheme, used by most apps
   colorScheme =
     {
       colors = import ../shared/cols/stardew.nix { };
@@ -91,6 +89,7 @@ in
     };
     packages = with pkgs; [
       (pkgs.callPackage ../../derivs/phocus.nix { inherit config nix-colors; })
+      (pkgs.callPackage ../../derivs/gruv.nix { })
       (pkgs.callPackage ../shared/icons/whitesur.nix { })
       (pkgs.callPackage ../shared/icons/reversal.nix { })
       zjstatus.packages.${system}.default

hosts/thinkpad/configuration.nix

@@ -14,8 +14,6 @@
 
   nixpkgs = {
     overlays = [
-      outputs.overlays.modifications
-      outputs.overlays.additions
       (final: prev:
         {
           awesome = inputs.nixpkgs-f2k.packages.${pkgs.system}.awesome-git;
@@ -27,11 +25,6 @@
   boot.loader.efi.canTouchEfiVariables = true;
 
   networking.hostName = "thinkpad"; # Define your hostname.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
   # Enable networking
   networking.networkmanager.enable = true;
@@ -98,9 +91,6 @@
   # Enable CUPS to print documents.
   services.printing.enable = true;
 
-  # Enable touchpad support (enabled default in most desktopManager).
-  # services.xserver.libinput.enable = true;
-
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;