From 4049c17abdecf90e3a453cff1a096fe9b4c6b6d9 Mon Sep 17 00:00:00 2001 From: serenity-F Date: Wed, 31 Dec 2025 01:28:59 +1000 Subject: [PATCH] tidying --- core/default.nix | 4 ++-- core/hosts/hades/hardware.nix | 4 ++-- home/desktop/noctalia.nix | 2 +- secrets/default.nix | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/default.nix b/core/default.nix index 87797c5..a76dbd3 100755 --- a/core/default.nix +++ b/core/default.nix @@ -1,4 +1,4 @@ -{ inputs, lib, pkgs, primaryUser, ... }: +{ inputs, lib, pkgs, user, ... }: { @@ -46,7 +46,7 @@ trusted-users = [ # adds root, @wheel, and ${primaryUser} to trusted users "root" "@wheel" - "${primaryUser}" + "${user}" ]; experimental-features = [ # enable flakes uwu,,, and some other junk idek "pipe-operators" # who tf knows diff --git a/core/hosts/hades/hardware.nix b/core/hosts/hades/hardware.nix index 51d52df..6a7318d 100755 --- a/core/hosts/hades/hardware.nix +++ b/core/hosts/hades/hardware.nix @@ -1,7 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, modulesPath, primaryUser, ... }: +{ config, lib, modulesPath, user, ... }: { @@ -36,7 +36,7 @@ options = [ "fmask=0022" "dmask=0022" ]; }; - fileSystems."/run/media/${primaryUser}/Tartarus" = { + fileSystems."/run/media/${user}/Tartarus" = { device = "/dev/disk/by-uuid/26d8d9d1-67d2-4d61-a092-10ed7368b9f6"; fsType = "ext4"; }; diff --git a/home/desktop/noctalia.nix b/home/desktop/noctalia.nix index 614ef6c..c3313c5 100644 --- a/home/desktop/noctalia.nix +++ b/home/desktop/noctalia.nix @@ -8,7 +8,7 @@ }: { - home-manager.users.${primaryUser} = { + home-manager.users.${user} = { # import the home manager module imports = [ inputs.noctalia.homeModules.default ]; diff --git a/secrets/default.nix b/secrets/default.nix index d4c6b6b..aad1d29 100644 --- a/secrets/default.nix +++ b/secrets/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, inputs, flakePath, disksPath, primaryUser, homeDir, ... }: +{ pkgs, config, inputs, flakePath, disksPath, user, homeDirectory, ... }: { @@ -12,7 +12,7 @@ defaultSopsFile = ./secrets.yaml; # default secrets file defaultSopsFormat = "yaml"; # .yaml format - ease of use age = { - keyFile = "${homeDir}/.config/sops/age/keys.txt"; # keyfile location + keyFile = "${homeDirectory}/.config/sops/age/keys.txt"; # keyfile location generateKey = true; # generate a new key if the one above is missing };