From d2f6b23e9e341a1688059f22858a0a1b93f83054 Mon Sep 17 00:00:00 2001
From: Aleksandr Lebedev <alex.lebedev2003@icloud.com>
Date: Fri, 6 Jun 2025 20:16:47 +0200
Subject: [PATCH] Zhu

---
 flake.lock                        | 24 +++++++--------
 nixos/configuration.nix           |  7 ++++-
 nixos/homes/kylekrein/default.nix | 51 -------------------------------
 nixos/users/kylekrein/default.nix |  1 -
 4 files changed, 18 insertions(+), 65 deletions(-)

diff --git a/flake.lock b/flake.lock
index 98a6662..12eb0d5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -115,19 +115,19 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1744117239,
-        "narHash": "sha256-kMqmtfpZ8yXTi2Qm8hQ9SpvOZ7BdEKl2flWoFvLJufM=",
-        "ref": "refs/heads/master",
-        "rev": "45ec8b21db7879b29a37d7c3f5aa770a29c9b470",
-        "revCount": 499,
+        "lastModified": 1749073956,
+        "narHash": "sha256-BbCET9hzmTSgnR0x4ILcbYbGl2hRc9Fr21Xd3RgjRkI=",
+        "ref": "rmlui",
+        "rev": "37821b1c22fa4f775ed2f2cf3cbc4b748491ce39",
+        "revCount": 540,
         "submodules": true,
         "type": "git",
-        "url": "https://github.com/KyleKrein/BeeEngine"
+        "url": "https://gitlab.kylekrein.com:443/beeengine/BeeEngine.git"
       },
       "original": {
-        "submodules": true,
+        "ref": "rmlui",
         "type": "git",
-        "url": "https://github.com/KyleKrein/BeeEngine"
+        "url": "https://gitlab.kylekrein.com:443/beeengine/BeeEngine.git"
       }
     },
     "cachix": {
@@ -1374,16 +1374,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1738843498,
-        "narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=",
+        "lastModified": 1749086602,
+        "narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f",
+        "rev": "4792576cb003c994bd7cc1edada3129def20b27d",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 35b42a8..7a54ce7 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -41,7 +41,11 @@ in
   };
 
   boot = {
-    kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
+    kernelPackages = lib.mkDefault pkgs.linuxPackages_6_14;
+
+    plymouth = {
+      enable = true;
+    };
     loader = {
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = if hwconfig.hostname != "kylekrein-mac" then true else false;
@@ -159,6 +163,7 @@ in
 
     llvmPackages_19.clang-tools
     gdb
+    dotnet-sdk_9
     csharp-ls
     element-desktop
     
diff --git a/nixos/homes/kylekrein/default.nix b/nixos/homes/kylekrein/default.nix
index e77e1da..71ae827 100644
--- a/nixos/homes/kylekrein/default.nix
+++ b/nixos/homes/kylekrein/default.nix
@@ -2,55 +2,4 @@
   imports = [
     ./git.nix
   ];
-  programs = {
-    nushell = { enable = true;
-      # The config.nu can be anywhere you want if you like to edit your Nushell with Nu
-      #configFile.source = ./.../config.nu;
-      # for editing directly to config.nu 
-      extraConfig = ''
-       $env.config.use_ls_colors = true
-       let carapace_completer = {|spans|
-       carapace $spans.0 nushell ...$spans | from json
-       }
-       $env.config = {
-        show_banner: false,
-        completions: {
-        case_sensitive: false # case-sensitive completions
-        quick: true    # set to false to prevent auto-selecting completions
-        partial: true    # set to false to prevent partial filling of the prompt
-        algorithm: "fuzzy"    # prefix or fuzzy
-        external: {
-        # set to false to prevent nushell looking into $env.PATH to find more suggestions
-            enable: true 
-        # set to lower can improve completion performance at the cost of omitting some options
-            max_results: 100 
-            completer: $carapace_completer # check 'carapace_completer' 
-          }
-        }
-       } 
-       $env.PATH = ($env.PATH | 
-       split row (char esep) |
-       prepend /home/${username}/Apps |
-       append /usr/bin/env
-       )
-       '';
-       shellAliases = {
-	 vi = "nvim";
-	 vim = "nvim";
-	 l = "ls -la";
-       };
-   };  
-   carapace.enable = true;
-   carapace.enableNushellIntegration = true;
-
-   starship = { enable = true;
-       settings = {
-         add_newline = false;
-         character = { 
-         success_symbol = "[➜](bold green)";
-         error_symbol = "[➜](bold red)";
-       };
-    };
-  };
-};
 }
diff --git a/nixos/users/kylekrein/default.nix b/nixos/users/kylekrein/default.nix
index 79a0b27..54581be 100644
--- a/nixos/users/kylekrein/default.nix
+++ b/nixos/users/kylekrein/default.nix
@@ -13,7 +13,6 @@ in {
   ];
   users.users.${username} = {
     isNormalUser = true;
-    shell = pkgs.nushell;
     description = "Aleksandr Lebedev";
     extraGroups = ["networkmanager" "wheel"];
     #initialPassword = "1234";