minor fixes

AtaraxiaSjel · Nov 11, 2024 · 42ebcf4 · 42ebcf4
1 parent fa55da2
commit 42ebcf4
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/profiles/overlay.nix b/profiles/overlay.nix
@@ -20,7 +20,7 @@ with lib; {
         attic-client = inputs.attic.packages.${system}.attic;
         attic-server = inputs.attic.packages.${system}.attic-server;
         cassowary-py = inputs.cassowary.packages.${system}.cassowary;
-        # nix = prev.lix;
+        heroic = (prev.heroic.override { extraPkgs = pkgs: [ final.umu-launcher ]; });
         nix-alien = inputs.nix-alien.packages.${system}.nix-alien;
         nix-fast-build = inputs.nix-fast-build.packages.${system}.default;
         nix-index-update = inputs.nix-alien.packages.${system}.nix-index-update;

diff --git a/profiles/servers/tinyproxy.nix b/profiles/servers/tinyproxy.nix
@@ -38,6 +38,24 @@
           rejectPackets = false;
         };
       };
+
+      nixpkgs.overlays = [(final: prev: {
+        sing-box =
+        if (lib.versionOlder prev.sing-box.version "1.10.1") then
+          prev.sing-box.overrideAttrs (_: {
+            version = "1.10.1";
+            src = prev.fetchFromGitHub {
+              owner = "SagerNet";
+              repo = "sing-box";
+              rev = "v1.10.1";
+              hash = "sha256-WGlYaD4u9M1hfT+L6Adc5gClIYOkFsn4c9FAympmscQ=";
+            };
+            vendorHash = "sha256-lyZ2Up1SSaRGvai0gGtq43MSdHfXc2PuxflSbASYZ4A=";
+          })
+        else
+          prev.sing-box;
+      })];
+
       system.stateVersion = "24.11";
     };
   };

diff --git a/profiles/workspace/zsh/default.nix b/profiles/workspace/zsh/default.nix
@@ -82,11 +82,11 @@
           "e" = "$EDITOR";
           "q" = "${pkgs.libqalculate}/bin/qalc";
           "man" = "${pkgs.pinfo}/bin/pinfo";
-          "l" = "${pkgs.eza}/bin/eza -lahg@F --git --group-directories-first";
+          "l" = "${pkgs.eza}/bin/eza -lahgF --git --group-directories-first";
           "tree" = "${pkgs.eza}/bin/eza -T";
-          "ltree" = "${pkgs.eza}/bin/eza -lhgT@F --git";
+          "ltree" = "${pkgs.eza}/bin/eza -lhgTF --git";
           "atree" = "${pkgs.eza}/bin/eza -aT";
-          "latree" = "${pkgs.eza}/bin/eza -lahgT@F --git";
+          "latree" = "${pkgs.eza}/bin/eza -lahgTF --git";
           "t" = "${pkgs.translate-shell}/bin/trans";
           "steam-gamescope" = "gamescope -b --steam -- steam -pipewire-dmabuf";
         };