fixes

flake.lock

@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763764254,
+        "lastModified": 1763788986,
-        "narHash": "sha256-+40Kw27qiSK/4BTAUXRa0xUo2dBCA9m5diOvLYPKDR4=",
+        "narHash": "sha256-uYgLhTSxWs9IRpia5Hxd7AMCaE0plr0+QhWBf26h9V0=",
         "owner": "AvengeMedia",
         "repo": "DankMaterialShell",
-        "rev": "f8dc6ad2bc7361a7cfb40d70bd0fcf16aba6e4de",
+        "rev": "58bf1899410536c4244b9d44c243426dc1b2a2c9",
         "type": "github"
       },
       "original": {
@@ -96,26 +96,6 @@
         "type": "github"
       }
     },
-    "dms-cli": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1763078370,
-        "narHash": "sha256-wsYqJlLdRSlJpRE0tIuuPMU6aOyhMdV237rEG/enUxY=",
-        "owner": "AvengeMedia",
-        "repo": "danklinux",
-        "rev": "7a083a0d6d087d41d0bc5077d03e662e1417ce3c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "AvengeMedia",
-        "repo": "danklinux",
-        "type": "github"
-      }
-    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -733,11 +713,11 @@
     "nvim-dots": {
       "flake": false,
       "locked": {
-        "lastModified": 1763770049,
+        "lastModified": 1763795441,
-        "narHash": "sha256-rSTmSFqyYXh/t/zsV46dHavshjJNlc1Qajb8K78blNA=",
+        "narHash": "sha256-hUP7GJuh5wSunhLCjuxkMRCYZweuQ3SOID3bUeG9zQ4=",
         "owner": "alsaiduq-lab",
         "repo": "nvim-dotfiles",
-        "rev": "2816b6522ce703c7d506064214f5dcb6bad149c5",
+        "rev": "26ae0fa8f47057c61632464d10b75599b1c2f1d6",
         "type": "github"
       },
       "original": {
@@ -814,7 +794,6 @@
         "dankMaterialShell": "dankMaterialShell",
         "dgop": "dgop",
         "disko": "disko",
-        "dms-cli": "dms-cli",
         "ghostty": "ghostty",
         "grim-hyprland": "grim-hyprland",
         "home-manager": "home-manager",

flake.nix

@@ -32,11 +32,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    dms-cli = {
-      url = "github:AvengeMedia/danklinux";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     dankMaterialShell = {
       url = "github:AvengeMedia/DankMaterialShell";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -88,7 +83,6 @@
     unstable,
     ghostty,
     hu-tao-cursor,
-    dms-cli,
     dankMaterialShell,
     pinix,
     disko,

home-manager/modules/lazygit.nix

@@ -16,7 +16,7 @@
     includes = [
       {path = "${config.home.homeDirectory}/nix/.secrets/.git-config";}
     ];
-    extraConfig = {
+    settings = {
       credential.helper = "store --file=${config.home.homeDirectory}/nix/.secrets/.git-credentials";
     };
   };

home-manager/modules/thorium.nix

@@ -1,3 +1,9 @@
 {pkgs, ...}: {
   home.packages = [pkgs.thorium];
+  xdg.dataFile = {
+    "icons/hicolor" = {
+      source = "${pkgs.thorium}/share/icons/hicolor";
+      recursive = true;
+    };
+  };
 }

pkgs/thorium/default.nix

@@ -1,12 +1,13 @@
 {
   lib,
-  stdenvNoCC,
+  stdenv,
   fetchurl,
   autoPatchelfHook,
   makeWrapper,
   dpkg,
   gnutar,
   xdg-utils,
+  hicolor-icon-theme,
   nss,
   nspr,
   glib,
@@ -49,8 +50,8 @@
   pipewire,
   gnome-settings-daemon,
 }:
-stdenvNoCC.mkDerivation rec {
+stdenv.mkDerivation rec {
-  pname = "thorium";
+  pname = "thorium-browser";
   version = "130.0.6723.174";
 
   src = fetchurl {
@@ -102,6 +103,7 @@ stdenvNoCC.mkDerivation rec {
     pipewire
   ];
 
+  propagatedBuildInputs = [hicolor-icon-theme];
   unpackPhase = ''
     ar x "$src"
     tar --no-same-owner --no-same-permissions -xf data.tar.*
@@ -117,21 +119,14 @@ stdenvNoCC.mkDerivation rec {
     if [ -f usr/share/applications/thorium-browser.desktop ]; then
       sed -E \
         -e "s|^Exec=.*|Exec=$out/bin/thorium %U|" \
-        usr/share/applications/thorium-browser.desktop > $out/share/applications/thorium.desktop
+        usr/share/applications/thorium-browser.desktop > $out/share/applications/thorium-browser.desktop
-    fi
-    if [ -d usr/share/icons ]; then
-      cp -r usr/share/icons $out/share/
-    fi
-    if [ ! -d $out/share/icons/hicolor ]; then
-      mkdir -p $out/share/icons/hicolor/{48x48,128x128,256x256}/apps
-      if [ -f $out/opt/thorium/product_logo_256.png ]; then
-        cp $out/opt/thorium/product_logo_256.png $out/share/icons/hicolor/256x256/apps/thorium-browser.png
-      elif [ -f $out/opt/thorium/product_logo_128.png ]; then
-        cp $out/opt/thorium/product_logo_128.png $out/share/icons/hicolor/128x128/apps/thorium-browser.png
-      elif [ -f $out/opt/thorium/thorium.png ]; then
-        cp $out/opt/thorium/thorium.png $out/share/icons/hicolor/256x256/apps/thorium-browser.png
-      fi
     fi
+    mkdir -p $out/share/icons/hicolor
+    cp ${hicolor-icon-theme}/share/icons/hicolor/index.theme $out/share/icons/hicolor/
+    for size in 16 24 32 48 64 128 256; do
+      mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps
+      cp $out/opt/thorium/product_logo_256.png $out/share/icons/hicolor/''${size}x''${size}/apps/thorium-browser.png
+    done
     runHook postInstall
   '';