update flake and fix issues with latest packages

This commit is contained in:
Noah Masur
2024-12-07 20:18:30 -05:00
parent 39f80ea79a
commit bc604bc2ce
13 changed files with 145 additions and 64 deletions

View File

@ -23,6 +23,6 @@
# Broken on 2023-12-11
# https://forum.obsidian.md/t/electron-25-is-now-eol-please-upgrade-to-a-newer-version/72878/8
nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" ];
insecurePackages = [ "electron-25.9.0" ];
};
}

View File

@ -29,14 +29,13 @@
sessionVariables.ROFI_SYSTEMD_TERM = "${pkgs.wezterm}/bin/wezterm";
};
terminal = "${pkgs.wezterm}/bin/wezterm";
home-manager.users.${config.user} = {
# Set the i3 terminal
xsession.windowManager.i3.config.terminal = lib.mkIf pkgs.stdenv.isLinux "wezterm";
# Set the Rofi terminal for running programs
programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux "${pkgs.wezterm}/bin/wezterm";
# Display images in the terminal
programs.fish.shellAliases = {
icat = lib.mkForce "wezterm imgcat";

View File

@ -190,9 +190,9 @@
};
};
xdg.desktopEntries.aerc = lib.mkIf pkgs.stdenv.isLinux {
xdg.desktopEntries.aerc = lib.mkIf (pkgs.stdenv.isLinux && config.gui.enable) {
name = "aerc";
exec = "${config.home-manager.users.${config.user}.programs.rofi.terminal} aerc %u";
exec = "${config.terminal} aerc %u";
};
xsession.windowManager.i3.config.keybindings = lib.mkIf pkgs.stdenv.isLinux {
"${