From 047d4fb2f4037f0980b8f454c63f064d5a647fe8 Mon Sep 17 00:00:00 2001
From: foglar <kohout.fi.2023@skola.ssps.cz>
Date: Fri, 27 Dec 2024 10:32:42 +0100
Subject: [PATCH] cleanup

---
 .gitignore                          |  4 ++--
 kogami/configuration.nix            | 11 ++---------
 kogami/home.nix                     |  6 +++++-
 nixos/system/packages/sops/sops.nix |  8 +++++++-
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 53dd5c7..d58052d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-
-laptop.qcow2
+kogami.qcow2
+ginoza.qcow2
\ No newline at end of file
diff --git a/kogami/configuration.nix b/kogami/configuration.nix
index 7cc9b45..f80f79b 100644
--- a/kogami/configuration.nix
+++ b/kogami/configuration.nix
@@ -72,8 +72,9 @@
   # Basic programs to enable
   programs.kdeconnect.enable = true;
   programs.wireshark.enable = true;
+  programs.auto-cpufreq.enable = true;
 
-  services.twingate.enable = true;
+  #services.twingate.enable = true;
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
@@ -81,14 +82,6 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
 
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
   # List services that you want to enable:
 
   # Enable the OpenSSH daemon.
diff --git a/kogami/home.nix b/kogami/home.nix
index 36ffa57..fe24ac2 100644
--- a/kogami/home.nix
+++ b/kogami/home.nix
@@ -1,4 +1,7 @@
-{userSettings, ...}: {
+{
+  userSettings,
+  ...
+}: {
   # Home manager configuration
   home.username = "${userSettings.username}";
   home.homeDirectory = "/home/${userSettings.username}";
@@ -83,6 +86,7 @@
       }
     '';
   };
+
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 }
diff --git a/nixos/system/packages/sops/sops.nix b/nixos/system/packages/sops/sops.nix
index 6810656..4bca528 100644
--- a/nixos/system/packages/sops/sops.nix
+++ b/nixos/system/packages/sops/sops.nix
@@ -19,6 +19,12 @@
     };
 
     users.users.${userSettings.username}.hashedPasswordFile = "${config.sops.secrets."${userSettings.hostname}/password-hash".path}";
-    security.pam.yubico.id = ["${config.sops.secrets.yubikey_id}".value];
+    security.pam.yubico.id =
+      []
+      ++ (
+        if config.program.yubikey.enable
+        then ["${config.sops.secrets.yubikey_id}".value]
+        else []
+      );
   };
 }