diff --git a/flake.lock b/flake.lock
index 5dadc0b..2207d6e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,27 +7,27 @@
         ]
       },
       "locked": {
-        "lastModified": 1733050161,
-        "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=",
+        "lastModified": 1726989464,
+        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "62d536255879be574ebfe9b87c4ac194febf47c5",
+        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nix-flatpak": {
       "locked": {
-        "lastModified": 1732304879,
-        "narHash": "sha256-/DOW8VadE//HA6tuV2++NowYWi7Wa/FmJHXRJoTQnfQ=",
+        "lastModified": 1729453639,
+        "narHash": "sha256-L19R5CXCfTU9IFs9FAaYhDiteegfhJQMiAHLfls4Pdw=",
         "owner": "gmodena",
         "repo": "nix-flatpak",
-        "rev": "c84579946c03c996916be0fb6e1340f444c277af",
+        "rev": "68bc646058386e2ffbd9d78d79d6558e684f6b8c",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1732483221,
-        "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
+        "lastModified": 1729742320,
+        "narHash": "sha256-u3Of8xRkN//me8PU+RucKA59/6RNy4B2jcGAF36P4jI=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
+        "rev": "e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda",
         "type": "github"
       },
       "original": {
@@ -54,27 +54,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1732350895,
-        "narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=",
+        "lastModified": 1729973466,
+        "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3",
+        "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.11",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1732521221,
-        "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
+        "lastModified": 1729880355,
+        "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
+        "rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 0c0e544..05175e9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,16 +2,15 @@
   ######
   inputs = {
     ######
-    #nixpkgs-old.url = "github:NixOS/nixpkgs/nixos-24.05";
 
     # Main nix package repository
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
 
     # NixOS unstable channel
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-24.11";
+      url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -75,9 +74,8 @@
 
       # NixOS configuration entrypoint
       # Available through 'nixos-rebuild --flake .#your-hostname'
-      nixosConfigurations =
-        host_helper "crocoite" # // (host_helper example);
-        // host_helper "factorio";
+      nixosConfigurations = host_helper "crocoite" # // (host_helper example);
+                         // host_helper "factorio";
 
       ## Standalone home-manager configuration entrypoint
       ## Available through 'home-manager --flake .#your-username@your-hostname'
diff --git a/hosts/crocoite/crocoite.nix b/hosts/crocoite/crocoite.nix
index c8dfb57..4aff002 100644
--- a/hosts/crocoite/crocoite.nix
+++ b/hosts/crocoite/crocoite.nix
@@ -3,8 +3,6 @@
   inputs,
   ...
 }: {
-  networking.hostName = "crocoite"; # Define your hostname.
-
   #MANPAGER='nvim +Man!'
 
   # This value determines the NixOS release from which the default
@@ -15,6 +13,9 @@
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "24.05"; # Did you read the comment?
 
+  # Allow unfree packages
+  #unstable.config.allowUnfree = true;
+
   #nixpkgs.overlays = [ overlays.unstable-packages ];
   nixpkgs = {
     # You can add overlays here
@@ -40,18 +41,14 @@
       allowUnfree = true;
     };
   };
+  networking.hostName = "crocoite"; # Define your hostname.
 
-  nix = {
-    settings.experimental-features = ["nix-command" "flakes"];
-
-    # https://lix.systems/ Lix is a modern, delicious implementation of the Nix package manager,
-    # focused on correctness, usability, and growth –
-    # and committed to doing right by its community.
-    package = pkgs.lix;
-
-    channel.enable = false;
-  };
+  nix.settings.experimental-features = ["nix-command" "flakes"];
 
+  # https://lix.systems/ Lix is a modern, delicious implementation of the Nix package manager,
+  # focused on correctness, usability, and growth –
+  # and committed to doing right by its community.
+  nix.package = pkgs.lix;
   imports = [
     inputs.nix-flatpak.nixosModules.nix-flatpak
 
@@ -59,21 +56,36 @@
     ./hardware-configuration.nix
     ./boot.nix
 
-    ../../modules
+    ../../modules/locale.nix
+    ../../modules/networking.nix
+    ../../modules/boot_theming.nix
 
-    ../../modules/users
+    ../../modules/specific_hardware/scan_and_print.nix
+    ../../modules/specific_hardware/fwupd.nix
+    ../../modules/specific_hardware/bluetooth.nix
 
-    ../../modules/specific_hardware
+    ../../modules/sec_auth/firejail.nix
+    ../../modules/sec_auth/login-manager.nix
+    ../../modules/sec_auth/users_and_permissions.nix
+    ../../modules/sec_auth/ssh.nix
 
-    ../../modules/sec_auth
+    ../../modules/software/software.nix
+    ../../modules/software/virt.nix
+    ../../modules/software/game.nix
+    ../../modules/software/audio_video.nix
+    ../../modules/software/obs-studio.nix
 
-    ../../modules/software
-    ../../modules/software/browser
-    ../../modules/software/nix-helper
+    ../../modules/wm_and_de/hyprland.nix
 
-    ../../modules/wm_and_de
+    ../../modules/pkg_mgrmnt/flatpak.nix
+    ../../modules/pkg_mgrmnt/podman.nix
+    ../../modules/pkg_mgrmnt/store_pkg_file.nix
 
-    ../../modules/pkg_mgrmnt
+    ../../modules/software/nix-helper/index.nix
+    #../../modules/software/nix-helper/doc.nix
+    ../../modules/software/nix-helper/nix-ld.nix
 
+    ../../modules/software/browser/firefox.nix
+    ../../modules/software/browser/brave.nix
   ];
 }
diff --git a/hosts/crocoite/hardware-configuration.nix b/hosts/crocoite/hardware-configuration.nix
index 273c87e..3ff12fe 100644
--- a/hosts/crocoite/hardware-configuration.nix
+++ b/hosts/crocoite/hardware-configuration.nix
@@ -12,7 +12,7 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["nvme" "ehci_pci" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
+  boot.initrd.availableKernelModules = ["nvme" "ehci_pci" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [];
   boot.kernelModules = ["kvm-amd"];
   boot.extraModulePackages = [];
diff --git a/hosts/factorio/hardware-configuration.nix b/hosts/factorio/hardware-configuration.nix
index daf8eca..23d07ad 100644
--- a/hosts/factorio/hardware-configuration.nix
+++ b/hosts/factorio/hardware-configuration.nix
@@ -1,30 +1,26 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
 {
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}: {
-  imports = [
-    (modulesPath + "/profiles/qemu-guest.nix")
-  ];
+  imports =
+    [ (modulesPath + "/profiles/qemu-guest.nix")
+    ];
 
-  boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = [];
-  boot.extraModulePackages = [];
+  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/a6c22dab-a82a-4109-a8d0-b7ed99d56bc7";
-    fsType = "ext4";
-  };
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/a6c22dab-a82a-4109-a8d0-b7ed99d56bc7";
+      fsType = "ext4";
+    };
 
-  swapDevices = [
-    {device = "/dev/disk/by-uuid/ca4eedce-6e52-4593-a188-a48e54074d14";}
-  ];
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/ca4eedce-6e52-4593-a188-a48e54074d14"; }
+    ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
@@ -35,3 +31,4 @@
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }
+
diff --git a/modules/default.nix b/modules/default.nix
deleted file mode 100644
index 8d6c975..0000000
--- a/modules/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }: {
-  imports = [
-    ./boot_theming.nix
-    ./environment.nix
-    ./locale.nix
-    ./networking.nix
-  ];
-}
diff --git a/modules/pkg_mgrmnt/default.nix b/modules/pkg_mgrmnt/default.nix
deleted file mode 100644
index 71c5425..0000000
--- a/modules/pkg_mgrmnt/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }: {
-  imports = [
-    ./flatpak.nix
-    ./podman.nix
-    ./store_pkg_file.nix
-  ];
-}
diff --git a/modules/pkg_mgrmnt/flatpak.nix b/modules/pkg_mgrmnt/flatpak.nix
index 09cdc72..7af54b5 100644
--- a/modules/pkg_mgrmnt/flatpak.nix
+++ b/modules/pkg_mgrmnt/flatpak.nix
@@ -1,23 +1,64 @@
-{ ... }: {
-  services.flatpak = {
-    enable = true;
-    update.auto = {
-      enable = false;
-      onCalendar = "weekly";
-    };
-    uninstallUnmanaged = true;
+{lib, ...}: {
+  services.flatpak.enable = true;
+  services.flatpak.update.auto.enable = false;
+  services.flatpak.uninstallUnmanaged = true;
 
-    remotes = [
-      {
-        name = "flathub";
-        location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
-        args = "--prio=99";
-      }
-      {
-        name = "flathub-beta";
-        location = "https://flathub.org/beta-repo/flathub-beta.flatpakrepo";
-      }
-    ];
+  services.flatpak.remotes = lib.mkOptionDefault [
+    {
+      name = "flathub-beta";
+      location = "https://flathub.org/beta-repo/flathub-beta.flatpakrepo";
+    }
+    {
+      name = "flathub";
+      location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
+    }
+  ];
 
-  };
+  services.flatpak.packages = [
+    {
+      origin = "flathub";
+      appId = "com.github.tchx84.Flatseal";
+    } # flatpak permisssion gui
+    {
+      origin = "flathub";
+      appId = "com.mojang.Minecraft";
+    } # Lego for adults
+    {
+      origin = "flathub";
+      appId = "de.schmidhuberj.DieBahn";
+    } # Public transport connection viewer
+    {
+      origin = "flathub";
+      appId = "com.github.hugolabe.Wike";
+    } # Wikpedia, but in nice
+    #{ origin = "flathub";   appId = "com.jeffser.Alpaca"; }          # Local chat AI
+    {
+      origin = "flathub";
+      appId = "io.gpt4all.gpt4all";
+    } # Local chat AI
+    {
+      origin = "flathub";
+      appId = "md.obsidian.Obsidian";
+    } # note taking and brain organising
+
+    # messenger
+    {
+      origin = "flathub";
+      appId = "org.signal.Signal";
+    }
+    {
+      origin = "flathub";
+      appId = "org.telegram.desktop";
+    }
+    {
+      origin = "flathub";
+      appId = "dev.vencord.Vesktop";
+    } # More usable discord for linux
+    {
+      origin = "flathub";
+      appId = "io.github.Soundux";
+    } # soundboard
+
+    #"com.obsproject.Studio" #this is another way to write it
+  ];
 }
diff --git a/modules/pkg_mgrmnt/podman.nix b/modules/pkg_mgrmnt/podman.nix
index ee82a11..5da164a 100644
--- a/modules/pkg_mgrmnt/podman.nix
+++ b/modules/pkg_mgrmnt/podman.nix
@@ -15,8 +15,6 @@
     };
   };
 
-  environment.sessionVariables = {
-  };
   # Useful other development tools
   environment.systemPackages = with pkgs; [
     dive # look into docker image layers
diff --git a/modules/sec_auth/apparmor.nix b/modules/sec_auth/apparmor.nix
deleted file mode 100644
index dad5775..0000000
--- a/modules/sec_auth/apparmor.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{pkgs, ...}: {
-  security.apparmor.enable = true;
-
-  # XDG-USER-DIR package and config
-  environment.systemPackages = with pkgs; [
-    apparmor-pam
-    apparmor-utils
-    apparmor-parser
-    apparmor-profiles
-    roddhjav-apparmor-rules
-  ];
-}
diff --git a/modules/sec_auth/default.nix b/modules/sec_auth/default.nix
deleted file mode 100644
index 8b8f5eb..0000000
--- a/modules/sec_auth/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }: {
-  imports = [
-    ./apparmor.nix
-    ./firejail.nix
-    ./login-manager.nix
-    ./ssh.nix
-  ];
-}
diff --git a/modules/sec_auth/firejail.nix b/modules/sec_auth/firejail.nix
index 11f7836..935d869 100644
--- a/modules/sec_auth/firejail.nix
+++ b/modules/sec_auth/firejail.nix
@@ -3,14 +3,18 @@
   programs.firejail = {
     enable = true;
     wrappedBinaries = {
-      nuclear = {
-        executable = "${pkgs.nuclear}/bin/nuclear";
-        profile = "${pkgs.firejail}/etc/firejail/nuclear.profile";
+      firefox = {
+        executable = "${pkgs.firefox}/bin/firefox";
+        profile = "${pkgs.firejail}/etc/firejail/firefox.profile";
         extraArgs = [
+          # Required for U2F USB stick
+          "--ignore=private-dev"
           # Enforce dark mode
           "--env=GTK_THEME=Adwaita:dark"
           # Enable system notifications
           "--dbus-user.talk=org.freedesktop.Notifications"
+          # For screen sharing
+          "--dbus-user.talk=org.freedesktop.portal.*"
         ];
       };
 
@@ -29,33 +33,14 @@
         ];
       };
 
-      firefox = {
-        executable = "${pkgs.firefox}/bin/firefox";
-        profile = "${pkgs.firejail}/etc/firejail/firefox.profile";
+      nuclear = {
+        executable = "${pkgs.nuclear}/bin/nuclear";
+        profile = "${pkgs.firejail}/etc/firejail/nuclear.profile";
         extraArgs = [
-          # Required for U2F USB stick
-          "--ignore=private-dev"
           # Enforce dark mode
           "--env=GTK_THEME=Adwaita:dark"
           # Enable system notifications
           "--dbus-user.talk=org.freedesktop.Notifications"
-          # For screen sharing
-          "--dbus-user.talk=org.freedesktop.portal.*"
-        ];
-      };
-
-      nyxt = {
-        executable = "${pkgs.nyxt}/bin/nyxt";
-        profile = "${pkgs.firejail}/etc/firejail/chromium-browser.profile";
-        extraArgs = [
-          # Required for U2F USB stick
-          "--ignore=private-dev"
-          # Enforce dark mode
-          "--env=GTK_THEME=Adwaita:dark"
-          # Enable system notifications
-          "--dbus-user.talk=org.freedesktop.Notifications"
-          # For screen sharing
-          "--dbus-user.talk=org.freedesktop.portal.*"
         ];
       };
 
diff --git a/modules/sec_auth/login-manager.nix b/modules/sec_auth/login-manager.nix
index 7c6801a..3964f7e 100644
--- a/modules/sec_auth/login-manager.nix
+++ b/modules/sec_auth/login-manager.nix
@@ -6,13 +6,13 @@
     vt = 7;
     settings = {
       default_session = {
-        command = ''          ${pkgs.greetd.tuigreet}/bin/tuigreet \
-                    	  --time \
-                    	  --time-format '%Y-%m-%dT%H:%M:%S %A' \
-                    	  --remember \
-                    	  --user-menu \
-                    	  --theme 'border=lightgreen;text=lightgreen;prompt=lightgreen;time=lightgreen;action=lightgreen;button=lightgreen;input=lightgreen' \
-                    	  --cmd Hyprland'';
+        command = ''${pkgs.greetd.tuigreet}/bin/tuigreet \
+          	  --time \
+          	  --time-format '%Y-%m-%dT%H:%M:%S %A' \
+          	  --remember \
+          	  --user-menu \
+          	  --theme 'border=lightgreen;text=lightgreen;prompt=lightgreen;time=lightgreen;action=lightgreen;button=lightgreen;input=lightgreen' \
+          	  --cmd Hyprland'';
         # removed elements from theme: container
         user = "greeter";
       };
diff --git a/modules/environment.nix b/modules/sec_auth/users_and_permissions.nix
similarity index 61%
rename from modules/environment.nix
rename to modules/sec_auth/users_and_permissions.nix
index d399d08..5d5e922 100644
--- a/modules/environment.nix
+++ b/modules/sec_auth/users_and_permissions.nix
@@ -1,4 +1,12 @@
 {pkgs, ...}: {
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.ranomier = {
+    isNormalUser = true;
+    description = "Ranomier";
+    extraGroups = ["networkmanager" "wheel"];
+    #packages = with pkgs; [];
+  };
+
   environment.etc = {
     "xdg/user-dirs.defaults".text = ''
       DESKTOP=Desktop
@@ -29,5 +37,21 @@
   # XDG-USER-DIR package and config
   environment.systemPackages = with pkgs; [
     xdg-user-dirs
+
+    apparmor-pam
+    apparmor-utils
+    apparmor-parser
+    apparmor-profiles
+    roddhjav-apparmor-rules
   ];
+
+  security.apparmor.enable = true;
+
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.mtr.enable = true;
+  # programs.gnupg.agent = {
+  #   enable = true;
+  #   enableSSHSupport = true;
+  # };
 }
diff --git a/modules/software/browser/default.nix b/modules/software/browser/default.nix
deleted file mode 100644
index c7993a3..0000000
--- a/modules/software/browser/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }: {
-  imports = [
-    ./brave.nix
-    ./firefox.nix
-    ./nyxt.nix
-  ];
-}
diff --git a/modules/software/browser/nyxt.nix b/modules/software/browser/nyxt.nix
deleted file mode 100644
index 3252875..0000000
--- a/modules/software/browser/nyxt.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
-    nyxt
-  ];
-}
diff --git a/modules/software/default.nix b/modules/software/default.nix
deleted file mode 100644
index 8a9ebdf..0000000
--- a/modules/software/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ ... }: {
-  imports = [
-    ./audio_video.nix
-    ./flatpak.nix
-    ./game.nix
-    ./obs-studio.nix
-    ./shell.nix
-    ./software.nix
-    ./virt.nix
-  ];
-}
diff --git a/modules/software/flatpak.nix b/modules/software/flatpak.nix
deleted file mode 100644
index 39f6aa2..0000000
--- a/modules/software/flatpak.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ ... }: {
-  services.flatpak = {
-    packages = [
-      {
-        origin = "flathub";
-        appId = "com.github.tchx84.Flatseal";
-      } # flatpak permisssion gui
-      {
-        origin = "flathub";
-        appId = "com.mojang.Minecraft";
-      } # Lego for adults
-      {
-        origin = "flathub";
-        appId = "de.schmidhuberj.DieBahn";
-      } # Public transport connection viewer
-      {
-        origin = "flathub";
-        appId = "com.github.hugolabe.Wike";
-      } # Wikpedia, but in nice
-      #{ origin = "flathub";   appId = "com.jeffser.Alpaca"; }          # Local chat AI
-      {
-        origin = "flathub";
-        appId = "io.gpt4all.gpt4all";
-      } # Local chat AI
-      {
-        origin = "flathub";
-        appId = "md.obsidian.Obsidian";
-      } # note taking and brain organising
-
-      # messenger
-      {
-        origin = "flathub";
-        appId = "org.signal.Signal";
-      }
-      {
-        origin = "flathub";
-        appId = "org.telegram.desktop";
-      }
-      {
-        origin = "flathub";
-        appId = "dev.vencord.Vesktop";
-      } # More usable discord for linux
-      {
-        origin = "flathub";
-        appId = "io.github.Soundux";
-      } # soundboard
-
-      #"com.obsproject.Studio" #this is another way to write it
-    ];
-  };
-}
diff --git a/modules/software/nix-helper/default.nix b/modules/software/nix-helper/default.nix
deleted file mode 100644
index 98db3a7..0000000
--- a/modules/software/nix-helper/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }: {
-  imports = [
-    #./doc.nix
-    ./index.nix
-    ./nix-ld.nix
-  ];
-}
diff --git a/modules/software/shell.nix b/modules/software/shell.nix
deleted file mode 100644
index ad14ac4..0000000
--- a/modules/software/shell.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{pkgs, ...}: {
-  programs.zsh.enable = true;
-  users.defaultUserShell = pkgs.zsh;
-}
diff --git a/modules/software/software.nix b/modules/software/software.nix
index 5e35767..69784fa 100644
--- a/modules/software/software.nix
+++ b/modules/software/software.nix
@@ -2,6 +2,8 @@
   # also opens the TCP and UDP port from 1714 to 1764
   programs.kdeconnect.enable = true;
 
+  environment.pathsToLink = ["/share/foot"];
+
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = let
@@ -41,7 +43,6 @@
       htop
       ncdu
       wget
-      unstable.yt-dlp
       miniserve
       file
       unzip
@@ -49,10 +50,9 @@
       ripgrep
       qemu
       home-manager
-      dfc
 
       # move to homemanager?
-      unstable.mumble
+      mumble
       amberol_wrapper
       amberol
       nuclear
@@ -63,13 +63,11 @@
       keepassxc
       #minecraft
       element-desktop
-      rustdesk
-      timer
     ];
 
   fonts.packages = with pkgs; [
     noto-fonts
-    noto-fonts-cjk-sans
+    noto-fonts-cjk
     noto-fonts-emoji
     liberation_ttf
     dina-font
diff --git a/modules/specific_hardware/default.nix b/modules/specific_hardware/default.nix
deleted file mode 100644
index 1eb44d0..0000000
--- a/modules/specific_hardware/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }: {
-  imports = [
-    ./bluetooth.nix
-    ./fwupd.nix
-    ./scan_and_print.nix
-  ];
-}
diff --git a/modules/users/default.nix b/modules/users/default.nix
deleted file mode 100644
index e76314b..0000000
--- a/modules/users/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }: {
-  imports = [
-    ./ranomier.nix
-  ];
-}
diff --git a/modules/users/ranomier.nix b/modules/users/ranomier.nix
deleted file mode 100644
index 9bd1e06..0000000
--- a/modules/users/ranomier.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{pkgs, ...}: {
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.ranomier = {
-    isNormalUser = true;
-    description = "Ranomier";
-    extraGroups = ["networkmanager" "wheel" "podman"];
-    shell = pkgs.zsh;
-    useDefaultShell = true;
-    #packages = with pkgs; [];
-  };
-}
diff --git a/modules/wm_and_de/default.nix b/modules/wm_and_de/default.nix
deleted file mode 100644
index 74809a6..0000000
--- a/modules/wm_and_de/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }: {
-  imports = [
-    ./hyprland.nix
-  ];
-}
diff --git a/modules/wm_and_de/hyprland.nix b/modules/wm_and_de/hyprland.nix
index e5ba3b1..3aaac03 100644
--- a/modules/wm_and_de/hyprland.nix
+++ b/modules/wm_and_de/hyprland.nix
@@ -44,8 +44,6 @@
     style = "kvantum";
   };
 
-  environment.pathsToLink = ["/share/foot"];
-
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
@@ -58,7 +56,7 @@
     pamixer
     waybar
     hyprpaper
-    unstable.kanshi
+    kanshi
     dunst
 
     # audio
@@ -83,6 +81,6 @@
     lxqt.lxqt-policykit
 
     # file manager
-    nautilus
+    gnome.nautilus
   ];
 }