From bc604bc2ce69bddf83d02bd7d8ce2b303ce72bc4 Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Sat, 7 Dec 2024 20:18:30 -0500 Subject: [PATCH] update flake and fix issues with latest packages --- flake.lock | 163 ++++++++++++++++------- flake.nix | 3 +- modules/common/applications/obsidian.nix | 2 +- modules/common/applications/wezterm.nix | 5 +- modules/common/mail/aerc.nix | 4 +- modules/darwin/fonts.nix | 2 +- modules/nixos/graphical/default.nix | 5 + modules/nixos/graphical/fonts.nix | 2 +- modules/nixos/graphical/rofi.nix | 1 + modules/nixos/hardware/audio.nix | 4 - modules/nixos/services/arr.nix | 9 ++ modules/nixos/services/backups.nix | 2 +- overlays/volnoti.nix | 7 + 13 files changed, 145 insertions(+), 64 deletions(-) create mode 100644 overlays/volnoti.nix diff --git a/flake.lock b/flake.lock index f99615f..db0746a 100644 --- a/flake.lock +++ b/flake.lock @@ -87,11 +87,11 @@ ] }, "locked": { - "lastModified": 1732603785, - "narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=", + "lastModified": 1733351379, + "narHash": "sha256-MTMsAhXxMMVHVN99jT8E0afOAOtt3JQWjYpTja94PAU=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a", + "rev": "55d07816a0944f06a9df5ef174999a72fa4060c7", "type": "github" }, "original": { @@ -108,11 +108,11 @@ ] }, "locked": { - "lastModified": 1732919362, - "narHash": "sha256-3SxlMD3nSI90+pHOF27SuLEt3+wew8xl+sUJaJMeHOI=", + "lastModified": 1733168902, + "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=", "owner": "nix-community", "repo": "disko", - "rev": "b71e3faca99b40fb801f03fd950fbefbbba691a4", + "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5", "type": "github" }, "original": { @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1732928331, - "narHash": "sha256-MNeVQdjQIURSxe+yJtnPpVKIaIB+TMn6Mjw8eYY1ZwE=", + "lastModified": 1733533240, + "narHash": "sha256-8IcEs77h6IiOTg1m1oTvw/WXDXLFW0fuXOuSZkT2nAc=", "owner": "bandithedoge", "repo": "nixpkgs-firefox-darwin", - "rev": "7b091902ef4ad7d2fff4201b1b9471c1b4243f83", + "rev": "f47d62eed12552182bde1fd03716edbeb581bb6e", "type": "github" }, "original": { @@ -191,6 +191,27 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -304,11 +325,11 @@ ] }, "locked": { - "lastModified": 1732884235, - "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=", + "lastModified": 1733484277, + "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "819f682269f4e002884702b87e445c82840c68f2", + "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "type": "github" }, "original": { @@ -327,11 +348,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1732929643, - "narHash": "sha256-5+jR08C37hrwSZucav0pqarKHyn0Xma+F+HVy2p++C0=", + "lastModified": 1733537181, + "narHash": "sha256-xGok4RSoVbno7UekyYRnCw9pj3CxQpCCBORWqrP8MZk=", "owner": "martinvonz", "repo": "jj", - "rev": "0ca6f00421f6f893e974e0f5349e126abd41a812", + "rev": "da3c75b3cb09d1ae98a3e07c54b6a0f06ff70ed4", "type": "github" }, "original": { @@ -380,7 +401,7 @@ "nextcloud-external": { "flake": false, "locked": { - "lastModified": 1729501349, + "lastModified": 1729501365, "narHash": "sha256-OV6HhFBzmnQBO5btGEnqmKlaUMY7/t2Qm3XebclpBlM=", "type": "tarball", "url": "https://github.com/nextcloud-releases/external/releases/download/v5.5.2/external-v5.5.2.tar.gz" @@ -393,7 +414,7 @@ "nextcloud-news": { "flake": false, "locked": { - "lastModified": 1729667621, + "lastModified": 1729667622, "narHash": "sha256-pnvyMZQ+NYMgH0Unfh5S19HdZSjnghgoUDAoi2KIXNI=", "type": "tarball", "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha12/news.tar.gz" @@ -406,8 +427,8 @@ "nextcloud-snappymail": { "flake": false, "locked": { - "lastModified": 1732938511, - "narHash": "sha256-oCw6Brs85rINBHvz3UJXheyLVqvA3RgPXG03b30Fx7E=", + "lastModified": 1728502660, + "narHash": "sha256-+0EivmFXn/o4CE/7Tgo0DFixZo4ELwKJpfEdQllEJMw=", "type": "tarball", "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz" }, @@ -439,11 +460,11 @@ }, "nixlib": { "locked": { - "lastModified": 1732410305, - "narHash": "sha256-/hxIKRTBsdrnudJWDGaBN8wIjHovqVAVxXdi8ByVtck=", + "lastModified": 1733015484, + "narHash": "sha256-qiyO0GrTvbp869U4VGX5GhAZ00fSiPXszvosY1AgKQ8=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "87b6978992e2eb605732fba842cad0a7e14b2047", + "rev": "0e4fdd4a0ab733276b6d2274ff84ae353f17129e", "type": "github" }, "original": { @@ -460,11 +481,11 @@ ] }, "locked": { - "lastModified": 1732496924, - "narHash": "sha256-/MNhZLR0eh9z/d3l+ammq+F5XxHln0RHgO4Bhtjr0IM=", + "lastModified": 1733360821, + "narHash": "sha256-bNXO+OGxrOjAxv/Lnyj84tNDicJ/FdLyLJHzOKSzYU8=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "098e8b6ff72c86944a8d54b64ddd7b7e6635830a", + "rev": "8cdaf8885c9c85d9d27b594dbe882406aadfe00e", "type": "github" }, "original": { @@ -475,11 +496,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "type": "github" }, "original": { @@ -507,11 +528,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1732749044, - "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=", + "lastModified": 1733220138, + "narHash": "sha256-Yh5XZ9yVurrcYdNTSWxYgW4+EJ0pcOqgM1043z9JaRc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685", + "rev": "bcb68885668cccec12276bbb379f8f2557aa06ce", "type": "github" }, "original": { @@ -521,13 +542,34 @@ "type": "github" } }, - "nur": { + "nixpkgs_2": { "locked": { - "lastModified": 1732938183, - "narHash": "sha256-Gs3fB2JCLFPR5IAXRrZ40fzBIkXclDgdOv/LQFcz1ag=", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nur": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_2", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1733530998, + "narHash": "sha256-1P2rCr8FgbP1CN1H2XQOtuOFqjRNXkxHqZmvK/pbt7M=", "owner": "nix-community", "repo": "nur", - "rev": "954f3b73ddae61755abe0e9bbc40ba6d68a6a22d", + "rev": "b35bbebaf9637f6a10e7a368981fc9ff69d07374", "type": "github" }, "original": { @@ -724,11 +766,11 @@ "snipe-nvim-src": { "flake": false, "locked": { - "lastModified": 1732490186, - "narHash": "sha256-/4mkMXNZrVVExMfMUshXXEijXCkk2LapB/TPtTn7rv0=", + "lastModified": 1733492360, + "narHash": "sha256-Zxr6X4bgh6mNPkTwdnVwfn3lGKl5UtXQLDhHax28qGg=", "owner": "leath-dub", "repo": "snipe.nvim", - "rev": "3d560dcac1cda409f5f6adf17b8003df3ab85eee", + "rev": "be443a02ca6fd1f331a0645d4a904a59ec302070", "type": "github" }, "original": { @@ -817,11 +859,11 @@ "telescope-project-nvim-src": { "flake": false, "locked": { - "lastModified": 1732660843, - "narHash": "sha256-H4IMj/eyhTZtt2+mFWokcIRFDOLCLpkJNNe61O3JpWU=", + "lastModified": 1733083023, + "narHash": "sha256-qEORRWYKBpK7fn7se8g+5uuVBJNu0T4JHSc0C2QzNDY=", "owner": "nvim-telescope", "repo": "telescope-project.nvim", - "rev": "9fc8428e2ccae167c36ad7cff72798bbd8e35836", + "rev": "1d7920e799fc5001dffc7bd10909a86e0358eaf4", "type": "github" }, "original": { @@ -833,11 +875,11 @@ "tiny-inline-diagnostic-nvim-src": { "flake": false, "locked": { - "lastModified": 1732895718, - "narHash": "sha256-bkH9dqui4acLef53QCLgzipCjsqAc5dlm7pmGuROEfw=", + "lastModified": 1733474439, + "narHash": "sha256-bc1p313YOkj2GI7U35lEomOxB83iJu23iTWyJyI05tU=", "owner": "rachartier", "repo": "tiny-inline-diagnostic.nvim", - "rev": "cd8e56dd88709e05ecd0036ca2a821d265379bfa", + "rev": "32c7e2eb8f36792056328e6c239d6365de9f8c7d", "type": "github" }, "original": { @@ -932,11 +974,11 @@ "tree-sitter-python": { "flake": false, "locked": { - "lastModified": 1731308116, - "narHash": "sha256-/jYGi2yksifMGPitlS8oM/g3YrR7RJ57imBhEyow/jc=", + "lastModified": 1733367408, + "narHash": "sha256-DojFqb5YJsqF95Hb2fjjeyNpwaexyJ8KkdxJWSYx7aY=", "owner": "tree-sitter", "repo": "tree-sitter-python", - "rev": "6d14e44ea217bc5bb1c1804180e9818d7d1b8d91", + "rev": "1ee3e775477f913ae3a46cde7a6a512deb06052c", "type": "github" }, "original": { @@ -978,6 +1020,27 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "wallpapers": { "flake": false, "locked": { @@ -1003,11 +1066,11 @@ ] }, "locked": { - "lastModified": 1731682434, - "narHash": "sha256-HnZFPB7akVIy0KuPq/tEkiB+Brt1qi0DUIDzR8z25qI=", + "lastModified": 1733516684, + "narHash": "sha256-yz3mZyTnPlxZW2f51kJyfofDsBeX7WxAPvTXZtr2lW4=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "a6b9cf0b7805e2c50829020a73e7bde683fd36dd", + "rev": "dd20ebde771edbdececade73dbb8791ff987d0db", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 48ad730..feae0be 100644 --- a/flake.nix +++ b/flake.nix @@ -272,7 +272,7 @@ # Common overlays to always use overlays = [ - inputs.nur.overlay + inputs.nur.overlays.default inputs.nix2vim.overlay inputs.jujutsu.overlays.default # Fix: https://github.com/martinvonz/jj/issues/4784 (import ./overlays/neovim-plugins.nix inputs) @@ -284,6 +284,7 @@ (import ./overlays/gh-collaborators.nix inputs) (import ./overlays/osc.nix inputs) (import ./overlays/ren-rep.nix inputs) + (import ./overlays/volnoti.nix) ]; # System types to support. diff --git a/modules/common/applications/obsidian.nix b/modules/common/applications/obsidian.nix index bfe93a3..b9dde4a 100644 --- a/modules/common/applications/obsidian.nix +++ b/modules/common/applications/obsidian.nix @@ -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" ]; }; } diff --git a/modules/common/applications/wezterm.nix b/modules/common/applications/wezterm.nix index e159c57..ea10c4c 100644 --- a/modules/common/applications/wezterm.nix +++ b/modules/common/applications/wezterm.nix @@ -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"; diff --git a/modules/common/mail/aerc.nix b/modules/common/mail/aerc.nix index 4a117e1..2f24792 100644 --- a/modules/common/mail/aerc.nix +++ b/modules/common/mail/aerc.nix @@ -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 { "${ diff --git a/modules/darwin/fonts.nix b/modules/darwin/fonts.nix index f09a482..88c0363 100644 --- a/modules/darwin/fonts.nix +++ b/modules/darwin/fonts.nix @@ -15,7 +15,7 @@ }; programs.kitty.font = { - package = (pkgs.nerdfonts.override { fonts = [ "VictorMono" ]; }); + package = pkgs.nerd-fonts.victor-mono; name = "VictorMono Nerd Font Mono"; }; }; diff --git a/modules/nixos/graphical/default.nix b/modules/nixos/graphical/default.nix index 372abb6..c1b864c 100644 --- a/modules/nixos/graphical/default.nix +++ b/modules/nixos/graphical/default.nix @@ -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"; diff --git a/modules/nixos/graphical/fonts.nix b/modules/nixos/graphical/fonts.nix index 896b3ac..8fc8431 100644 --- a/modules/nixos/graphical/fonts.nix +++ b/modules/nixos/graphical/fonts.nix @@ -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 ]; diff --git a/modules/nixos/graphical/rofi.nix b/modules/nixos/graphical/rofi.nix index 87430f1..1de331c 100644 --- a/modules/nixos/graphical/rofi.nix +++ b/modules/nixos/graphical/rofi.nix @@ -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 diff --git a/modules/nixos/hardware/audio.nix b/modules/nixos/hardware/audio.nix index b086d9e..594ef7c 100644 --- a/modules/nixos/hardware/audio.nix +++ b/modules/nixos/hardware/audio.nix @@ -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 diff --git a/modules/nixos/services/arr.nix b/modules/nixos/services/arr.nix index 27d76fb..d47f680 100644 --- a/modules/nixos/services/arr.nix +++ b/modules/nixos/services/arr.nix @@ -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; diff --git a/modules/nixos/services/backups.nix b/modules/nixos/services/backups.nix index dd5e091..58bde30 100644 --- a/modules/nixos/services/backups.nix +++ b/modules/nixos/services/backups.nix @@ -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 = { diff --git a/overlays/volnoti.nix b/overlays/volnoti.nix new file mode 100644 index 0000000..7a8213a --- /dev/null +++ b/overlays/volnoti.nix @@ -0,0 +1,7 @@ +# Fix: Volnoti binary not found +# Broken by https://github.com/nix-community/home-manager/pull/5725/commits/98bf8de65dc1ed12c6443b18f6f24d36e9c438d6 +_final: prev: { + volnoti = prev.volnoti.overrideAttrs (oldAttrs: { + meta.mainProgram = "volnoti"; + }); +}