memleaks yay

fufexan · Jan 11, 2024 · 980a839 · 980a839
1 parent acca82f
commit 980a839
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 40 deletions.
diff --git a/flake.nix b/flake.nix
@@ -6,7 +6,7 @@
       systems = ["x86_64-linux"];
 
       imports = [
-        # ./home/profiles
+        ./home/profiles
         ./hosts
         ./lib
         ./modules

diff --git a/home/default.nix b/home/default.nix
@@ -29,9 +29,9 @@
   # let HM manage itself when in standalone mode
   programs.home-manager.enable = true;
 
-  # nixpkgs.overlays = [
-  #   (final: prev: {
-  #     lib = prev.lib // {colors = import "${self}/lib/colors" lib;};
-  #   })
-  # ];
+  nixpkgs.overlays = [
+    (final: prev: {
+      lib = prev.lib // {colors = import "${self}/lib/colors" lib;};
+    })
+  ];
 }
diff --git a/home/profiles/io/default.nix b/home/profiles/io/default.nix
@@ -1,37 +1,37 @@
 {
   imports = [
     # editors
-    # ../../editors/helix
-    # ../../editors/neovim
+    ../../editors/helix
+    ../../editors/neovim
 
     # programs
-    # ../../programs
-    # ../../programs/games
-    # ../../programs/wayland
+    ../../programs
+    ../../programs/games
+    ../../programs/wayland
 
     # services
-    # ../../services/ags
-    # ../../services/cinny.nix
+    ../../services/ags
+    ../../services/cinny.nix
 
     # media services
-    # ../../services/media/playerctl.nix
-    # ../../services/media/spotifyd.nix
+    ../../services/media/playerctl.nix
+    ../../services/media/spotifyd.nix
 
     # system services
-    # ../../services/system/dunst.nix
-    # ../../services/system/kdeconnect.nix
-    # ../../services/system/polkit-agent.nix
-    # ../../services/system/power-monitor.nix
-    # ../../services/system/syncthing.nix
-    # ../../services/system/udiskie.nix
+    ../../services/system/dunst.nix
+    ../../services/system/kdeconnect.nix
+    ../../services/system/polkit-agent.nix
+    ../../services/system/power-monitor.nix
+    ../../services/system/syncthing.nix
+    ../../services/system/udiskie.nix
 
     # wayland-specific
-    # ../../services/wayland/hyprpaper.nix
-    # ../../services/wayland/swayidle.nix
+    ../../services/wayland/hyprpaper.nix
+    ../../services/wayland/swayidle.nix
 
     # terminal emulators
-    # ../../terminal/emulators/foot.nix
-    # ../../terminal/emulators/wezterm.nix
+    ../../terminal/emulators/foot.nix
+    ../../terminal/emulators/wezterm.nix
   ];
 
   wayland.windowManager.hyprland.settings = let

diff --git a/hosts/default.nix b/hosts/default.nix
@@ -14,16 +14,6 @@
     inherit (import "${self}/system") desktop laptop;
 
     # get these into the module system
-    # specialArgs = let
-    #   self_ = inputs.nixpkgs.lib.recursiveUpdate self {
-    #     nixosConfigurations = null;
-    #     homeConfigurations = null;
-    #   };
-    #   inputs_ = inputs.nixpkgs.lib.recursiveUpdate inputs {self = self_;};
-    # in {
-    #   self = self_;
-    #   inputs = inputs_;
-    # };
     specialArgs = {inherit inputs self;};
   in {
     io = nixosSystem {
@@ -45,12 +35,11 @@
           "${mod}/services/gnome-services.nix"
           "${mod}/services/location.nix"
 
-          # {home-manager.users.mihai.imports = homeImports."mihai@io";}
           {
-            home-manager.users.mihai.imports = [
-              ../home
-              ../home/profiles/io
-            ];
+            home-manager = {
+              users.mihai.imports = homeImports."mihai@io";
+              extraSpecialArgs = specialArgs;
+            };
           }
 
           # enable unmerged Howdy