From edf7cc355cb1f55a9301283ebec15e01dc4ffe62 Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Sun, 19 Nov 2023 21:58:34 +0300
Subject: 2023-11-19

---
 modules/common/profiles/dev/containers.nix | 2 +-
 modules/common/profiles/dev/default.nix    | 4 ++--
 modules/common/profiles/dev/sql.nix        | 2 +-
 modules/common/profiles/email.nix          | 8 ++++----
 modules/common/profiles/headful.nix        | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'modules/common/profiles')

diff --git a/modules/common/profiles/dev/containers.nix b/modules/common/profiles/dev/containers.nix
index 38852ad..6e9346a 100644
--- a/modules/common/profiles/dev/containers.nix
+++ b/modules/common/profiles/dev/containers.nix
@@ -10,7 +10,7 @@ in {
   options.nixfiles.modules.profiles.dev.containers.enable =
     mkEnableOption "Tools for working with containers and container orchestration"
     // {
-      default = config.nixfiles.modules.profiles.dev.default.enable;
+      default = config.nixfiles.modules.profiles.dev.enable;
     };
 
   config = mkIf cfg.enable {
diff --git a/modules/common/profiles/dev/default.nix b/modules/common/profiles/dev/default.nix
index 4c52961..2d0c0f6 100644
--- a/modules/common/profiles/dev/default.nix
+++ b/modules/common/profiles/dev/default.nix
@@ -5,14 +5,14 @@
   ...
 }:
 with lib; let
-  cfg = config.nixfiles.modules.profiles.dev.default;
+  cfg = config.nixfiles.modules.profiles.dev;
 in {
   imports = [
     ./containers.nix
     ./sql.nix
   ];
 
-  options.nixfiles.modules.profiles.dev.default.enable =
+  options.nixfiles.modules.profiles.dev.enable =
     mkEnableOption "Catch-all profile for stuff related to software development and etc.";
 
   config = mkIf cfg.enable {
diff --git a/modules/common/profiles/dev/sql.nix b/modules/common/profiles/dev/sql.nix
index 6a32a76..b290c16 100644
--- a/modules/common/profiles/dev/sql.nix
+++ b/modules/common/profiles/dev/sql.nix
@@ -10,7 +10,7 @@ in {
   options.nixfiles.modules.profiles.dev.sql.enable =
     mkEnableOption "SQL stuff and database management tools"
     // {
-      default = config.nixfiles.modules.profiles.dev.default.enable;
+      default = config.nixfiles.modules.profiles.dev.enable;
     };
 
   config = mkIf cfg.enable {
diff --git a/modules/common/profiles/email.nix b/modules/common/profiles/email.nix
index 19eaee5..3c809af 100644
--- a/modules/common/profiles/email.nix
+++ b/modules/common/profiles/email.nix
@@ -6,9 +6,9 @@
   ...
 }:
 with lib; let
-  cfg = config.nixfiles.modules.profiles.email.default;
+  cfg = config.nixfiles.modules.profiles.email;
 in {
-  options.nixfiles.modules.profiles.email.default.enable =
+  options.nixfiles.modules.profiles.email.enable =
     mkEnableOption "Local Email management" // {default = this.isHeadful;};
 
   config = mkIf cfg.enable {
@@ -46,13 +46,13 @@ in {
             assert (builtins.isInt line);
               concatStringsSep " " (
                 [
-                  "${config.hm.programs.password-store.package}/bin/pass"
+                  (getExe config.hm.programs.password-store.package)
                   "show"
                   path
                 ]
                 ++ optionals (line > 0) [
                   "|"
-                  "${pkgs.gnused}/bin/sed"
+                  (getExe pkgs.gnused)
                   "-e"
                   "'${toString line}!d'"
                 ]
diff --git a/modules/common/profiles/headful.nix b/modules/common/profiles/headful.nix
index f85e793..094d5dd 100644
--- a/modules/common/profiles/headful.nix
+++ b/modules/common/profiles/headful.nix
@@ -13,7 +13,7 @@ in {
 
   config = mkIf cfg.enable {
     nixfiles.modules = {
-      profiles.dev.default.enable = true;
+      profiles.dev.enable = true;
 
       alacritty.enable = true;
       aria2.enable = true;
-- 
cgit 1.4.1