This repository has no description
Merge remote-tracking branch 'origin/master'
author
lassulus
date
(Jun 17, 2025, 9:31 AM CEST)
commit
aa1c5d2b
aa1c5d2b2e23e0634fbe60c8fd6b115c2b96baa3
parent
7d16d4c0
7d16d4c0ad40e5205aae509fc775c4f77e532fd4
+349
-298
+31
-36
flake.nix
+31
-36
flake.nix
···
83
83
"laptop"
84
84
"focus"
85
85
];
86
+
barnacle = {
87
+
machineClass = "darwin";
88
+
tags = [
89
+
"laptop"
90
+
"focus"
91
+
];
92
+
};
86
93
icarus.tags = [ "laptop" ];
87
94
prism.tags = [ "server" ];
88
95
neoprism.tags = [ "server" ];
···
93
100
];
94
101
};
95
102
};
96
-
machines = nixpkgs.lib.mapAttrs (machineName: _: {
97
-
98
-
imports = [
99
-
./machines/${machineName}/physical.nix
103
+
machines =
104
+
nixpkgs.lib.mapAttrs
105
+
(machineName: _: {
106
+
imports = [
107
+
./machines/${machineName}/physical.nix
108
+
];
109
+
})
100
110
(
101
-
{ config, ... }:
102
-
{
103
-
clan.core.facts.secretStore = "password-store";
104
-
clan.core.facts.secretUploadDirectory = nixpkgs.lib.mkDefault "/etc/secrets";
105
-
clan.core.vars.settings.secretStore = "password-store";
106
-
clan.core.networking.targetHost = "root@${machineName}";
107
-
krebs.secret.directory = config.clan.core.facts.secretUploadDirectory;
108
-
nixpkgs.overlays = [
109
-
self.inputs.stockholm.overlays.default
110
-
(import (self.inputs.stockholm.inputs.nix-writers + "/pkgs")) # TODO get rid of that overlay
111
-
];
112
-
}
113
-
)
114
-
./2configs
115
-
./3modules
116
-
self.inputs.stockholm.nixosModules.krebs
117
-
];
118
-
}) (builtins.readDir ./machines);
111
+
nixpkgs.lib.filterAttrs (
112
+
machineName: _: builtins.pathExists ./machines/${machineName}/physical.nix
113
+
) (builtins.readDir ./machines)
114
+
);
119
115
};
120
116
in
121
117
flake-parts.lib.mkFlake { inherit inputs; } {
···
125
121
"aarch64-darwin"
126
122
"x86_64-darwin"
127
123
];
128
-
imports = [
129
-
./formatter.nix
130
-
] ++ (
131
-
# Auto-import all flake-module.nix files from tools subdirectories
132
-
let
133
-
toolDirs = builtins.attrNames (nixpkgs.lib.filterAttrs
134
-
(_: type: type == "directory")
135
-
(builtins.readDir ./tools));
136
-
in
124
+
imports =
125
+
[
126
+
./formatter.nix
127
+
]
128
+
++ (
129
+
# Auto-import all flake-module.nix files from tools subdirectories
130
+
let
131
+
toolDirs = builtins.attrNames (
132
+
nixpkgs.lib.filterAttrs (_: type: type == "directory") (builtins.readDir ./tools)
133
+
);
134
+
in
137
135
map (dir: ./tools + "/${dir}/flake-module.nix") toolDirs
138
-
);
136
+
);
139
137
flake.nixosConfigurations = clan.nixosConfigurations;
140
138
flake.clanInternals = clan.clanInternals;
139
+
flake.darwinConfigurations = clan.darwinConfigurations;
141
140
perSystem =
142
141
{
143
142
lib,
···
175
174
];
176
175
};
177
176
};
178
-
flake.darwinConfigurations.barnacle = inputs.nix-darwin.lib.darwinSystem {
179
-
specialArgs.self = self;
180
-
modules = [ ./darwin/barnacle/config.nix ];
181
-
};
182
177
flake.keys = {
183
178
pgp.yubi = {
184
179
key = ./keys/yubi.pgp;
+5
-1
2configs/container-tests.nix
+5
-1
2configs/container-tests.nix
+26
-2
2configs/default.nix
+26
-2
2configs/default.nix
···
6
6
...
7
7
}:
8
8
{
9
+
# Clan core configuration
10
+
clan.core.facts.secretStore = "password-store";
11
+
clan.core.facts.secretUploadDirectory = lib.mkDefault "/etc/secrets";
12
+
clan.core.vars.settings.secretStore = "password-store";
13
+
clan.core.networking.targetHost = "root@${config.networking.hostName}";
14
+
15
+
# Stockholm configuration
16
+
krebs.secret.directory = config.clan.core.facts.secretUploadDirectory;
17
+
18
+
# Nixpkgs overlays
19
+
nixpkgs.overlays = [
20
+
self.inputs.stockholm.overlays.default
21
+
(import (self.inputs.stockholm.inputs.nix-writers + "/pkgs")) # TODO get rid of that overlay
22
+
];
23
+
9
24
imports = [
25
+
# Import 3modules
26
+
../3modules
27
+
28
+
# Import stockholm krebs module
29
+
self.inputs.stockholm.nixosModules.krebs
30
+
31
+
# Import individual configurations
10
32
./security-workarounds.nix
11
33
# ./binary-cache/client.nix
12
34
./gc.nix
···
22
44
./nether.nix
23
45
./spora.nix
24
46
./nix.nix
47
+
48
+
# Import stockholm modules
25
49
self.inputs.stockholm.nixosModules.users
26
50
self.inputs.stockholm.nixosModules.hosts
27
51
self.inputs.stockholm.nixosModules.kartei
···
40
64
self.inputs.stockholm.nixosModules.xresources
41
65
self.inputs.stockholm.nixosModules.ssh
42
66
self.inputs.stockholm.nixosModules.sync-containers3
43
-
{ # nix-index
67
+
{
68
+
# nix-index
44
69
imports = [
45
70
self.inputs.nix-index-database.nixosModules.nix-index
46
71
];
···
321
346
];
322
347
};
323
348
};
324
-
325
349
326
350
networking.extraHosts = ''
327
351
10.42.0.1 styx.gg23
+2
-4
2configs/exim-smarthost.nix
+2
-4
2configs/exim-smarthost.nix
···
288
288
config.krebs.hosts.mors
289
289
config.krebs.hosts.xerxes
290
290
];
291
-
internet-aliases =
292
-
map (from: { inherit from to; }) mails
293
-
++ [
294
-
];
291
+
internet-aliases = map (from: { inherit from to; }) mails ++ [
292
+
];
295
293
system-aliases = [
296
294
{
297
295
from = "mailer-daemon";
+1
-1
2configs/networkd.nix
+1
-1
2configs/networkd.nix
+14
-16
3modules/klem.nix
+14
-16
3modules/klem.nix
···
67
67
68
68
#run the chosen script
69
69
case $script in
70
-
${
71
-
concatMapStringsSep "\n" (
72
-
script:
73
-
slib.indent ''
74
-
${script.label})
75
-
target=$(${pkgs.xclip}/bin/xclip -selection clipboard -target TARGETS -out \
76
-
| ${pkgs.gnugrep}/bin/grep '${script.target}' \
77
-
| ${pkgs.gnugrep}/bin/grep -v TARGETS \
78
-
| ${pkgs.coreutils}/bin/head -1)
79
-
${pkgs.xclip}/bin/xclip -selection clipboard -target "$target" -out \
80
-
| ${script.script} \
81
-
| ${pkgs.xclip}/bin/xclip -selection clipboard -in
82
-
;;
83
-
''
84
-
) (attrValues cfg)
85
-
}
70
+
${concatMapStringsSep "\n" (
71
+
script:
72
+
slib.indent ''
73
+
${script.label})
74
+
target=$(${pkgs.xclip}/bin/xclip -selection clipboard -target TARGETS -out \
75
+
| ${pkgs.gnugrep}/bin/grep '${script.target}' \
76
+
| ${pkgs.gnugrep}/bin/grep -v TARGETS \
77
+
| ${pkgs.coreutils}/bin/head -1)
78
+
${pkgs.xclip}/bin/xclip -selection clipboard -target "$target" -out \
79
+
| ${script.script} \
80
+
| ${pkgs.xclip}/bin/xclip -selection clipboard -in
81
+
;;
82
+
''
83
+
) (attrValues cfg)}
86
84
esac
87
85
'';
88
86
in
+8
-9
2configs/websites/util.nix
+8
-9
2configs/websites/util.nix
···
4
4
5
5
rec {
6
6
7
-
ssl =
8
-
_domains:
9
-
{
10
-
};
7
+
ssl = _domains: {
8
+
};
11
9
12
10
servePage =
13
11
domains:
···
163
161
include ${pkgs.nginx}/conf/fastcgi.conf;
164
162
'';
165
163
#Directives to send expires headers and turn off 404 error logging.
166
-
locations."~* ^.+\.(xml|ogg|ogv|svg|svgz|eot|otf|woff|mp4|ttf|css|rss|atom|js|jpg|jpeg|gif|png|ico|zip|tgz|gz|rar|bz2|doc|xls|exe|ppt|tar|mid|midi|wav|bmp|rtf)$".extraConfig = ''
167
-
access_log off;
168
-
log_not_found off;
169
-
expires max;
170
-
'';
164
+
locations."~* ^.+\.(xml|ogg|ogv|svg|svgz|eot|otf|woff|mp4|ttf|css|rss|atom|js|jpg|jpeg|gif|png|ico|zip|tgz|gz|rar|bz2|doc|xls|exe|ppt|tar|mid|midi|wav|bmp|rtf)$".extraConfig =
165
+
''
166
+
access_log off;
167
+
log_not_found off;
168
+
expires max;
169
+
'';
171
170
locations."/nb".extraConfig = ''
172
171
index index.html;
173
172
'';
-136
darwin/barnacle/config.nix
-136
darwin/barnacle/config.nix
···
1
-
{ pkgs, self, ... }:
2
-
3
-
{
4
-
imports = [
5
-
# ./rosetta.nix
6
-
self.inputs.nix-index-database.darwinModules.nix-index
7
-
];
8
-
programs.nix-index-database.comma.enable = true;
9
-
10
-
nixpkgs.hostPlatform = "aarch64-darwin";
11
-
environment.systemPackages = [
12
-
self.packages.${pkgs.system}.nvim
13
-
self.packages.${pkgs.system}.pass
14
-
self.packages.${pkgs.system}.passmenu
15
-
16
-
# zsh dependencies
17
-
pkgs.fzf
18
-
pkgs.atuin
19
-
20
-
pkgs.gnupg
21
-
pkgs.pinentry_mac
22
-
pkgs.lazygit
23
-
pkgs.sshuttle
24
-
pkgs.git
25
-
pkgs.element-desktop
26
-
pkgs.iterm2
27
-
(pkgs.firefox-devedition-bin-unwrapped.overrideAttrs (o: {
28
-
meta = o.meta // {
29
-
license = pkgs.lib.licenses.free;
30
-
};
31
-
}))
32
-
pkgs.ripgrep
33
-
pkgs.alt-tab-macos
34
-
pkgs.zed-editor
35
-
pkgs.nixd
36
-
pkgs.nil
37
-
];
38
-
39
-
# Use a custom configuration.nix location.
40
-
# $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
41
-
# environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix";
42
-
43
-
nix = {
44
-
package = pkgs.nix;
45
-
settings = {
46
-
extra-experimental-features = [
47
-
"nix-command"
48
-
"flakes"
49
-
];
50
-
};
51
-
};
52
-
53
-
# homebrew = {
54
-
# enable = true;
55
-
# casks = [
56
-
# "gpg-suite"
57
-
# ];
58
-
# };
59
-
60
-
# keyboard settings
61
-
system.keyboard = {
62
-
enableKeyMapping = true;
63
-
};
64
-
65
-
# Add skhd for keyboard shortcuts
66
-
services.skhd = {
67
-
enable = true;
68
-
skhdConfig = ''
69
-
# Open passmenu with Hyper-P
70
-
ctrl + shift + alt + cmd - p : /run/current-system/sw/bin/passmenu
71
-
'';
72
-
};
73
-
74
-
system.defaults = {
75
-
# minimal dock
76
-
dock = {
77
-
autohide = true;
78
-
orientation = "left";
79
-
show-process-indicators = false;
80
-
show-recents = false;
81
-
static-only = true;
82
-
};
83
-
# a finder that tells me what I want to know and lets me work
84
-
finder = {
85
-
AppleShowAllExtensions = true;
86
-
ShowPathbar = true;
87
-
FXEnableExtensionChangeWarning = false;
88
-
};
89
-
# Tab between form controls and F-row that behaves as F1-F12
90
-
NSGlobalDomain = {
91
-
AppleKeyboardUIMode = 3;
92
-
"com.apple.keyboard.fnState" = true;
93
-
};
94
-
};
95
-
96
-
nix.linux-builder.enable = true;
97
-
nix.linux-builder.supportedFeatures = [
98
-
"benchmark"
99
-
"big-parallel"
100
-
"kvm"
101
-
"nixos-test"
102
-
"uid-range"
103
-
];
104
-
nix.linux-builder.config = {
105
-
imports = [
106
-
../../2configs/container-tests.nix
107
-
];
108
-
};
109
-
110
-
# Create /etc/zshrc that loads the nix-darwin environment.
111
-
programs.zsh.enable = true; # default shell on catalina
112
-
programs.zsh.shellInit = self.packages.${pkgs.system}.zsh.zshrc;
113
-
114
-
# enable sudo touch
115
-
security.pam.services.sudo_local.touchIdAuth = true;
116
-
117
-
# disable natural scrolling
118
-
system.defaults.NSGlobalDomain."com.apple.swipescrolldirection" = false;
119
-
programs.direnv.enable = true;
120
-
programs.nix-index.enable = true;
121
-
programs.gnupg.agent = {
122
-
enable = true;
123
-
enableSSHSupport = true;
124
-
};
125
-
126
-
# Used for backwards compatibility, please read the changelog before changing.
127
-
# $ darwin-rebuild changelog
128
-
system.stateVersion = 6;
129
-
130
-
system.primaryUser = "lassulus";
131
-
# enable ssh in the macos system settings:
132
-
# apple -> system settings -> general -> sharing -> remote login
133
-
users.users.lassulus.openssh.authorizedKeys.keys = [
134
-
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDIb3uuMqE/xSJ7WL/XpJ6QOj4aSmh0Ga+GtmJl3CDvljGuIeGCKh7YAoqZAi051k5j6ZWowDrcWYHIOU+h0eZCesgCf+CvunlXeUz6XShVMjyZo87f2JPs2Hpb+u/ieLx4wGQvo/Zw89pOly/vqpaX9ZwyIR+U81IAVrHIhqmrTitp+2FwggtaY4FtD6WIyf1hPtrrDecX8iDhnHHuGhATr8etMLwdwQ2kIBx5BBgCoiuW7wXnLUBBVYeO3II957XP/yU82c+DjSVJtejODmRAM/3rk+B7pdF5ShRVVFyB6JJR+Qd1g8iSH+2QXLUy3NM2LN5u5p2oTjUOzoEPWZo7lykZzmIWd/5hjTW9YiHC+A8xsCxQqs87D9HK9hLA6udZ6CGkq4hG/6wFwNjSMnv30IcHZzx6IBihNGbrisrJhLxEiKWpMKYgeemhIirefXA6UxVfiwHg3gJ8BlEBsj0tl/HVARifR2y336YINEn8AsHGhwrPTBFOnBTmfA/VnP1NlWHzXCfVimP6YVvdoGCCnAwvFuJ+ZuxmZ3UzBb2TenZZOzwzV0sUzZk0D1CaSBFJUU3oZNOkDIM6z5lIZgzsyKwb38S8Vs3HYE+Dqpkfsl4yeU5ldc6DwrlVwuSIa4vVus4eWD3gDGFrx98yaqOx17pc4CC9KXk/2TjtJY5xmQ== lass@yubikey"
135
-
];
136
-
}
+1
machines/aergia/config.nix
+1
machines/aergia/config.nix
+140
machines/barnacle/configuration.nix
+140
machines/barnacle/configuration.nix
···
1
+
{ pkgs, self, ... }:
2
+
3
+
{
4
+
imports = [
5
+
# ./rosetta.nix
6
+
self.inputs.nix-index-database.darwinModules.nix-index
7
+
];
8
+
clan.core.networking.targetHost = "root@localhost";
9
+
programs.nix-index-database.comma.enable = true;
10
+
11
+
nixpkgs.hostPlatform = "aarch64-darwin";
12
+
environment.systemPackages = [
13
+
self.packages.${pkgs.system}.nvim
14
+
self.packages.${pkgs.system}.pass
15
+
self.packages.${pkgs.system}.passmenu
16
+
17
+
# zsh dependencies
18
+
pkgs.fzf
19
+
pkgs.atuin
20
+
21
+
pkgs.gnupg
22
+
pkgs.pinentry_mac
23
+
pkgs.lazygit
24
+
pkgs.sshuttle
25
+
pkgs.git
26
+
pkgs.element-desktop
27
+
pkgs.iterm2
28
+
(pkgs.firefox-devedition-bin-unwrapped.overrideAttrs (o: {
29
+
meta = o.meta // {
30
+
license = pkgs.lib.licenses.free;
31
+
};
32
+
}))
33
+
pkgs.ripgrep
34
+
pkgs.alt-tab-macos
35
+
pkgs.zed-editor
36
+
pkgs.nixd
37
+
pkgs.nil
38
+
];
39
+
40
+
# Use a custom configuration.nix location.
41
+
# $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
42
+
# environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix";
43
+
44
+
nix = {
45
+
package = pkgs.nix;
46
+
settings = {
47
+
extra-experimental-features = [
48
+
"nix-command"
49
+
"flakes"
50
+
];
51
+
};
52
+
};
53
+
54
+
# homebrew = {
55
+
# enable = true;
56
+
# casks = [
57
+
# "gpg-suite"
58
+
# ];
59
+
# };
60
+
61
+
# keyboard settings
62
+
system.keyboard = {
63
+
enableKeyMapping = true;
64
+
};
65
+
66
+
# Add skhd for keyboard shortcuts
67
+
services.skhd = {
68
+
enable = true;
69
+
skhdConfig = ''
70
+
# Open passmenu with Hyper-P
71
+
ctrl + shift + alt + cmd - p : /run/current-system/sw/bin/passmenu
72
+
'';
73
+
};
74
+
75
+
system.defaults = {
76
+
# minimal dock
77
+
dock = {
78
+
autohide = true;
79
+
orientation = "left";
80
+
show-process-indicators = false;
81
+
show-recents = false;
82
+
static-only = true;
83
+
};
84
+
# a finder that tells me what I want to know and lets me work
85
+
finder = {
86
+
AppleShowAllExtensions = true;
87
+
ShowPathbar = true;
88
+
FXEnableExtensionChangeWarning = false;
89
+
};
90
+
# Tab between form controls and F-row that behaves as F1-F12
91
+
NSGlobalDomain = {
92
+
AppleKeyboardUIMode = 3;
93
+
"com.apple.keyboard.fnState" = true;
94
+
};
95
+
};
96
+
97
+
nix.linux-builder.enable = true;
98
+
nix.linux-builder.supportedFeatures = [
99
+
"benchmark"
100
+
"big-parallel"
101
+
"kvm"
102
+
"nixos-test"
103
+
"uid-range"
104
+
];
105
+
nix.linux-builder.config = {
106
+
imports = [
107
+
../../2configs/container-tests.nix
108
+
];
109
+
};
110
+
111
+
# Create /etc/zshrc that loads the nix-darwin environment.
112
+
programs.zsh.enable = true; # default shell on catalina
113
+
programs.zsh.shellInit = self.packages.${pkgs.system}.zsh.zshrc;
114
+
115
+
# enable sudo touch
116
+
security.pam.services.sudo_local.touchIdAuth = true;
117
+
118
+
# disable natural scrolling
119
+
system.defaults.NSGlobalDomain."com.apple.swipescrolldirection" = false;
120
+
programs.direnv.enable = true;
121
+
programs.nix-index.enable = true;
122
+
programs.gnupg.agent = {
123
+
enable = true;
124
+
enableSSHSupport = true;
125
+
};
126
+
127
+
# Used for backwards compatibility, please read the changelog before changing.
128
+
# $ darwin-rebuild changelog
129
+
system.stateVersion = 6;
130
+
131
+
system.primaryUser = "lassulus";
132
+
133
+
services.openssh.enable = true;
134
+
users.users.lassulus.openssh.authorizedKeys.keys = [ self.keys.ssh ];
135
+
users.users.root.openssh.authorizedKeys.keys = [ self.keys.ssh ];
136
+
137
+
users.users.root.shell = pkgs.zsh;
138
+
users.users.root.uid = 0;
139
+
users.knownUsers = [ "root" ];
140
+
}
+1
machines/coaxmetal/config.nix
+1
machines/coaxmetal/config.nix
+1
machines/daedalus/config.nix
+1
machines/daedalus/config.nix
+1
-1
machines/gui-machine/configuration.nix
+1
-1
machines/gui-machine/configuration.nix
+1
machines/hilum/config.nix
+1
machines/hilum/config.nix
+1
machines/icarus/config.nix
+1
machines/icarus/config.nix
+10
machines/installer/config.nix
+10
machines/installer/config.nix
+1
machines/mors/config.nix
+1
machines/mors/config.nix
+1
machines/neoprism/config.nix
+1
machines/neoprism/config.nix
+2
-3
machines/neoprism/disk.nix
+2
-3
machines/neoprism/disk.nix
+1
-1
machines/prism/config.nix
+1
-1
machines/prism/config.nix
+1
machines/shodan/config.nix
+1
machines/shodan/config.nix
+1
machines/styx/config.nix
+1
machines/styx/config.nix
+1
-1
tools/jellyseekrr/flake-module.nix
+1
-1
tools/jellyseekrr/flake-module.nix
+47
-44
tools/mpv/flake-module.nix
+47
-44
tools/mpv/flake-module.nix
···
1
1
{ self, ... }:
2
2
{
3
3
perSystem =
4
-
{ pkgs, lib, ... }:
4
+
{ pkgs, ... }:
5
5
{
6
-
packages.mpv =
6
+
packages.mpv =
7
7
let
8
8
mpvInput = pkgs.writeText "mpv.input" ''
9
9
: script-binding console/enable
···
65
65
};
66
66
67
67
in
68
-
pkgs.writeShellApplication {
69
-
name = "mpv";
70
-
runtimeInputs = [
71
-
mpvPackage
72
-
pkgs.yt-dlp
73
-
];
74
-
text = ''
75
-
Y_RES=1081
76
-
# we need to disable sponsorblock local database because of
77
-
# https://github.com/po5/mpv_sponsorblock/issues/31
78
-
exec mpv \
79
-
--no-config \
80
-
--input-conf=${mpvInput} \
81
-
--include=${mpvConfig} \
82
-
--script=${autosub} \
83
-
--ytdl-format="best[height<$Y_RES]" \
84
-
--script-opts=ytdl_hook-ytdl_path=${pkgs.yt-dlp}/bin/yt-dlp \
85
-
--script-opts-append=sponsorblock-local_database=no \
86
-
--audio-channels=2 \
87
-
"$@"
88
-
'';
89
-
};
68
+
pkgs.writeShellApplication {
69
+
name = "mpv";
70
+
runtimeInputs = [
71
+
mpvPackage
72
+
pkgs.yt-dlp
73
+
];
74
+
text = ''
75
+
Y_RES=1081
76
+
# we need to disable sponsorblock local database because of
77
+
# https://github.com/po5/mpv_sponsorblock/issues/31
78
+
exec mpv \
79
+
--no-config \
80
+
--input-conf=${mpvInput} \
81
+
--include=${mpvConfig} \
82
+
--script=${autosub} \
83
+
--ytdl-format="best[height<$Y_RES]" \
84
+
--script-opts=ytdl_hook-ytdl_path=${pkgs.yt-dlp}/bin/yt-dlp \
85
+
--script-opts-append=sponsorblock-local_database=no \
86
+
--audio-channels=2 \
87
+
"$@"
88
+
'';
89
+
};
90
90
91
91
# Separate package for subtitle downloader
92
-
packages.mpv-dl-subs = pkgs.writers.writePython3Bin "dl_subs" {
93
-
libraries = [ pkgs.python3Packages.subliminal ];
94
-
flakeIgnore = [ "E501" ];
95
-
} ''
96
-
import babelfish
97
-
import subliminal
98
-
from pathlib import Path
99
-
import sys
100
-
import os
92
+
packages.mpv-dl-subs =
93
+
pkgs.writers.writePython3Bin "dl_subs"
94
+
{
95
+
libraries = [ pkgs.python3Packages.subliminal ];
96
+
flakeIgnore = [ "E501" ];
97
+
}
98
+
''
99
+
import babelfish
100
+
import subliminal
101
+
from pathlib import Path
102
+
import sys
103
+
import os
101
104
102
-
video_path = Path(sys.argv[1])
103
-
video = subliminal.scan_video(video_path)
104
-
cache_path = Path(os.path.expanduser("~/.cache/subliminal")) / f"{video.title}.srt"
105
-
if not cache_path.exists():
106
-
cache_path.parent.mkdir(parents=True, exist_ok=True)
107
-
language = babelfish.Language("eng")
108
-
sub = subliminal.download_best_subtitles([video], {language})[video][0]
109
-
cache_path.write_bytes(sub.content)
110
-
print(cache_path)
111
-
'';
105
+
video_path = Path(sys.argv[1])
106
+
video = subliminal.scan_video(video_path)
107
+
cache_path = Path(os.path.expanduser("~/.cache/subliminal")) / f"{video.title}.srt"
108
+
if not cache_path.exists():
109
+
cache_path.parent.mkdir(parents=True, exist_ok=True)
110
+
language = babelfish.Language("eng")
111
+
sub = subliminal.download_best_subtitles([video], {language})[video][0]
112
+
cache_path.write_bytes(sub.content)
113
+
print(cache_path)
114
+
'';
112
115
};
113
-
}
116
+
}
+13
-9
tools/muchsync/flake-module.nix
+13
-9
tools/muchsync/flake-module.nix
···
8
8
paths = [
9
9
(pkgs.writeShellApplication {
10
10
name = "muchsync";
11
-
runtimeInputs = [
12
-
pkgs.muchsync
13
-
pkgs.notmuch
14
-
] ++ lib.optionals pkgs.stdenv.isLinux [
15
-
pkgs.iputils
16
-
];
11
+
runtimeInputs =
12
+
[
13
+
pkgs.muchsync
14
+
pkgs.notmuch
15
+
]
16
+
++ lib.optionals pkgs.stdenv.isLinux [
17
+
pkgs.iputils
18
+
];
17
19
text = ''
18
-
export NOTMUCH_CONFIG=${pkgs.writeText "notmuch-config" self.packages.${pkgs.system}.mutt.passthru.notmuchConfig}
19
-
20
+
export NOTMUCH_CONFIG=${
21
+
pkgs.writeText "notmuch-config" self.packages.${pkgs.system}.mutt.passthru.notmuchConfig
22
+
}
23
+
20
24
set -efu
21
25
22
26
# Create Maildir structure if it doesn't exist
···
79
83
];
80
84
};
81
85
};
82
-
}
86
+
}
+17
-14
tools/mutt/flake-module.nix
+17
-14
tools/mutt/flake-module.nix
···
3
3
perSystem =
4
4
{ pkgs, lib, ... }:
5
5
{
6
-
packages.mutt =
6
+
packages.mutt =
7
7
let
8
8
# Mailboxes configuration from mail.nix
9
9
mailboxes = {
···
257
257
'';
258
258
259
259
in
260
-
(pkgs.writeShellApplication {
261
-
name = "mutt";
262
-
runtimeInputs = [
260
+
(pkgs.writeShellApplication {
261
+
name = "mutt";
262
+
runtimeInputs =
263
+
[
263
264
pkgs.neomutt
264
265
pkgs.elinks
265
266
pkgs.msmtp
266
267
pkgs.notmuch
267
268
pkgs.urlscan
268
-
] ++ lib.optionals pkgs.stdenv.isLinux [
269
+
]
270
+
++ lib.optionals pkgs.stdenv.isLinux [
269
271
pkgs.iputils
270
272
];
271
-
text = ''
272
-
export NOTMUCH_CONFIG_FILE=${pkgs.writeText "notmuch-config" notmuchConfig}
273
-
export MUTTRC=${muttrc}
274
-
${builtins.readFile ./mutt.sh}
275
-
'';
276
-
}) // {
277
-
passthru.notmuchConfig = notmuchConfig;
278
-
};
273
+
text = ''
274
+
export NOTMUCH_CONFIG_FILE=${pkgs.writeText "notmuch-config" notmuchConfig}
275
+
export MUTTRC=${muttrc}
276
+
${builtins.readFile ./mutt.sh}
277
+
'';
278
+
})
279
+
// {
280
+
passthru.notmuchConfig = notmuchConfig;
281
+
};
279
282
};
280
-
}
283
+
}
+1
-1
tools/nvim/flake-module.nix
+1
-1
tools/nvim/flake-module.nix
+2
-2
tools/tornade/flake-module.nix
+2
-2
tools/tornade/flake-module.nix
+2
-2
tools/wifi-qr/flake-module.nix
+2
-2
tools/wifi-qr/flake-module.nix
+1
-1
2configs/desktops/qtile/nixos.nix
+1
-1
2configs/desktops/qtile/nixos.nix
+1
-1
2configs/services/pad/module.nix
+1
-1
2configs/services/pad/module.nix