Johan Rong 1 месяц назад
Родитель
Сommit
f93d809663
3 измененных файлов с 35 добавлено и 30 удалено
  1. 23 6
      flake.lock
  2. 4 11
      hosts/ideapad/home/default.nix
  3. 8 13
      hosts/ideapad/nixos/default.nix

+ 23 - 6
flake.lock

@@ -1,18 +1,35 @@
 {
   "nodes": {
+    "dank-qml-common": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1788376015,
+        "narHash": "sha256-/tT8rTznLADndTwLBzdgzzgfJH1ZhYQibYo5v/F8U+U=",
+        "owner": "AvengeMedia",
+        "repo": "dank-qml-common",
+        "rev": "26396ce432d6c71c3f5367438f96f4a8d667e160",
+        "type": "github"
+      },
+      "original": {
+        "owner": "AvengeMedia",
+        "repo": "dank-qml-common",
+        "type": "github"
+      }
+    },
     "dms": {
       "inputs": {
+        "dank-qml-common": "dank-qml-common",
         "flake-compat": "flake-compat",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1785111455,
-        "narHash": "sha256-aTNuC9NDBnYAeEtFsleeUwmGX3AZlKOutbl+LQRPkmQ=",
+        "lastModified": 1788454433,
+        "narHash": "sha256-E4KUauS30dL2R/n/yABNENdTehhT+qHV7uemd/jxQfU=",
         "owner": "AvengeMedia",
         "repo": "DankMaterialShell",
-        "rev": "069ddab041c738236a8910e4c39b65d9628d3018",
+        "rev": "0bbe83380c9406d262d567581d64477d261c9ee5",
         "type": "github"
       },
       "original": {
@@ -77,11 +94,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1787753485,
-        "narHash": "sha256-BZWCi9ZRJiARTuKTbbtvFTj7t1TK4G3UEckT3HyNfRg=",
+        "lastModified": 1788405554,
+        "narHash": "sha256-r2f1oUwixlgq9zOdYLqJLfS/lWBT60/IITjhTKI59JU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "062346a6d85bc4b49dfaa61c986e9c5be21217d1",
+        "rev": "a5cc6f2c37bf518436dc8d1c288ccd0c43c2f4c4",
         "type": "github"
       },
       "original": {

+ 4 - 11
hosts/ideapad/home/default.nix

@@ -1,20 +1,13 @@
 { config, pkgs, lib, ... }:
-let
-  users = import ../../../config/users.nix;
-in
+
 {
   imports = [
     ../../../home/modules/system/home-base.nix
 
     ../../../home/modules/desktop/hyprland
     ../../../home/modules/shells/dms-shell
-  ];
 
-  news.display = "silent";
-
-  home = {
-    username = users.default;
-    homeDirectory = "/home/${users.default}";
-    stateVersion = "26.05";
-  };
+    ../../../home/modules/configs/alacritty.nix
+    ../../../home/modules/configs/fish.nix
+  ];
 }

+ 8 - 13
hosts/ideapad/nixos/default.nix

@@ -9,27 +9,26 @@ in
 
     ../../../nixos/modules/system/nixos-base.nix
     ../../../nixos/modules/system/users.nix
+
+    ../../../nixos/profiles/workstation
+    ../../../nixos/profiles/development
+    ../../../nixos/profiles/gaming
+    ../../../nixos/profiles/school
+
     ../../../nixos/modules/hardware/networking
     ../../../nixos/modules/hardware/sound
     ../../../nixos/modules/hardware/bluetooth
     ../../../nixos/modules/hardware/biometric/elan-fingerprint.nix
+
     ../../../nixos/modules/desktop/hyprland
     ../../../nixos/modules/desktop/hyprland/greeter-default.nix
-    ../../../nixos/profiles/workstation
-    ../../../nixos/profiles/development
-    ../../../nixos/profiles/gaming
-    ../../../nixos/profiles/school
+
   ];
 
   boot.kernelParams = [
     "resume=UUID=3f914128-2e08-4080-b1bb-d7ddf9ef647a"
   ];
 
-  nixpkgs.config.allowUnfree = true;
-  hardware.enableAllFirmware = true;
-
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
   networking.hostName = hosts.ideapad.hostname;
 
   virtualisation = {
@@ -37,8 +36,4 @@ in
       storageDriver = "overlay2";
     };
   };
-
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-  system.stateVersion = "26.05";
 }