Commit again

.gitignore

@@ -0,0 +1 @@
+hardware-configuration.nix

README.md

@@ -1,7 +1,15 @@
 # OCbwoy3's Dotfiles
 The second ones, because the first ones were too difficult to install.
 
+```bash
+cd ~
+nix-shell -p git --run "git clone https://github.com/ocbwoy3/config"
+cd config
+cp /etc/nixos/hardware-configuration.nix .
+sudo nixos-rebuild switch --flake ./#default --impure
+```
+
 Commands you will most likely need:
 ```bash
-sudo nixos-rebuild switch --flake "~/config/#default"
+sudo nixos-rebuild switch --flake ./#default --impure
 ```

flake.lock

@@ -1,5 +1,20 @@
 {
   "nodes": {
+    "catppuccin": {
+      "locked": {
+        "lastModified": 1731088327,
+        "narHash": "sha256-Oizjf0wXBTqALipX4fQdGjq9IBSCXz8wwcfCGRK73bI=",
+        "owner": "catppuccin",
+        "repo": "nix",
+        "rev": "7bebd062df3239c005c0d600f5dfd8514f5915f8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -20,6 +35,22 @@
         "type": "github"
       }
     },
+    "nix-flatpak": {
+      "locked": {
+        "lastModified": 1711997201,
+        "narHash": "sha256-J71xzQlVYsjagA4AsVwRazhBh2rZrPpKvxTgs6UzL7c=",
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "rev": "b76fa31346db7fc958a9898f3c594696ca71c4fd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gmodena",
+        "ref": "v0.4.1",
+        "repo": "nix-flatpak",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1730785428,
@@ -38,7 +69,9 @@
     },
     "root": {
       "inputs": {
+        "catppuccin": "catppuccin",
         "home-manager": "home-manager",
+        "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs"
       }
     }

flake.nix

@@ -13,7 +13,7 @@
 	};
 
 	# Required by NixOS:
-	# /etc/nixos/hardware-configuration.nix 
+	# ./hardware-configuration.nix 
 
 	# inputs.home-manager.nixosModules.default
 	# catppuccin.nixosModules.catppuccin
@@ -24,8 +24,8 @@
 			specialArgs = {inherit inputs;};
 			modules = [
 				inputs.home-manager.nixosModules.default
-				catppuccin.nixosModules.catppuccin
+				inputs.catppuccin.nixosModules.catppuccin
-				nix-flatpak.nixosModules.nix-flatpak
+				inputs.nix-flatpak.nixosModules.nix-flatpak
 				/etc/nixos/hardware-configuration.nix
 				./hosts/default/configuration.nix
 				

hosts/default/configuration.nix

@@ -12,7 +12,7 @@
 		../../modules/nixos/network.nix
 		../../modules/nixos/programs.nix
 		./packages.nix
-	]
+	];
 
 	programs.steam = {
 		enable = true;
@@ -26,33 +26,60 @@
 		{
 			name = "flathub";
 			location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
-		};
-		{
-			name = "sober";
-			location = "https://sober.vinegarhq.org/repo/"
 		}
 	];
 
+	# Sadly, I don't know how to install flatpaks like this.
 	services.flatpak.packages = [
-		{ appId = "org.vinegarhq.Sober"; origin = "sober";  }
+		# { flatpakref = "https://sober.vinegarhq.org/sober.flatpakref"; sha256 = "0"; }
 	];
 
 	programs.hyprland = {
-		# Install the packages from nixpkgs
 		enable = true;
-		# Whether to enable XWayland
 		xwayland.enable = true;
 	};
 
-	main-user.userName = "ocbwoy3";
-	main-user.realName = "OCbwoy3";
 	main-user.packages = with pkgs; [
-		brave
 		prismlauncher
 		vesktop
 	];
 
-	catppuccin.enable = true;
+	# CHANGE YOUR NAME IN HOME MANAGER!
-	catppuccin.flavor = "mocha";
+
+	main-user.userName = "ocbwoy3";
+	main-user.realName = "OCbwoy3";
+
+	catppuccin = {
+		enable = true;
+		flavor = "mocha";
+		accent = "blue";
+	};
+
+	home-manager.users.ocbwoy3 = {
+
+		programs.chromium = {
+			enable = true;
+			package = pkgs.brave;
+			extensions = [
+				{ id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; } # uBlock Origin
+				{ id = "enamippconapkdmgfgjchkhakpfinmaj"; } # DeArrow
+				{ id = "clngdbkpkpeebahjckkjfobafhncgmne"; } # Sytlus
+				{ id = "hnmpcagpplmpfojmgmnngilcnanddlhb"; } # Windscribe
+				{ id = "hfjngafpndganmdggnapblamgbfjhnof"; } # RoSeal
+				{ id = "aflpfginfpjhanhkmdpohpggpolfopmb"; } # SkyLink
+				{ id = "agjnjboanicjcpenljmaaigopkgdnihi"; } # PreMiD
+				
+			];
+		};
+
+		programs.git = {
+			enable = true;
+			userName  = "OCbwoy3";
+			userEmail = "ocbwoy3@ocbwoy3.dev";
+		};
+
+		home.stateVersion = "24.11";
+
+	};
 
 }

hosts/default/packages.nix

@@ -18,11 +18,10 @@
 		imagemagick
 		alacritty
 		libimobiledevice
-		catppuccin-sddm
 		vim
 		microsoft-edge
 		direnv
-		gnome.nautilus
+		nautilus
 		kdePackages.dolphin
 		kdePackages.kservice
 		qpwgraph
@@ -83,6 +82,6 @@
 		gobject-introspection 
 		gimp
 		mpv
-	]
+	];
-}
 
+}

modules/nixos/hardware.nix

@@ -23,4 +23,6 @@
 		pulse.enable = true;
 	};
 
+	system.stateVersion = "24.11";
+
 }

modules/nixos/main-user.nix

@@ -29,14 +29,7 @@
 			description = "${config.main-user.realName}";
 			shell = pkgs.zsh;
 			extraGroups = [ "networkmanager" "wheel" "input" ];
-			packages = ${config.main-user.packages};
+			packages = config.main-user.packages;
-			# with pkgs; [
-			# 	brave
-			# 	prismlauncher
-			# 	gimp
-			# 	mpv
-			# 	vesktop
-			# ];
 		};
 	};
 

modules/nixos/nixpkgs.nix

@@ -7,4 +7,6 @@
 		vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
 	};
 
+	nix.settings.experimental-features = [ "nix-command" "flakes" ];
+
 }

modules/nixos/programs.nix

@@ -2,6 +2,11 @@
 
 {
 
+	services.displayManager.sddm = {
+		enable = true;
+		package = pkgs.kdePackages.sddm;
+	};
+
 	programs.zsh.enable = true;
 
 	programs.direnv = {