From 0f6ff4bda2a2a55259626b1c9f6ea0bbd6c1e0b9 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sat, 23 Dec 2023 17:08:49 -0700 Subject: encrypted partitions on khad were annoying and useless --- machines/khad/configuration.nix | 12 ------------ machines/khad/hardware-configuration.nix | 12 ++++-------- 2 files changed, 4 insertions(+), 20 deletions(-) (limited to 'machines') diff --git a/machines/khad/configuration.nix b/machines/khad/configuration.nix index b0f8490..3f46f5f 100644 --- a/machines/khad/configuration.nix +++ b/machines/khad/configuration.nix @@ -14,18 +14,6 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - # Setup keyfile - boot.initrd.secrets = { - "/crypto_keyfile.bin" = null; - }; - - # Enable swap on luks - boot.initrd.luks.devices."luks-12daadca-e9a9-413b-9286-017b3038e5ba".device = "/dev/disk/by-uuid/12daadca-e9a9-413b-9286-017b3038e5ba"; - boot.initrd.luks.devices."luks-12daadca-e9a9-413b-9286-017b3038e5ba".keyFile = "/crypto_keyfile.bin"; - - boot.initrd.luks.devices."luks-02516df1-d33b-4c83-90f8-4be7b918132e".keyFile = "/crypto_keyfile.bin"; - - networking.hostName = "khad"; # Define your hostname. # Pick only one of the below networking options. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. diff --git a/machines/khad/hardware-configuration.nix b/machines/khad/hardware-configuration.nix index 9807d16..6e9d239 100644 --- a/machines/khad/hardware-configuration.nix +++ b/machines/khad/hardware-configuration.nix @@ -14,27 +14,23 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/360dd54b-c347-4ca9-adfd-3891414eeef6"; + { device = "/dev/disk/by-uuid/17bf776d-ed6d-4a80-831c-ddd65dec14fb"; fsType = "btrfs"; options = [ "subvol=@" ]; }; - boot.initrd.luks.devices."luks-f6d45986-2c3d-4c6a-bc73-6753d182fef9".device = "/dev/disk/by-uuid/f6d45986-2c3d-4c6a-bc73-6753d182fef9"; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/CE2A-4E2F"; + { device = "/dev/disk/by-uuid/83FA-1F6E"; fsType = "vfat"; }; fileSystems."/home" = - { device = "/dev/disk/by-uuid/ce569948-e98c-47e0-9a1b-1e33fc1f0664"; + { device = "/dev/disk/by-uuid/c6f221f0-f4c0-413e-821b-7363aa5c5f4c"; fsType = "btrfs"; }; - boot.initrd.luks.devices."luks-02516df1-d33b-4c83-90f8-4be7b918132e".device = "/dev/disk/by-uuid/02516df1-d33b-4c83-90f8-4be7b918132e"; - swapDevices = - [ { device = "/dev/disk/by-uuid/8f615eac-c1a1-48c6-8d34-8059732527c0"; } + [ { device = "/dev/disk/by-uuid/9b961057-79f7-4024-b1ec-16f9e8af7405"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking -- cgit v1.2.3 From 50c3eaf685ff1449e9e96679eb20a0e5e474d5cf Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 8 Jan 2024 00:37:20 -0700 Subject: enable wayland sddm --- machines/zenbook/configuration.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'machines') diff --git a/machines/zenbook/configuration.nix b/machines/zenbook/configuration.nix index 47aecfa..40283c3 100644 --- a/machines/zenbook/configuration.nix +++ b/machines/zenbook/configuration.nix @@ -32,6 +32,7 @@ services.xserver.displayManager.sddm = { enableHidpi = true; + wayland.enable = true; # settings = { # serverArguments = "-nolisten tcp -dpi 170"; # }; -- cgit v1.2.3 From f578ed905f76836132d256e678b819f490c1ae66 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 12 Jan 2024 05:01:28 -0700 Subject: hopefully fix sddm scaling this time --- machines/zenbook/configuration.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'machines') diff --git a/machines/zenbook/configuration.nix b/machines/zenbook/configuration.nix index 40283c3..7f5e132 100644 --- a/machines/zenbook/configuration.nix +++ b/machines/zenbook/configuration.nix @@ -33,9 +33,9 @@ services.xserver.displayManager.sddm = { enableHidpi = true; wayland.enable = true; - # settings = { - # serverArguments = "-nolisten tcp -dpi 170"; - # }; + settings = { + Wayland.serverArguments = "-nolisten tcp -dpi 170"; + }; }; networking = { -- cgit v1.2.3 From 0f8062875c9ce4a638aecc71011a0d97589a5f76 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 12 Jan 2024 10:41:09 -0700 Subject: add dynamic timezone to zenbook --- machines/zenbook/configuration.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'machines') diff --git a/machines/zenbook/configuration.nix b/machines/zenbook/configuration.nix index 7f5e132..41dd5f0 100644 --- a/machines/zenbook/configuration.nix +++ b/machines/zenbook/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running `nixos-help`). -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { imports = [ @@ -57,7 +57,8 @@ }; # Set your time zone. - time.timeZone = "US/Mountain"; + time.timeZone = lib.mkDefault "US/Mountain"; + services.automatic-timezoned.enable = true; # time.timeZone = "Europe/Stockholm"; # time.timeZone = "UTC"; -- cgit v1.2.3 From ecddd3d06c1a18ad388666c24c2374cd508b8a20 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sat, 13 Jan 2024 10:34:34 -0700 Subject: format boot field like zenbook, use latest kernel --- machines/khad/configuration.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'machines') diff --git a/machines/khad/configuration.nix b/machines/khad/configuration.nix index 3f46f5f..1f9c187 100644 --- a/machines/khad/configuration.nix +++ b/machines/khad/configuration.nix @@ -10,9 +10,14 @@ ./hardware-configuration.nix ]; - # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; + # Use the systemd-boot EFI boot loader. + boot = { + loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + }; + kernelPackages = pkgs.linuxPackages_latest; # use latest kernel + }; networking.hostName = "khad"; # Define your hostname. # Pick only one of the below networking options. -- cgit v1.2.3