From 12acb4fc4745961cc48b9d7f74fadda24680dfb0 Mon Sep 17 00:00:00 2001
From: cnst <adamhilmersson@gmail.com>
Date: Thu, 1 Aug 2024 19:19:20 +0200
Subject: [PATCH] freddy ready for the new

---
 .../toothpick/{imports.nix => default.nix}    | 41 ++++++++-----------
 home/users/toothpick/home.nix                 | 36 ----------------
 nixos/hosts/toothpc/default.nix               |  5 ++-
 3 files changed, 21 insertions(+), 61 deletions(-)
 rename home/users/toothpick/{imports.nix => default.nix} (53%)
 delete mode 100644 home/users/toothpick/home.nix

diff --git a/home/users/toothpick/imports.nix b/home/users/toothpick/default.nix
similarity index 53%
rename from home/users/toothpick/imports.nix
rename to home/users/toothpick/default.nix
index 3f41359d..31d347ad 100644
--- a/home/users/toothpick/imports.nix
+++ b/home/users/toothpick/default.nix
@@ -1,41 +1,24 @@
 {pkgs, ...}: {
-  imports = [
-    # core.gui
-    ../../core/gui/gtk
-    ../../core/gui/waybar
-    ../../core/gui/browsers
-    ../../core/gui/xdg
-    ../../core/gui/discord
-    ../../core/gui/vscode
-    ../../core/gui/utility
-    ../../core/gui/hypr/toothpick.nix
-    # core.tui
-    ../../core/tui/git/toothpick.nix
-    ../../core/tui/shell/toothpick.nix
-    ../../core/tui/alacritty
-    ../../core/tui/foot
-    ../../core/tui/wezterm
-    ../../core/tui/neovim
-    # core.services
-    ../../core/services/mako
-    ../../core/services/polkit
-    ../../core/services/hypr
-  ];
   home = {
+    username = "toothpick";
+    homeDirectory = "/home/toothpick";
+    stateVersion = "23.11";
+    extraOutputsToInstall = ["doc" "devdoc"];
+
     packages = with pkgs; [
       # misc.gui
       virt-manager
       xfce.thunar
-      filezilla
 
       # misc.tui
       ranger
+      xcur2png
 
       # misc.system
       adwaita-icon-theme
+      egl-wayland
       qt5.qtwayland
       qt6.qtwayland
-      egl-wayland
       #  thefuck
       wireguard-tools
       wl-clipboard
@@ -47,10 +30,20 @@
       BROWSER = "firefox";
       EDITOR = "nvim";
       TERM = "foot";
+
       QT_QPA_PLATFORM = "wayland-egl";
       SDL_VIDEODRIVER = "wayland";
       XDG_SESSION_TYPE = "wayland";
       ELECTRON_OZONE_PLATFORM_HINT = "auto";
     };
   };
+  # disable manuals as nmd fails to build often
+  manual = {
+    html.enable = false;
+    json.enable = false;
+    manpages.enable = false;
+  };
+
+  # let HM manage itself when in standalone mode
+  programs.home-manager.enable = true;
 }
diff --git a/home/users/toothpick/home.nix b/home/users/toothpick/home.nix
deleted file mode 100644
index 70b787b8..00000000
--- a/home/users/toothpick/home.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  inputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
-  imports = [
-    ./imports.nix
-  ];
-
-  nix = {
-    package = lib.mkDefault pkgs.nix;
-    settings = {
-      experimental-features = [
-        "nix-command"
-        "flakes"
-      ];
-      warn-dirty = false;
-    };
-  };
-
-  # TODO: Set your username
-  home = {
-    username = "toothpick";
-    homeDirectory = "/home/toothpick";
-  };
-
-  programs.home-manager.enable = true;
-
-  # Nicely reload system units when changing configs
-  systemd.user.startServices = "sd-switch";
-
-  # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  home.stateVersion = "24.05";
-}
diff --git a/nixos/hosts/toothpc/default.nix b/nixos/hosts/toothpc/default.nix
index f5b2f95c..e66ef5ff 100644
--- a/nixos/hosts/toothpc/default.nix
+++ b/nixos/hosts/toothpc/default.nix
@@ -35,7 +35,10 @@ in {
   ];
 
   boot = {
-    blacklistedKernelModules = ["ucsi_ccg"];
+    blacklistedKernelModules = [
+      "ucsi_ccg"
+      "i2c_nvidia_gpu"
+    ];
     consoleLogLevel = 3;
     kernelPackages = lib.mkForce pkgs.linuxPackages_cachyos;
     kernelParams = [