From 8e3005efb585e853f1a67ab556899509fa338314 Mon Sep 17 00:00:00 2001 From: iFargle Date: Sat, 25 Nov 2023 19:04:12 +0900 Subject: [PATCH] test --- flake.nix | 6 +++--- nixos/hosts/framework-server/default.nix | 10 +++++----- nixos/hosts/nixos-framework/default.nix | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index 5a1c8533..10ce86e9 100644 --- a/flake.nix +++ b/flake.nix @@ -40,8 +40,8 @@ osaka-vultr-01 = libx.mkSmallHost { hostname = "osaka-vultr-01"; }; nixos-vm-01 = libx.mkHost { hostname = "nixos-vm-01"; }; # Physical - nixos-desktop = libx.mkHost { hostname = "nixos-desktop"; desktop = "hyprland"; gpu = "nvidia"; theme = "gruvbox"; }; - nixos-framework = libx.mkHost { hostname = "nixos-framework"; desktop = "hyprland"; gpu = "intel"; theme = "green"; }; + nixos-desktop = libx.mkHost { hostname = "nixos-desktop"; desktop = "gnome"; gpu = "nvidia"; }; + nixos-framework = libx.mkHost { hostname = "nixos-framework"; desktop = "hyprland"; gpu = "amd"; theme = "green"; }; framework-server = libx.mkHost { hostname = "framework-server"; }; nixos-rpi4-01 = libx.mkHost { hostname = "nixos-rpi4-01"; platform = "aarch64-linux"; }; nixos-rpi4-02 = libx.mkHost { hostname = "nixos-rpi4-02"; platform = "aarch64-linux"; }; @@ -53,7 +53,7 @@ "albert@nixos-vm-01" = libx.mkHome { hostname = "nixos-vm-01"; }; # Physical "albert@framework-server" = libx.mkHome { hostname = "framework-server"; }; - "albert@nixos-desktop" = libx.mkHome { hostname = "nixos-desktop"; desktop = "hyprland"; theme = "gruvbox"; }; + "albert@nixos-desktop" = libx.mkHome { hostname = "nixos-desktop"; }; "albert@nixos-framework" = libx.mkHome { hostname = "nixos-framework"; desktop = "hyprland"; theme = "green"; }; "albert@nixos-rpi4-01" = libx.mkHome { hostname = "nixos-rpi4-01"; platform = "aarch64-linux"; }; "albert@nixos-rpi4-02" = libx.mkHome { hostname = "nixos-rpi4-02"; platform = "aarch64-linux"; }; diff --git a/nixos/hosts/framework-server/default.nix b/nixos/hosts/framework-server/default.nix index db20e796..bb6feefe 100644 --- a/nixos/hosts/framework-server/default.nix +++ b/nixos/hosts/framework-server/default.nix @@ -3,11 +3,11 @@ inputs.nixos-hardware.nixosModules.framework-13th-gen-intel (modulesPath + "/installer/scan/not-detected.nix") ./disks.nix - ../../common/modules/boot.nix - # ../../common/modules/secureboot.nix + # ../../common/modules/boot.nix + ../../common/modules/secureboot.nix ../../common/services/fwupd.nix - ./builder.nix - ./ssh-luks.nix + # ./builder.nix + # ./ssh-luks.nix ]; # steam , etc @@ -27,7 +27,7 @@ time.timeZone = "Asia/Tokyo"; # Set the networking hostname: - networking.hostName = "nixos-framework"; + networking.hostName = "framework-server"; hardware = { opengl = { diff --git a/nixos/hosts/nixos-framework/default.nix b/nixos/hosts/nixos-framework/default.nix index 70a07a82..def86e33 100644 --- a/nixos/hosts/nixos-framework/default.nix +++ b/nixos/hosts/nixos-framework/default.nix @@ -20,7 +20,7 @@ networking.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + # hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; # Set your time zone. time.timeZone = "Asia/Tokyo";