diff --git a/flake.nix b/flake.nix index 2c3f135..4e95853 100644 --- a/flake.nix +++ b/flake.nix @@ -45,7 +45,7 @@ })); homeManagerSharedModule = { home-manager.useGlobalPkgs = true; - home-manager.users.nathan = ((import ./home-manager/home.nix) { username = "nathan"; homeDirectory = "/home/nathan"; }); + home-manager.users.nathan = ((import ./home-manager/home.nix) { username = "nathan"; homeDirectory = "/home/nathan"; backgroundImg = config.stylix.image }); }; commonConfigFunc = ({ config, lib, pkgs, modulesPath, ... }: (specificPkgs: { nixpkgs.config.allowUnfree = true; diff --git a/home-manager/flake.nix b/home-manager/flake.nix index a9cf70f..e67817f 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -27,7 +27,7 @@ # Specify your home configuration modules here, for example, # the path to your home.nix. modules = [ - ((import ./home.nix) { username = "nbraswell6"; homeDirectory = "/home/nbraswell6";}) + ((import ./home.nix) { username = "nbraswell6"; homeDirectory = "/home/nbraswell6"; backgroundImg = "/home/nbraswell6"; email = "nathan.braswell@gtri.gatech.edu"; }) #niri.nixosModules.niri niri.homeModules.niri ]; diff --git a/home-manager/home.nix b/home-manager/home.nix index 42e5768..198291e 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -1,4 +1,4 @@ -{ username, homeDirectory }: ({ config, pkgs, lib, ... }:{ +{ username, homeDirectory, backgroundImg, email }: ({ config, pkgs, lib, ... }:{ # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage # when a new Home Manager release introduces backwards @@ -109,7 +109,7 @@ }; spawn-at-startup = [ { command = [ "swww-daemon" ]; } - { command = [ "swww" "img" "${config.stylix.image}" ]; } + { command = [ "swww" "img" "${backgroundImg}" ]; } { command = [ "waybar" ]; } { command = [ "xwayland-satellite" ]; } ]; @@ -421,7 +421,14 @@ enable = true; lfs.enable = true; userName = "Nathan Braswell"; - userEmail = "nathan@braswell.email"; + userEmail = email; + }; + programs.jujutsu = { + enable = true; + settings.user = { + name = "Nathan Braswell"; + email = email; + }; }; programs.vim = { enable = true;