diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix index b382563..d445854 100644 --- a/modules/home/hyprland/default.nix +++ b/modules/home/hyprland/default.nix @@ -35,7 +35,6 @@ wayland.windowManager.hyprland = { enable = true; systemdIntegration = true; - enableNvidiaPatches = true; # extraConfig = builtins.readFile ./conf/hyprland.conf; }; diff --git a/modules/nixos/tmpsys.nix b/modules/nixos/tmpsys.nix index f76ddcb..71dde28 100644 --- a/modules/nixos/tmpsys.nix +++ b/modules/nixos/tmpsys.nix @@ -1,5 +1,5 @@ -{ config, pkgs, username,inputs, lib, ... }: +{ config, pkgs, username, inputs, lib, ... }: { imports = [ inputs.impermanence.nixosModules.impermanence @@ -11,38 +11,29 @@ ''; # 启用 tmpfs 作为根文件系统 - fileSystems."/" = lib.mkForce{ + fileSystems."/" = lib.mkForce { device = "none"; fsType = "tmpfs"; options = [ "defaults" "size=2G" "mode=755" ]; }; - # 将 /nix 存储在持久化分区 - fileSystems."/nix" = lib.mkForce{ - device = "/nix/persistent/nix"; - fsType = "btrfs"; - options = [ "compress-force=zstd" ]; - }; - - # 建议的 fstab 配置 - fileSystems."/nix/persistent" = { + # 将 /nix 目录绑定到持久化存储 + fileSystems."/nix" = { device = "/dev/disk/by-label/nixos-persistent"; # 需要根据实际情况修改 fsType = "btrfs"; - neededForBoot = true; + options = [ "bind" ]; + }; # 配置持久化存储 environment.persistence."/nix/persistent" = { - # 不在文件管理器中显示这些挂载点 hideMounts = true; - directories = [ - "/etc/nixos" # NixOS 配置文件 - "/etc/NetworkManager/system-connections" # 网络配置 - "/var/log" # 系统日志 - "/var/lib" # 系统数据 - "/root" # root 用户目录 - "/.nix" + "/etc/nixos" + "/etc/NetworkManager/system-connections" + "/var/log" + "/var/lib" + "/root" ]; files = [ @@ -53,21 +44,16 @@ "/etc/ssh/ssh_host_rsa_key.pub" ]; - # 用户目录持久化配置 users.${username} = { directories = [ - # 应用配置 ".config" ".cache" ".local" ".ssh" ".gnupg" - - # 开发相关 ".vscode" ".npm" ".cargo" - "data" "doc" ]; @@ -79,7 +65,4 @@ ]; }; }; - - } -