diff --git a/flake.lock b/flake.lock
index 5ee9057..4ed5dee 100644
--- a/flake.lock
+++ b/flake.lock
@@ -224,7 +224,7 @@
     },
     "flake-utils": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -639,26 +639,6 @@
         "type": "github"
       }
     },
-    "nix-flatpak": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_3",
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1732008249,
-        "narHash": "sha256-cGq/ybv2/S5oNHQUBCUZplXZC4nV1dx5MZ9VhMDZTNI=",
-        "owner": "GermanBread",
-        "repo": "declarative-flatpak",
-        "rev": "fb59bd957efb6580ceeba35d66bd2c6f14306bcf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "GermanBread",
-        "ref": "stable-v3",
-        "repo": "declarative-flatpak",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1731139594,
@@ -708,22 +688,6 @@
       }
     },
     "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1727907660,
-        "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
       "locked": {
         "lastModified": 1732837521,
         "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=",
@@ -739,7 +703,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1732238832,
         "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=",
@@ -835,8 +799,7 @@
         "apple-silicon-support": "apple-silicon-support",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
-        "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
         "nixvim": "nixvim",
         "stylix": "stylix"
       }
@@ -867,8 +830,8 @@
         "flake-utils": "flake-utils_2",
         "gnome-shell": "gnome-shell",
         "home-manager": "home-manager_3",
-        "nixpkgs": "nixpkgs_5",
-        "systems": "systems_4",
+        "nixpkgs": "nixpkgs_4",
+        "systems": "systems_3",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
         "tinted-tmux": "tinted-tmux"
@@ -903,21 +866,6 @@
       }
     },
     "systems_2": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_3": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -932,7 +880,7 @@
         "type": "github"
       }
     },
-    "systems_4": {
+    "systems_3": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
diff --git a/flake.nix b/flake.nix
index 9426ab2..c0d0755 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,7 +13,7 @@
     };
     hyprland.url = "github:hyprwm/Hyprland";
     stylix.url = "github:danth/stylix";
-    nix-flatpak.url = "github:GermanBread/declarative-flatpak/stable-v3";
+    #nix-flatpak.url = "github:GermanBread/declarative-flatpak/stable-v3";
     apple-silicon-support.url = "github:zzywysm/nixos-asahi";
 
     #nur.url = "github:nix-community/NUR";
@@ -24,7 +24,7 @@
     };
   };
 
-  outputs = { self, nixpkgs, stylix, nixvim, nix-flatpak, ... }@inputs:
+  outputs = { self, nixpkgs, stylix, nixvim, ... }@inputs:
     let
        #systems = ["aarch64-linux" "x86_64-linux" ];
        #forAllSystems = nixpkgs.lib.genAttrs systems;
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 37f42ec..ef9caee 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, stylix, hwconfig, username, nixvim, inputs, ... }:
+{ config, lib, pkgs, stylix, hwconfig, username, nixvim, inputs, ... }:
 
 {
   imports =
@@ -11,10 +11,31 @@
       inputs.nixvim.nixosModules.nixvim
       ./firefox.nix
     ];
-
+  
+  boot = { 
+    plymouth = {
+	enable = true;
+    };
+    # Enable "Silent Boot"
+    consoleLogLevel = 0;
+    initrd.verbose = false;
+    kernelParams = [
+      "quiet"
+      "splash"
+      "boot.shell_on_fail"
+      "loglevel=3"
+      "rd.systemd.show_status=false"
+      "rd.udev.log_level=3"
+      "udev.log_priority=3"
+    ];
+    # Hide the OS choice for bootloaders.
+    # It's still possible to open the bootloader list by pressing any key
+    # It will just not appear on screen unless a key is pressed
+    loader.timeout = 0;
+  };
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = if hwconfig.hostname == "${username}-homepc" then true else false;
+  boot.loader.efi.canTouchEfiVariables = if hwconfig.hostname != "${username}-mac" then true else false;
 
   networking.hostName = hwconfig.hostname;
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
@@ -312,6 +333,11 @@
 	};
 	targets = {
 		gtk.enable = true;
+		plymouth = {
+		    enable = true;
+		    #logo = ./fastfetch/nixos.png;
+		    logoAnimated = false;
+		};
 	};
 	fonts = {
 		sizes = {