aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--home/mun/programs/git.nix8
-rw-r--r--home/mun/programs/nvim.nix4
-rw-r--r--hosts/herra/drivers.nix2
-rw-r--r--hosts/herra/steam.nix18
-rw-r--r--system/services.nix2
5 files changed, 27 insertions, 7 deletions
diff --git a/home/mun/programs/git.nix b/home/mun/programs/git.nix
index 3e2e0a4..7d29b04 100644
--- a/home/mun/programs/git.nix
+++ b/home/mun/programs/git.nix
@@ -1,4 +1,4 @@
-{...}: {
+{pkgs, ...}: {
programs.git = {
enable = true;
settings = {
@@ -11,4 +11,10 @@
gpg.program = "gpg";
};
};
+ programs.gpg.enable = true;
+
+ services.gpg-agent = {
+ enable = true;
+ pinentryPackage = pkgs.pinentry-curses; # terminal-friendly, good for a tty/zsh setup
+ };
}
diff --git a/home/mun/programs/nvim.nix b/home/mun/programs/nvim.nix
index dff9270..7cda2e1 100644
--- a/home/mun/programs/nvim.nix
+++ b/home/mun/programs/nvim.nix
@@ -9,6 +9,8 @@
black
shfmt
typst
+ jdk21 # QwQ
+ gradle
# Language servers
lua-language-server
@@ -18,6 +20,7 @@
bash-language-server
texlab
tinymist
+ jdt-language-server
];
programs.neovim = {
@@ -43,6 +46,7 @@
p.latex
p.c
p.typst
+ p.java
]))
# LSP
diff --git a/hosts/herra/drivers.nix b/hosts/herra/drivers.nix
index e886948..f169970 100644
--- a/hosts/herra/drivers.nix
+++ b/hosts/herra/drivers.nix
@@ -37,4 +37,6 @@
'';
virtualisation.docker.storageDriver = "btrfs";
+
+ programs.gamemode.enable = true;
}
diff --git a/hosts/herra/steam.nix b/hosts/herra/steam.nix
index e3d5142..9bbe499 100644
--- a/hosts/herra/steam.nix
+++ b/hosts/herra/steam.nix
@@ -1,17 +1,24 @@
-{lib, pkgs, ...}: {
+{
+ lib,
+ pkgs,
+ ...
+}: {
programs.steam = {
enable = true;
package = pkgs.steam.override {
extraEnv = {
LD_PRELOAD = "${pkgs.gamemode.lib}/lib/libgamemodeauto.so";
};
- extraLibraries = pkgs: with pkgs; [
- gamemode
- ];
+ extraLibraries = pkgs:
+ with pkgs; [
+ gamemode
+ ];
};
remotePlay.openFirewall = true;
dedicatedServer.openFirewall = true;
localNetworkGameTransfers.openFirewall = true;
+ gamescopeSession.enable = false;
+ extraCompatPackages = [pkgs.proton-ge-bin];
};
nixpkgs.config.allowUnfreePredicate = pkg:
@@ -24,4 +31,5 @@
programs.appimage.enable = true;
programs.appimage.binfmt = true;
-} \ No newline at end of file
+}
+
diff --git a/system/services.nix b/system/services.nix
index a65d523..131b279 100644
--- a/system/services.nix
+++ b/system/services.nix
@@ -1,4 +1,4 @@
-{...}: {
+{pkgs, ...}: {
security.pam.sshAgentAuth.enable = true;
time.timeZone = "Europe/Prague";