diff --git a/nixosConfigurations/catarina/default.nix b/nixosConfigurations/catarina/default.nix
index 1277195..2a11032 100644
--- a/nixosConfigurations/catarina/default.nix
+++ b/nixosConfigurations/catarina/default.nix
@@ -1,5 +1,5 @@
 { config, pkgs, lib, inputs, self, ... }:
-rec {
+{
     system.stateVersion = "23.11";
 
     imports = [ 
@@ -12,8 +12,8 @@ rec {
     nix = {
         settings = {
             experimental-features = [ "nix-command" "flakes" ];
-            trusted-users = [ "l.nafaryus" ];
-            allowed-users = [ "l.nafaryus" ];
+            trusted-users = [ "l-nafaryus" ];
+            allowed-users = [ "l-nafaryus" ];
             substituters = [ "https://nix-community.cachix.org" ];
             trusted-public-keys = [ 
                 "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" 
@@ -38,23 +38,6 @@ rec {
     };
 
 # Services
-    services.xserver = {
-        enable = true;
- 
-        xkb = {
-            layout = "us";
-            variant = "";
-        };
- 
-        videoDrivers = [ "nvidia" ];
-
-        displayManager.gdm = {
-            enable = false;
-            autoSuspend = false;
-        };
-        desktopManager.gnome.enable = false;
-    };
-
     services.printing.enable = true;
 
     services.pipewire = {
@@ -204,6 +187,11 @@ rec {
         };
     };
 
+    services.oscuro = {
+        enable = true;
+        discordTokenFile = config.sops.secrets.discordToken.path;
+    };
+
 # Packages
     environment.systemPackages = with pkgs; [
         wget
@@ -255,16 +243,13 @@ rec {
         Host astora
             HostName 192.168.156.101
             Port 22
-            User nafaryus 
+            User l-nafaryus 
 
         Host catarina
             HostName 192.168.156.102
             Port 22
-            User l.nafaryus
+            User l-nafaryus
     '';
 
     programs.direnv.enable = true;
-
-    fonts.packages = with pkgs; [ nerdfonts ];
-
 }
diff --git a/nixosConfigurations/catarina/hardware.nix b/nixosConfigurations/catarina/hardware.nix
index 2c58c06..3bdf74d 100644
--- a/nixosConfigurations/catarina/hardware.nix
+++ b/nixosConfigurations/catarina/hardware.nix
@@ -119,12 +119,6 @@
 
         cpu.intel.updateMicrocode = true;
 
-        nvidia.nvidiaSettings = true;
-        nvidia.modesetting.enable = true;
-        
-        opengl.enable = true;
-        opengl.driSupport32Bit = true;
-
         bluetooth.enable = true;
 
         pulseaudio.enable = false;
diff --git a/nixosConfigurations/catarina/users.nix b/nixosConfigurations/catarina/users.nix
index 9efd96d..700eab5 100644
--- a/nixosConfigurations/catarina/users.nix
+++ b/nixosConfigurations/catarina/users.nix
@@ -3,14 +3,14 @@
 # Users
     users.users.root.hashedPasswordFile = config.sops.secrets."users/root".path;
 
-    users.users."l.nafaryus" = {
+    users.users.l-nafaryus = {
         isNormalUser = true;
         description = "L-Nafaryus";
         extraGroups = [ "networkmanager" "wheel" ];
         group = "users";
         uid = 1000;
         shell = pkgs.fish;
-        hashedPasswordFile = config.sops.secrets."users/l.nafaryus".path;
+        hashedPasswordFile = config.sops.secrets."users/l-nafaryus".path;
     };
 
     users.users.nginx.extraGroups = [ "acme" "papermc" ];