diff --git a/hosts/laptop/hardware-configuration.nix b/hosts/laptop/hardware-configuration.nix
index d60fd11..e3473f4 100644
--- a/hosts/laptop/hardware-configuration.nix
+++ b/hosts/laptop/hardware-configuration.nix
@@ -6,6 +6,7 @@
 {
   imports =
     [ (modulesPath + "/installer/scan/not-detected.nix")
+    ./networking.nix
     # ./nvidia.nix
     ];
 
@@ -64,14 +65,6 @@
     '';
   };
 
-  # 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
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp0s20f0u4u4c2.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
-
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/hosts/laptop/networking.nix b/hosts/laptop/networking.nix
new file mode 100644
index 0000000..d629559
--- /dev/null
+++ b/hosts/laptop/networking.nix
@@ -0,0 +1,24 @@
+{ pkgs, ... }: {
+  
+  # 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
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  # networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp0s20f0u4u4c2.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
+
+  networking = {
+    useDHCP = lib.mkDefault true;
+    hostName = "nixos";
+    networkmanager.enable = true; # enable network manager to start during boot
+    nameservers = [ "8.8.8.8" "8.8.4.4" ];
+    enableIPv6 = false;
+    # nat = {
+    #   enable = true;
+    #   internalInterfaces = ["ve-+"];
+    #   externalInterface = "enp0s31f6"; # eth interface
+    # };
+  };
+
+}
diff --git a/modules/greetd/default.nix b/modules/greetd/default.nix
new file mode 100644
index 0000000..da7fcb6
--- /dev/null
+++ b/modules/greetd/default.nix
@@ -0,0 +1,22 @@
+{ pkgs, ... } : {
+  services = {
+    greetd = {
+      enable = true;
+      settings = {
+        initial_session = {
+          # Change "Hyprland" to the command to run your window manager. ^Note1
+          command = "Hyprland";
+          # Change "${user}" to your username or to your username variable.
+          user = "${user}";
+        };
+        # By adding default_session it ensures you can still access the tty terminal if you logout of your windows manager otherwise you would just relaunch into it.
+        default_session = {
+          # Again here just change "-cmd Hyprland" to "-cmd your-start-command".
+          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --greeting 'Welcome To NixOS' --asterisks --remember --remember-user-session --time -cmd Hyprland";
+          # DO NOT CHANGE THIS USER
+          user = "greeter";
+        };
+      };
+    };
+  };
+}
diff --git a/modules/kodi/default.nix b/modules/kodi/default.nix
new file mode 100644
index 0000000..4424bd9
--- /dev/null
+++ b/modules/kodi/default.nix
@@ -0,0 +1,24 @@
+{ pkgs, ... }: {
+
+  # users.extraUsers.kodi.isNormalUser = true;
+  # services.cage.user = "kodi";
+  # services.cage.program = "${pkgs.kodi-wayland}/bin/kodi-standalone";
+  # services.cage.enable = true;
+
+  environment.systemPackages = [
+	(pkgs.kodi.withPackages (kodiPkgs: with kodiPkgs; [
+		jellyfin
+	]))
+  ];
+
+
+  # Define a user account
+  home-manager.users.marc = { pkgs, inputs, ... }: {
+
+    home.packages = with pkgs; [
+   #    (kodi.withPackages (kodiPkgs: with kodiPkgs; [
+	  # 	jellyfin
+	  # ]))
+    ];
+  };
+}
diff --git a/modules/librewolf/default.nix b/modules/librewolf/default.nix
index f562318..b2f0485 100644
--- a/modules/librewolf/default.nix
+++ b/modules/librewolf/default.nix
@@ -106,9 +106,11 @@
             (extension "refined_github" "{a4c4eda4-fb84-4a84-b4a1-f7c1cbf2a1ad}")
             (extension "single-file" "{531906d3-e22f-4a6c-a102-8057b88a1a63}")
             (extension "videospeed" "{7be2ba16-0f1e-4d93-9ebc-5164397477a9}")
-            (extension "tab_stash" "tab-stash@condordes.net")
             (extension "sponsorblock" "sponsorBlocker@ajay.app")
+
+            (extension "tab_stash" "tab-stash@condordes.net")
             (extension "pwas_for_firefox" "firefoxpwa@filips.si")
+            (extension "privacy_badger17" "jid1-MnnxcxisBPnSXQ@jetpack")
           ];
           # To add additional extensions, find it on addons.mozilla.org, find
           # the short ID in the url (like https://addons.mozilla.org/en-US/firefox/addon/!SHORT_ID!/)
diff --git a/users/marc/default.nix b/users/marc/default.nix
index 98c64b2..eb194de 100644
--- a/users/marc/default.nix
+++ b/users/marc/default.nix
@@ -14,6 +14,7 @@
       ../../modules/docker
       ../../modules/zsh
       ../../modules/alacritty
+      ../../modules/kodi
       # ../../modules/kubernetes
     ];
 
@@ -54,6 +55,7 @@
       chatgpt-cli
       lowfi
       ytmdl
+      playerctl
 
       # gui
       wasistlos