aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2024-07-09 10:42:52 +0200
committerKarel Kočí <cynerd@email.cz>2024-07-09 10:42:52 +0200
commit4349cada1a0637db67501354c7d8f2d14fff0650 (patch)
treef19f1347bca2c6e66d3d253ce8a597666d2b2077
parentd973ed45edc82c5e4ce40d9454e29d6f671b931c (diff)
downloadnixos-personal-4349cada1a0637db67501354c7d8f2d14fff0650.tar.gz
nixos-personal-4349cada1a0637db67501354c7d8f2d14fff0650.tar.bz2
nixos-personal-4349cada1a0637db67501354c7d8f2d14fff0650.zip
nixos: tweak some of the packages
-rw-r--r--flake.lock12
-rw-r--r--nixos/configurations/lipwig.nix7
-rw-r--r--nixos/modules/desktop.nix11
3 files changed, 14 insertions, 16 deletions
diff --git a/flake.lock b/flake.lock
index 96cce4f..9f1b87c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -274,11 +274,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1719895800,
- "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=",
+ "lastModified": 1720429258,
+ "narHash": "sha256-d6JI5IgJ1xdrk7DvYVx7y8ijcYz5I1nhCwOiDP6cq00=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "6e253f12b1009053eff5344be5e835f604bb64cd",
+ "rev": "72d3c007024ce47d838bb38693c8773812f54bf2",
"type": "github"
},
"original": {
@@ -332,11 +332,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1720067112,
- "narHash": "sha256-RqDbuJnwe29ffD8KE810dLxzCyaX5cvXks8TaJZK4H4=",
+ "lastModified": 1720501375,
+ "narHash": "sha256-+uhyVoqSWA3+dQAeeWwovRmoD9eeqCWaAnpOuuqalNk=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "1af787b0e7fda63e5313fb1a6815019e0c4d6f9b",
+ "rev": "bb1588c3045cfdc18154cb45a2f2186122cbbad8",
"type": "github"
},
"original": {
diff --git a/nixos/configurations/lipwig.nix b/nixos/configurations/lipwig.nix
index 367275a..6368ebc 100644
--- a/nixos/configurations/lipwig.nix
+++ b/nixos/configurations/lipwig.nix
@@ -107,7 +107,7 @@
root = "${pkgs.cgit}/cgit";
locations."/".tryFiles = "$uri @cgit";
locations."@cgit".extraConfig = ''
- fastcgi_pass unix:${config.services.fcgiwrap.nginx.socket.address};
+ fastcgi_pass unix:${config.services.fcgiwrap.cgit.socket.address};
fastcgi_param SCRIPT_FILENAME ${pkgs.cgit}/cgit/cgit.cgi;
fastcgi_param PATH_INFO $uri;
fastcgi_param QUERY_STRING $args;
@@ -137,8 +137,9 @@
};
};
};
- services.fcgiwrap.nginx = {
- socket.group = config.services.nginx.group;
+ services.fcgiwrap.cgit = {
+ process.user = "git";
+ socket.user = config.services.nginx.group;
};
security.acme = {
acceptTerms = true;
diff --git a/nixos/modules/desktop.nix b/nixos/modules/desktop.nix
index bdf32f5..7b21c7d 100644
--- a/nixos/modules/desktop.nix
+++ b/nixos/modules/desktop.nix
@@ -72,8 +72,8 @@ in {
astroid
taskwarrior
vdirsyncer
- #khal
- #khard
+ khal
+ khard
gnupg
pinentry-gnome3
pinentry-curses
@@ -104,7 +104,7 @@ in {
id3lib
vlc
mpv
- youtube-dl
+ yt-dlp
spotify
nordic
@@ -125,6 +125,7 @@ in {
freerdp
plasma5Packages.kdeconnect-kde
+ gnome-firmware
hdparm
ethtool
multipath-tools
@@ -159,10 +160,6 @@ in {
typst-lsp
vale
- # Gnome utils
- gnome-firmware
- #gaphor
-
# CAD
freecad
kicad