diff --git a/flake.nix b/flake.nix index 97dd741..0832c87 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,8 @@ system = "x86_64-linux"; name = "emmet"; email = "librephoenix@protonmail.com"; - dotfilesDir = ./.; + dotfilesDir = "~/dotfiles"; + theme = "tokyo-night-dark"; pkgs = import nixpkgs { inherit system; @@ -39,6 +40,7 @@ myDotfilesDir = dotfilesDir; myNixConfigurationFilePath = dotfilesDir+"/system/configuration.nix"; myHomeManagerFilePath = dotfilesDir+"/user/home.nix"; + myTheme = theme; }; }; }; @@ -47,7 +49,11 @@ inherit system; modules = [ ./system/configuration.nix + # stylix.nixosModules.stylix # complains that home-manager is not defined ]; + # specialArgs = { + # myTheme = theme; + # }; }; }; }; diff --git a/system/configuration.nix b/system/configuration.nix index 8c4c1ab..dc58df7 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -2,12 +2,13 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: +{ config, pkgs, myTheme, ... }: { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix + # ./style/stylix.nix ]; nix.nixPath = [ "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos" diff --git a/user/home.nix b/user/home.nix index 0848eb0..3756fc7 100644 --- a/user/home.nix +++ b/user/home.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, myName, myEmail, myHomeDir, myDotfilesDir, ... }: +{ config, lib, pkgs, myName, myEmail, myHomeDir, myDotfilesDir, myTheme, ... }: let # This sets up my "phoenix" script with my configuration paths diff --git a/user/style/stylix.nix b/user/style/stylix.nix index ea56e4d..e07a125 100644 --- a/user/style/stylix.nix +++ b/user/style/stylix.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, myTheme, ... }: let myFont = "Inconsolata"; @@ -7,11 +7,12 @@ let in { stylix.autoEnable = false; + stylix.polarity = "dark"; stylix.image = pkgs.fetchurl { url = "https://w.wallhaven.cc/full/6d/wallhaven-6d5k6x.jpg"; sha256 = "+xl4H3UiVmMRNvMhIlaLdVTYYqnSyCTSX2UOTGsDQ8c="; }; - stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml"; + stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/"+myTheme+".yaml"; stylix.fonts = { monospace = { @@ -47,5 +48,4 @@ in programs.rofi.enable = true; stylix.targets.feh.enable = true; programs.feh.enable = true; - # stylix.targets.lightdm.enable = true; }