From 771b7b1a42960a37a3cad91a963be3d242839723 Mon Sep 17 00:00:00 2001
From: Danilo Reyes <CaptainJawZ@protonmail.com>
Date: Thu, 2 Oct 2025 03:27:13 -0600
Subject: [PATCH] specializations are annoying + trying to fix emacs

---
 config/base.nix                     |  1 +
 dotfiles/doom/config.org            | 20 ++++++++++----------
 environments/hyprland.nix           |  1 -
 flake.lock                          | 12 ++++++------
 hosts/workstation/configuration.nix | 11 +----------
 modules/dev/nix.nix                 |  8 +++++---
 6 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/config/base.nix b/config/base.nix
index ef08ea8..1af3dc4 100644
--- a/config/base.nix
+++ b/config/base.nix
@@ -78,6 +78,7 @@
     ];
   };
   nix = {
+    nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
     distributedBuilds = true;
     optimise.automatic = true;
     settings = {
diff --git a/dotfiles/doom/config.org b/dotfiles/doom/config.org
index 4d5d1a5..1665167 100755
--- a/dotfiles/doom/config.org
+++ b/dotfiles/doom/config.org
@@ -451,17 +451,17 @@ later.
 Configurations to add linting support to specific languages by integrating linters with flycheck.
 
 #+begin_src emacs-lisp :tangle ./config.el
-(use-package! flycheck
-  :config
-  (flycheck-define-checker nix-statix
-    "A syntax checker for Nix using Statix."
-    :command ("statix" "check" source)
-    :error-patterns
-    ((warning line-start (file-name) ":" line ":" column
-              ": " (message) line-end))
-    :modes (nix-mode))
+;; (use-package! flycheck
+;;   :config
+;;   (flycheck-define-checker deadnix
+;;     "A syntax checker for Nix using deadnix."
+;;     :command ("deadnix" "--fail" source)
+;;     :error-patterns
+;;     ((warning line-start (file-name) ":" line ":" column
+;;               ": " (message) line-end))
+;;     :modes (nix-mode))
 
-  (add-to-list 'flycheck-checkers 'nix-statix))
+;;   (add-to-list 'flycheck-checkers 'deadnix))
 #+end_src
 * GPT
 Integrate most AI agents with emacs on a way that through api keys it can do
diff --git a/environments/hyprland.nix b/environments/hyprland.nix
index 321fab6..e6e37a9 100644
--- a/environments/hyprland.nix
+++ b/environments/hyprland.nix
@@ -45,7 +45,6 @@ in
     enable = true;
     extraPortals = [
       pkgs.xdg-desktop-portal-hyprland
-      # pkgs.xdg-desktop-portal-gtk
     ];
   };
   users.users.jawz.packages = builtins.attrValues {
diff --git a/flake.lock b/flake.lock
index d1db6c7..247e04f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -125,11 +125,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1759221805,
-        "narHash": "sha256-gKne7A7DWffiqdfUPdX4TK1/a4FU942LM7e6E8ORsTY=",
+        "lastModified": 1759394468,
+        "narHash": "sha256-mPbw6N6ERaUfaoXcuq7+pzbIiSYgymxw1ZU8dImHaQo=",
         "owner": "marienz",
         "repo": "nix-doom-emacs-unstraightened",
-        "rev": "5697968fa38469d12012706d9322211de10309c9",
+        "rev": "84f91b8df69b7cb904fc6caae3a77d0742d70285",
         "type": "github"
       },
       "original": {
@@ -164,11 +164,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759221279,
-        "narHash": "sha256-7EAByrl70kQ2gV0opDiNhySsk9KcJiRpnnL+BEaNOhc=",
+        "lastModified": 1759370635,
+        "narHash": "sha256-qX5Ot+d1Hh7wvpDnt41dwJC3VqzpG+Yue4d3fM/Xlmk=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "6bbda1ce5dc002b22c95323b01d40518e843a00d",
+        "rev": "e8a15f25bcbd4e29cd7a36e1fbc3df525cca9acb",
         "type": "github"
       },
       "original": {
diff --git a/hosts/workstation/configuration.nix b/hosts/workstation/configuration.nix
index 04a4c83..33ba8e4 100644
--- a/hosts/workstation/configuration.nix
+++ b/hosts/workstation/configuration.nix
@@ -21,6 +21,7 @@ in
     ./hardware-configuration.nix
     ../../config/base.nix
     ../../config/stylix.nix
+    ../../environments/hyprland.nix
   ];
   my = import ./toggles.nix // {
     nix.cores = 8;
@@ -47,16 +48,6 @@ in
       };
     };
   };
-  specialisation = {
-    gnome.configuration = {
-      imports = [ ../../environments/gnome.nix ];
-      services.flatpak.enable = true;
-    };
-    hyprland.configuration = {
-      imports = [ ../../environments/hyprland.nix ];
-      services.flatpak.enable = true;
-    };
-  };
   networking = {
     hostName = "workstation";
     firewall =
diff --git a/modules/dev/nix.nix b/modules/dev/nix.nix
index a0365bf..57a9ec9 100644
--- a/modules/dev/nix.nix
+++ b/modules/dev/nix.nix
@@ -9,8 +9,10 @@ let
   packages = builtins.attrValues {
     inherit (pkgs)
       nixfmt-rfc-style # formatting
+      nixfmt-tree # formatting
       cachix # binary cache management
       nixd # language server for Nix
+      deadnix # detext unused/uneeded dependencies
       statix # linter for Nix expressions
       ;
   };
@@ -34,9 +36,9 @@ in
     users.users.jawz = { inherit packages; };
     home-manager.users.jawz.programs.${shellType}.shellAliases = {
       nixformat = ''
-        nix run unstable#deadnix -- -e && \
-        nix run unstable#nixfmt-tree && \
-        nix run unstable#statix fix
+        deadnix -- -e && \
+        nixfmt-tree && \
+        statix fix
       '';
     };
   };