home/common/default.nix

@@ -3,6 +3,5 @@
   imports = [
     ./wm.nix
     ./nodm.nix
-    ./nix.nix
   ];
 }

home/common/nix.nix

@@ -1,45 +0,0 @@
-{ pkgs, lib, config, osConfig ? { }, options, nixpkgs, ... }:
-let
-  cfg = config.nixfiles.common.nix;
-  standalone = !(osConfig ? home-manager);
-in {
-  config = lib.mkIf cfg.enable (lib.mkMerge [
-    {
-      nix.registry = {
-        nixfiles = {
-          exact = true;
-          from = {
-            id = "nixfiles";
-            type = "indirect";
-          };
-          to = {
-            type = "git";
-            url = "file://${config.home.homeDirectory}/nixfiles";
-          };
-        };
-      };
-    }
-
-    (lib.mkIf standalone {
-      home.sessionVariables.NIX_PATH = "nixpkgs=${nixpkgs}\${NIX_PATH:+:\${NIX_PATH}}";
-      nix.registry = {
-        nixpkgs = {
-          exact = true;
-          from = {
-            id = "nixpkgs";
-            type = "indirect";
-          };
-          to = {
-            type = "github";
-            owner = "NixOS";
-            repo = "nixpkgs";
-            rev = "${nixpkgs.rev}";
-          };
-        };
-      };
-    })
-  ]);
-  options.nixfiles.common.nix = {
-    enable = lib.mkEnableOption "Nix configuration";
-  };
-}

home/default.nix

@@ -1,6 +1,6 @@
 { pkgs, config, lib, options, osConfig ? { }, nixpkgs, home-manager, inputs, ... }@args:
 let
-  isStandalone = osConfig ? home-manager;
+  isStandalone = with builtins; !( (typeOf osConfig == "set") && hasAttr "home-manager" osConfig );
   cfg = config.nixfiles;
   flakeType = cfg.lib.types.flake;
 in

home/profile/base.nix

@@ -15,7 +15,6 @@ in
 
   config = lib.mkIf cfg.enable {
     nixfiles.programs.comma.enable = true;
-    nixfiles.common.nix.enable = true;
 
     home.sessionVariables = lib.mkMerge [
       (lib.mkIf config.programs.neovim.enable {

home/sessions/hyprland/default.nix

@@ -238,7 +238,6 @@ in
 
           "$mod, f, fullscreen"
           "$mod SHIFT, f, fakefullscreen"
-          "$mod CTRL, f, fullscreen, 1"
 
           # Move focus with mod + arrow keys
           "$mod, left, movefocus, l"