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 {
"${

View File

@ -15,7 +15,7 @@
};
programs.kitty.font = {
package = (pkgs.nerdfonts.override { fonts = [ "VictorMono" ]; });
package = pkgs.nerd-fonts.victor-mono;
name = "VictorMono Nerd Font Mono";
};
};

View File

@ -46,6 +46,11 @@
type = lib.types.str;
description = "Command to use for power options menu";
};
terminal = lib.mkOption {
type = lib.types.nullOr lib.types.str;
description = "Path to executable for terminal emulator program.";
default = null;
};
wallpaper = lib.mkOption {
type = lib.types.path;
description = "Wallpaper background image file";

View File

@ -14,7 +14,7 @@ in
fonts.packages = with pkgs; [
victor-mono # Used for Vim and Terminal
(nerdfonts.override { fonts = [ "Hack" ]; }) # For Polybar, Rofi
nerd-fonts.hack # For Polybar, Rofi
];
fonts.fontconfig.defaultFonts.monospace = [ fontName ];

View File

@ -29,6 +29,7 @@ in
cycle = true;
location = "center";
pass = { };
terminal = lib.mkIf pkgs.stdenv.isLinux config.terminal;
plugins = [
pkgs.rofi-calc
pkgs.rofi-emoji

View File

@ -56,10 +56,6 @@ in
# Graphical volume notifications
services.volnoti.enable = true;
# Fix: Volnoti binary not found
# Broken by https://github.com/nix-community/home-manager/pull/5725/commits/98bf8de65dc1ed12c6443b18f6f24d36e9c438d6
systemd.user.services.volnoti.Service.ExecStart = lib.mkForce "${pkgs.volnoti}/bin/volnoti -v -n";
xsession.windowManager.i3.config = {
# Make sure that Volnoti actually starts (home-manager doesn't start

View File

@ -44,6 +44,15 @@ in
config = lib.mkIf config.arrs.enable {
# Broken on 2024-12-07
# https://discourse.nixos.org/t/solved-sonarr-is-broken-in-24-11-unstable-aka-how-the-hell-do-i-use-nixpkgs-config-permittedinsecurepackages/
insecurePackages = [
"aspnetcore-runtime-wrapped-6.0.36"
"aspnetcore-runtime-6.0.36"
"dotnet-sdk-wrapped-6.0.428"
"dotnet-sdk-6.0.428"
];
services = {
bazarr = {
enable = true;

View File

@ -46,7 +46,7 @@
# Broken on 2024-08-23
# https://github.com/NixOS/nixpkgs/commit/0875d0ce1c778f344cd2377a5337a45385d6ffa0
nixpkgs.config.permittedInsecurePackages = [ "litestream-0.3.13" ];
insecurePackages = [ "litestream-0.3.13" ];
# Wait for secret to exist
systemd.services.litestream = {