summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock78
-rw-r--r--modules/common/profiles/headful.nix1
-rw-r--r--modules/nixos/common/xdg.nix44
-rw-r--r--modules/nixos/matrix/dendrite.nix6
-rw-r--r--modules/nixos/unbound.nix2
5 files changed, 75 insertions, 56 deletions
diff --git a/flake.lock b/flake.lock
index bfb1caa..d5ba9b5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -13,11 +13,11 @@
]
},
"locked": {
- "lastModified": 1684153753,
- "narHash": "sha256-PVbWt3qrjYAK+T5KplFcO+h7aZWfEj1UtyoKlvcDxh0=",
+ "lastModified": 1689334118,
+ "narHash": "sha256-djk5AZv1yU84xlKFaVHqFWvH73U7kIRstXwUAnDJPsk=",
"owner": "ryantm",
"repo": "agenix",
- "rev": "db5637d10f797bb251b94ef9040b237f4702cde3",
+ "rev": "0d8c5325fc81daf00532e3e26c6752f7bcde1143",
"type": "github"
},
"original": {
@@ -70,11 +70,11 @@
]
},
"locked": {
- "lastModified": 1683614365,
- "narHash": "sha256-55hW0UQjQRJ6+xtMDpNI5mjxp/5QHNZuY1iqExqYdiM=",
+ "lastModified": 1689577647,
+ "narHash": "sha256-YflmV5S6lLLwFlMUGQ/vtO8IjosXK7I+Ql59VAWPNXQ=",
"owner": "dwarfmaster",
"repo": "arkenfox-nixos",
- "rev": "8b5d2c251cdd6c2fbcb86d0501a957cc94a14f10",
+ "rev": "f3f475c5de3651103cb9365ae7ff9cc3122b9fa8",
"type": "github"
},
"original": {
@@ -124,11 +124,11 @@
]
},
"locked": {
- "lastModified": 1689281837,
- "narHash": "sha256-msgwgot2/hxXzlpYltIZ7boAqBkN8XejNOhBJ07q3FY=",
+ "lastModified": 1689516967,
+ "narHash": "sha256-sFAa33wkQHanmij/uhfGduIDK8z4dJAita/rK6u9pvE=",
"owner": "LnL7",
"repo": "nix-darwin",
- "rev": "c806a73609e77f0c446fdad5d3ea6ca3b7ae6e5f",
+ "rev": "61662a63bfe1726588c1da6b412df86d8ca94d63",
"type": "github"
},
"original": {
@@ -203,11 +203,11 @@
"flake-registry": {
"flake": false,
"locked": {
- "lastModified": 1682423975,
- "narHash": "sha256-zvOBrH3hwCedgpaWiOSHYSt+fgF/RhaJs8R5qOX6AYc=",
+ "lastModified": 1689333397,
+ "narHash": "sha256-g1Nn0sgH/hR/gEAQ1q6bloU+Q+V+Y4HlBBH6CBxC0HM=",
"owner": "NixOS",
"repo": "flake-registry",
- "rev": "8054bfa00d60437297d670ab3296a117e7059a10",
+ "rev": "5d8dc3eb692809ffd9a2f22cdb8015aa11972905",
"type": "github"
},
"original": {
@@ -264,11 +264,11 @@
]
},
"locked": {
- "lastModified": 1689134369,
- "narHash": "sha256-0G9dutIvhS/WUr3Awcnqw71g8EVVvvkOhVDnDDbY4Fw=",
+ "lastModified": 1689791618,
+ "narHash": "sha256-+GbknQxvqytQDecu8vyAAUipP7DZexdckBbByykVJW0=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "e42fb59768f0305085abde0dd27ab5e0cc15420c",
+ "rev": "44ba0184376c1bf017b8f2646a6040fb66d9c3e8",
"type": "github"
},
"original": {
@@ -323,11 +323,11 @@
]
},
"locked": {
- "lastModified": 1689299971,
- "narHash": "sha256-9MCY86aE1GbcWmKWQf+KE/6i6iTKSgyXLlOo/nRhGPk=",
+ "lastModified": 1689646015,
+ "narHash": "sha256-MO05NOUqkBJv9pgTT8n38s9xjaxdwyjlsDmtDZVTZZk=",
"owner": "Infinidoge",
"repo": "nix-minecraft",
- "rev": "af65261d39bcef245e0bedcf3bbf59d8974ea301",
+ "rev": "7b087b7f516ebb32cb38d17b2b2e198f984d11a0",
"type": "github"
},
"original": {
@@ -350,11 +350,11 @@
]
},
"locked": {
- "lastModified": 1689299928,
- "narHash": "sha256-qArmf72ZT8ug+HfRYKXdCHXf3iptrpxOtD4Yid/OsYY=",
+ "lastModified": 1689755083,
+ "narHash": "sha256-yKKMFJBBtEc0orszJYIg4D7ADbsjYAm/tuYoXTWoQs8=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
- "rev": "a8ff4484ea0f3737f3ce5d0602459c8e7631118a",
+ "rev": "b0f8fb071e9821d37eafb2648624186002b6265a",
"type": "github"
},
"original": {
@@ -382,11 +382,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1689261696,
- "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=",
+ "lastModified": 1689752456,
+ "narHash": "sha256-VOChdECcEI8ixz8QY+YC4JaNEFwQd1V8bA0G4B28Ki0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c",
+ "rev": "7f256d7da238cb627ef189d56ed590739f42f13b",
"type": "github"
},
"original": {
@@ -398,11 +398,11 @@
},
"nixpkgs-master": {
"locked": {
- "lastModified": 1689331843,
- "narHash": "sha256-EX6AHxH6bX1QM2x8aWecM44mbmz67fAtUJPYSl9QKBA=",
+ "lastModified": 1689797934,
+ "narHash": "sha256-SDGtQfZa1IfByvamNJNcoUGNglNAHhf8n5kM0Fv75T4=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "da56af6c22e57e01d5b2e09ac6a8240e2909d556",
+ "rev": "8f15fe7914501fa41904396582cfb9c22962d0ab",
"type": "github"
},
"original": {
@@ -414,11 +414,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1689326639,
- "narHash": "sha256-79zi0t83Dcc2dE0NuYZ+2hqtKXZN1yWVq5mtx8D2d7Y=",
+ "lastModified": 1689786379,
+ "narHash": "sha256-Z4t9R3POzqWTcCfq9wWB297ZcfU7FeWxP6P+kro4m1I=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "9fdfaeb7b96f05e869f838c73cde8d98c640c649",
+ "rev": "242a519286787cfcf83b99222cb883360a4b671f",
"type": "github"
},
"original": {
@@ -464,11 +464,11 @@
},
"nur": {
"locked": {
- "lastModified": 1689328451,
- "narHash": "sha256-WWJXUi3mT05cNBQ9YwLO/AqWyaTOxmHEp7EdJlkioM4=",
+ "lastModified": 1689795975,
+ "narHash": "sha256-Iz/hKVdr9icP8fnVleyYqN+TfPqFcJtYaysurxWJp/g=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "1839d2b991671f63666cdb0716875a2dd8ba4a46",
+ "rev": "94163e73e3d744a423abd5cd08417f19e01bd207",
"type": "github"
},
"original": {
@@ -528,11 +528,11 @@
]
},
"locked": {
- "lastModified": 1689328505,
- "narHash": "sha256-9B3+OeUn1a/CvzE3GW6nWNwS5J7PDHTyHGlpL3wV5oA=",
+ "lastModified": 1689668210,
+ "narHash": "sha256-XAATwDkaUxH958yXLs1lcEOmU6pSEIkatY3qjqk8X0E=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "5e28316db471d1ac234beb70031b635437421dd6",
+ "rev": "eb433bff05b285258be76513add6f6c57b441775",
"type": "github"
},
"original": {
@@ -592,11 +592,11 @@
]
},
"locked": {
- "lastModified": 1689103880,
- "narHash": "sha256-vHRCkcpnBbFsPqUNXliUmdPU81jqyuL9ZPzj3vJx2RE=",
+ "lastModified": 1689610936,
+ "narHash": "sha256-g/+hhD6Kpz8EQvE93q3tpP58LBxNyR7f1UhREKZJvXM=",
"owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver",
- "rev": "69a4b7ad67d2732ba1f86666b3d4d2d83b15200e",
+ "rev": "a3b03d1b5af5112bc94b448879a2f401043b42ea",
"type": "gitlab"
},
"original": {
diff --git a/modules/common/profiles/headful.nix b/modules/common/profiles/headful.nix
index a1bb7d6..935da31 100644
--- a/modules/common/profiles/headful.nix
+++ b/modules/common/profiles/headful.nix
@@ -22,6 +22,7 @@ in {
openssh.client.enable = true;
password-store.enable = true;
vscode.enable = true;
+ zathura.enable = true;
};
hm = {
diff --git a/modules/nixos/common/xdg.nix b/modules/nixos/common/xdg.nix
index fb762ab..b02c0ae 100644
--- a/modules/nixos/common/xdg.nix
+++ b/modules/nixos/common/xdg.nix
@@ -42,47 +42,65 @@ with lib; {
(mkIf this.isHeadful {
mimeApps = {
enable = true;
+ # https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types
defaultApplications = mkMerge (mapAttrsToList
(n: v: genAttrs v (_: ["${n}.desktop"]))
{
emacsclient = [
"application/json"
+ "application/ld+json"
"application/vnd.ms-publisher"
+ "application/x-c"
"application/x-desktop"
- "application/x-shellscript"
- "application/x-trash"
- "application/x-wine-extension-ini"
+ "application/x-httpd-php"
+ "application/x-sh"
+ "application/x-tex"
+ "application/xhtml+xml"
"application/xml"
+ "text/css"
+ "text/csv"
+ "text/javascript"
"text/markdown"
"text/plain"
+ "text/x-lisp"
];
firefox = [
"text/html"
"x-scheme-handler/http"
"x-scheme-handler/https"
];
- imv = [
- "image/bmp"
- "image/gif"
- "image/jpeg"
- "image/jpg"
- "image/png"
- "image/svg+xml"
- "image/tiff"
- "image/webp"
- ];
mpv = [
+ "audio/3gpp"
+ "audio/3gpp2"
"audio/aac"
"audio/flac"
"audio/mp3"
+ "audio/mpeg"
"audio/ogg"
+ "audio/opus"
"audio/wav"
"audio/webm"
+ "image/avif"
+ "image/bmp"
+ "image/gif"
+ "image/jpeg"
+ "image/jpg"
+ "image/png"
+ "image/tiff"
+ "image/vnd.microsoft.icon"
+ "image/webp"
"video/mkv"
+ "video/mp2t"
"video/mp4"
+ "video/mpeg"
"video/ogg"
"video/webm"
"video/x-matroska"
+ "video/x-msvideo"
+ ];
+ "org.pwmt.zathura" = [
+ "application/pdf"
+ "application/epub+zip"
];
});
};
diff --git a/modules/nixos/matrix/dendrite.nix b/modules/nixos/matrix/dendrite.nix
index d7c7b18..efeef3c 100644
--- a/modules/nixos/matrix/dendrite.nix
+++ b/modules/nixos/matrix/dendrite.nix
@@ -77,21 +77,21 @@ in {
];
};
- # Silence annoying errors when connecting to poorly configured federated
+ # Silence annoying errors when connecting to faulty federated
# homeservers.
promtail.filters = [
{
match = {
selector = ''{syslog_identifier="dendrite"} |~ ".*Failed to fetch key for server.*"'';
action = "drop";
- drop_counter_reason = "noisy_error";
+ drop_counter_reason = "noise";
};
}
{
match = {
selector = ''{syslog_identifier="dendrite"} |~ ".*could not download key for.*"'';
action = "drop";
- drop_counter_reason = "noisy_error";
+ drop_counter_reason = "noise";
};
}
];
diff --git a/modules/nixos/unbound.nix b/modules/nixos/unbound.nix
index c9d45f2..bbf91ac 100644
--- a/modules/nixos/unbound.nix
+++ b/modules/nixos/unbound.nix
@@ -35,7 +35,7 @@ in {
# [1]: https://github.com/NLnetLabs/unbound/commit/d7e776114114c16816570e48ab3a27eedc401a0e
selector = ''{syslog_identifier="unbound"} |~ ".*could not SSL_read crypto.*"'';
action = "drop";
- drop_counter_reason = "noisy_error";
+ drop_counter_reason = "noise";
};
}
];