mirror of
https://github.com/nmasur/dotfiles
synced 2024-12-05 02:29:08 +00:00
Compare commits
2 Commits
e6644ab7b9
...
96caba63c4
Author | SHA1 | Date | |
---|---|---|---|
|
96caba63c4 | ||
|
01cd6151c1 |
@ -362,14 +362,14 @@
|
|||||||
"nextcloud-snappymail": {
|
"nextcloud-snappymail": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723347706,
|
"lastModified": 1724017617,
|
||||||
"narHash": "sha256-HlqO7xlMSRGgBtwi0t5oz5v7iw0zTSHysc9wGVRwGZI=",
|
"narHash": "sha256-WwCRAZzxYWUpOy6iVTDpVIr/DrkJkQGjgIdVWNfCH3Q=",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://snappymail.eu/repository/nextcloud/snappymail-2.36.4-nextcloud.tar.gz"
|
"url": "https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://snappymail.eu/repository/nextcloud/snappymail-2.36.4-nextcloud.tar.gz"
|
"url": "https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nix2vim": {
|
"nix2vim": {
|
||||||
|
@ -211,7 +211,7 @@
|
|||||||
nextcloud-snappymail = {
|
nextcloud-snappymail = {
|
||||||
# https://github.com/the-djmaze/snappymail/releases
|
# https://github.com/the-djmaze/snappymail/releases
|
||||||
# https://snappymail.eu/repository/nextcloud
|
# https://snappymail.eu/repository/nextcloud
|
||||||
url = "https://snappymail.eu/repository/nextcloud/snappymail-2.36.4-nextcloud.tar.gz";
|
url = "https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz";
|
||||||
# url = "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.3/snappymail-2.36.3-nextcloud.tar.gz";
|
# url = "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.3/snappymail-2.36.3-nextcloud.tar.gz";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
@ -259,7 +259,6 @@
|
|||||||
inputs.nur.overlay
|
inputs.nur.overlay
|
||||||
inputs.nix2vim.overlay
|
inputs.nix2vim.overlay
|
||||||
(import ./overlays/neovim-plugins.nix inputs)
|
(import ./overlays/neovim-plugins.nix inputs)
|
||||||
(import ./overlays/calibre-web.nix)
|
|
||||||
(import ./overlays/disko.nix inputs)
|
(import ./overlays/disko.nix inputs)
|
||||||
(import ./overlays/tree-sitter.nix inputs)
|
(import ./overlays/tree-sitter.nix inputs)
|
||||||
(import ./overlays/mpv-scripts.nix inputs)
|
(import ./overlays/mpv-scripts.nix inputs)
|
||||||
|
@ -1,27 +0,0 @@
|
|||||||
diff --git a/cps/__init__.py b/cps/__init__.py
|
|
||||||
index f4f8dbf2..7377acdf 100644
|
|
||||||
--- a/cps/__init__.py
|
|
||||||
+++ b/cps/__init__.py
|
|
||||||
@@ -151,7 +151,6 @@ def create_app():
|
|
||||||
|
|
||||||
lm.login_view = 'web.login'
|
|
||||||
lm.anonymous_user = ub.Anonymous
|
|
||||||
- lm.session_protection = 'strong' if config.config_session == 1 else "basic"
|
|
||||||
|
|
||||||
db.CalibreDB.update_config(config)
|
|
||||||
db.CalibreDB.setup_db(config.config_calibre_dir, cli_param.settings_path)
|
|
||||||
diff --git a/cps/admin.py b/cps/admin.py
|
|
||||||
index 045a9523..825a28af 100644
|
|
||||||
--- a/cps/admin.py
|
|
||||||
+++ b/cps/admin.py
|
|
||||||
@@ -102,10 +102,6 @@ def admin_required(f):
|
|
||||||
|
|
||||||
@admi.before_app_request
|
|
||||||
def before_request():
|
|
||||||
- if not ub.check_user_session(current_user.id,
|
|
||||||
- flask_session.get('_id')) and 'opds' not in request.path \
|
|
||||||
- and config.config_session == 1:
|
|
||||||
- logout_user()
|
|
||||||
g.constants = constants
|
|
||||||
g.google_site_verification = os.getenv('GOOGLE_SITE_VERIFICATION', '')
|
|
||||||
g.allow_registration = config.config_public_reg
|
|
@ -1,7 +0,0 @@
|
|||||||
# Fix: https://github.com/janeczku/calibre-web/issues/2422
|
|
||||||
|
|
||||||
_final: prev: {
|
|
||||||
calibre-web = prev.calibre-web.overrideAttrs (old: {
|
|
||||||
patches = (old.patches or [ ]) ++ [ ./calibre-web-cloudflare.patch ];
|
|
||||||
});
|
|
||||||
}
|
|
@ -5,21 +5,25 @@ inputs: _final: prev: {
|
|||||||
url = inputs.nextcloud-news.outPath;
|
url = inputs.nextcloud-news.outPath;
|
||||||
sha256 = inputs.nextcloud-news.narHash;
|
sha256 = inputs.nextcloud-news.narHash;
|
||||||
license = "agpl3Plus";
|
license = "agpl3Plus";
|
||||||
|
unpack = true;
|
||||||
};
|
};
|
||||||
external = prev.fetchNextcloudApp {
|
external = prev.fetchNextcloudApp {
|
||||||
url = inputs.nextcloud-external.outPath;
|
url = inputs.nextcloud-external.outPath;
|
||||||
sha256 = inputs.nextcloud-external.narHash;
|
sha256 = inputs.nextcloud-external.narHash;
|
||||||
license = "agpl3Plus";
|
license = "agpl3Plus";
|
||||||
|
unpack = true;
|
||||||
};
|
};
|
||||||
cookbook = prev.fetchNextcloudApp {
|
cookbook = prev.fetchNextcloudApp {
|
||||||
url = inputs.nextcloud-cookbook.outPath;
|
url = inputs.nextcloud-cookbook.outPath;
|
||||||
sha256 = inputs.nextcloud-cookbook.narHash;
|
sha256 = inputs.nextcloud-cookbook.narHash;
|
||||||
license = "agpl3Plus";
|
license = "agpl3Plus";
|
||||||
|
unpack = true;
|
||||||
};
|
};
|
||||||
snappymail = prev.fetchNextcloudApp {
|
snappymail = prev.fetchNextcloudApp {
|
||||||
url = inputs.nextcloud-snappymail.outPath;
|
url = inputs.nextcloud-snappymail.outPath;
|
||||||
sha256 = inputs.nextcloud-snappymail.narHash;
|
sha256 = inputs.nextcloud-snappymail.narHash;
|
||||||
license = "agpl3Plus";
|
license = "agpl3Plus";
|
||||||
|
unpack = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user