summaryrefslogtreecommitdiff
path: root/os
diff options
context:
space:
mode:
Diffstat (limited to 'os')
-rw-r--r--os/core/security.nix2
-rw-r--r--os/core/ssh.nix8
-rw-r--r--os/srv/gaming.nix2
-rw-r--r--os/srv/kdeconnect.nix8
-rw-r--r--os/srv/sops.nix1
5 files changed, 11 insertions, 10 deletions
diff --git a/os/core/security.nix b/os/core/security.nix
index f0eadab..00bb48a 100644
--- a/os/core/security.nix
+++ b/os/core/security.nix
@@ -39,7 +39,7 @@ in
environment.systemPackages = with pkgs; [
doas-sudo-shim
veracrypt
- bitwarden-desktop
+ # bitwarden-desktop
keepassxc
git-credential-keepassxc
];
diff --git a/os/core/ssh.nix b/os/core/ssh.nix
index 3d1bedb..4f9b551 100644
--- a/os/core/ssh.nix
+++ b/os/core/ssh.nix
@@ -20,16 +20,18 @@ in
};
};
+ programs.ssh.startAgent = true;
+ services.gnome.gcr-ssh-agent.enable = false;
+
programs.gnupg.agent = {
enable = true;
- enableSSHSupport = true;
- # settings.default-key = "1DCCDC4E78380113E9BBBE413C7DEF329223B701";
+ enableSSHSupport = false;
pinentryPackage = pkgs.pinentry-curses;
};
users.users = {
${username}.openssh.authorizedKeys.keys = [
- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID5/Mr4PLMDflZ+SoaYP9N3kRbkkh1qL5NLSgW6C7sAu adikro@disroot.org"
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC610CJfgc3yII7MpLVqzEzQGa8Tsm+dih+CTXHXTnv4 adikro@disroot.org"
];
};
};
diff --git a/os/srv/gaming.nix b/os/srv/gaming.nix
index acfd754..e95cb93 100644
--- a/os/srv/gaming.nix
+++ b/os/srv/gaming.nix
@@ -47,7 +47,7 @@ in
# --- EXTERNAL LAUNCHERS ---
(lib.mkIf cfg.launchers.enable {
environment.systemPackages = with pkgs; [
- heroic
+ # heroic
(prismlauncher.override {
additionalLibs = with pkgs; [ ocl-icd ];
jdks = with pkgs; [ javaPackages.compiler.temurin-bin.jdk-25 ];
diff --git a/os/srv/kdeconnect.nix b/os/srv/kdeconnect.nix
index 01a0e4d..0b54f98 100644
--- a/os/srv/kdeconnect.nix
+++ b/os/srv/kdeconnect.nix
@@ -1,7 +1,6 @@
{
config,
lib,
- username,
pkgs,
...
}:
@@ -11,8 +10,9 @@ in
{
options.os.srv.kdeconnect.enable = lib.mkEnableOption "enables kde connect";
config = lib.mkIf cfg.enable {
- environment.systemPackages = [ pkgs.kdePackages.dolphin ];
- programs.kdeconnect.enable = true;
- home-manager.users.${username}.services.kdeconnect.enable = true;
+ programs.kdeconnect = {
+ enable = true;
+ package = pkgs.valent;
+ };
};
}
diff --git a/os/srv/sops.nix b/os/srv/sops.nix
index 36ab9ef..6fac789 100644
--- a/os/srv/sops.nix
+++ b/os/srv/sops.nix
@@ -37,7 +37,6 @@ in
sops
age
ssh-to-age
- gnupg
];
};
}