diff --git a/flake.lock b/flake.lock index bb61c06e..b36e2e83 100644 --- a/flake.lock +++ b/flake.lock @@ -565,7 +565,7 @@ "inputs": { "flake-compat": "flake-compat_13", "nix": "nix_5", - "nixpkgs": "nixpkgs_22", + "nixpkgs": "nixpkgs_24", "pre-commit-hooks": "pre-commit-hooks_4" }, "locked": { @@ -1244,6 +1244,24 @@ "inputs": { "systems": "systems_11" }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_11": { + "inputs": { + "systems": "systems_13" + }, "locked": { "lastModified": 1731533236, "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", @@ -1258,9 +1276,9 @@ "type": "github" } }, - "flake-utils_11": { + "flake-utils_12": { "inputs": { - "systems": "systems_12" + "systems": "systems_14" }, "locked": { "lastModified": 1731533236, @@ -1276,9 +1294,9 @@ "type": "github" } }, - "flake-utils_12": { + "flake-utils_13": { "inputs": { - "systems": "systems_13" + "systems": "systems_15" }, "locked": { "lastModified": 1681202837, @@ -1294,9 +1312,9 @@ "type": "github" } }, - "flake-utils_13": { + "flake-utils_14": { "inputs": { - "systems": "systems_14" + "systems": "systems_16" }, "locked": { "lastModified": 1710146030, @@ -1312,9 +1330,9 @@ "type": "github" } }, - "flake-utils_14": { + "flake-utils_15": { "inputs": { - "systems": "systems_15" + "systems": "systems_17" }, "locked": { "lastModified": 1685518550, @@ -1697,9 +1715,29 @@ "type": "github" } }, + "lemurs": { + "inputs": { + "nixpkgs": "nixpkgs_15", + "rust-overlay": "rust-overlay_3", + "utils": "utils" + }, + "locked": { + "lastModified": 1721847815, + "narHash": "sha256-t/riJpgy0bD5CU8Zkzket4Gks2JXXSLRreMlrxlok0c=", + "owner": "coastalwhite", + "repo": "lemurs", + "rev": "1d4be7d0c3f528a0c1e9326ac77f1e8a17161c83", + "type": "github" + }, + "original": { + "owner": "coastalwhite", + "repo": "lemurs", + "type": "github" + } + }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils_11", + "flake-utils": "flake-utils_12", "nixpkgs-lib": "nixpkgs-lib_5" }, "locked": { @@ -1783,7 +1821,7 @@ }, "lix-module": { "inputs": { - "flake-utils": "flake-utils_10", + "flake-utils": "flake-utils_11", "flakey-profile": "flakey-profile", "lix": [ "lix" @@ -1840,7 +1878,7 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_23" + "nixpkgs": "nixpkgs_25" }, "locked": { "lastModified": 1698420672, @@ -1860,7 +1898,7 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_17", "nixpkgs-stable": "nixpkgs-stable_5", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" @@ -1945,7 +1983,7 @@ "nix-direnv": { "inputs": { "flake-parts": "flake-parts_8", - "nixpkgs": "nixpkgs_16", + "nixpkgs": "nixpkgs_18", "treefmt-nix": "treefmt-nix_2" }, "locked": { @@ -1966,7 +2004,7 @@ "inputs": { "flake-parts": "flake-parts_10", "nix-github-actions": "nix-github-actions_3", - "nixpkgs": "nixpkgs_19", + "nixpkgs": "nixpkgs_21", "treefmt-nix": "treefmt-nix_4" }, "locked": { @@ -2248,7 +2286,7 @@ "inputs": { "flake-parts": "flake-parts_9", "flake-root": "flake-root_2", - "nixpkgs": "nixpkgs_17", + "nixpkgs": "nixpkgs_19", "treefmt-nix": "treefmt-nix_3" }, "locked": { @@ -2272,7 +2310,7 @@ "nixpkgs" ], "nixpkgs-stable": "nixpkgs-stable_6", - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_4" }, "locked": { "lastModified": 1732412226, @@ -2783,6 +2821,37 @@ } }, "nixpkgs_15": { + "locked": { + "lastModified": 1733630332, + "narHash": "sha256-SdYtEeuRfMGXYz3j1KDHS8nnJhdw288aorsZsyfM36c=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "45ccd347abd01d950f61dc8422f8b4a0528a6a88", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_16": { + "locked": { + "lastModified": 1706487304, + "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_17": { "locked": { "lastModified": 1732014248, "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", @@ -2798,7 +2867,7 @@ "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_18": { "locked": { "lastModified": 1725194671, "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", @@ -2814,7 +2883,7 @@ "type": "github" } }, - "nixpkgs_17": { + "nixpkgs_19": { "locked": { "lastModified": 1730831018, "narHash": "sha256-2S0HwIFRxYp+afuoFORcZA9TjryAf512GmE0MTfEOPU=", @@ -2830,45 +2899,45 @@ "type": "github" } }, - "nixpkgs_18": { + "nixpkgs_2": { "locked": { - "lastModified": 1732718005, - "narHash": "sha256-rBd/tZyE0iw6C/xPOwqXZwIOi6sLA29t0ZXNomhBkqw=", + "lastModified": 1730272153, + "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e245a698cd491e8d91cabc22901fd8c8cedf2e23", + "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable-small", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_19": { + "nixpkgs_20": { "locked": { - "lastModified": 1730958623, - "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=", + "lastModified": 1732718005, + "narHash": "sha256-rBd/tZyE0iw6C/xPOwqXZwIOi6sLA29t0ZXNomhBkqw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85f7e662eda4fa3a995556527c87b2524b691933", + "rev": "e245a698cd491e8d91cabc22901fd8c8cedf2e23", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_21": { "locked": { - "lastModified": 1730272153, - "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", + "lastModified": 1730958623, + "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", + "rev": "85f7e662eda4fa3a995556527c87b2524b691933", "type": "github" }, "original": { @@ -2878,7 +2947,7 @@ "type": "github" } }, - "nixpkgs_20": { + "nixpkgs_22": { "locked": { "lastModified": 1701436327, "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", @@ -2892,7 +2961,7 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz" } }, - "nixpkgs_21": { + "nixpkgs_23": { "locked": { "lastModified": 1726463316, "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", @@ -2908,7 +2977,7 @@ "type": "github" } }, - "nixpkgs_22": { + "nixpkgs_24": { "locked": { "lastModified": 1678875422, "narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=", @@ -2924,7 +2993,7 @@ "type": "github" } }, - "nixpkgs_23": { + "nixpkgs_25": { "locked": { "lastModified": 1708655239, "narHash": "sha256-ZrP/yACUvDB+zbqYJsln4iwotbH6CTZiTkANJ0AgDv4=", @@ -2937,7 +3006,7 @@ "type": "indirect" } }, - "nixpkgs_24": { + "nixpkgs_26": { "locked": { "lastModified": 1708807242, "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", @@ -2953,7 +3022,7 @@ "type": "github" } }, - "nixpkgs_25": { + "nixpkgs_27": { "locked": { "lastModified": 1732014248, "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", @@ -3117,8 +3186,8 @@ }, "nuenv_2": { "inputs": { - "nixpkgs": "nixpkgs_20", - "rust-overlay": "rust-overlay_4" + "nixpkgs": "nixpkgs_22", + "rust-overlay": "rust-overlay_5" }, "locked": { "lastModified": 1731006591, @@ -3140,7 +3209,7 @@ "flake-schemas": "flake-schemas", "home-manager": "home-manager", "jovian": "jovian", - "nixpkgs": "nixpkgs_21" + "nixpkgs": "nixpkgs_23" }, "locked": { "lastModified": 1726625508, @@ -3339,7 +3408,7 @@ "devenv", "flake-compat" ], - "flake-utils": "flake-utils_14", + "flake-utils": "flake-utils_15", "gitignore": "gitignore_5", "nixpkgs": [ "tg-online-keeper", @@ -3404,11 +3473,11 @@ "inputs": { "advisory-db": "advisory-db", "crane": "crane_4", - "flake-utils": "flake-utils_13", + "flake-utils": "flake-utils_14", "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_5" + "rust-overlay": "rust-overlay_6" }, "locked": { "lastModified": 1732307265, @@ -3458,6 +3527,7 @@ "flake-parts": "flake-parts_6", "flake-root": "flake-root", "lanzaboote": "lanzaboote", + "lemurs": "lemurs", "lix": "lix", "lix-module": "lix-module", "niri": "niri", @@ -3465,7 +3535,7 @@ "nix-ld": "nix-ld", "nixd": "nixd", "nixos-cosmic": "nixos-cosmic", - "nixpkgs": "nixpkgs_18", + "nixpkgs": "nixpkgs_20", "nixpkgs-22": "nixpkgs-22", "nixpkgs-factorio": "nixpkgs-factorio", "nixpkgs-master": "nixpkgs-master", @@ -3594,6 +3664,25 @@ } }, "rust-overlay_3": { + "inputs": { + "flake-utils": "flake-utils_10", + "nixpkgs": "nixpkgs_16" + }, + "locked": { + "lastModified": 1712369449, + "narHash": "sha256-tbWug3uXPlSm1j0xD80Y3xbP+otT6gLnQo1e/vQat48=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "41b3b080cc3e4b3a48e933b87fc15a05f1870779", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_4": { "inputs": { "nixpkgs": [ "nixos-cosmic", @@ -3614,9 +3703,9 @@ "type": "github" } }, - "rust-overlay_4": { + "rust-overlay_5": { "inputs": { - "flake-utils": "flake-utils_12", + "flake-utils": "flake-utils_13", "nixpkgs": [ "nuenv", "nixpkgs" @@ -3636,7 +3725,7 @@ "type": "github" } }, - "rust-overlay_5": { + "rust-overlay_6": { "inputs": { "nixpkgs": [ "radicle", @@ -3657,7 +3746,7 @@ "type": "github" } }, - "rust-overlay_6": { + "rust-overlay_7": { "inputs": { "nixpkgs": [ "vaultix", @@ -3782,6 +3871,36 @@ "type": "github" } }, + "systems_16": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_17": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1689347949, @@ -3907,7 +4026,7 @@ "devenv": "devenv_5", "flake-parts": "flake-parts_11", "naersk": "naersk", - "nixpkgs": "nixpkgs_24" + "nixpkgs": "nixpkgs_26" }, "locked": { "lastModified": 1710153718, @@ -4009,12 +4128,30 @@ "type": "github" } }, + "utils": { + "inputs": { + "systems": "systems_12" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "vaultix": { "inputs": { "crane": "crane_5", "flake-parts": "flake-parts_12", - "nixpkgs": "nixpkgs_25", - "rust-overlay": "rust-overlay_6" + "nixpkgs": "nixpkgs_27", + "rust-overlay": "rust-overlay_7" }, "locked": { "lastModified": 1733360567, diff --git a/flake.nix b/flake.nix index 284aed87..4ee1fc8a 100755 --- a/flake.nix +++ b/flake.nix @@ -156,6 +156,10 @@ url = "github:lilyinstarlight/nixos-cosmic"; inputs.nixpkgs.follows = "nixpkgs"; }; + lemurs = { + url = "github:coastalwhite/lemurs"; + # inputs.nixpkgs.follows = "nixpkgs"; + }; ascii2char = { url = "github:oluceps/nix-ascii2char"; }; diff --git a/hosts/niri.nix b/hosts/niri.nix index 3ba1e902..0342034f 100644 --- a/hosts/niri.nix +++ b/hosts/niri.nix @@ -2,6 +2,7 @@ user, lib, pkgs, + inputs', ... }: { @@ -22,6 +23,117 @@ default_session = initial_session; }; }; + # environment.etc."lemurs/wayland/niri".source = pkgs.writeShellScript "niri-start" '' + # niri-session + # ''; + + # services.lemurs = { + # enable = true; + # package = pkgs.lemurs; + # settings = { + # background = { + # show_background = false; + # style = { + # border_color = "white"; + # color = "black"; + # show_border = true; + # }; + # }; + # cache_path = "/var/cache/lemurs"; + # client_log_path = "/var/log/lemurs.client.log"; + # do_log = true; + # environment_switcher = { + # include_tty_shell = false; + # left_mover = "<"; + # max_display_length = 8; + # mover_color = "dark gray"; + # mover_color_focused = "orange"; + # mover_margin = 1; + # mover_modifiers = ""; + # mover_modifiers_focused = "bold"; + # neighbour_color = "dark gray"; + # neighbour_color_focused = "gray"; + # neighbour_margin = 1; + # neighbour_modifiers = ""; + # neighbour_modifiers_focused = ""; + # no_envs_color = "white"; + # no_envs_color_focused = "red"; + # no_envs_modifiers = ""; + # no_envs_modifiers_focused = ""; + # no_envs_text = "No environments..."; + # remember = true; + # right_mover = ">"; + # selected_color = "gray"; + # selected_color_focused = "white"; + # selected_modifiers = "underlined"; + # selected_modifiers_focused = "bold"; + # show_movers = true; + # show_neighbours = true; + # switcher_visibility = "visible"; + # toggle_hint = "Switcher %key%"; + # toggle_hint_color = "dark gray"; + # toggle_hint_modifiers = ""; + # }; + # focus_behaviour = "default"; + # main_log_path = "/var/log/lemurs.log"; + # pam_service = "lemurs"; + # password_field = { + # content_replacement_character = "*"; + # style = { + # border_color = "white"; + # border_color_focused = "orange"; + # content_color = "white"; + # content_color_focused = "orange"; + # max_width = 48; + # show_border = true; + # show_title = true; + # title = "Password"; + # title_color = "white"; + # title_color_focused = "orange"; + # use_max_width = true; + # }; + # }; + # power_controls = { + # base_entries = [ + # { + # cmd = "systemctl poweroff -l"; + # hint = "Shutdown"; + # hint_color = "dark gray"; + # hint_modifiers = ""; + # key = "F1"; + # } + # { + # cmd = "systemctl reboot -l"; + # hint = "Reboot"; + # hint_color = "dark gray"; + # hint_modifiers = ""; + # key = "F2"; + # } + # ]; + # entries = [ ]; + # hint_margin = 2; + # }; + # shell_login_flag = "short"; + # system_shell = "/bin/sh"; + # tty = 2; + # username_field = { + # remember = true; + # style = { + # border_color = "white"; + # border_color_focused = "orange"; + # content_color = "white"; + # content_color_focused = "orange"; + # max_width = 48; + # show_border = true; + # show_title = true; + # title = "Login"; + # title_color = "white"; + # title_color_focused = "orange"; + # use_max_width = true; + # }; + # }; + # }; + # }; systemd.user = { services = { swaybg = { diff --git a/modules/lemurs.nix b/modules/lemurs.nix new file mode 100644 index 00000000..bf8248d4 --- /dev/null +++ b/modules/lemurs.nix @@ -0,0 +1,152 @@ +# origin https://github.com/NullCub3/lemurs/blob/nixosmodule-dev/nix/lemurs-module.nix +{ + config, + pkgs, + lib, + ... +}: +let + cfg = config.services.lemurs; + settingsFormat = pkgs.formats.toml { }; + inherit (config.services.displayManager) sessionData; + + inherit (lib) + mkDefault + mkEnableOption + mkOption + mkPackageOption + ; +in +{ + options.services.lemurs = { + enable = mkEnableOption "the Lemurs Display Manager"; + package = mkPackageOption pkgs "lemurs" { }; + settings = mkOption { + default = { }; + type = lib.types.submodule { + freeformType = settingsFormat.type; + options = { + tty = lib.mkOption { + type = lib.types.int; + default = 2; + defaultText = lib.literalExpression "2"; + description = '' + The tty which contains lemurs. This has to be mirrored in the lemurs.service + ''; + }; + cache_path = lib.mkOption { + type = lib.types.str; + default = "/var/cache/lemurs"; + defaultText = lib.literalExpression "/var/cache/lemurs"; + description = '' + cache + ''; + }; + wayland = { + scripts_path = lib.mkOption { + type = lib.types.str; + default = "/etc/lemurs/wayland"; + defaultText = lib.literalExpression "/etc/lemurs/wayland"; + description = '' + Path to the directory where the startup scripts for the Wayland sessions are + found + ''; + }; + wayland_sessions_path = lib.mkOption { + type = lib.types.str; + default = "${sessionData.desktops.outPath}/share/wayland-sessions"; + defaultText = lib.literalExpression "/etc/lemurs/wayland"; + description = '' + Path to the directory where the startup scripts for the Wayland sessions are + found + ''; + }; + # x11 etc no needed to me + }; + }; + }; + }; + }; + + config = + let + tty = "tty${toString (cfg.settings.tty)}"; + in + lib.mkIf cfg.enable { + systemd.tmpfiles.rules = [ + "d '${cfg.settings.cache_path}' - - - - -" + ]; + + security.pam.services = { + lemurs.text = '' + auth include login + account include login + session include login + password include login + ''; + + # See https://github.com/coastalwhite/lemurs/issues/166 + login = { + setLoginUid = false; + enableGnomeKeyring = config.services.gnome.gnome-keyring.enable; + }; + }; + + environment.sessionVariables = { + XDG_SEAT = "seat0"; + XDG_VTNR = toString tty; + }; + + services.displayManager = { + enable = mkDefault true; + }; + + environment.etc."lemurs/config.toml".source = (settingsFormat.generate "lemurs.toml" cfg.settings); + systemd = { + defaultUnit = "graphical.target"; + services = { + "autovt@${tty}".enable = false; + + lemurs = { + aliases = [ "display-manager.service" ]; + + unitConfig = { + Wants = [ + "systemd-user-sessions.service" + ]; + + After = [ + "systemd-user-sessions.service" + "plymouth-quit-wait.service" + "getty@${tty}.service" + ]; + + Conflicts = [ + "getty@${tty}.service" + ]; + }; + + serviceConfig = { + ExecStart = + let + args = lib.cli.toGNUCommandLineShell { } { + wlsessions = cfg.settings.wayland.wayland_sessions_path; + }; + in + "${cfg.package}/bin/lemurs ${args}"; + + StandardInput = "tty"; + TTYPath = "/dev/${tty}"; + TTYReset = "yes"; + TTYVHangup = "yes"; + Type = "idle"; + }; + + restartIfChanged = false; + wantedBy = [ "graphical.target" ]; + }; + }; + }; + + }; +} diff --git a/pkgs/by-name/lemurs.nix b/pkgs/by-name/lemurs.nix new file mode 100644 index 00000000..96fe9957 --- /dev/null +++ b/pkgs/by-name/lemurs.nix @@ -0,0 +1,29 @@ +{ + pam, + fenix, + fetchFromGitHub, + makeRustPlatform, + ... +}: +let + inherit (fenix.minimal) toolchain; +in +(makeRustPlatform { + cargo = toolchain; + rustc = toolchain; +}).buildRustPackage + { + name = "lemurs"; + version = "0.3.2-patch"; + src = fetchFromGitHub { + owner = "coastalwhite"; + repo = "lemurs"; + rev = "1d4be7d0c3f528a0c1e9326ac77f1e8a17161c83"; + hash = "sha256-t/riJpgy0bD5CU8Zkzket4Gks2JXXSLRreMlrxlok0c="; + }; + cargoHash = "sha256-NlcILzwY3x4LJW4BcmD0YyxJHez/UBq6U6J3iZuj1I0="; + + buildInputs = [ + pam + ]; + } diff --git a/repack/calibre.nix b/repack/calibre.nix index 899d2157..74b1db4a 100644 --- a/repack/calibre.nix +++ b/repack/calibre.nix @@ -16,10 +16,10 @@ reIf { userDb = "/var/lib/calibre-server/users.sqlite"; }; }; - calibre-web = { - enable = true; - group = "calibre"; - options.calibreLibrary = "/var/lib/calibre-server"; - }; + # calibre-web = { + # enable = true; + # group = "calibre"; + # options.calibreLibrary = "/var/lib/calibre-server"; + # }; }; }