feat: Packaged adom and updated some stuff

Made a package for the game adom
Also switched form lightdm to sddm
YATwm works slightly better
Note: The current flake.nix will fail for anyone else as it uses a
path to find the flake

10 files changed, 142 insertions, 814 deletions

diff --git a/configuration.nix b/configuration.nix
index 43a9411..aa843dd 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -25,14 +25,13 @@ in
     nix.nixPath = [ "/etc/nix/path" ];
     nix.registry.nixpkgs.flake = inputs.nixpkgs;
     environment.etc."nix/path/nixpkgs".source = inputs.nixpkgs;
-
     
     # Use the systemd-boot EFI boot loader.
     boot = {
         loader.grub.enable = true;
         loader.grub.device = "nodev";
         loader.grub.efiSupport = true;
-	loader.grub.enableCryptodisk = true;
+	    loader.grub.enableCryptodisk = true;
         # loader.grub.useOSProber = true;
         loader.efi.canTouchEfiVariables = true;
         kernel.sysctl."kernel.sysrq" = 502;
@@ -92,11 +91,12 @@ in
 		    package = pkgs.i3-gaps;
 	    };
 
-        #windowManager.YATwm = {
-        #    enable = true;
-        #    package = inputs.YATwm.packages.x86_64-linux.YATwm;
-        #};
+        windowManager.YATwm = {
+            enable = true;
+            package = inputs.YATwm.packages.x86_64-linux.YATwm;
+        };
 	};
+    programs.i3lock.enable = true;
     programs.hyprland = {
         enable = true;
         #package = inputs.hyprland.packages.${pkgs.system}.hyprland;
@@ -104,12 +104,13 @@ in
     };
     services.displayManager = {
 		#defaultSession = "none+i3";
-		#sddm.enable = true;
+		sddm.enable = true;
         #sddm.theme = "catppuccin-macchiato";
-        #ly.enable = true;
-        
+        # ly.enable = true;
 	};
-	services.xserver.displayManager.lightdm.enable = true;
+	# services.xserver.displayManager = {
+    #     lightdm.enable = true;
+    # };
 
 	# Configure keymap in X11
 	services.xserver.xkb.layout = "us";
@@ -155,7 +156,8 @@ in
 	};
 
 	fonts.packages = with pkgs; [
-	    (nerdfonts.override { fonts = [ "Cousine" ]; })
+	    #(nerdfonts.override { fonts = [ "Cousine" ]; })
+        nerd-fonts.cousine
 	];
 
 	# List packages installed in system profile. To search, run:
@@ -171,9 +173,9 @@ in
                 "https://cache.nixos.org"
             ];
 
-            trusted-public-keys = [
-                "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-            ];
+            # trusted-public-keys = [
+            #     "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+            # ];
         };
         gc = {
             automatic = true;
@@ -194,16 +196,13 @@ in
 	    ];
     documentation.dev.enable = true;
 
-    programs.steam.enable = true;
     hardware.graphics.enable32Bit = true;
-    nixpkgs.config.packageOverrides = pkgs: {
-        steam = pkgs.steam.override {
-            extraPkgs = pkgs: with pkgs; [
-                pango
-                # gamemode
-                harfbuzz
-            ];
-        };
+
+    programs.steam = {
+        enable = true;
+        extraCompatPackages = with pkgs; [
+            proton-ge-bin
+        ];
     };
 
 	# Some programs need SUID wrappers, can be configured further or are
@@ -225,6 +224,9 @@ in
         "f /var/lib/systemd/linger/boss" # enables lingering
     ];
 
+    
+    services.ratbagd.enable = true;
+
     stylix = {
         enable = true;
         
@@ -241,7 +243,7 @@ in
 
         fonts = {
             monospace = {
-                package = pkgs.nerdfonts.override { fonts = [ "Cousine" ]; };
+                package = pkgs.nerd-fonts.cousine;
                 name = "Cousine Nerd Font Mono";
             };
 
@@ -289,4 +291,3 @@ in
 	system.stateVersion = "24.05"; # Did you read the comment?
 
 }
-
diff --git a/flake.lock b/flake.lock
deleted file mode 100644
index 0e14433..0000000
--- a/flake.lock
+++ /dev/null
@@ -1,750 +0,0 @@
-{
-  "nodes": {
-    "YATwm": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1746511325,
-        "narHash": "sha256-yQoyXGJE8JrSon/P5uhyN1rRwBH/kz0LCGIly3yNDhg=",
-        "owner": "BossCode45",
-        "repo": "YATwm",
-        "rev": "7dd44834f0af18cca87786a2050ae69928b7a397",
-        "type": "github"
-      },
-      "original": {
-        "owner": "BossCode45",
-        "repo": "YATwm",
-        "type": "github"
-      }
-    },
-    "base16": {
-      "inputs": {
-        "fromYaml": "fromYaml"
-      },
-      "locked": {
-        "lastModified": 1745523430,
-        "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=",
-        "owner": "SenchoPens",
-        "repo": "base16.nix",
-        "rev": "58bfe2553d937d8af0564f79d5b950afbef69717",
-        "type": "github"
-      },
-      "original": {
-        "owner": "SenchoPens",
-        "repo": "base16.nix",
-        "type": "github"
-      }
-    },
-    "base16-fish": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1622559957,
-        "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
-        "owner": "tomyun",
-        "repo": "base16-fish",
-        "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tomyun",
-        "repo": "base16-fish",
-        "type": "github"
-      }
-    },
-    "base16-helix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1736852337,
-        "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=",
-        "owner": "tinted-theming",
-        "repo": "base16-helix",
-        "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-helix",
-        "type": "github"
-      }
-    },
-    "base16-vim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1732806396,
-        "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=",
-        "owner": "tinted-theming",
-        "repo": "base16-vim",
-        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-vim",
-        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
-        "type": "github"
-      }
-    },
-    "firefox-gnome-theme": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1743774811,
-        "narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=",
-        "owner": "rafaelmardojai",
-        "repo": "firefox-gnome-theme",
-        "rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rafaelmardojai",
-        "repo": "firefox-gnome-theme",
-        "type": "github"
-      }
-    },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1732722421,
-        "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733328505,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": [
-          "stylix",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "fromYaml": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1731966426,
-        "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
-        "owner": "SenchoPens",
-        "repo": "fromYaml",
-        "rev": "106af9e2f715e2d828df706c386a685698f3223b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "SenchoPens",
-        "repo": "fromYaml",
-        "type": "github"
-      }
-    },
-    "git-hooks": {
-      "inputs": {
-        "flake-compat": [
-          "stylix",
-          "flake-compat"
-        ],
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "stylix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1742649964,
-        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "stylix",
-          "git-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
-    "gnome-shell": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1732369855,
-        "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=",
-        "owner": "GNOME",
-        "repo": "gnome-shell",
-        "rev": "dadd58f630eeea41d645ee225a63f719390829dc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "GNOME",
-        "ref": "47.2",
-        "repo": "gnome-shell",
-        "type": "github"
-      }
-    },
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1746171682,
-        "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "50eee705bbdbac942074a8c120e8194185633675",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-24.11",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "stylix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1743808813,
-        "narHash": "sha256-2lDQBOmlz9ggPxcS7/GvcVdzXMIiT+PpMao6FbLJSr0=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "a9f8b3db211b4609ddd83683f9db89796c7f6ac6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-24.11",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "hyprgraphics": {
-      "inputs": {
-        "hyprutils": [
-          "hyprlock",
-          "hyprutils"
-        ],
-        "nixpkgs": [
-          "hyprlock",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprlock",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1743953322,
-        "narHash": "sha256-prQ5JKopXtzCMX2eT3dXbaVvGmzjMRE2bXStQDdazpM=",
-        "owner": "hyprwm",
-        "repo": "hyprgraphics",
-        "rev": "9d7f2687c84c729afbc3b13f7937655570f2978d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprgraphics",
-        "type": "github"
-      }
-    },
-    "hyprlang": {
-      "inputs": {
-        "hyprutils": [
-          "hyprlock",
-          "hyprutils"
-        ],
-        "nixpkgs": [
-          "hyprlock",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprlock",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1744468525,
-        "narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=",
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "type": "github"
-      }
-    },
-    "hyprlock": {
-      "inputs": {
-        "hyprgraphics": "hyprgraphics",
-        "hyprlang": "hyprlang",
-        "hyprutils": "hyprutils",
-        "hyprwayland-scanner": "hyprwayland-scanner",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1746809694,
-        "narHash": "sha256-WLz+tLh7nZfZ6GmwTOBCqP6RClMhdnW7xWsvlgc0Ttg=",
-        "owner": "hyprwm",
-        "repo": "hyprlock",
-        "rev": "f7f0c9c6b0b930905eddd61ead4a5f12bf534815",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprlock",
-        "type": "github"
-      }
-    },
-    "hyprutils": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprlock",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprlock",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1743950287,
-        "narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=",
-        "owner": "hyprwm",
-        "repo": "hyprutils",
-        "rev": "f2dc70e448b994cef627a157ee340135bd68fbc6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprutils",
-        "type": "github"
-      }
-    },
-    "hyprwayland-scanner": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprlock",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprlock",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1739870480,
-        "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=",
-        "owner": "hyprwm",
-        "repo": "hyprwayland-scanner",
-        "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprwayland-scanner",
-        "type": "github"
-      }
-    },
-    "libnbtplusplus": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1650031308,
-        "narHash": "sha256-TvVOjkUobYJD9itQYueELJX3wmecvEdCbJ0FinW2mL4=",
-        "owner": "PolyMC",
-        "repo": "libnbtplusplus",
-        "rev": "2203af7eeb48c45398139b583615134efd8d407f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "PolyMC",
-        "repo": "libnbtplusplus",
-        "type": "github"
-      }
-    },
-    "nil": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "rust-overlay": "rust-overlay"
-      },
-      "locked": {
-        "lastModified": 1741118843,
-        "narHash": "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c=",
-        "owner": "oxalica",
-        "repo": "nil",
-        "rev": "577d160da311cc7f5042038456a0713e9863d09e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "nil",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1746810718,
-        "narHash": "sha256-VljtYzyttmvkWUKTVJVW93qAsJsrBbgAzy7DdnJaQfI=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "0c0bf9c057382d5f6f63d54fd61f1abd5e1c2f63",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "polymc": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "libnbtplusplus": "libnbtplusplus",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "tomlplusplus": "tomlplusplus"
-      },
-      "locked": {
-        "lastModified": 1739671702,
-        "narHash": "sha256-oRK1X1Byw+8UXFOk1/QZF1FadtX6BPiMvcj4Ga08KzA=",
-        "owner": "PolyMC",
-        "repo": "PolyMC",
-        "rev": "470283af9e4e22ae16f38fa5c124678128e5bfd5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "PolyMC",
-        "repo": "PolyMC",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "YATwm": "YATwm",
-        "home-manager": "home-manager",
-        "hyprlock": "hyprlock",
-        "nil": "nil",
-        "nixpkgs": "nixpkgs",
-        "polymc": "polymc",
-        "spicetify-nix": "spicetify-nix",
-        "stylix": "stylix",
-        "zen-browser": "zen-browser"
-      }
-    },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "nil",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1741055476,
-        "narHash": "sha256-52vwEV0oS2lCnx3c/alOFGglujZTLmObit7K8VblnS8=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "aefb7017d710f150970299685e8d8b549d653649",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "spicetify-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1746937129,
-        "narHash": "sha256-Dx/YpnRridWnxF0Xpz9FUP3kl/m2QAOM2BM3KNls3sk=",
-        "owner": "Gerg-L",
-        "repo": "spicetify-nix",
-        "rev": "8f1c5c34cf5f99e1d7197d6d9fa7dd44f00966f0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Gerg-L",
-        "repo": "spicetify-nix",
-        "type": "github"
-      }
-    },
-    "stylix": {
-      "inputs": {
-        "base16": "base16",
-        "base16-fish": "base16-fish",
-        "base16-helix": "base16-helix",
-        "base16-vim": "base16-vim",
-        "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_2",
-        "git-hooks": "git-hooks",
-        "gnome-shell": "gnome-shell",
-        "home-manager": "home-manager_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": "systems_4",
-        "tinted-foot": "tinted-foot",
-        "tinted-kitty": "tinted-kitty",
-        "tinted-tmux": "tinted-tmux"
-      },
-      "locked": {
-        "lastModified": 1746143246,
-        "narHash": "sha256-O8rZjqJUIkUva66XTOZy0wcgfBP2eaxU9+Xt7ZHtfhI=",
-        "owner": "danth",
-        "repo": "stylix",
-        "rev": "20ace60f9cb5e179cb2256abaee505780df8e804",
-        "type": "github"
-      },
-      "original": {
-        "owner": "danth",
-        "ref": "release-24.11",
-        "repo": "stylix",
-        "type": "github"
-      }
-    },
-    "systems": {
-      "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_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "tinted-foot": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1726913040,
-        "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
-        "owner": "tinted-theming",
-        "repo": "tinted-foot",
-        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-foot",
-        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
-        "type": "github"
-      }
-    },
-    "tinted-kitty": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1716423189,
-        "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=",
-        "owner": "tinted-theming",
-        "repo": "tinted-kitty",
-        "rev": "eb39e141db14baef052893285df9f266df041ff8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-kitty",
-        "rev": "eb39e141db14baef052893285df9f266df041ff8",
-        "type": "github"
-      }
-    },
-    "tinted-tmux": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1743296873,
-        "narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=",
-        "owner": "tinted-theming",
-        "repo": "tinted-tmux",
-        "rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-tmux",
-        "type": "github"
-      }
-    },
-    "tomlplusplus": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1731586115,
-        "narHash": "sha256-FLZvfbMN3PwmBOqvMUxQe96/Yukk0OAFPeDzHcBYZhk=",
-        "owner": "marzer",
-        "repo": "tomlplusplus",
-        "rev": "c4369ae1d8955cae20c4ab40b9813ef4b60e48be",
-        "type": "github"
-      },
-      "original": {
-        "owner": "marzer",
-        "repo": "tomlplusplus",
-        "type": "github"
-      }
-    },
-    "zen-browser": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1727721329,
-        "narHash": "sha256-QYlWZwUSwrM7BuO+dXclZIwoPvBIuJr6GpFKv9XKFPI=",
-        "owner": "MarceColl",
-        "repo": "zen-browser-flake",
-        "rev": "e6ab73f405e9a2896cce5956c549a9cc359e5fcc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "MarceColl",
-        "repo": "zen-browser-flake",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/flake.nix b/flake.nix
index 6b14937..3ec4440 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,13 +2,13 @@
     description = "My nixos configuration";
 
     inputs = {
-        nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+        nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
         home-manager = {
-            url = "github:nix-community/home-manager/release-24.11";
+            url = "github:nix-community/home-manager/release-25.05";
             inputs.nixpkgs.follows = "nixpkgs";
         };
         stylix = {
-            url = "github:danth/stylix/release-24.11";
+            url = "github:danth/stylix/release-25.05";
             inputs.nixpkgs.follows = "nixpkgs";
         };
         spicetify-nix = {
@@ -17,8 +17,8 @@
         };
         YATwm = {
             #url = "git+https://git.tehbox.org/cgit/boss/YATwm.git";
-            url = "github:BossCode45/YATwm";
-            #url = "git+file:///home/boss/Documents/Coding/WM/YATwm";
+            #url = "github:BossCode45/YATwm";
+            url = "git+file:///home/boss/Documents/Coding/WM/YATwm";
             inputs.nixpkgs.follows = "nixpkgs";
         };
         # hyprland = {
@@ -41,6 +41,10 @@
             url = "github:MarceColl/zen-browser-flake";
             inputs.nixpkgs.follows = "nixpkgs";
         };
+        nixcord = {
+            url = "github:kaylorben/nixcord";
+            inputs.nixpkgs.follows = "nixpkgs";
+        };
     };
 
     outputs = inputs@{ nixpkgs, ... }: {
@@ -49,8 +53,10 @@
                 system = "x86_64-linux";
                 specialArgs = {inherit inputs;};
                 modules = [
+                    (import ./my-pkgs)
+                    
                     ./configuration.nix
-
+                    
                     inputs.home-manager.nixosModules.home-manager
                     {
                         home-manager.useGlobalPkgs = true;
diff --git a/home-manager/YATwm/default.nix b/home-manager/YATwm/default.nix
index a7d650d..6c5e5f3 100644
--- a/home-manager/YATwm/default.nix
+++ b/home-manager/YATwm/default.nix
@@ -26,7 +26,7 @@
         package = inputs.YATwm.packages.x86_64-linux.YATwm;
         useEmacsBinds = true;
         quitKey = "C-s-g";
-        swapMods = true;
+        swapMods = false;
         keybinds = let
             left = "h";
             right = "l";
@@ -51,8 +51,8 @@
             "s-d" = "bashSpawn rofi -i -show drun -disable-history";
             "s-D" = "bashSpawn prime-run rofi -i -show drun -disable-history";
             "s-g" = "bashSpawn ~/bin/rofi-passmenu";
-            "s-RET" = "spawn alacritty";
-            "s-r k" = "spawn kitty";
+            "s-RET" = "bashSpawn kitty";
+            # "s-r k" = "spawn kitty";
             "s-c" = "spawn firefox";
             "s-S--" = "bashSpawn emacsclient -c";
             "s-S" = "spawn flameshot gui";
@@ -60,6 +60,10 @@
             "s-X" = "bashSpawn loginctl lock-session && systemctl suspend";
             "s-Q" = "kill";
 
+            # Sound
+            "s-[" = "spawn playerctl -p firefox play-pause";
+            "s-]" = "spawn playerctl -p spotify play-pause";
+
             # Workspaces
             "s-1" = "changeWS 1";
             "s-S-1" = "wToWS 1";
@@ -81,6 +85,7 @@
             "s-S-9" = "wToWS 9";
             "s-0" = "changeWS 10";
             "s-S-0" = "wToWS 10";
+            
             # Special workspaces
             "s-p s" = "changeWS 11";
             "s-S-p s" = "wToWS 11";
@@ -99,7 +104,7 @@
             {name = "S"; monitorPriorities = [1];}
         ];
         startup = [
-            {command = ".config/polybar/launch.sh"; once = false;}
+            {command = "~/.config/polybar/launch.sh"; once = false;}
             {command = "picom --legacy-backends -fD 3"; once = false;}
             {command = "xss-lock --transfer-sleep-lock -- i3lock -eti ~/Documents/lockscreen.png --nofork"; bash = false;}
             {command = "nitrogen --restore";}
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 8c524aa..fe27af0 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -8,6 +8,7 @@
         ./YATwm
         ./kitty
         inputs.spicetify-nix.homeManagerModules.default
+        inputs.nixcord.homeModules.nixcord
         #inputs.stylix.homeManagerModules.stylix
     ];
 
@@ -19,7 +20,7 @@
     
     # The home.packages option allows you to install Nix packages into your
     # environment.
-    nixpkgs.config.allowUnfree = true;
+    # nixpkgs.config.allowUnfree = true;
     home.packages = with pkgs; [
         feh
         pass
@@ -33,7 +34,9 @@
         discord
         # (discord.override {
         #     withOpenASAR = true;
+        #     withVencord = true;
         # })
+        # vesktop
         mumble
         gimp
         bottom
@@ -53,15 +56,6 @@
         lunar-client
         libnotify
         xclip
-        (openttd-jgrpp.overrideAttrs (oldAttrs: rec {
-            version = "0.63.3";
-            src = fetchFromGitHub {
-                owner = "JGRennison";
-                repo = "OpenTTD-patches";
-                rev = "jgrpp-${version}";
-                hash = "sha256-853LbApHqQn+ucb7xjFDfohB0/T1h11o4voBgvgbpSI=";
-            };
-        }))
         (python3.withPackages (ps: with ps; [
             python-lsp-server
         ]))
@@ -73,8 +67,11 @@
         inputs.polymc.packages.${system}.default
         jre8
         inputs.zen-browser.packages."${system}".default
+        piper
+        qbittorrent
+        adom
     ];
-
+    
     nix = {
         #package = pkgs.nix;
         settings.experimental-features = [ "nix-command" "flakes" ];
@@ -110,8 +107,14 @@
 
     programs.firefox.enable = true;
 
+    # programs.nixcord = {
+    #     enable = true;
+    # };
+    
+
     stylix.targets.spicetify.enable = false;
     stylix.targets.firefox.profileNames = [ "default"];
+    # stylix.targets.nixcord.enable = true;
     
     programs.spicetify =
         let
@@ -132,5 +135,6 @@
               theme = spicePkgs.themes.nightlight;
           };
     
+    
     xsession.windowManager.command = lib.mkForce "$@";
 }
diff --git a/home-manager/i3/config b/home-manager/i3/config
index dafa928..acfd0d0 100644
--- a/home-manager/i3/config
+++ b/home-manager/i3/config
@@ -86,7 +86,7 @@ bindsym $mod+Shift+p exec --no-startup-id "workspaces.sh move"
 bindsym $mod+Control+$left workspace prev
 bindsym $mod+Control+Left workspace prev
 
-set $i3lock-cmd i3lock -eti ~/Documents/lockscreen.png
+#set $i3lock-cmd i3lock -eti ~/Documents/lockscreen.png
 
 bindsym $mod+Shift+s exec --no-startup-id flameshot gui
 
diff --git a/home-manager/polybar/config.ini b/home-manager/polybar/config.ini
index ada0268..b7cf83e 100644
--- a/home-manager/polybar/config.ini
+++ b/home-manager/polybar/config.ini
@@ -27,7 +27,7 @@ disabled = #515772
 active = #eeffff
 inactive = #515772
 
-[bar/status]
+[section/bar-defaults]
 width = 100%
 height = 19pt
 radius = 10
@@ -55,29 +55,34 @@ separator-foreground = ${colors.disabled}
 
 font-0 = Cousine Nerd Font;1
 
-modules-left = xworkspaces
-modules-right = pipewire xkeyboard memory cpu battery date tray
-; modules-center = xwindow
-
 cursor-click = pointer
 cursor-scroll = ns-resize
 
 enable-ipc = true
 
-; For center tray - also make sure to change the launch.sh
-tray-position = ${env:TRAY:}
-
 ; wm-restack = generic
 ; wm-restack = bspwm
 wm-restack = generic
 
 override-redirect = false
 
+[bar/mainbar]
+inherit = section/bar-defaults
+modules-left = xworkspaces
+modules-right = pipewire xkeyboard memory cpu battery date tray
+modules-center = xwindow
+
+[bar/extrabar]
+inherit = section/bar-defaults
+modules-left = xworkspaces
+modules-right = pipewire xkeyboard memory cpu battery date
+modules-center = xwindow
 
 [module/xworkspaces]
-pin-workspaces = true
 type = internal/xworkspaces
 
+pin-workspaces = true
+
 label-active = %name%
 label-active-foreground = ${colors.active}
 label-active-padding = 1
@@ -91,7 +96,7 @@ label-urgent-foreground = ${colors.inactive}
 label-urgent-background = ${colors.alert}
 label-urgent-padding = 1
 
-label-empty = 
+label-empty =
 label-empty-foreground = ${colors.inactive}
 label-empty-padding = 0
 
@@ -158,11 +163,9 @@ date-alt = %H:%M:%S %d-%m-%Y
 label = %date%
 label-foreground = ${colors.primary}
 
-; Using polybar-git instead
-; [module/tray]
-; type = internal/tray
-; format = ${env:TRAY:}
-; tray-spacing = 5
+[module/tray]
+type = internal/tray
+tray-spacing = 5
 
 [module/xwindow]
 type = internal/xwindow
diff --git a/home-manager/polybar/launch.sh b/home-manager/polybar/launch.sh
index 00514be..41d5f3d 100755
--- a/home-manager/polybar/launch.sh
+++ b/home-manager/polybar/launch.sh
@@ -11,9 +11,9 @@ echo "---" | tee -a /tmp/polybarstatus.log
 
 for m in $(xrandr --query | grep " connected" | cut -d" " -f1); do
     if [ $(xrandr | grep $m | grep primary | wc -l) -eq 1 ]; then
-        MONITOR=$m TRAY="center" polybar status | tee -a /tmp/polybarstatus.log & disown
+        MONITOR=$m polybar mainbar | tee -a /tmp/mainpolybar.log & disown
     else
-        MONITOR=$m TRAY="" polybar status | tee -a /tmp/polybarstatus.log & disown
+        MONITOR=$m polybar extrabar | tee -a /tmp/extrapolybar.log & disown
     fi
 done
 
diff --git a/my-pkgs/adom.nix b/my-pkgs/adom.nix
new file mode 100644
index 0000000..25d2dae
--- /dev/null
+++ b/my-pkgs/adom.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, autoPatchelfHook, makeDesktopItem, makeWrapper, ncurses5, libtinfo, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf, luajit} :
+
+stdenv.mkDerivation rec {
+    pname = "adom";
+    version = "3.3.3";
+    src = fetchurl {
+        url = "https://sjc4.dl.dbolical.com/dl/2019/01/29/adom_noteye_linux_ubuntu_64_${version}.tar.gz?st=PcXL3PZSxDxr6H6v58PFfw==&e=1750223221";
+        hash = "sha256-7c39tEPlrpWIL6QH0BIOLLrFFIlhEHPw5F3knMUh+BA=";
+    };
+
+    nativeBuildInputs = [
+        autoPatchelfHook
+        makeWrapper
+    ];
+    
+    buildInputs = [
+        (ncurses5.override { unicodeSupport = false; })
+        ncurses5
+        SDL2
+        SDL2_image
+        SDL2_mixer
+        SDL2_net
+        SDL2_ttf
+        luajit
+        stdenv.cc.cc.lib
+    ];
+
+    sourceRoot = "adom";
+    installPhase = let desktopEntry = makeDesktopItem {
+        name = "adom";
+        desktopName = "Adom";
+        exec = "OUT_DIR/bin/adom";
+        #path = "OUT_DIR/share";
+    }; in ''
+    runHook preInstall
+    install -m755 -D adom $out/bin/adom
+    wrapProgram $out/bin/adom \
+                --chdir $out/share
+    install -m644 -D lib/libnoteye.so $out/lib/libnoteye.so
+    mkdir -p $out/share
+    cp -r common $out/share/
+    cp -r docs $out/share/
+    cp -r games $out/share/
+    cp -r gfx $out/share/
+    cp -r licenses $out/share/
+    cp -r sound $out/share/
+    mkdir -p $out/share/applications
+    sed -e "s|OUT_DIR|$out|g" ${desktopEntry}/share/applications/adom.desktop > $out/share/applications/adom.desktop
+    runHook postInstall
+'';
+}
diff --git a/my-pkgs/default.nix b/my-pkgs/default.nix
new file mode 100644
index 0000000..ccf18f5
--- /dev/null
+++ b/my-pkgs/default.nix
@@ -0,0 +1,8 @@
+{ config, pkgs, lib, ... }:
+{
+    nixpkgs.overlays = [
+        (final: prev: {
+            adom = prev.callPackage ./adom.nix { };
+        })
+    ];
+}