Compare commits

..

No commits in common. "d7ea1577618966b5f7c85d38802145b495fc1fa8" and "5b194ca54a2ad6411ec7dd79e15dc194812e6246" have entirely different histories.

7 changed files with 38 additions and 46 deletions

19
home/modules/browsers.nix Normal file
View file

@ -0,0 +1,19 @@
{
config,
lib,
pkgs,
...
}:
with lib; let
cfg = config.local.apps.browsers;
in {
options.local.apps.browsers = {
enable = mkEnableOption "Browser home settings";
};
config = mkIf cfg.enable {
home.packages = with pkgs; [
chromium
firefox
];
};
}

View file

@ -10,7 +10,7 @@
./baseline.nix ./baseline.nix
./gaming.nix ./gaming.nix
./yubikey.nix ./yubikey.nix
./firefox.nix ./browsers.nix
./gui ./gui
./zsh ./zsh
./gpg.nix ./gpg.nix

View file

@ -13,7 +13,6 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
calibre calibre
chromium
discord discord
gwenview gwenview
libreoffice-fresh libreoffice-fresh

View file

@ -1,29 +0,0 @@
{
config,
lib,
pkgs,
...
}:
with lib; let
cfg = config.local.apps.browsers;
in {
options.local.apps.browsers = {
enable = mkEnableOption "firefox settings";
workspace = mkOption {
type = types.nullOr types.str;
default = null;
description = ''
Workspace in which Firefox should open. If not set, Firefox will not open at startup.
'';
};
};
config = mkIf cfg.enable {
programs.firefox.enable = true;
xsession.windowManager.i3.config.startup = optional (cfg.workspace != null) {
command = "${lib.getExe pkgs.i3-gaps} 'workspace ${cfg.workspace}; exec ${lib.getExe pkgs.firefox}'";
};
};
}

View file

@ -45,43 +45,47 @@ with lib; {
# y se sobreescriba las cosas que pongo acá # y se sobreescriba las cosas que pongo acá
# NO QUITARLO. ver man home-configuration.nix # NO QUITARLO. ver man home-configuration.nix
keybindings = mkOptionDefault { keybindings = mkOptionDefault {
"${mod}+Return" = "exec ${lib.getExe pkgs.kitty} ${lib.getExe pkgs.tmux}"; "${mod}+Return" = "exec ${pkgs.kitty}/bin/kitty ${pkgs.tmux}/bin/tmux";
"${mod}+Tab" = "focus right"; "${mod}+Tab" = "focus right";
"${mod}+Shift+Tab" = "focus left"; "${mod}+Shift+Tab" = "focus left";
"${mod}+Shift+s" = "exec ${lib.getExe pkgs.maim} -s -u | ${lib.getExe pkgs.xclip} -selection clipboard -t image/png -i"; "${mod}+Shift+s" = "exec ${pkgs.maim}/bin/maim -s -u | ${pkgs.xclip}/bin/xclip -selection clipboard -t image/png -i";
"${mod}+Shift+w" = "move workspace to output right"; "${mod}+Shift+w" = "move workspace to output right";
"${mod}+l" = "exec ${lib.getExe pkgs.betterlockscreen} -l"; "${mod}+l" = "exec ${pkgs.betterlockscreen}/bin/betterlockscreen -l";
}; };
startup = [ startup = [
{ {
command = "${lib.getExe pkgs.xss-lock} --transfer-sleep-lock -- ${lib.getExe pkgs.i3lock} --nofork"; command = "${pkgs.xss-lock}/bin/xss-lock --transfer-sleep-lock -- ${pkgs.i3lock}/bin/i3lock --nofork";
notification = false; notification = false;
} }
{ {
command = "${lib.getExe pkgs.networkmanagerapplet}"; command = "${pkgs.networkmanagerapplet}/bin/nm-applet";
notification = false; notification = false;
} }
#todo: sería nice hostear esta imagen en el server y fetchearla si no existe #todo: sería nice hostear esta imagen en el server y fetchearla si no existe
{ {
command = "${lib.getExe pkgs.feh} --bg-fill ${config.home.homeDirectory}/Pictures/wallpapers/jupiter.png"; command = "${pkgs.feh}/bin/feh --bg-fill ${config.home.homeDirectory}/Pictures/wallpapers/jupiter.png";
notification = false; notification = false;
always = true; always = true;
} }
{ {
#todo: move this to telegram module #todo: move this to browsers module
command = "${lib.getExe pkgs.i3-gaps} 'workspace 2; exec ${lib.getExe pkgs.tdesktop}'"; command = "${pkgs.i3-gaps}/bin/i3-msg 'workspace 1; exec ${pkgs.firefox}/bin/firefox'";
} }
{ {
command = "${lib.getExe pkgs.i3-gaps} 'workspace 2; exec ${lib.getExe pkgs.gajim}'"; #todo: move this to telegram module
command = "${pkgs.i3-gaps}/bin/i3-msg 'workspace 2; exec ${pkgs.tdesktop}/bin/telegram-desktop'";
} }
#{
# command = "${pkgs.i3-gaps}/bin/i3-msg 'workspace 2; exec ${pkgs.element-desktop}/bin/element-desktop'";
#}
{ {
command = "${pkgs.systemd}/bin/systemctl --user restart polybar.service"; command = "${pkgs.systemd}/bin/systemctl --user restart polybar.service";
notification = false; notification = false;
always = true; always = true;
} }
{ {
command = "${lib.getExe pkgs.autorandr} -c"; command = "${pkgs.autorandr}/bin/autorandr -c";
notification = false; notification = false;
always = true; always = true;
} }

View file

@ -40,11 +40,8 @@
neovim.enable = true; neovim.enable = true;
gaming.enable = true; gaming.enable = true;
yubikey.enable = true; yubikey.enable = true;
browsers.enable = true;
defaultDesktopPack.enable = true; defaultDesktopPack.enable = true;
firefox = {
enable = true;
workspace = 1;
};
}; };
gui = { gui = {

View file

@ -47,10 +47,12 @@ with lib; {
LANDING_PAGE = "explore"; LANDING_PAGE = "explore";
}; };
# You can temporarily allow registration to create an admin user.
service.DISABLE_REGISTRATION = true; service.DISABLE_REGISTRATION = true;
# ver https://github.com/nektos/act
actions = { actions = {
ENABLED = true; ENABLED = false;
}; };
mailer = { mailer = {
ENABLED = false; ENABLED = false;