fix default values

noriah · Feb 25, 2025 · 449308f · 449308f
1 parent 47fce98
commit 449308f
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 23 deletions.
diff --git a/etc/den/host/plix.zsh b/etc/den/host/plix.zsh
@@ -1,4 +1,4 @@
-# niji is an AMD Desktop running Linux
+# plix is a Framework AMD Laptop13 running NixOS
 export WORKSPACE_DIR="$HOME/workspace"
 
 den::conf linux.zsh

diff --git a/nix/home/hosts/plix.nix b/nix/home/hosts/plix.nix
@@ -24,6 +24,8 @@ in
         alacritty.enable = true;
         tor.enable = true;
 
+        vscode.enable = false;
+
         go.goPath = ".opt/go";
       };
 

diff --git a/nix/home/modules/den.nix b/nix/home/modules/den.nix
@@ -72,15 +72,11 @@ in
   config = mkIf cfg.enable {
 
     # enable some packs by default
-    den.shell = {
-      enable = true;
-      aliases = {
-        hm = "home-manager";
-      };
-    };
+    den.shell.enable = mkDefault true;
+    den.shell.aliases.hm = mkDefault "home-manager";
 
     # enable our host configuration
-    den.hosts.${cfg.hostName}.enable = true;
+    den.hosts.${cfg.hostName}.enable = mkDefault true;
 
     home.username = cfg.user;
     home.homeDirectory = cfg.dir.home;

diff --git a/nix/home/modules/packs/comfy.nix b/nix/home/modules/packs/comfy.nix
@@ -13,7 +13,7 @@ in
 
   config = mkIf cfg.enable {
     den.apps = {
-      neofetch.enable = true;
+      neofetch.enable = mkDefault true;
     };
 
     den.packs = { };

diff --git a/nix/home/modules/packs/development.nix b/nix/home/modules/packs/development.nix
@@ -22,18 +22,18 @@ in
     den.apps = mkMerge [
       {
 
-        helix.enable = true;
-        git.enable = true;
-        vim.enable = true;
+        helix.enable = mkDefault true;
+        git.enable = mkDefault true;
+        vim.enable = mkDefault true;
 
-        go.enable = true;
-        julia.enable = true;
-        rust.enable = true;
+        go.enable = mkDefault true;
+        julia.enable = mkDefault true;
+        rust.enable = mkDefault true;
 
       }
       (mkIf cfg.gui {
-        vscode.enable = true;
-        vscode.client = true;
+        vscode.enable = mkDefault true;
+        vscode.client = mkDefault true;
       })
     ];
 

diff --git a/nix/home/modules/shell.nix b/nix/home/modules/shell.nix
@@ -40,8 +40,8 @@ in
     (mkIf cfg.enable {
 
       den.apps = {
-        tmux.enable = true;
-        vim.enable = true;
+        tmux.enable = mkDefault true;
+        vim.enable = mkDefault true;
       };
 
       den.shell.envVariables = {
@@ -57,10 +57,6 @@ in
         neofetch
       ];
 
-      home.shellAliases = {
-        hm = "home-manager";
-      };
-
       # programs.zsh.enable = true;
 
       home.file = {