Passing checks

This commit is contained in:
Daniel Flanagan 2024-01-04 18:55:30 -06:00
parent 000ef1fb2c
commit b7027a4ab1
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
6 changed files with 10 additions and 20 deletions

View file

@ -14,7 +14,7 @@
imports = imports =
[ [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
# inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
inputs.disko.nixosModules.disko inputs.disko.nixosModules.disko
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
] ]

View file

@ -8,16 +8,16 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x01 0x00
sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00 sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
*/ */
{ {
# inputs, inputs,
outputs, outputs,
modulesPath,
config, config,
pkgs, pkgs,
system,
... ...
}: { }: {
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix")
outputs.nixosModules.intel outputs.nixosModules.intel
inputs.api-lyte-dev.nixosModules.${system}.api-lyte-dev
# inputs.nix-minecraft.nixosModules.minecraft-servers # inputs.nix-minecraft.nixosModules.minecraft-servers
]; ];
@ -67,7 +67,7 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
systemd.services.api-lyte-dev.environment.LOG_LEVEL = "debug"; systemd.services.api-lyte-dev.environment.LOG_LEVEL = "debug";
sops = { sops = {
defaultSopsFile = ../../secrets/beefcake/secrets.yml; defaultSopsFile = ../secrets/beefcake/secrets.yml;
age = { age = {
sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"]; sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
keyFile = "/var/lib/sops-nix/key.txt"; keyFile = "/var/lib/sops-nix/key.txt";

View file

@ -11,8 +11,8 @@
imports = imports =
[ [
inputs.disko.nixosModules.disko
flake.diskoConfigurations.standard flake.diskoConfigurations.standard
inputs.hardware.nixosModules.framework-13-7040-amd
] ]
++ (with outputs.nixosModules; [ ++ (with outputs.nixosModules; [
desktop-usage desktop-usage
@ -20,10 +20,7 @@
postgres postgres
wifi wifi
# hyprland # hyprland
]) ]);
++ [
inputs.hardware.nixosModules.framework-13-7040-amd
];
# use updated ppd for framework 13: # use updated ppd for framework 13:
# source: https://community.frame.work/t/tracking-ppd-v-tlp-for-amd-ryzen-7040/39423/137?u=lytedev # source: https://community.frame.work/t/tracking-ppd-v-tlp-for-amd-ryzen-7040/39423/137?u=lytedev

View file

@ -1,6 +1,5 @@
{ {
flake, flake,
inputs,
outputs, outputs,
# lib, # lib,
# config, # config,
@ -11,7 +10,6 @@
imports = imports =
[ [
inputs.disko.nixosModules.disko
flake.diskoConfigurations.unencrypted flake.diskoConfigurations.unencrypted
] ]
++ (with outputs.nixosModules; [ ++ (with outputs.nixosModules; [

View file

@ -36,7 +36,6 @@ in {
networking.useDHCP = false; networking.useDHCP = false;
imports = [ imports = [
inputs.disko.nixosModules.disko
flake.diskoConfigurations.unencrypted flake.diskoConfigurations.unencrypted
]; ];

View file

@ -32,20 +32,16 @@
imports = imports =
[ [
inputs.disko.nixosModules.disko
flake.diskoConfigurations.thinker flake.diskoConfigurations.thinker
inputs.hardware.nixosModules.lenovo-thinkpad-t480
inputs.hardware.nixosModules.common-pc-laptop-ssd
] ]
++ (with outputs.nixosModules; [ ++ (with outputs.nixosModules; [
desktop-usage desktop-usage
podman podman
postgres postgres
wifi wifi
]) ]);
++ [
inputs.hardware.nixosModules.lenovo-thinkpad-t480
inputs.hardware.nixosModules.common-pc-laptop-ssd
# ./relative-module.nix
];
boot = { boot = {
loader = { loader = {