Compare commits
12 commits
main
...
xdg-mime-a
| Author | SHA1 | Date | |
|---|---|---|---|
| ebdb33a546 | |||
| cbb3dcea0f | |||
| eef41f8b8e | |||
| 4c14bf9c7c | |||
| 9f184ce491 | |||
| ef6703a735 | |||
| 1d52067f38 | |||
| 2e4f49aa9f | |||
| 130f1853a0 | |||
| 6cb5fe9893 | |||
| b283d6eed3 | |||
| 930d5a2a81 |
28 changed files with 550 additions and 141 deletions
68
flake.lock
generated
68
flake.lock
generated
|
|
@ -14,11 +14,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762618334,
|
||||
"narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
|
||||
"lastModified": 1754433428,
|
||||
"narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
|
||||
"owner": "ryantm",
|
||||
"repo": "agenix",
|
||||
"rev": "fcdea223397448d35d9b31f798479227e80183f6",
|
||||
"rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -53,11 +53,11 @@
|
|||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1761588595,
|
||||
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
|
||||
"lastModified": 1747046372,
|
||||
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
|
||||
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -73,11 +73,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763759067,
|
||||
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
|
||||
"lastModified": 1756770412,
|
||||
"narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
|
||||
"rev": "4524271976b625a4a605beefd893f270620fd751",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -117,11 +117,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763988335,
|
||||
"narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=",
|
||||
"lastModified": 1757588530,
|
||||
"narHash": "sha256-tJ7A8mID3ct69n9WCvZ3PzIIl3rXTdptn/lZmqSS95U=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce",
|
||||
"rev": "b084b2c2b6bc23e83bbfe583b03664eb0b18c411",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -159,11 +159,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764361670,
|
||||
"narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=",
|
||||
"lastModified": 1757578556,
|
||||
"narHash": "sha256-w1PGkTGow5XzsjccV364No46rkuGxTqo7m/4cfhnkIk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6",
|
||||
"rev": "b7112b12ea5b8c3aa6af344498ed9ca27dd03ba3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -175,11 +175,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1764242076,
|
||||
"narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
|
||||
"lastModified": 1757487488,
|
||||
"narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
|
||||
"rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -196,19 +196,20 @@
|
|||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
],
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764449851,
|
||||
"narHash": "sha256-VnodC1+3KML8MYLLnK84E6U2Fz4ioNacOeQd1pMCSTw=",
|
||||
"lastModified": 1753980880,
|
||||
"narHash": "sha256-aj1pbYxL6N+XFqBHjB4B1QP0bnKRcg1AfpgT5zUFsW8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "b1781c0aa8935d8d1f35d228bcc7127fcebcd363",
|
||||
"rev": "16db3e61da7606984a05b4dfc33cd1d26d22fb22",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "main",
|
||||
"ref": "master",
|
||||
"repo": "NUR",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -240,6 +241,27 @@
|
|||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nur",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733222881,
|
||||
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@
|
|||
type = "github";
|
||||
owner = "nix-community";
|
||||
repo = "NUR";
|
||||
ref = "main";
|
||||
ref = "master";
|
||||
inputs = {
|
||||
flake-parts.follows = "flake-parts";
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ self, lib, ... }:
|
||||
{ self, ... }:
|
||||
let
|
||||
default-overlays = import "${self}/overlays";
|
||||
|
||||
|
|
@ -8,7 +8,7 @@ let
|
|||
|
||||
# Expose my custom packages
|
||||
pkgs = _final: prev: {
|
||||
ambroisie = lib.recurseIntoAttrs (import "${self}/pkgs" { pkgs = prev; });
|
||||
ambroisie = prev.recurseIntoAttrs (import "${self}/pkgs" { pkgs = prev; });
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -38,6 +38,14 @@
|
|||
};
|
||||
};
|
||||
|
||||
xdg = {
|
||||
mime-apps = {
|
||||
applications = {
|
||||
browser = "garcon_host_browser.desktop";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
zsh = {
|
||||
notify = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -83,9 +83,18 @@ in
|
|||
"servarr/autobrr/session-secret.age".publicKeys = all;
|
||||
"servarr/cross-seed/configuration.json.age".publicKeys = all;
|
||||
|
||||
"sso/auth-key.age".publicKeys = all;
|
||||
"sso/ambroisie/password-hash.age".publicKeys = all;
|
||||
"sso/ambroisie/totp-secret.age".publicKeys = all;
|
||||
"sso/auth-key.age" = {
|
||||
owner = "nginx-sso";
|
||||
publicKeys = all;
|
||||
};
|
||||
"sso/ambroisie/password-hash.age" = {
|
||||
owner = "nginx-sso";
|
||||
publicKeys = all;
|
||||
};
|
||||
"sso/ambroisie/totp-secret.age" = {
|
||||
owner = "nginx-sso";
|
||||
publicKeys = all;
|
||||
};
|
||||
|
||||
"tandoor-recipes/secret-key.age".publicKeys = all;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
let
|
||||
cfg = config.my.home.delta;
|
||||
|
||||
configFormat = pkgs.formats.gitIni { };
|
||||
configPath = "${config.xdg.configHome}/delta/config";
|
||||
in
|
||||
{
|
||||
options.my.home.delta = with lib; {
|
||||
|
|
@ -14,14 +17,28 @@ in
|
|||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
programs.delta = {
|
||||
enable = true;
|
||||
assertions = [
|
||||
{
|
||||
# For its configuration
|
||||
assertion = cfg.enable -> cfg.git.enable;
|
||||
message = ''
|
||||
`config.my.home.delta` must enable `config.my.home.delta.git` to be
|
||||
properly configured.
|
||||
'';
|
||||
}
|
||||
{
|
||||
assertion = cfg.enable -> config.programs.git.enable;
|
||||
message = ''
|
||||
`config.my.home.delta` relies on `config.programs.git` to be
|
||||
enabled.
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
inherit (cfg) package;
|
||||
home.packages = [ cfg.package ];
|
||||
|
||||
enableGitIntegration = cfg.git.enable;
|
||||
|
||||
options = {
|
||||
xdg.configFile."delta/config".source = configFormat.generate "delta-config" {
|
||||
delta = {
|
||||
features = "diff-highlight decorations";
|
||||
|
||||
# Less jarring style for `diff-highlight` emulation
|
||||
|
|
@ -45,5 +62,18 @@ in
|
|||
};
|
||||
};
|
||||
};
|
||||
|
||||
programs.git = lib.mkIf cfg.git.enable {
|
||||
delta = {
|
||||
enable = true;
|
||||
inherit (cfg) package;
|
||||
};
|
||||
|
||||
includes = [
|
||||
{
|
||||
path = configPath;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.my.home.discord;
|
||||
|
||||
jsonFormat = pkgs.formats.json { };
|
||||
in
|
||||
{
|
||||
options.my.home.discord = with lib; {
|
||||
|
|
@ -10,15 +12,14 @@ in
|
|||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
programs.discord = {
|
||||
enable = true;
|
||||
home.packages = with pkgs; [
|
||||
cfg.package
|
||||
];
|
||||
|
||||
inherit (cfg) package;
|
||||
|
||||
settings = {
|
||||
xdg.configFile."discord/settings.json".source =
|
||||
jsonFormat.generate "discord.json" {
|
||||
# Do not keep me from using the app just to force an update
|
||||
SKIP_HOST_UPDATE = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,4 +10,11 @@ in
|
|||
config.programs.feh = lib.mkIf cfg.enable {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
config.my.home.xdg.mime-apps = lib.mkIf cfg.enable {
|
||||
applications.media.image = {
|
||||
bitmap = [ "feh.desktop" ];
|
||||
vector = [ "feh.desktop" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -79,4 +79,8 @@ in
|
|||
};
|
||||
};
|
||||
};
|
||||
|
||||
config.my.home.xdg.mime-apps = lib.mkIf cfg.enable {
|
||||
applications.editor = [ "firefox.desktop" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,31 +21,29 @@ in
|
|||
config.programs.git = lib.mkIf cfg.enable {
|
||||
enable = true;
|
||||
|
||||
# Who am I?
|
||||
userEmail = mkMailAddress "bruno" "belanyi.fr";
|
||||
userName = "Bruno BELANYI";
|
||||
|
||||
inherit (cfg) package;
|
||||
|
||||
aliases = {
|
||||
git = "!git";
|
||||
lol = "log --graph --decorate --pretty=oneline --abbrev-commit --topo-order";
|
||||
lola = "lol --all";
|
||||
assume = "update-index --assume-unchanged";
|
||||
unassume = "update-index --no-assume-unchanged";
|
||||
assumed = "!git ls-files -v | grep ^h | cut -c 3-";
|
||||
pick = "log -p -G";
|
||||
push-new = "!git push -u origin "
|
||||
+ ''"$(git branch | grep '^* ' | cut -f2- -d' ')"'';
|
||||
root = "git rev-parse --show-toplevel";
|
||||
};
|
||||
|
||||
lfs.enable = true;
|
||||
|
||||
# There's more
|
||||
settings = {
|
||||
# Who am I?
|
||||
user = {
|
||||
email = mkMailAddress "bruno" "belanyi.fr";
|
||||
name = "Bruno BELANYI";
|
||||
};
|
||||
|
||||
alias = {
|
||||
git = "!git";
|
||||
lol = "log --graph --decorate --pretty=oneline --abbrev-commit --topo-order";
|
||||
lola = "lol --all";
|
||||
assume = "update-index --assume-unchanged";
|
||||
unassume = "update-index --no-assume-unchanged";
|
||||
assumed = "!git ls-files -v | grep ^h | cut -c 3-";
|
||||
pick = "log -p -G";
|
||||
push-new = "!git push -u origin "
|
||||
+ ''"$(git branch | grep '^* ' | cut -f2- -d' ')"'';
|
||||
root = "git rev-parse --show-toplevel";
|
||||
};
|
||||
|
||||
extraConfig = {
|
||||
# Makes it a bit more readable
|
||||
blame = {
|
||||
coloring = "repeatedLines";
|
||||
|
|
|
|||
|
|
@ -20,4 +20,8 @@ in
|
|||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config.my.home.xdg.mime-apps = lib.mkIf cfg.enable {
|
||||
applications.editor = [ "himalaya.desktop" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,5 +17,12 @@ in
|
|||
pkgs.mpvScripts.uosc # Nicer UI
|
||||
];
|
||||
};
|
||||
|
||||
my.home.xdg.mime-apps = {
|
||||
applications.media = {
|
||||
audio = [ "mpv.desktop" ];
|
||||
video = [ "mpv.desktop" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,5 +48,9 @@ in
|
|||
};
|
||||
};
|
||||
};
|
||||
|
||||
my.home.xdg.mime-apps = {
|
||||
applications.terminal = [ "Alacritty.desktop" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,5 +49,9 @@ in
|
|||
color15 = ${whiteBold}
|
||||
'';
|
||||
};
|
||||
|
||||
my.home.xdg.mime-apps = {
|
||||
applications.terminal = [ "termite.desktop" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,5 +13,9 @@ in
|
|||
home.packages = with pkgs; [
|
||||
cfg.package
|
||||
];
|
||||
|
||||
my.home.xdg.mime-apps = {
|
||||
applications.torrent = "TrguiNG.desktop";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -104,4 +104,8 @@ in
|
|||
};
|
||||
|
||||
config.xdg.configFile = lib.mkIf cfg.enable configFiles;
|
||||
|
||||
config.my.home.xdg.mime-apps = lib.mkIf cfg.enable {
|
||||
applications.editor = [ "nvim.desktop" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
7
modules/home/vim/ftdetect/glsl.lua
Normal file
7
modules/home/vim/ftdetect/glsl.lua
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
-- Use GLSL filetype for common shader file extensions
|
||||
vim.filetype.add({
|
||||
extension = {
|
||||
frag = "glsl",
|
||||
vert = "glsl",
|
||||
},
|
||||
})
|
||||
|
|
@ -81,6 +81,9 @@ set updatetime=250
|
|||
" Disable all mouse integrations
|
||||
set mouse=
|
||||
|
||||
" Set dark mode by default
|
||||
set background=dark
|
||||
|
||||
" Setup some overrides for gruvbox
|
||||
lua << EOF
|
||||
local gruvbox = require("gruvbox")
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
local lspconfig = require("lspconfig")
|
||||
local lsp = require("ambroisie.lsp")
|
||||
local utils = require("ambroisie.utils")
|
||||
|
||||
|
|
@ -24,27 +25,59 @@ vim.diagnostic.config({
|
|||
-- Inform servers we are able to do completion, snippets, etc...
|
||||
local capabilities = require("cmp_nvim_lsp").default_capabilities()
|
||||
|
||||
-- Shared configuration
|
||||
vim.lsp.config("*", {
|
||||
capabilities = capabilities,
|
||||
on_attach = lsp.on_attach,
|
||||
})
|
||||
-- C/C++
|
||||
if utils.is_executable("clangd") then
|
||||
lspconfig.clangd.setup({
|
||||
capabilities = capabilities,
|
||||
on_attach = lsp.on_attach,
|
||||
})
|
||||
end
|
||||
|
||||
local servers = {
|
||||
-- C/C++
|
||||
clangd = {},
|
||||
-- Haskell
|
||||
hls = {},
|
||||
-- Nix
|
||||
nil_ls = {},
|
||||
-- Python
|
||||
pyright = {},
|
||||
ruff = {},
|
||||
-- Rust
|
||||
rust_analyzer = {},
|
||||
-- Shell
|
||||
bashls = {
|
||||
-- Haskell
|
||||
if utils.is_executable("haskell-language-server-wrapper") then
|
||||
lspconfig.hls.setup({
|
||||
capabilities = capabilities,
|
||||
on_attach = lsp.on_attach,
|
||||
})
|
||||
end
|
||||
|
||||
-- Nix
|
||||
if utils.is_executable("nil") then
|
||||
lspconfig.nil_ls.setup({
|
||||
capabilities = capabilities,
|
||||
on_attach = lsp.on_attach,
|
||||
})
|
||||
end
|
||||
|
||||
-- Python
|
||||
if utils.is_executable("pyright") then
|
||||
lspconfig.pyright.setup({
|
||||
capabilities = capabilities,
|
||||
on_attach = lsp.on_attach,
|
||||
})
|
||||
end
|
||||
|
||||
if utils.is_executable("ruff") then
|
||||
lspconfig.ruff.setup({
|
||||
capabilities = capabilities,
|
||||
on_attach = lsp.on_attach,
|
||||
})
|
||||
end
|
||||
|
||||
-- Rust
|
||||
if utils.is_executable("rust-analyzer") then
|
||||
lspconfig.rust_analyzer.setup({
|
||||
capabilities = capabilities,
|
||||
on_attach = lsp.on_attach,
|
||||
})
|
||||
end
|
||||
|
||||
-- Shell
|
||||
if utils.is_executable("bash-language-server") then
|
||||
lspconfig.bashls.setup({
|
||||
filetypes = { "bash", "sh", "zsh" },
|
||||
capabilities = capabilities,
|
||||
on_attach = lsp.on_attach,
|
||||
settings = {
|
||||
bashIde = {
|
||||
shfmt = {
|
||||
|
|
@ -55,17 +88,28 @@ local servers = {
|
|||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
-- Starlark
|
||||
starpls = {},
|
||||
-- Generic
|
||||
harper_ls = {},
|
||||
typos_lsp = {},
|
||||
}
|
||||
|
||||
for server, config in pairs(servers) do
|
||||
if not vim.tbl_isempty(config) then
|
||||
vim.lsp.config(server, config)
|
||||
end
|
||||
vim.lsp.enable(server)
|
||||
})
|
||||
end
|
||||
|
||||
-- Starlark
|
||||
if utils.is_executable("starpls") then
|
||||
lspconfig.starpls.setup({
|
||||
capabilities = capabilities,
|
||||
on_attach = lsp.on_attach,
|
||||
})
|
||||
end
|
||||
|
||||
-- Generic
|
||||
if utils.is_executable("harper-ls") then
|
||||
lspconfig.harper_ls.setup({
|
||||
capabilities = capabilities,
|
||||
on_attach = lsp.on_attach,
|
||||
})
|
||||
end
|
||||
|
||||
if utils.is_executable("typos-lsp") then
|
||||
lspconfig.typos_lsp.setup({
|
||||
capabilities = capabilities,
|
||||
on_attach = lsp.on_attach,
|
||||
})
|
||||
end
|
||||
|
|
|
|||
|
|
@ -3,6 +3,10 @@ let
|
|||
cfg = config.my.home.xdg;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
./mime-apps.nix
|
||||
];
|
||||
|
||||
options.my.home.xdg = with lib; {
|
||||
enable = my.mkDisableOption "XDG configuration";
|
||||
};
|
||||
|
|
|
|||
280
modules/home/xdg/mime-apps.nix
Normal file
280
modules/home/xdg/mime-apps.nix
Normal file
|
|
@ -0,0 +1,280 @@
|
|||
{ config, lib, ... }:
|
||||
let
|
||||
cfg = config.my.home.xdg.mime-apps;
|
||||
app = cfg.applications;
|
||||
|
||||
strOrStrList = with lib.types; coercedTo str lib.singleton (listOf str);
|
||||
mkMimeAppOption = kind: lib.mkOption {
|
||||
description = "Application to associate as ${kind}";
|
||||
default = null;
|
||||
type = lib.types.nullOr strOrStrList;
|
||||
};
|
||||
in
|
||||
{
|
||||
options.my.home.xdg.mime-apps = with lib; {
|
||||
enable = my.mkDisableOption "XDG MIME Applications configuration";
|
||||
|
||||
applications = lib.mapAttrsRecursive (_: mkMimeAppOption) {
|
||||
archive = "archive manager";
|
||||
browser = "internet browser";
|
||||
calendar = "calendar";
|
||||
editor = "text editor";
|
||||
fileManager = "file manager";
|
||||
mail = "mail client";
|
||||
media = {
|
||||
audio = "audio player";
|
||||
document = {
|
||||
comic = "comic book reader";
|
||||
ebook = "ebook reader";
|
||||
pdf = "PDF reader";
|
||||
};
|
||||
image = {
|
||||
bitmap = "bitmap image viewer";
|
||||
vector = "vector image viewer";
|
||||
editor = "image editor";
|
||||
};
|
||||
video = "video player";
|
||||
};
|
||||
office = {
|
||||
database = "database management program";
|
||||
formula = "formula editor";
|
||||
graphics = "graphics editor";
|
||||
presentation = "presentation editor";
|
||||
spreadsheet = "spreadsheet editor";
|
||||
text = "word processor";
|
||||
};
|
||||
terminal = "terminal";
|
||||
torrent = "bittorrent client";
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
xdg = {
|
||||
mimeApps = {
|
||||
enable = true;
|
||||
defaultApplications = lib.filterAttrs (_: apps: apps != null) {
|
||||
"application/epub+zip" = app.media.document.ebook;
|
||||
"application/gzip" = app.archive;
|
||||
"application/json" = app.editor;
|
||||
"application/ld+json" = app.editor;
|
||||
"application/mxf " = app.media.video;
|
||||
"application/ogg" = app.media.audio;
|
||||
"application/pdf" = app.media.document.pdf;
|
||||
"application/rss+xml" = app.editor;
|
||||
"application/smil+xml " = app.media.video;
|
||||
"application/vnd.amazon.ebook" = app.media.document.ebook;
|
||||
"application/vnd.apple.mpegurl " = app.media.video;
|
||||
"application/vnd.comicbook+zip" = app.media.document.comic;
|
||||
"application/vnd.comicbook-rar" = app.media.document.comic;
|
||||
"application/vnd.mozilla.xul+xml" = app.browser;
|
||||
"application/vnd.ms-excel" = app.office.spreadsheet;
|
||||
"application/vnd.ms-powerpoint" = app.office.presentation;
|
||||
"application/vnd.ms-word" = app.office.text;
|
||||
"application/vnd.oasis.opendocument.database" = app.office.database;
|
||||
"application/vnd.oasis.opendocument.formula" = app.office.formula;
|
||||
"application/vnd.oasis.opendocument.graphics" = app.office.graphics;
|
||||
"application/vnd.oasis.opendocument.graphics-template" = app.office.graphics;
|
||||
"application/vnd.oasis.opendocument.presentation" = app.office.presentation;
|
||||
"application/vnd.oasis.opendocument.presentation-template" = app.office.presentation;
|
||||
"application/vnd.oasis.opendocument.spreadsheet" = app.office.spreadsheet;
|
||||
"application/vnd.oasis.opendocument.spreadsheet-template" = app.office.spreadsheet;
|
||||
"application/vnd.oasis.opendocument.text" = app.office.text;
|
||||
"application/vnd.oasis.opendocument.text-master" = app.office.text;
|
||||
"application/vnd.oasis.opendocument.text-template" = app.office.text;
|
||||
"application/vnd.oasis.opendocument.text-web" = app.office.text;
|
||||
"application/vnd.openxmlformats-officedocument.presentationml.presentation" = app.office.presentation;
|
||||
"application/vnd.openxmlformats-officedocument.presentationml.template" = app.office.presentation;
|
||||
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" = app.office.spreadsheet;
|
||||
"application/vnd.openxmlformats-officedocument.spreadsheetml.template" = app.office.spreadsheet;
|
||||
"application/vnd.openxmlformats-officedocument.wordprocessingml.document" = app.office.text;
|
||||
"application/vnd.openxmlformats-officedocument.wordprocessingml.template" = app.office.text;
|
||||
"application/vnd.rar" = app.archive;
|
||||
"application/vnd.stardivision.calc" = app.office.spreadsheet;
|
||||
"application/vnd.stardivision.draw" = app.office.graphics;
|
||||
"application/vnd.stardivision.impress" = app.office.presentation;
|
||||
"application/vnd.stardivision.math" = app.office.formula;
|
||||
"application/vnd.stardivision.writer" = app.office.text;
|
||||
"application/vnd.sun.xml.base" = app.office.database;
|
||||
"application/vnd.sun.xml.calc" = app.office.spreadsheet;
|
||||
"application/vnd.sun.xml.calc.template" = app.office.spreadsheet;
|
||||
"application/vnd.sun.xml.draw" = app.office.graphics;
|
||||
"application/vnd.sun.xml.draw.template" = app.office.graphics;
|
||||
"application/vnd.sun.xml.impress" = app.office.presentation;
|
||||
"application/vnd.sun.xml.impress.template" = app.office.presentation;
|
||||
"application/vnd.sun.xml.math" = app.office.formula;
|
||||
"application/vnd.sun.xml.writer" = app.office.text;
|
||||
"application/vnd.sun.xml.writer.global" = app.office.text;
|
||||
"application/vnd.sun.xml.writer.template" = app.office.text;
|
||||
"application/vnd.wordperfect" = app.office.text;
|
||||
"application/x-7z-compressed" = app.archive;
|
||||
"application/x-arj" = app.archive;
|
||||
"application/x-bittorrent" = app.torrent;
|
||||
"application/x-bzip" = app.archive;
|
||||
"application/x-bzip-compressed-tar" = app.archive;
|
||||
"application/x-bzip2" = app.archive;
|
||||
"application/x-cb7" = app.media.document.comic;
|
||||
"application/x-cbr" = app.media.document.comic;
|
||||
"application/x-cbt" = app.media.document.comic;
|
||||
"application/x-cbz" = app.media.document.comic;
|
||||
"application/x-compress" = app.archive;
|
||||
"application/x-compressed-tar" = app.archive;
|
||||
"application/x-csh" = app.editor;
|
||||
"application/x-cue" = app.media.audio;
|
||||
"application/x-directory" = app.fileManager;
|
||||
"application/x-extension-htm" = app.browser;
|
||||
"application/x-extension-html" = app.browser;
|
||||
"application/x-extension-ics" = app.calendar;
|
||||
"application/x-extension-m4a" = app.media.audio;
|
||||
"application/x-extension-mp4" = app.media.video;
|
||||
"application/x-extension-shtml" = app.browser;
|
||||
"application/x-extension-xht" = app.browser;
|
||||
"application/x-extension-xhtml" = app.browser;
|
||||
"application/x-fictionbook" = app.media.document.ebook;
|
||||
"application/x-fictionbook+xml" = app.media.document.ebook;
|
||||
"application/x-flac" = app.media.audio;
|
||||
"application/x-gzip" = app.archive;
|
||||
"application/x-lha" = app.archive;
|
||||
"application/x-lhz" = app.archive;
|
||||
"application/x-lzop" = app.archive;
|
||||
"application/x-matroska" = app.media.video;
|
||||
"application/x-netshow-channel" = app.media.video;
|
||||
"application/x-quicktime-media-link" = app.media.video;
|
||||
"application/x-quicktimeplayer" = app.media.video;
|
||||
"application/x-rar" = app.archive;
|
||||
"application/x-sh" = app.editor;
|
||||
"application/x-shellscript" = app.editor;
|
||||
"application/x-shorten " = app.media.audio;
|
||||
"application/x-smil" = app.media.video;
|
||||
"application/x-tar" = app.archive;
|
||||
"application/x-tarz" = app.archive;
|
||||
"application/x-wine-extension-ini" = app.editor;
|
||||
"application/x-zip-compressed" = app.archive;
|
||||
"application/x-zoo" = app.archive;
|
||||
"application/xhtml+xml" = app.browser;
|
||||
"application/xml" = app.editor;
|
||||
"application/zip" = app.archive;
|
||||
"audio/*" = app.media.video;
|
||||
"image/*" = app.media.image.bitmap;
|
||||
"image/svg+xml" = app.media.image.vector;
|
||||
"image/x-compressed-xcf" = app.media.image.editor;
|
||||
"image/x-fits" = app.media.image.editor;
|
||||
"image/x-psd" = app.media.image.editor;
|
||||
"image/x-xcf" = app.media.image.editor;
|
||||
"inode/directory" = app.fileManager;
|
||||
"message/rfc822" = app.mail;
|
||||
"text/*" = app.editor;
|
||||
"text/calendar" = app.calendar;
|
||||
"text/html" = app.browser;
|
||||
"text/plain" = app.editor;
|
||||
"video/*" = app.media.video;
|
||||
"x-scheme-handler/about" = app.browser;
|
||||
"x-scheme-handler/chrome" = app.browser;
|
||||
"x-scheme-handler/file" = app.fileManager;
|
||||
"x-scheme-handler/ftp" = app.browser;
|
||||
"x-scheme-handler/http" = app.browser;
|
||||
"x-scheme-handler/https" = app.browser;
|
||||
"x-scheme-handler/mailto" = app.mail;
|
||||
"x-scheme-handler/mid" = app.mail;
|
||||
"x-scheme-handler/terminal" = app.terminal;
|
||||
"x-scheme-handler/unknown" = app.browser;
|
||||
"x-scheme-handler/webcal" = app.calendar;
|
||||
"x-scheme-handler/webcals" = app.calendar;
|
||||
"x-www-browser" = app.browser;
|
||||
|
||||
# FIXME: relevant? https://bbs.archlinux.org/viewtopic.php?id=243125
|
||||
|
||||
# FIXME: shouldn't be necessary then
|
||||
# "audio/AMR" = app.media.audio;
|
||||
# "audio/aac" = app.media.audio;
|
||||
# "audio/ac3" = app.media.audio;
|
||||
# "audio/flac" = app.media.audio;
|
||||
# "audio/mp2" = app.media.audio;
|
||||
# "audio/mp4" = app.media.audio;
|
||||
# "audio/mpeg" = app.media.audio;
|
||||
# "audio/ogg" = app.media.audio;
|
||||
# "audio/vnd.dts" = app.media.audio;
|
||||
# "audio/vnd.dts.hd" = app.media.audio;
|
||||
# "audio/vnd.rn-realaudio" = app.media.audio;
|
||||
# "audio/webm" = app.media.audio;
|
||||
# "audio/x-adpcm" = app.media.audio;
|
||||
# "audio/x-aiff" = app.media.audio;
|
||||
# "audio/x-ape" = app.media.audio;
|
||||
# "audio/x-matroska" = app.media.audio;
|
||||
# "audio/x-mpegurl" = app.media.audio;
|
||||
# "audio/x-ms-asx" = app.media.audio;
|
||||
# "audio/x-ms-wma" = app.media.audio;
|
||||
# "audio/x-musepack" = app.media.audio;
|
||||
# "audio/x-scpls" = app.media.audio;
|
||||
# "audio/x-tta" = app.media.audio;
|
||||
# "audio/x-vorbis+ogg" = app.media.audio;
|
||||
# "audio/x-wav" = app.media.audio;
|
||||
# "audio/x-wavpack" = app.media.audio;
|
||||
# "image/bmp" = app.media.image.bitmap;
|
||||
# "image/gif" = app.media.image.bitmap;
|
||||
# "image/heif" = app.media.image.bitmap;
|
||||
# "image/jpeg" = app.media.image.bitmap;
|
||||
# "image/jpg" = app.media.image.bitmap;
|
||||
# "image/pjpeg" = app.media.image.bitmap;
|
||||
# "image/png" = app.media.image.bitmap;
|
||||
# "image/tiff" = app.media.image.bitmap;
|
||||
# "image/vnd.zbrush.pcx" = app.media.image.bitmap;
|
||||
# "image/webp" = app.media.image.bitmap;
|
||||
# "image/x-icb" = app.media.image.bitmap;
|
||||
# "image/x-ico" = app.media.image.bitmap;
|
||||
# "image/x-pcx" = app.media.image.bitmap;
|
||||
# "image/x-portable-anymap" = app.media.image.bitmap;
|
||||
# "image/x-portable-bitmap" = app.media.image.bitmap;
|
||||
# "image/x-portable-graymap" = app.media.image.bitmap;
|
||||
# "image/x-portable-pixmap" = app.media.image.bitmap;
|
||||
# "image/x-tga" = app.media.image.bitmap;
|
||||
# "image/x-xbitmap" = app.media.image.bitmap;
|
||||
# "image/x-xpixmap" = app.media.image.bitmap;
|
||||
# "image/x-xwindowdump" = app.media.image.bitmap;
|
||||
# "text/tcl" = app.editor;
|
||||
# "text/x-c++hdr" = app.editor;
|
||||
# "text/x-c++src" = app.editor;
|
||||
# "text/x-chdr" = app.editor;
|
||||
# "text/x-csrc" = app.editor;
|
||||
# "text/x-java" = app.editor;
|
||||
# "text/x-makefile" = app.editor;
|
||||
# "text/x-moc" = app.editor;
|
||||
# "text/x-pascal" = app.editor;
|
||||
# "text/x-tex" = app.editor;
|
||||
# "video/3gpp" = app.media.video;
|
||||
# "video/3gpp2" = app.media.video;
|
||||
# "video/dv" = app.media.video;
|
||||
# "video/mp2t" = app.media.video;
|
||||
# "video/mp4" = app.media.video;
|
||||
# "video/mpeg" = app.media.video;
|
||||
# "video/ogg" = app.media.video;
|
||||
# "video/quicktime" = app.media.video;
|
||||
# "video/vnd.mpegurl" = app.media.video;
|
||||
# "video/vnd.rn-realvideo" = app.media.video;
|
||||
# "video/webm" = app.media.video;
|
||||
# "video/x-flic" = app.media.video;
|
||||
# "video/x-flv" = app.media.video;
|
||||
# "video/x-matroska" = app.media.video;
|
||||
# "video/x-ms-wmv" = app.media.video;
|
||||
# "video/x-msvideo" = app.media.video;
|
||||
# "video/x-ogm+ogg" = app.media.video;
|
||||
# "video/x-theora+ogg" = app.media.video;
|
||||
|
||||
# FIXME: kind of weird formats, not quite adapted to attribute name
|
||||
# "application/eps" = app.media.document.pdf
|
||||
# "application/oxps" = app.media.document.pdf
|
||||
# "application/postscript" = app.media.document.pdf
|
||||
# "application/x-eps" = app.media.document.pdf
|
||||
# "image/eps" = app.media.document.pdf
|
||||
# "image/vnd.djvu" = app.media.document.pdf
|
||||
# "image/vnd.djvu+multipage" = app.media.document.pdf
|
||||
# "image/x-eps" = app.media.document.pdf
|
||||
|
||||
# FIXME: additionally interesting, but not necessary
|
||||
# "x-scheme-handler/discord" = [ "discord.desktop" ];
|
||||
# "x-scheme-handler/msteams" = [ "teams.desktop" ];
|
||||
# "x-scheme-handler/slack" = [ "slack.desktop" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -17,4 +17,12 @@ in
|
|||
"statusbar-home-tilde" = true;
|
||||
};
|
||||
};
|
||||
|
||||
config.my.home.xdg.mime-apps = lib.mkIf cfg.enable {
|
||||
applications.media.document = {
|
||||
comic = [ "org.pwmt.zathura.desktop" ];
|
||||
ebook = [ "org.pwmt.zathura.desktop" ];
|
||||
pdf = [ "org.pwmt.zathura.desktop" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,10 +8,6 @@ in
|
|||
|
||||
launchTmux = mkEnableOption "auto launch tmux at shell start";
|
||||
|
||||
completionSync = {
|
||||
enable = mkEnableOption "zsh-completion-sync plugin";
|
||||
};
|
||||
|
||||
notify = {
|
||||
enable = mkEnableOption "zsh-done notification";
|
||||
|
||||
|
|
@ -23,7 +19,7 @@ in
|
|||
"direnv reload"
|
||||
"fg"
|
||||
"git (?!push|pull|fetch)"
|
||||
"home-manager (?!switch|build)"
|
||||
"home-manager (?!switch|build|news)"
|
||||
"htop"
|
||||
"less"
|
||||
"man"
|
||||
|
|
@ -72,7 +68,7 @@ in
|
|||
plugins = [
|
||||
{
|
||||
name = "fast-syntax-highlighting";
|
||||
file = "share/zsh/plugins/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh";
|
||||
file = "share/zsh/site-functions/fast-syntax-highlighting.plugin.zsh";
|
||||
src = pkgs.zsh-fast-syntax-highlighting;
|
||||
}
|
||||
{
|
||||
|
|
@ -122,18 +118,6 @@ in
|
|||
};
|
||||
}
|
||||
|
||||
(lib.mkIf cfg.completionSync.enable {
|
||||
programs.zsh = {
|
||||
plugins = [
|
||||
{
|
||||
name = "zsh-completion-sync";
|
||||
file = "share/zsh-completion-sync/zsh-completion-sync.plugin.zsh";
|
||||
src = pkgs.zsh-completion-sync;
|
||||
}
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
(lib.mkIf cfg.notify.enable {
|
||||
programs.zsh = {
|
||||
plugins = [
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ in
|
|||
|
||||
my.services.backup = {
|
||||
paths = [
|
||||
(lib.removePrefix "file://" config.services.homebox.settings.HBOX_STORAGE_CONN_STRING)
|
||||
config.services.homebox.settings.HBOX_STORAGE_DATA
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ in
|
|||
BASE_URL = "https://mealie.${config.networking.domain}";
|
||||
TZ = config.time.timeZone;
|
||||
ALLOw_SIGNUP = "false";
|
||||
TOKEN_TIME = 24 * 180; # 180 days
|
||||
};
|
||||
|
||||
# Automatic PostgreSQL provisioning
|
||||
|
|
@ -54,12 +53,6 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
my.services.backup = {
|
||||
paths = [
|
||||
"/var/lib/mealie"
|
||||
];
|
||||
};
|
||||
|
||||
services.fail2ban.jails = {
|
||||
mealie = ''
|
||||
enabled = true
|
||||
|
|
|
|||
|
|
@ -16,12 +16,6 @@ in
|
|||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
services.nextcloud = {
|
||||
extraApps = {
|
||||
inherit (config.services.nextcloud.package.packages.apps) richdocuments;
|
||||
};
|
||||
};
|
||||
|
||||
services.collabora-online = {
|
||||
enable = true;
|
||||
inherit (cfg) port;
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ in
|
|||
config = lib.mkIf cfg.enable {
|
||||
services.nextcloud = {
|
||||
enable = true;
|
||||
package = pkgs.nextcloud32;
|
||||
package = pkgs.nextcloud31;
|
||||
hostName = "nextcloud.${config.networking.domain}";
|
||||
home = "/var/lib/nextcloud";
|
||||
maxUploadSize = cfg.maxSize;
|
||||
|
|
@ -62,16 +62,6 @@ in
|
|||
# Allow using the push service without hard-coding my IP in the configuration
|
||||
bendDomainToLocalhost = true;
|
||||
};
|
||||
|
||||
extraApps = {
|
||||
inherit (config.services.nextcloud.package.packages.apps)
|
||||
calendar
|
||||
contacts
|
||||
deck
|
||||
tasks
|
||||
;
|
||||
# notify_push is automatically installed by the module
|
||||
};
|
||||
};
|
||||
|
||||
# The service above configures the domain, no need for my wrapper
|
||||
|
|
|
|||
|
|
@ -71,14 +71,10 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
# Transmission wants to eat *all* my RAM if left to its own devices
|
||||
systemd.services.transmission = {
|
||||
serviceConfig = {
|
||||
# Transmission wants to eat *all* my RAM if left to its own devices
|
||||
MemoryMax = "33%";
|
||||
# Avoid errors due to high number of open files.
|
||||
LimitNOFILE = 1048576;
|
||||
# Longer stop timeout to finish all torrents
|
||||
TimeoutStopSec = "5m";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue