diff --git a/flake.nix b/flake.nix index c8a571a..eaaca59 100644 --- a/flake.nix +++ b/flake.nix @@ -43,6 +43,10 @@ inputs.nixpkgs.follows = "nixpkgs-unstable"; }; copyparty.url = "github:9001/copyparty"; + slippi = { + url = "github:lytedev/slippi-nix"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; }; outputs = { self, diff --git a/users/blake/assets/wallpapers/test.jpg b/users/blake/assets/wallpapers/test.jpg deleted file mode 100644 index 258013c..0000000 Binary files a/users/blake/assets/wallpapers/test.jpg and /dev/null differ diff --git a/users/blake/dots/browser/default.nix b/users/blake/dots/browser/default.nix deleted file mode 100644 index 41f69c7..0000000 --- a/users/blake/dots/browser/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: { - imports = [ - ./librewolf - ./firefox - ]; -} diff --git a/users/blake/dots/programs/browsers/default.nix b/users/blake/dots/programs/browsers/default.nix new file mode 100644 index 0000000..a83bf2d --- /dev/null +++ b/users/blake/dots/programs/browsers/default.nix @@ -0,0 +1,24 @@ +{ + pkgs, + lib, + config, + ... +}: let + cfg = config.dots.browsers; +in { + imports = [ + ./librewolf + ./firefox + ]; + + options.dots.programs = { + enable = lib.mkEnableOption "enables all programs by default"; + }; + + config = lib.mkIf cfg.enable { + dots = { + librewolf.enable = lib.mkDefault true; + firefox.enable = lib.mkDefault false; + }; + }; +} diff --git a/users/blake/dots/browser/firefox/default.nix b/users/blake/dots/programs/browsers/firefox/default.nix similarity index 100% rename from users/blake/dots/browser/firefox/default.nix rename to users/blake/dots/programs/browsers/firefox/default.nix diff --git a/users/blake/dots/browser/librewolf/default.nix b/users/blake/dots/programs/browsers/librewolf/default.nix similarity index 100% rename from users/blake/dots/browser/librewolf/default.nix rename to users/blake/dots/programs/browsers/librewolf/default.nix diff --git a/users/blake/dots/programs/default.nix b/users/blake/dots/programs/default.nix index ad07868..e26414e 100644 --- a/users/blake/dots/programs/default.nix +++ b/users/blake/dots/programs/default.nix @@ -16,7 +16,11 @@ in { ./discord ./mpv ./nsxiv + + ./slippi + ./media_tools + ./browsers ]; options.dots.programs = { @@ -36,7 +40,10 @@ in { mpv.enable = lib.mkDefault true; nsxiv.enable = lib.mkDefault true; + slippi.enable = lib.mkDefault true; + media_tools.enable = lib.mkDefault true; + browsers.enable = lib.mkDefault true; }; }; } diff --git a/users/blake/dots/programs/slippi/default.nix b/users/blake/dots/programs/slippi/default.nix new file mode 100644 index 0000000..2940be1 --- /dev/null +++ b/users/blake/dots/programs/slippi/default.nix @@ -0,0 +1,30 @@ +{ + pkgs, + lib, + inputs, + config, + ... +}: let + program = "slippi"; + cfg = config.dots.${program}; +in { + options.dots.${program} = { + enable = lib.mkEnableOption "enables ${program}"; + }; + + imports = [ + inputs.slippi.homeManagerModules.default + ]; + + config = lib.mkIf cfg.enable { + + # enable with home-manager + programs.${program} = { + enable = true; + }; + + # just install package + home.packages = with pkgs; []; + + }; +} diff --git a/users/blake/hosts/yveltal.nix b/users/blake/hosts/yveltal.nix index 2fffd5d..f1be01c 100644 --- a/users/blake/hosts/yveltal.nix +++ b/users/blake/hosts/yveltal.nix @@ -43,7 +43,4 @@ bitwarden.enable = true; }; - home.packages = with pkgs; [ - sl - ]; }