aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/programs/anki.nix14
-rw-r--r--modules/programs/jellyfin-mpv-shim.nix2
-rw-r--r--modules/programs/mpv.nix80
-rw-r--r--modules/programs/nextcloud-client.nix8
-rw-r--r--modules/programs/obsidian.nix9
-rw-r--r--modules/programs/opencode.nix18
-rw-r--r--modules/programs/zed.nix68
-rw-r--r--modules/services/nginx.nix46
-rw-r--r--modules/services/sunshine.nix18
9 files changed, 122 insertions, 141 deletions
diff --git a/modules/programs/anki.nix b/modules/programs/anki.nix
deleted file mode 100644
index ca0cd0f..0000000
--- a/modules/programs/anki.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- flake.modules.homeManager.anki =
- { ... }:
- {
- programs.anki = {
- enable = true;
- #style = "native";
- #addons = with pkgs.ankiAddons; [
- # anki-connect
- # review-heatmap
- #];
- };
- };
-}
diff --git a/modules/programs/jellyfin-mpv-shim.nix b/modules/programs/jellyfin-mpv-shim.nix
index 1844296..681add5 100644
--- a/modules/programs/jellyfin-mpv-shim.nix
+++ b/modules/programs/jellyfin-mpv-shim.nix
@@ -23,6 +23,8 @@
gpu-api = "vulkan";
target-colorspace-hint = "yes";
target-peak = 500;
+ UP = "add chapter 1";
+ DOWN = "add chapter -1";
}
// (optionalAttrs false {
target-trc = "pq";
diff --git a/modules/programs/mpv.nix b/modules/programs/mpv.nix
index 8787bbd..8a8ecf4 100644
--- a/modules/programs/mpv.nix
+++ b/modules/programs/mpv.nix
@@ -1,48 +1,50 @@
{
- flake.modules.homeManager.mpv =
- { ... }:
- {
- programs.mpv = {
- enable = true;
- config = {
- vo = "gpu-next";
- gpu-api = "vulkan";
+ flake.modules.homeManager.mpv = {
+ programs.mpv = {
+ enable = true;
+ config = {
+ vo = "gpu-next";
+ gpu-api = "vulkan";
+ target-peak = 500;
+ target-colorspace-hint = "yes";
+ };
+ bindings = {
+ UP = "add chapter 1";
+ DOWN = "add chapter -1";
+ };
+ profiles = {
+ # Dolby Vision profile
+ "DOVI" = {
+ profile-restore = "copy";
+ profile-cond = "p[\"video-dec-params/gamma\"] == \"auto\"";
+ target-trc = "pq";
+ target-prim = "bt.2020";
target-peak = 500;
- target-colorspace-hint = "yes";
+ tone-mapping-mode = "auto";
};
- profiles = {
- # Dolby Vision profile
- "DOVI" = {
- profile-restore = "copy";
- profile-cond = "p[\"video-dec-params/gamma\"] == \"auto\"";
- target-trc = "pq";
- target-prim = "bt.2020";
- target-peak = 500;
- tone-mapping-mode = "auto";
- };
- # SDR look while in HDR
- "SDR" = {
- profile-restore = "copy";
- target-trc = "pq";
- target-prim = "bt.2020";
- target-peak = 207;
- tone-mapping = "bt.2390";
- tone-mapping-mode = "rgb";
- inverse-tone-mapping = "yes";
- };
+ # SDR look while in HDR
+ "SDR" = {
+ profile-restore = "copy";
+ target-trc = "pq";
+ target-prim = "bt.2020";
+ target-peak = 207;
+ tone-mapping = "bt.2390";
+ tone-mapping-mode = "rgb";
+ inverse-tone-mapping = "yes";
+ };
- # SDR to HDR inverse tone mapping
- "SDR_HDR_EFFECT" = {
- profile-restore = "copy";
- target-trc = "pq";
- target-prim = "bt.2020";
- target-peak = 406;
- tone-mapping = "spline";
- tone-mapping-mode = "rgb";
- inverse-tone-mapping = "yes";
- };
+ # SDR to HDR inverse tone mapping
+ "SDR_HDR_EFFECT" = {
+ profile-restore = "copy";
+ target-trc = "pq";
+ target-prim = "bt.2020";
+ target-peak = 406;
+ tone-mapping = "spline";
+ tone-mapping-mode = "rgb";
+ inverse-tone-mapping = "yes";
};
};
};
+ };
}
diff --git a/modules/programs/nextcloud-client.nix b/modules/programs/nextcloud-client.nix
new file mode 100644
index 0000000..5b8095e
--- /dev/null
+++ b/modules/programs/nextcloud-client.nix
@@ -0,0 +1,8 @@
+{
+ flake.modules.homeManager.nextcloud-client = {
+ services.nextcloud-client = {
+ enable = true;
+ startInBackground = true;
+ };
+ };
+}
diff --git a/modules/programs/obsidian.nix b/modules/programs/obsidian.nix
deleted file mode 100644
index 873a51a..0000000
--- a/modules/programs/obsidian.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- flake.modules.homeManager.obsidian =
- { ... }:
- {
- programs.obsidian = {
- enable = true;
- };
- };
-}
diff --git a/modules/programs/opencode.nix b/modules/programs/opencode.nix
index 266562f..ce97b03 100644
--- a/modules/programs/opencode.nix
+++ b/modules/programs/opencode.nix
@@ -1,14 +1,12 @@
{
- flake.modules.homeManager.opencode =
- { ... }:
- {
- programs.opencode = {
- enable = true;
- settings = {
- theme = "system";
- share = "disabled";
- autoupdate = false;
- };
+ flake.modules.homeManager.opencode = {
+ programs.opencode = {
+ enable = true;
+ settings = {
+ theme = "system";
+ share = "disabled";
+ autoupdate = false;
};
};
+ };
}
diff --git a/modules/programs/zed.nix b/modules/programs/zed.nix
index 0bee73e..f77f48e 100644
--- a/modules/programs/zed.nix
+++ b/modules/programs/zed.nix
@@ -1,40 +1,38 @@
{
- flake.modules.homeManager.zed =
- { ... }:
- {
- programs.zed-editor = {
- enable = true;
- extensions = [ "nix" ];
- userSettings = {
- telemetry = {
- metrics = false;
- };
- title_bar = {
- show_onboarding_banner = false;
- show_project_items = false;
- show_branch_name = false;
- show_user_menu = false;
- };
- tab_bar.show = false;
- toolbar.quick_actions = false;
- status_bar."experimental.show" = false;
- project_panel = {
- dock = "right";
- default_width = 400;
- hide_root = true;
- auto_fold_dirs = false;
- starts_open = false;
- git_status = false;
- sticky_scroll = false;
- scrollbar.show = "never";
- indent_guides.show = "never";
- };
- outline_panel = {
- default_width = 300;
- indent_guides.show = "never";
- };
- file_finder.modal_max_width = "large";
+ flake.modules.homeManager.zed = {
+ programs.zed-editor = {
+ enable = true;
+ extensions = [ "nix" ];
+ userSettings = {
+ telemetry = {
+ metrics = false;
};
+ title_bar = {
+ show_onboarding_banner = false;
+ show_project_items = false;
+ show_branch_name = false;
+ show_user_menu = false;
+ };
+ tab_bar.show = false;
+ toolbar.quick_actions = false;
+ status_bar."experimental.show" = false;
+ project_panel = {
+ dock = "right";
+ default_width = 400;
+ hide_root = true;
+ auto_fold_dirs = false;
+ starts_open = false;
+ git_status = false;
+ sticky_scroll = false;
+ scrollbar.show = "never";
+ indent_guides.show = "never";
+ };
+ outline_panel = {
+ default_width = 300;
+ indent_guides.show = "never";
+ };
+ file_finder.modal_max_width = "large";
};
};
+ };
}
diff --git a/modules/services/nginx.nix b/modules/services/nginx.nix
index 6ad4c0f..73ed594 100644
--- a/modules/services/nginx.nix
+++ b/modules/services/nginx.nix
@@ -1,27 +1,25 @@
{
- flake.modules.nixos.nginx =
- { ... }:
- {
- services.nginx = {
- enable = true;
- recommendedGzipSettings = true;
- recommendedOptimisation = true;
- recommendedProxySettings = true;
- recommendedTlsSettings = true;
- appendHttpConfig = ''
- map $scheme $hsts_header {
- https "max-age=31536000; includeSubdomains; preload";
- }
- add_header Strict-Transport-Security $hsts_header;
- #add_header Content-Security-Policy "default-src 'self'; script-src 'self'; style-src 'self'; img-src 'self' data:; font-src 'self'; connect-src 'self'; object-src 'none'; frame-ancestors 'none'; base-uri 'self';" always;
- add_header 'Referrer-Policy' 'same-origin';
- add_header X-Frame-Options DENY;
- add_header X-Content-Type-Options nosniff;
- '';
- };
- networking.firewall.allowedTCPPorts = [
- 80
- 443
- ];
+ flake.modules.nixos.nginx = {
+ services.nginx = {
+ enable = true;
+ recommendedGzipSettings = true;
+ recommendedOptimisation = true;
+ recommendedProxySettings = true;
+ recommendedTlsSettings = true;
+ appendHttpConfig = ''
+ map $scheme $hsts_header {
+ https "max-age=31536000; includeSubdomains; preload";
+ }
+ add_header Strict-Transport-Security $hsts_header;
+ #add_header Content-Security-Policy "default-src 'self'; script-src 'self'; style-src 'self'; img-src 'self' data:; font-src 'self'; connect-src 'self'; object-src 'none'; frame-ancestors 'none'; base-uri 'self';" always;
+ add_header 'Referrer-Policy' 'same-origin';
+ add_header X-Frame-Options DENY;
+ add_header X-Content-Type-Options nosniff;
+ '';
};
+ networking.firewall.allowedTCPPorts = [
+ 80
+ 443
+ ];
+ };
}
diff --git a/modules/services/sunshine.nix b/modules/services/sunshine.nix
index 69496f2..510de8a 100644
--- a/modules/services/sunshine.nix
+++ b/modules/services/sunshine.nix
@@ -1,13 +1,11 @@
{
- flake.modules.nixos.sunshine =
- { ... }:
- {
- services.sunshine = {
- enable = true;
- autoStart = true;
- capSysAdmin = true;
- openFirewall = true;
- };
- hardware.graphics.enable = true;
+ flake.modules.nixos.sunshine = {
+ services.sunshine = {
+ enable = true;
+ autoStart = true;
+ capSysAdmin = true;
+ openFirewall = true;
};
+ hardware.graphics.enable = true;
+ };
}