From af373baeccc61f72f721cd6f95ccb1006e0fee3f Mon Sep 17 00:00:00 2001
From: oqyude <oqyude@gmail.com>
Date: Mon, 9 Mar 2026 20:24:22 +0300
Subject: [PATCH] refind is rofl

121

1

12

12

1

12

12

12

1

asd
---
 flake.lock                      | 21 +++++++++++++++++++++
 flake.nix                       |  8 ++++----
 home/modules/packages.nix       |  1 -
 modules/default.nix             |  2 +-
 modules/desktop/default.nix     | 20 ++++++++------------
 modules/essentials/packages.nix |  3 +++
 modules/server/calibre-web.nix  |  5 +++--
 7 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/flake.lock b/flake.lock
index b658c80..0c26d5a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -61,6 +61,26 @@
         "type": "github"
       }
     },
+    "grub2-themes": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1757136219,
+        "narHash": "sha256-tKU+vq34KHu/A2wD7WdgP5A4/RCmSD8hB0TyQAUlixA=",
+        "owner": "vinceliuice",
+        "repo": "grub2-themes",
+        "rev": "80dd04ddf3ba7b284a7b1a5df2b1e95ee2aad606",
+        "type": "github"
+      },
+      "original": {
+        "owner": "vinceliuice",
+        "repo": "grub2-themes",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -255,6 +275,7 @@
         "deploy-rs": "deploy-rs",
         "disko": "disko",
         "flake-compat": "flake-compat",
+        "grub2-themes": "grub2-themes",
         "home-manager": "home-manager",
         "nixos-hardware": "nixos-hardware",
         "nixos-wsl": "nixos-wsl",
diff --git a/flake.nix b/flake.nix
index 89d9065..95bce01 100644
--- a/flake.nix
+++ b/flake.nix
@@ -61,6 +61,10 @@
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    grub2-themes = {
+      url = "github:vinceliuice/grub2-themes";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     # nix-index-database = {
     #   url = "github:nix-community/nix-index-database";
     #   inputs.nixpkgs.follows = "nixpkgs";
@@ -79,10 +83,6 @@
     #   url = "github:musnix/musnix";
     #   inputs.nixpkgs.follows = "nixpkgs";
     # };
-    # grub2-themes = {
-    #   url = "github:vinceliuice/grub2-themes";
-    #   inputs.nixpkgs.follows = "nixpkgs";
-    # };
     # nypkgs = {
     #   # https://github.com/yunfachi/nypkgs
     #   url = "github:yunfachi/nypkgs";
diff --git a/home/modules/packages.nix b/home/modules/packages.nix
index 848b4b1..422e51c 100644
--- a/home/modules/packages.nix
+++ b/home/modules/packages.nix
@@ -75,7 +75,6 @@
       # Games
       #ludusavi
       #prismlauncher
-      steam
       #lutris
 
       # AI
diff --git a/modules/default.nix b/modules/default.nix
index 299d880..945c7d1 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -17,7 +17,7 @@ let
 
         home-manager.nixosModules.home-manager # home-manager module
         # nix-index-database.nixosModules.nix-index # nix-index module
-        # grub2-themes.nixosModules.default # grub2 themes module
+        grub2-themes.nixosModules.default # grub2 themes module
         sops-nix.nixosModules.sops # sops module
         self.homeConfigurations.default.nixosModule # default homeConfigurations
         disko.nixosModules.disko # disko module
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index f82d388..a673e2b 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -29,22 +29,18 @@
       efi.canTouchEfiVariables = lib.mkForce false;
       systemd-boot.enable = lib.mkForce false;
       grub = {
-        enable = lib.mkForce false;
+        enable = lib.mkForce true;
         device = "nodev";
         efiInstallAsRemovable = true;
         efiSupport = true;
         useOSProber = true;
       };
-      # grub2-theme = {
-      #   enable = true;
-      #   theme = "whitesur";
-      #   icon = "whitesur";
-      #   footer = true;
-      #   customResolution = "1920x1080"; # Optional: Set a custom resolution
-      # };
-      refind = {
-        enable = lib.mkForce true;
-        efiInstallAsRemovable = true;
+      grub2-theme = {
+        enable = true;
+        theme = "whitesur";
+        icon = "whitesur";
+        footer = true;
+        customResolution = "1920x1080"; # Optional: Set a custom resolution
       };
     };
   };
@@ -53,7 +49,7 @@
   programs = {
     dconf.enable = true;
     gamemode.enable = true;
-    # steam.enable = true;
+    steam.enable = true;
     xwayland.enable = true;
   };
   services = {
diff --git a/modules/essentials/packages.nix b/modules/essentials/packages.nix
index fa40178..d989d2d 100644
--- a/modules/essentials/packages.nix
+++ b/modules/essentials/packages.nix
@@ -183,6 +183,9 @@ in
           name = "oqyude";
           email = "oqyude@gmail.com";
         };
+        pull = {
+          rebase = true;
+        };
       };
     };
     lazygit.enable = true;
diff --git a/modules/server/calibre-web.nix b/modules/server/calibre-web.nix
index 4bc7719..958a827 100644
--- a/modules/server/calibre-web.nix
+++ b/modules/server/calibre-web.nix
@@ -1,7 +1,8 @@
 {
   config,
-  xlib,
   inputs,
+  pkgs,
+  xlib,
   ...
 }:
 let
@@ -11,7 +12,7 @@ let
 in
 {
   services.calibre-web = {
-    package = stable.calibre-web;
+    # package = stable.calibre-web;
     enable = true;
     # dataDir = "${xlib.dirs.services-mnt-folder}/calibre-web";
     options = {