Add my user to trusted user

arunoruto · Oct 26, 2024 · 85f96a0 · 85f96a0
1 parent c1bffde
commit 85f96a0
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 30 deletions.
diff --git a/modules/home-manager/server/nix-utils.nix b/modules/home-manager/server/nix-utils.nix
@@ -2,6 +2,7 @@
   config,
   lib,
   pkgs,
+  user,
   ...
 }: let
   default = {
@@ -25,6 +26,10 @@ in {
   };
 
   config = lib.mkIf config.nix-utils.enable {
+    nix.extraOptions = ''
+      trusted-users = root ${user}
+    '';
+
     home.packages = with pkgs; [
       alejandra
       nixd

diff --git a/modules/home-manager/server/shell/misc.nix b/modules/home-manager/server/shell/misc.nix
@@ -69,4 +69,8 @@
       enable = true;
     };
   };
+
+  home.packages = with pkgs; [
+    devenv
+  ];
 }
diff --git a/modules/home-manager/theming/fonts.nix b/modules/home-manager/theming/fonts.nix
@@ -1,28 +1,24 @@
-# https://danth.github.io/stylix/
 {
   config,
   pkgs,
   lib,
   ...
-}: {
+}: let
+  cantarell = {
+    name = "Cantarell";
+    package = pkgs.cantarell-fonts;
+  };
+  # roboto = {
+  #   name = "Roboto";
+  #   package = pkgs.roboto;
+  # };
+in {
   options.theming.fonts.enable = lib.mkEnableOption "Setup fonts on system";
 
   config = lib.mkIf config.theming.fonts.enable {
-    stylix.fonts = rec {
-      serif = {
-        name = "Cantarell";
-        package = pkgs.cantarell-fonts;
-      };
-      # serif = {
-      #   name = "Roboto";
-      #   package = pkgs.roboto;
-      # };
-      # sansSerif = config.stylix.fonts.serif;
-      sansSerif = serif;
-      # sansSerif = {
-      #   name = "Roboto Serif";
-      #   package = pkgs.roboto-serif;
-      # };
+    stylix.fonts = {
+      serif = cantarell;
+      sansSerif = cantarell;
       monospace = {
         name = "FiraCode Nerd Font";
         package = pkgs.fira-code-nerdfont;

diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
@@ -1,6 +1,8 @@
 {
   inputs,
   lib,
+  config,
+  username,
   ...
 }: {
   imports = [
@@ -23,5 +25,8 @@
   media.enable = lib.mkDefault false;
   gui.enable = lib.mkDefault true;
 
-  nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
+  nix = {
+    nixPath = ["nixpkgs=${inputs.nixpkgs}"];
+    extraOptions = config.home-manager.users.${username}.nix.extraOptions;
+  };
 }
diff --git a/modules/nixos/system/theming.nix b/modules/nixos/system/theming.nix
@@ -3,6 +3,7 @@
   pkgs,
   lib,
   config,
+  username,
   ...
 }: {
   imports = [inputs.stylix.nixosModules.stylix];
@@ -36,18 +37,15 @@
     stylix = {
       enable = lib.mkDefault true;
       base16Scheme = lib.mkDefault "${pkgs.base16-schemes}/share/themes/${config.theming.scheme}.yaml";
-      image =
-        # pkgs.fetchFromGitHub {
-        #   owner = "arunoruto";
-        #   repo = "wallpapers";
-        #   rev = "8815698729ceff1f97fae5ab2bf930a9dd682198";
-        #   hash = "sha256-uPaPAggLFmureDXqKcvwr2uMb24QuxQzbwCqTHNSIrg=";
-        # }
-        inputs.wallpapers + "/${config.theming.image}";
-      # cursor = {
-      #   name = "catppuccin-macchiato-dark-cursors";
-      #   package = pkgs.catppuccin-cursors.macchiatoDark;
-      # };
+      image = inputs.wallpapers + "/${config.theming.image}";
+      cursor =
+        if (config.gui.enable)
+        then config.home-manager.users.${username}.stylix.cursor
+        else {};
+      # fonts =
+      #   if (config.gui.enable)
+      #   then config.home-manager.users.${username}.stylix.fonts
+      #   else {};
       targets = {
         # lightdm.enable = true;
       };

diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -1,3 +1,4 @@
+# TODO: create an apple-fonts package inspired by this flake: https://github.com/Lyndeno/apple-fonts.nix
 pkgs: {
   # banana-cursor = pkgs.callPackage ./banana-cursor/package.nix {};
   zluda-rocm5 = pkgs.callPackage ./zluda-rocm5/package.nix {};
-Original file line number
+Diff line change
@@ Expand Up / @@ -69,4 +69,8 @@ @@
           enable = true;
         };
       };
+      home.packages = with pkgs; [
+        devenv
+      ];
     }