now my entire disk is on nixos + games :)

7 files changed, 35 insertions, 29 deletions

diff --git a/flake.nix b/flake.nix
index 00913ce..cac7e1b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -54,6 +54,11 @@
         tmux = true;
         zellij = false;
       };
+      games = {
+        enable = true;
+        minecraft = true;
+      };
+      dualbootedwithwindows = false;
 
       # This is where I have keep the dotfiles folder, replace it accordingly
       symlinkRoot = "/home/${username}/dotfiles";
@@ -68,7 +73,8 @@
         specialArgs = {
           inherit quickshell inputs system
             username hostname unstable symlinkRoot
-            opt languages terminalworkspace;
+            opt languages terminalworkspace
+            dualbootedwithwindows games;
         };
 
         modules = [
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index 019ac6d..d71c2cc 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -14,29 +14,14 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/aadeb47f-49f3-4052-b061-6d02fd0165cb";
+    { device = "/dev/disk/by-uuid/7efe503a-9f35-4c4c-b93b-1e88c300751b";
       fsType = "ext4";
     };
 
-  fileSystems."/boot/efi" =
-    { device = "/dev/disk/by-uuid/111C-A2C4";
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/8110-364A";
       fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
-
-  fileSystems."/var/lib/docker/overlay2/4644c4a5a2b1c4a0cb4542e69c9532a324f9dba60040695760d0222a1cb161e8/merged" =
-    { device = "overlay";
-      fsType = "overlay";
-    };
-
-  fileSystems."/var/lib/docker/overlay2/9cbb4669695d642dd03b76ef59374502793490f8c64404a1dc1342641742f789/merged" =
-    { device = "overlay";
-      fsType = "overlay";
-    };
-
-  fileSystems."/var/lib/docker/overlay2/b6ee16857d614f1210c4bd29c841ddd901fd7ccdc6b0370045311774611eed47/merged" =
-    { device = "overlay";
-      fsType = "overlay";
+      options = [ "fmask=0077" "dmask=0077" ];
     };
 
   swapDevices = [ ];
diff --git a/nixos/boot.nix b/nixos/boot.nix
index b3563f9..b94deff 100644
--- a/nixos/boot.nix
+++ b/nixos/boot.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, dualbootedwithwindows, ... }:
 {
   boot.loader = {
     grub = {
@@ -7,13 +7,13 @@
       devices = ["nodev"];
       useOSProber = true;
       extraEntries = ''
-      GRUB_SAVEDEFAULT=true
+      GRUB_SAVEDEFAULT=true'' + (if dualbootedwithwindows then ''
       menuentry "Windows" {
         insmod part_gpt
         insmod fat
         set root=(hd0,gpt1)
         chainloader /EFI/Microsoft/Boot/bootmgfw.efi
-      }
+      }'' else '''') + ''
       menuentry "Reboot" {
         reboot
       }
@@ -35,7 +35,7 @@
       };
     };
     efi.canTouchEfiVariables = true;
-    efi.efiSysMountPoint = "/boot/efi";
+    efi.efiSysMountPoint = "/boot";
     systemd-boot.enable = false;
   };
 
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 7bb1948..c17e4c9 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, username, hostname, ... }:
+{ config, pkgs, username, hostname, games, ... }:
 {
   imports =
     [
@@ -14,7 +14,7 @@
       ./languages
       ./terminal_workspace
       ./opt
-    ];
+    ] ++ (if games.enable then [ ./games ] else []);
 
   nix.settings = {
     cores = 6;
diff --git a/nixos/games/default.nix b/nixos/games/default.nix
new file mode 100644
index 0000000..75103a8
--- /dev/null
+++ b/nixos/games/default.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+{
+  imports =
+    (if games.minecraft then [ ./minecraft.nix ] else []);
+  programs.steam.enable = true;
+  environment.systemPackages = with pkgs; [
+    steam-run
+  ];
+}
diff --git a/nixos/games/minecraft.nix b/nixos/games/minecraft.nix
new file mode 100644
index 0000000..594f8bd
--- /dev/null
+++ b/nixos/games/minecraft.nix
@@ -0,0 +1,6 @@
+{ config, pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    prismlauncher
+  ];
+}
diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index b8c19c5..55eeca0 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -9,20 +9,20 @@
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
   "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" },
   "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
-  "gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" },
+  "gitsigns.nvim": { "branch": "main", "commit": "e1fb5425c8812214209b3f24eaa582c6c552cf98" },
   "indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" },
   "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
   "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
   "menu": { "branch": "main", "commit": "7a0a4a2896b715c066cfbe320bdc048091874cc6" },
   "minty": { "branch": "main", "commit": "aafc9e8e0afe6bf57580858a2849578d8d8db9e0" },
   "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
-  "nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" },
+  "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" },
   "nvim-lspconfig": { "branch": "master", "commit": "7fac9025a967a4d0846660f751cd392fac6bb788" },
   "nvim-tree.lua": { "branch": "master", "commit": "b0b49552c9462900a882fe772993b01d780445fe" },
   "nvim-treesitter": { "branch": "main", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" },
+  "telescope.nvim": { "branch": "master", "commit": "cfb85dcf7f822b79224e9e6aef9e8c794211b20b" },
   "ui": { "branch": "v3.0", "commit": "cb75908a86720172594b30de147272c1b3a7f452" },
   "undotree": { "branch": "master", "commit": "15d91b0afe04ea9ba5cd53e30190d1602af9a925" },
   "vim-tmux-navigator": { "branch": "master", "commit": "c45243dc1f32ac6bcf6068e5300f3b2b237e576a" },