Compare commits

..

No commits in common. "4127c28ed6e7b7855f004bdb8da1614d3b1b49cd" and "6ae38b1d2fb31c814aac97a578206afeedafd1f0" have entirely different histories.

7 changed files with 13 additions and 50 deletions

View file

@ -1,17 +0,0 @@
{
inputs,
config,
lib,
pkgs,
...
}: let
secretsDirectory = builtins.toString inputs.nix-secrets;
in {
imports = [
inputs.sops-nix.nixosModules.sops
];
sops = {
defaultSopsFile = "${secretsDirectory}/common.yaml";
validateSopsFiles = false;
};
}

View file

@ -15,7 +15,7 @@ inputs.nixpkgs.lib.nixosSystem {
../../configs/nixos/common.nix ../../configs/nixos/common.nix
../../configs/nixos/printing.nix ../../configs/nixos/printing.nix
../../configs/nixos/sound.nix ../../configs/nixos/sound.nix
../../configs/nixos/interactive-networking.nix ../../configs/nixos/networking.nix
../../configs/nixos/i3 ../../configs/nixos/i3
({ ({
config, config,
@ -46,10 +46,8 @@ inputs.nixpkgs.lib.nixosSystem {
programs.zsh.enable = true; programs.zsh.enable = true;
environment.shells = with pkgs; [zsh]; environment.shells = with pkgs; [zsh];
users.mutableUsers=false;
# Define a user account. Don't forget to set a password with passwd. # Define a user account. Don't forget to set a password with passwd.
users.users.${config.host.user} = { users.users.${config.host.user} = {
hashedPasswordFile=config.sops.secrets.gv-password.path;
isNormalUser = true; isNormalUser = true;
description = "Gabe Venberg"; description = "Gabe Venberg";
shell = pkgs.zsh; shell = pkgs.zsh;

View file

@ -1,14 +0,0 @@
{
inputs,
config,
lib,
pkgs,
...
}: {
imports=[
../../configs/nixos/secrets.nix
];
sops.secrets.gv-password = {
neededForUsers = true;
};
}

View file

@ -17,7 +17,7 @@ inputs.nixpkgs.lib.nixosSystem {
../../roles/nixos/graphical-vm.nix ../../roles/nixos/graphical-vm.nix
../../configs/nixos/printing.nix ../../configs/nixos/printing.nix
../../configs/nixos/sound.nix ../../configs/nixos/sound.nix
../../configs/nixos/interactive-networking.nix ../../configs/nixos/networking.nix
../../configs/nixos/nfsv2.nix ../../configs/nixos/nfsv2.nix
../../configs/nixos/i3 ../../configs/nixos/i3
../../configs/nixos/common.nix ../../configs/nixos/common.nix

View file

@ -4,11 +4,17 @@
lib, lib,
pkgs, pkgs,
... ...
}: { }: let
secretsDirectory = builtins.toString inputs.nix-secrets;
in {
imports = [ imports = [
../../configs/nixos/secrets.nix inputs.sops-nix.nixosModules.sops
]; ];
sops.secrets.gv-password = { sops = {
defaultSopsFile = "${secretsDirectory}/common.yaml";
validateSopsFiles = false;
secrets.gv-password={
neededForUsers=true; neededForUsers=true;
}; };
};
} }

View file

@ -1,10 +0,0 @@
{
config,
pkgs,
lib,
...
}: {
powerManagement.powertop.enable = true;
powerManagement.enable = true;
powerManaagement.cpuFreqGovernor = "ondemand";
}