diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9240914
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+/.idea/inspectionProfiles/profiles_settings.xml
+/.idea/.gitignore
+/.idea/modules.xml
+/.idea/nixos.iml
+/.idea/vcs.xml
diff --git a/flake.lock b/flake.lock
index 74e9960..4a145dc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715077503,
-        "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=",
+        "lastModified": 1722119539,
+        "narHash": "sha256-2kU90liMle0vKR8exJx1XM4hZh9CdNgZGHCTbeA9yzY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6e277d9566de9976f47228dd8c580b97488734d4",
+        "rev": "d0240a064db3987eb4d5204cf2400bc4452d9922",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1715087517,
-        "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=",
+        "lastModified": 1722062969,
+        "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29",
+        "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3",
         "type": "github"
       },
       "original": {
diff --git a/hosts/cap-nr200p/configuration.nix b/hosts/cap-nr200p/configuration.nix
index 0a09c0a..ac48dc0 100644
--- a/hosts/cap-nr200p/configuration.nix
+++ b/hosts/cap-nr200p/configuration.nix
@@ -53,18 +53,15 @@
   # services.xserver.desktopManager.xfce.enable = true;
 
   # Configure keymap in X11
-  services.xserver = {
+  services.xserver.xkb = {
     layout = "us";
-    xkbVariant = "";
+    variant = "";
   };
-  # services.xserver.xkb.layout = "us";
-  # services.xserver.xkb.variant = "";
 
   # Enable CUPS to print documents.
   services.printing.enable = true;
 
   # Enable sound with pipewire.
-  sound.enable = true;
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
@@ -87,7 +84,7 @@
   users.users.caperren = {
     isNormalUser = true;
     description = "Corwin Perren";
-    extraGroups = [ "networkmanager" "wheel" ];
+    extraGroups = [ "networkmanager" "wheel" "input" ];
     packages = with pkgs; [
     #  thunderbird
     ];
@@ -106,8 +103,94 @@
   #  wget
     lf
     git
+    wofi    
+    nvtopPackages.full
+    htop
+    iftop
+    iotop
+    pulsemixer
+    arandr
+    util-linux
+    usbutils
+    telegram-desktop
+    discord
+    # spotify
+    pavucontrol
+    networkmanagerapplet
+    pasystray
+    glava
+    spotify-player
+    hyprpicker 
+    unetbootin
+    lf
+    dnsutils
+    unzip
+    playerctl
+    google-chrome
+    killall
+    jetbrains.pycharm-professional
+    wget
+    jq
+    rofi-bluetooth
+    wl-clipboard
+    networkmanager
+    alsaUtils
+    nixfmt-rfc-style
   ];
 
+  fonts.fontDir.enable = true;
+  fonts.fontconfig.enable = true;
+  fonts.fontconfig.antialias = true;
+  fonts.packages = with pkgs; [
+    noto-fonts
+    noto-fonts-emoji
+    liberation_ttf
+    fira-code
+    fira-code-symbols
+    jetbrains-mono
+    mplus-outline-fonts.githubRelease
+    dina-font
+    proggyfonts
+    font-awesome
+    nerdfonts
+  ];
+
+  programs.thunar.enable = true;
+    programs.thunar.plugins = with pkgs.xfce; [
+    thunar-archive-plugin
+    thunar-volman
+  ];
+  services.gvfs.enable = true; # Mount, trash, and other functionalities
+  services.tumbler.enable = true; # Thumbnail support for images
+
+  hardware.bluetooth.enable = true; # enables support for Bluetooth
+  hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
+  services.blueman.enable = true;
+
+  security.sudo = {
+    enable = true;
+    extraRules = [{
+      commands = [
+        {
+          command = "${pkgs.systemd}/bin/reboot";
+          options = [ "NOPASSWD" ];
+        }
+        {
+          command = "${pkgs.systemd}/bin/poweroff";
+          options = [ "NOPASSWD" ];
+        }
+      ];
+      groups = [ "wheel" ];
+    }];
+  };
+
+  programs.steam = {
+    enable = true;
+    remotePlay.openFirewall = true;
+    dedicatedServer.openFirewall = true;
+    gamescopeSession.enable = true;
+  };
+
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix
index be9896d..c00aeeb 100644
--- a/modules/nixos/hyprland.nix
+++ b/modules/nixos/hyprland.nix
@@ -4,14 +4,24 @@
     xwayland.enable = true;
   };
 
- environment.sessionVariables = {
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    # If you want to use JACK applications, uncomment this
+    #jack.enable = true;
+  };
+
+  environment.sessionVariables = {
     # If your cursor becomes invisible
-    # WLR_NO_HARDWARE_CURSORS = "1";
+    WLR_NO_HARDWARE_CURSORS = "1";
     # Hint electron apps to use wayland
     NIXOS_OZONE_WL = "1";
   };
 
-  services.xserver = { 
+  services.xserver = {
     enable = true;
     videoDrivers = [ "nvidia" ];
     displayManager.gdm = {
@@ -19,11 +29,15 @@
       wayland = true;
     };
   };
+
+  services.displayManager.autoLogin = {
+    enable = true;
+    user = "caperren";
+  };
   
-  hardware.opengl = {  
-    enable = true;  
-    driSupport = true;  
-    driSupport32Bit = true;  
+  hardware.graphics = {
+    enable = true;
+    enable32Bit = true;
   };
 
   hardware.nvidia = {
@@ -43,11 +57,16 @@
     pkgs.dunst
     pkgs.libnotify
     pkgs.rofi-wayland
+    pkgs.nwg-look
+    pkgs.desktop-file-utils
+    pkgs.grim
+    pkgs.slurp
+    pkgs.nwg-displays
 
-  #(pkgs.waybar.overrideAttrs (oldAttrs: {
-  #    mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
-  #  })
-  #)
+  (pkgs.waybar.overrideAttrs (oldAttrs: {
+      mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
+    })
+  )
   ];
 
   xdg.portal.enable = true;