Compare commits

..

No commits in common. "874cbcec703a08d13b507bab4ca5d8d3c8242eb2" and "47d070ce5edcc3134e18082e3d74aa95cf7300d8" have entirely different histories.

9 changed files with 19 additions and 43 deletions

View file

@ -2,6 +2,5 @@ _: {
imports = [ imports = [
./wayland.nix ./wayland.nix
./stremio.nix ./stremio.nix
./nomacs.nix
]; ];
} }

View file

@ -1,16 +0,0 @@
{
lib,
pkgs,
osConfig,
...
}: let
inherit (lib) mkIf;
cfg = osConfig.myOptions.home-manager.programs.applications.nomacs;
in {
config = mkIf cfg.enable {
home.packages = with pkgs; [
nomacs
];
};
}

View file

@ -6,7 +6,7 @@
}: let }: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = osConfig.myOptions.home-manager.programs.applications.stremio; cfg = osConfig.myOptions.home-manager.programs.stremio;
in { in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [

View file

@ -7,7 +7,7 @@
}: let }: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = osConfig.myOptions.home-manager.programs.applications.spotify; cfg = osConfig.myOptions.home-manager.programs.spotify;
spicePkgs = inputs.spicetify.packages.${pkgs.system}.default; spicePkgs = inputs.spicetify.packages.${pkgs.system}.default;
in { in {
imports = [inputs.spicetify.homeManagerModule]; imports = [inputs.spicetify.homeManagerModule];

View file

@ -6,7 +6,7 @@
}: let }: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = osConfig.myOptions.home-manager.programs.applications.vesktop; cfg = osConfig.myOptions.home-manager.programs.vesktop;
in { in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = with pkgs; [ vesktop ]; home.packages = with pkgs; [ vesktop ];

View file

@ -62,9 +62,9 @@ in {
Install.WantedBy = [ "graphical-session.target" ]; Install.WantedBy = [ "graphical-session.target" ];
}; };
"eww-window-bar0" = { "eww-window@" = {
Unit = { Unit = {
Description = "Open bar0 eww (ElKowar's Wacky Widgets) window"; Description = "Open %I eww (ElKowar's Wacky Widgets) window";
After = [ "eww.service" ]; After = [ "eww.service" ];
PartOf = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ];
}; };
@ -73,8 +73,8 @@ in {
Type = "oneshot"; Type = "oneshot";
RemainAfterExit = true; RemainAfterExit = true;
ExecStartPre = "${pkgs.eww}/bin/eww ping"; ExecStartPre = "${pkgs.eww}/bin/eww ping";
ExecStart = "${pkgs.eww}/bin/eww open bar0"; ExecStart = "${pkgs.eww}/bin/eww open %i";
ExecStop = "${pkgs.eww}/bin/eww close bar0"; ExecStop = "${pkgs.eww}/bin/eww close %i";
Restart = "on-failure"; Restart = "on-failure";
}; };

View file

@ -101,10 +101,9 @@
mullvad-browser.enable = true; mullvad-browser.enable = true;
schizofox.enable = true; schizofox.enable = true;
}; };
applications = {
spotify.enable = true; spotify.enable = true;
}; };
}; };
}; };
};
} }

View file

@ -166,15 +166,12 @@
fastfetch.enable = true; fastfetch.enable = true;
hyfetch.enable = true; hyfetch.enable = true;
}; };
applications = {
spotify.enable = true; spotify.enable = true;
stremio.enable = true; stremio.enable = true;
vesktop = { vesktop = {
enable = true; enable = true;
autoStart = true; autoStart = true;
}; };
nomacs.enable = true;
};
}; };
}; };
}; };

View file

@ -26,15 +26,12 @@ in
schizofox.enable = mkEnableOption "Schizophrenic version of Firefox browser"; schizofox.enable = mkEnableOption "Schizophrenic version of Firefox browser";
}; };
applications = {
spotify.enable = mkEnableOption "Spotify"; spotify.enable = mkEnableOption "Spotify";
stremio.enable = mkEnableOption "Stremio free media center"; stremio.enable = mkEnableOption "Stremio free media center";
vesktop = { vesktop = {
enable = mkEnableOption "Vesktop (An alternate client for Discord with Vencord built-in)"; enable = mkEnableOption "Vesktop (An alternate client for Discord with Vencord built-in)";
autoStart = mkEnableOption "Auto-Start for Vesktop"; autoStart = mkEnableOption "Auto-Start for Vesktop";
}; };
nomacs.enable = mkEnableOption "Nomacs (Qt-based image viewer)";
};
tools = { tools = {
fastfetch.enable = mkEnableOption "FastFetch (fast neofetch)"; fastfetch.enable = mkEnableOption "FastFetch (fast neofetch)";