Update flake.lock

rhoriguchi · Dec 6, 2024 · 09144a8 · 09144a8
1 parent 9ff4d38
commit 09144a8
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 52 deletions.
diff --git a/configuration/devices/headless/common.nix b/configuration/devices/headless/common.nix
@@ -9,7 +9,16 @@
 
   nixpkgs.config.permittedInsecurePackages = [ ]
     # TODO remove when https://github.com/project-chip/connectedhomeip/issues/25688 fixed
-    ++ lib.optionals config.services.home-assistant.enable [ "openssl-1.1.1w" ];
+    ++ lib.optionals config.services.home-assistant.enable [
+      "openssl-1.1.1w"
+    ]
+    # TODO remove when https://github.com/NixOS/nixpkgs/issues/360592 fixed
+    ++ lib.optionals config.services.sonarr.enable [
+      "aspnetcore-runtime-6.0.36"
+      "aspnetcore-runtime-wrapped-6.0.36"
+      "dotnet-sdk-6.0.428"
+      "dotnet-sdk-wrapped-6.0.428"
+    ];
 
   networking = {
     nftables.enable = true;

diff --git a/flake.lock b/flake.lock
diff --git a/modules/home-manager/alacritty.nix b/modules/home-manager/alacritty.nix
@@ -1,5 +1,5 @@
 { pkgs, config, colors, ... }: {
-  home.packages = [ (pkgs.nerdfonts.override { fonts = [ "RobotoMono" ]; }) ];
+  home.packages = [ pkgs.nerd-fonts.roboto-mono ];
 
   home.sessionVariables.TERMINAL = "alacritty";
 

diff --git a/modules/home-manager/gnome-text-editor.nix b/modules/home-manager/gnome-text-editor.nix
@@ -1,9 +1,5 @@
 { pkgs, ... }: {
-  home.packages = [
-    (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
-
-    pkgs.gnome-text-editor
-  ];
+  home.packages = [ pkgs.nerd-fonts.jetbrains-mono pkgs.gnome-text-editor ];
 
   dconf = {
     enable = true;

diff --git a/modules/home-manager/vscode.nix b/modules/home-manager/vscode.nix
@@ -1,5 +1,5 @@
 { config, pkgs, lib, colors, ... }: {
-  home.packages = [ (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) ];
+  home.packages = [ pkgs.nerd-fonts.jetbrains-mono ];
 
   programs.zsh.shellAliases.vscode = "${config.programs.vscode.package}/bin/code";
 

diff --git a/modules/profiles/gnome.nix b/modules/profiles/gnome.nix
@@ -59,17 +59,16 @@
   environment = {
     sessionVariables.QT_QPA_PLATFORM = "wayland";
 
-    systemPackages = [ pkgs.inter (pkgs.nerdfonts.override { fonts = [ "RobotoMono" ]; }) ]
-      ++ [ pkgs.dconf-editor pkgs.networkmanager-openconnect ] ++ [
-        pkgs.alacritty # pkgs.gnome-console
-        pkgs.firefox # pkgs.epiphany
-        pkgs.mission-center # pkgs.gnome-system-monitor
-
-        pkgs.baobab
-        pkgs.gnome-calculator
-        pkgs.loupe
-        pkgs.snapshot
-      ];
+    systemPackages = [ pkgs.nerd-fonts.roboto-mono ] ++ [ pkgs.dconf-editor pkgs.networkmanager-openconnect ] ++ [
+      pkgs.alacritty # pkgs.gnome-console
+      pkgs.firefox # pkgs.epiphany
+      pkgs.mission-center # pkgs.gnome-system-monitor
+
+      pkgs.baobab
+      pkgs.gnome-calculator
+      pkgs.loupe
+      pkgs.snapshot
+    ];
 
     gnome.excludePackages = [
       pkgs.adwaita-icon-theme

diff --git a/overlays/default.nix b/overlays/default.nix
@@ -9,36 +9,6 @@
           hash = "sha256-VlvxAWOKZ/ih7bxKxD2qfp2S8skGABS90hfmP8aV2w0=";
         }
       }/pkgs/tools/system/fancy-motd") { };
-
-    # TODO remove when merged https://nixpk.gs/pr-tracker.html?pr=355011
-    adguardhome = super.callPackage (import "${
-        super.fetchFromGitHub {
-          owner = "NixOS";
-          repo = "nixpkgs";
-          rev = "0dff4975e883f6e18d0e8adf4eab295c33200c0a";
-          sha256 = "sha256-bRaTBORcCcu3gpEEGJgLawmuk/hXG0nzfOD2glRaiY4=";
-        }
-      }/pkgs/servers/adguardhome") { };
-
-    # TODO remove when merged https://nixpk.gs/pr-tracker.html?pr=358983
-    tautulli = super.python3Packages.callPackage (import "${
-        super.fetchFromGitHub {
-          owner = "NixOS";
-          repo = "nixpkgs";
-          rev = "0706f4f5390fcddc62d8cf974857901a7ebf95e3";
-          sha256 = "sha256-Rg6B6b4/2Ydfi6w67RWPmEeC9u6E+zon2Idg9wO184Q=";
-        }
-      }/pkgs/servers/tautulli") { };
-
-    # TODO remove when merged https://nixpk.gs/pr-tracker.html?pr=359151
-    plexRaw = super.python3Packages.callPackage (import "${
-        super.fetchFromGitHub {
-          owner = "NixOS";
-          repo = "nixpkgs";
-          rev = "414adcabe0e4c032f64737bf8d0bc079d8236ce8";
-          sha256 = "sha256-HshRHzDiyd3+uYbzLTh4M1w5Qi0YoaG5mTMUrEnPrrc=";
-        }
-      }/pkgs/servers/plex/raw.nix") { };
   })
   (_: super: {
     discord = super.callPackage ./discord.nix { inherit (super) discord; };