summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configuration.nix2
-rw-r--r--flake.lock8
-rw-r--r--flake.nix2
-rw-r--r--host/athena.nix7
-rw-r--r--host/software/desktop/default.nix8
5 files changed, 14 insertions, 13 deletions
diff --git a/configuration.nix b/configuration.nix
index d832560..47e3733 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -39,7 +39,7 @@
programs = {
fish.enable = true;
- bash.enableCompletion = true;
+ bash.completion.enable = true;
gnupg.agent = {
enable = true;
enableSSHSupport = true;
diff --git a/flake.lock b/flake.lock
index 47e2dd7..5d4ea85 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,16 +2,16 @@
"nodes": {
"nixpkgs": {
"locked": {
- "lastModified": 1719426051,
- "narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=",
+ "lastModified": 1732981179,
+ "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "89c49874fb15f4124bf71ca5f42a04f2ee5825fd",
+ "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-24.05",
+ "ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
diff --git a/flake.nix b/flake.nix
index 40e38e1..9846c5a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
description = "System environment of Adrian Kummerlaender";
inputs = {
- nixpkgs.url = github:NixOS/nixpkgs/nixos-24.05;
+ nixpkgs.url = github:NixOS/nixpkgs/nixos-24.11;
pkgs-personal.url = github:KnairdA/pkgs/master;
};
diff --git a/host/athena.nix b/host/athena.nix
index 7124ebc..f32fee7 100644
--- a/host/athena.nix
+++ b/host/athena.nix
@@ -59,7 +59,11 @@
libinput = {
enable = true;
touchpad = {
- accelSpeed = "2.0";
+ accelSpeed = "4.0";
+ tapping = false;
+ tappingDragLock = false;
+ scrollMethod = "twofinger";
+ disableWhileTyping = true;
};
};
@@ -75,6 +79,7 @@
};
hardware.nvidia = {
+ open = true;
package = pkgs.linuxPackages.nvidia_x11;
prime = {
offload.enable = true;
diff --git a/host/software/desktop/default.nix b/host/software/desktop/default.nix
index d557f5a..8aac8ad 100644
--- a/host/software/desktop/default.nix
+++ b/host/software/desktop/default.nix
@@ -7,6 +7,8 @@
fileSystems."/".options = [ "noatime" "nodiratime" "discard" ];
+ hardware.graphics.enable32Bit = true;
+
services.pipewire = {
enable = true;
alsa = {
@@ -16,12 +18,6 @@
pulse.enable = true;
};
- hardware = {
- opengl= {
- driSupport32Bit = true;
- };
- };
-
services = {
journald = {
extraConfig = ''Storage=volatile'';