From 190bf349658ceb6f64c6d69cdccbddfb5491f894 Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Sat, 16 Sep 2023 14:47:29 +0300
Subject: 2023-09-16

---
 modules/nixos/beets.nix            |  2 +-
 modules/nixos/common/nix.nix       | 10 +---------
 modules/nixos/docker.nix           |  2 +-
 modules/nixos/firefox/default.nix  |  1 -
 modules/nixos/games/minecraft.nix  |  4 ++++
 modules/nixos/podman.nix           |  5 ++++-
 modules/nixos/profiles/headful.nix |  4 ++--
 modules/nixos/xmonad.nix           |  2 ++
 8 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'modules/nixos')

diff --git a/modules/nixos/beets.nix b/modules/nixos/beets.nix
index 7a380cc..ccceaeb 100644
--- a/modules/nixos/beets.nix
+++ b/modules/nixos/beets.nix
@@ -92,7 +92,7 @@ in {
           };
         };
 
-        bash.shellAliases.beet = "${config.hm.programs.beets.package}/bin/beet --config ${config.dirs.config}/beets/config.yaml";
+        bash.shellAliases.beet = "beet --config ${config.dirs.config}/beets/config.yaml";
       };
     };
   };
diff --git a/modules/nixos/common/nix.nix b/modules/nixos/common/nix.nix
index 9978513..c0061db 100644
--- a/modules/nixos/common/nix.nix
+++ b/modules/nixos/common/nix.nix
@@ -14,15 +14,7 @@ in {
   };
 
   config = {
-    nixpkgs = {
-      config.allowUnfreePredicate = p: elem (getName p) cfg.allowedUnfreePackages;
-
-      overlays = with inputs; [
-        nix-minecraft.overlay
-        pollymc.overlays.default
-        xmonad-ng.overlays.default
-      ];
-    };
+    nixpkgs.config.allowUnfreePredicate = p: elem (getName p) cfg.allowedUnfreePackages;
 
     system.stateVersion = with builtins;
       head (split "\n" (readFile "${inputs.nixpkgs}/.version"));
diff --git a/modules/nixos/docker.nix b/modules/nixos/docker.nix
index e642030..31c0dda 100644
--- a/modules/nixos/docker.nix
+++ b/modules/nixos/docker.nix
@@ -32,7 +32,7 @@ in {
     my.extraGroups = ["docker"];
 
     hm.programs.bash = {
-      shellAliases.d = "${pkgs.docker}/bin/docker";
+      shellAliases.d = "docker";
       initExtra = mkAfter ''
         _complete_alias d _docker docker
       '';
diff --git a/modules/nixos/firefox/default.nix b/modules/nixos/firefox/default.nix
index 8e2380b..e5b54fe 100644
--- a/modules/nixos/firefox/default.nix
+++ b/modules/nixos/firefox/default.nix
@@ -539,7 +539,6 @@ in {
             "general.smoothScroll" = true;
             "gfx.font_rendering.opentype_svg.enabled" = false;
             "identity.fxaccounts.enabled" = false;
-            "keyword.enabled" = false;
             "media.autoplay.blocking_policy" = 2;
             "media.autoplay.default" = 5;
             "media.autoplay.enabled" = false;
diff --git a/modules/nixos/games/minecraft.nix b/modules/nixos/games/minecraft.nix
index b8a2949..f738c33 100644
--- a/modules/nixos/games/minecraft.nix
+++ b/modules/nixos/games/minecraft.nix
@@ -32,6 +32,8 @@ in {
   config = mkMerge [
     (mkIf cfg.client.enable {
       hm.home.packages = with pkgs; [pollymc-unwrapped];
+
+      nixpkgs.overlays = [inputs.pollymc.overlays.default];
     })
     (mkIf cfg.server.enable {
       nixfiles.modules.common.nix.allowedUnfreePackages = ["minecraft-server"];
@@ -80,6 +82,8 @@ in {
         };
       };
 
+      nixpkgs.overlays = [inputs.nix-minecraft.overlay];
+
       my.extraGroups = [config.services.minecraft-servers.group];
     })
   ];
diff --git a/modules/nixos/podman.nix b/modules/nixos/podman.nix
index cda8a4b..ceb748b 100644
--- a/modules/nixos/podman.nix
+++ b/modules/nixos/podman.nix
@@ -55,7 +55,10 @@ in {
       };
 
       programs.bash = {
-        shellAliases.p = "${pkgs.podman}/bin/podman";
+        shellAliases = {
+          podman = "grc -es ${pkgs.podman}/bin/podman";
+          p = "podman";
+        };
         initExtra = mkAfter ''
           _complete_alias p __start_podman podman
         '';
diff --git a/modules/nixos/profiles/headful.nix b/modules/nixos/profiles/headful.nix
index e1480b0..f8df169 100644
--- a/modules/nixos/profiles/headful.nix
+++ b/modules/nixos/profiles/headful.nix
@@ -27,11 +27,11 @@ in {
         imv
         mumble
         tdesktop
-        tor-browser
+        tor-browser-bundle-bin
       ];
 
       programs = {
-        bash.shellAliases.open = "${pkgs.xdg-utils}/bin/xdg-open";
+        bash.shellAliases.open = "xdg-open";
 
         thunderbird = {
           enable = true;
diff --git a/modules/nixos/xmonad.nix b/modules/nixos/xmonad.nix
index da005b2..c5fedc2 100644
--- a/modules/nixos/xmonad.nix
+++ b/modules/nixos/xmonad.nix
@@ -23,5 +23,7 @@ in {
     };
 
     services.xserver.displayManager.startx.enable = true;
+
+    nixpkgs.overlays = [inputs.xmonad-ng.overlays.default];
   };
 }
-- 
cgit 1.4.1