split home-manager into their own submodules
This commit is contained in:
Danilo Reyes
@@ -1,66 +0,0 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
krisp-settings = {
|
||||
libraries = builtins.attrValues {
|
||||
inherit (pkgs.python3Packages)
|
||||
capstone
|
||||
pyelftools
|
||||
;
|
||||
};
|
||||
flakeIgnore = [
|
||||
"E501" # line too long (82 > 79 characters)
|
||||
"F403" # 'from module import *' used; unable to detect undefined names
|
||||
"F405" # name may be undefined, or defined from star imports: module
|
||||
];
|
||||
};
|
||||
krisp-patch = builtins.readFile (
|
||||
pkgs.fetchurl {
|
||||
url = "https://pastebin.com/raw/8tQDsMVd";
|
||||
sha256 = "sha256-IdXv0MfRG1/1pAAwHLS2+1NESFEz2uXrbSdvU9OvdJ8=";
|
||||
}
|
||||
);
|
||||
krisp-patcher = pkgs.writers.writePython3Bin "krisp-patcher" krisp-settings krisp-patch;
|
||||
in
|
||||
{
|
||||
options.my.apps.internet = {
|
||||
enable = lib.mkEnableOption "internet browsers and communication apps";
|
||||
users = lib.mkOption {
|
||||
type = inputs.self.lib.usersOptionType lib;
|
||||
default = config.my.toggleUsers.apps;
|
||||
description = "Users to install internet packages for";
|
||||
};
|
||||
};
|
||||
config = lib.mkIf config.my.apps.internet.enable {
|
||||
home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.apps.internet.users (_user: {
|
||||
programs.librewolf = import ./librewolf.nix;
|
||||
});
|
||||
programs.geary.enable = true;
|
||||
users.users =
|
||||
let
|
||||
packages = builtins.attrValues {
|
||||
# inherit (inputs.zen-browser.packages.x86_64-linux) twilight;
|
||||
inherit krisp-patcher;
|
||||
inherit (pkgs)
|
||||
# thunderbird # email client
|
||||
warp # transfer files with based ppl
|
||||
nextcloud-client # self-hosted google-drive alternative
|
||||
fragments # beautiful torrent client
|
||||
tor-browser # dark web, so dark!
|
||||
telegram-desktop # furry chat
|
||||
nicotine-plus # remember Ares?
|
||||
discord # :3
|
||||
vdhcoapp # video download helper assistant
|
||||
nextcloud-talk-desktop # nextcloud talk client
|
||||
fractal # matrix client
|
||||
;
|
||||
};
|
||||
in
|
||||
inputs.self.lib.mkUserPackages lib config.my.apps.internet.users packages;
|
||||
};
|
||||
}
|
||||
68
modules/apps/internet/home.nix
Normal file
68
modules/apps/internet/home.nix
Normal file
@@ -0,0 +1,68 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
osConfig ? null,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
hm = inputs.self.lib.hmModule {
|
||||
inherit
|
||||
config
|
||||
inputs
|
||||
osConfig
|
||||
;
|
||||
optionPath = [
|
||||
"apps"
|
||||
"internet"
|
||||
];
|
||||
};
|
||||
cfg = config.my.apps.internet;
|
||||
krisp-settings = {
|
||||
libraries = builtins.attrValues {
|
||||
inherit (pkgs.python3Packages)
|
||||
capstone
|
||||
pyelftools
|
||||
;
|
||||
};
|
||||
flakeIgnore = [
|
||||
"E501"
|
||||
"F403"
|
||||
"F405"
|
||||
];
|
||||
};
|
||||
krisp-patch = builtins.readFile (
|
||||
pkgs.fetchurl {
|
||||
url = "https://pastebin.com/raw/8tQDsMVd";
|
||||
sha256 = "sha256-IdXv0MfRG1/1pAAwHLS2+1NESFEz2uXrbSdvU9OvdJ8=";
|
||||
}
|
||||
);
|
||||
krisp-patcher = pkgs.writers.writePython3Bin "krisp-patcher" krisp-settings krisp-patch;
|
||||
in
|
||||
{
|
||||
options.my.apps.internet.enable = lib.mkEnableOption "internet browsers and communication apps";
|
||||
config = lib.mkMerge [
|
||||
{
|
||||
my.apps.internet.enable = lib.mkDefault hm.enabledByDefault;
|
||||
}
|
||||
(lib.mkIf cfg.enable {
|
||||
programs.librewolf = import ../librewolf.nix;
|
||||
home.packages = builtins.attrValues {
|
||||
inherit krisp-patcher;
|
||||
inherit (pkgs)
|
||||
warp
|
||||
nextcloud-client
|
||||
fragments
|
||||
tor-browser
|
||||
telegram-desktop
|
||||
nicotine-plus
|
||||
discord
|
||||
vdhcoapp
|
||||
nextcloud-talk-desktop
|
||||
fractal
|
||||
;
|
||||
};
|
||||
})
|
||||
];
|
||||
}
|
||||
19
modules/apps/internet/nixos.nix
Normal file
19
modules/apps/internet/nixos.nix
Normal file
@@ -0,0 +1,19 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
options.my.apps.internet = {
|
||||
enable = lib.mkEnableOption "internet browsers and communication apps";
|
||||
users = lib.mkOption {
|
||||
type = inputs.self.lib.usersOptionType lib;
|
||||
default = config.my.toggleUsers.apps;
|
||||
description = "Users to install internet packages for";
|
||||
};
|
||||
};
|
||||
config = lib.mkIf config.my.apps.internet.enable {
|
||||
programs.geary.enable = true;
|
||||
};
|
||||
}
|
||||
@@ -1,88 +0,0 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
options.my.emacs = {
|
||||
enable = lib.mkEnableOption "Doom Emacs configuration";
|
||||
users = lib.mkOption {
|
||||
type = inputs.self.lib.usersOptionType lib;
|
||||
default = config.my.toggleUsers.dev;
|
||||
description = "Users to install Emacs packages for";
|
||||
};
|
||||
};
|
||||
config = lib.mkIf config.my.emacs.enable {
|
||||
home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.emacs.users (_user: {
|
||||
xdg.dataFile = {
|
||||
"doom/templates/events.org".source = ../../dotfiles/doom/templates/events.org;
|
||||
"doom/templates/default.org".source = ../../dotfiles/doom/templates/default.org;
|
||||
"doom/templates/programming.org".source = ../../dotfiles/doom/templates/programming.org;
|
||||
};
|
||||
services.lorri.enable = true;
|
||||
programs.${config.my.shell.type}.shellAliases =
|
||||
inputs.self.lib.mergeAliases inputs.self.lib.commonAliases
|
||||
{
|
||||
edit = "emacsclient -t";
|
||||
e = "edit";
|
||||
};
|
||||
});
|
||||
users.users =
|
||||
let
|
||||
packages = builtins.attrValues {
|
||||
inherit (pkgs.xorg) xwininfo;
|
||||
inherit (pkgs)
|
||||
#emacs everywhere
|
||||
xdotool
|
||||
xclip
|
||||
wl-clipboard-rs
|
||||
fd # modern find, faster searches
|
||||
fzf # fuzzy finder! super cool and useful
|
||||
ripgrep # modern grep
|
||||
tree-sitter # code parsing based on symbols and shit, I do not get it
|
||||
graphviz # graphs
|
||||
tetex # export pdf
|
||||
languagetool # proofreader for English
|
||||
# lsps
|
||||
yaml-language-server
|
||||
markdownlint-cli
|
||||
;
|
||||
inherit (pkgs.nodePackages)
|
||||
vscode-json-languageserver
|
||||
prettier # multi-language linter
|
||||
;
|
||||
};
|
||||
in
|
||||
inputs.self.lib.mkUserPackages lib config.my.emacs.users packages;
|
||||
services.emacs = {
|
||||
enable = true;
|
||||
defaultEditor = true;
|
||||
package = pkgs.emacsWithDoom {
|
||||
doomDir = ../../dotfiles/doom;
|
||||
doomLocalDir = "/home/${inputs.self.lib.getFirstUser config.my.emacs.users}/.local/share/nix-doom";
|
||||
tangleArgs = "--all config.org";
|
||||
extraPackages =
|
||||
epkgs:
|
||||
let
|
||||
inherit
|
||||
(config.home-manager.users.${inputs.self.lib.getFirstUser config.my.emacs.users}.programs.emacs)
|
||||
extraPackages
|
||||
extraConfig
|
||||
;
|
||||
extra = extraPackages epkgs;
|
||||
themes = lib.optional config.my.stylix.enable [
|
||||
(epkgs.trivialBuild {
|
||||
pname = "stylix-theme";
|
||||
src = pkgs.writeText "stylix-theme.el" extraConfig;
|
||||
version = "0.1.0";
|
||||
packageRequires = extra;
|
||||
})
|
||||
];
|
||||
in
|
||||
extra ++ themes;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
44
modules/dev/emacs/common.nix
Normal file
44
modules/dev/emacs/common.nix
Normal file
@@ -0,0 +1,44 @@
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
stylixEnabled,
|
||||
emacsExtraConfig,
|
||||
emacsExtraPackages,
|
||||
}:
|
||||
{
|
||||
packages = builtins.attrValues {
|
||||
inherit (pkgs.xorg) xwininfo;
|
||||
inherit (pkgs)
|
||||
xdotool
|
||||
xclip
|
||||
wl-clipboard-rs
|
||||
fd
|
||||
fzf
|
||||
ripgrep
|
||||
tree-sitter
|
||||
graphviz
|
||||
tetex
|
||||
languagetool
|
||||
yaml-language-server
|
||||
markdownlint-cli
|
||||
;
|
||||
inherit (pkgs.nodePackages)
|
||||
vscode-json-languageserver
|
||||
prettier
|
||||
;
|
||||
};
|
||||
extraPackages =
|
||||
epkgs:
|
||||
let
|
||||
extra = emacsExtraPackages epkgs;
|
||||
themes = lib.optional stylixEnabled [
|
||||
(epkgs.trivialBuild {
|
||||
pname = "stylix-theme";
|
||||
src = pkgs.writeText "stylix-theme.el" emacsExtraConfig;
|
||||
version = "0.1.0";
|
||||
packageRequires = extra;
|
||||
})
|
||||
];
|
||||
in
|
||||
extra ++ themes;
|
||||
}
|
||||
61
modules/dev/emacs/home.nix
Normal file
61
modules/dev/emacs/home.nix
Normal file
@@ -0,0 +1,61 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
osConfig ? null,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
shellType = inputs.self.lib.hmShellType config osConfig;
|
||||
hm = inputs.self.lib.hmModule {
|
||||
inherit
|
||||
config
|
||||
inputs
|
||||
osConfig
|
||||
;
|
||||
optionPath = [ "emacs" ];
|
||||
};
|
||||
cfg = config.my.emacs;
|
||||
emacs = import ./common.nix {
|
||||
inherit lib pkgs;
|
||||
stylixEnabled = if osConfig == null then false else osConfig.my.stylix.enable;
|
||||
emacsExtraConfig = config.programs.emacs.extraConfig;
|
||||
emacsExtraPackages = config.programs.emacs.extraPackages;
|
||||
};
|
||||
in
|
||||
{
|
||||
imports = [ inputs.doom-emacs.homeModule ];
|
||||
options.my.emacs.enable = lib.mkEnableOption "Doom Emacs configuration";
|
||||
config = lib.mkMerge [
|
||||
{
|
||||
my.emacs.enable = lib.mkDefault hm.enabledByDefault;
|
||||
}
|
||||
(lib.mkIf cfg.enable {
|
||||
home.packages = emacs.packages;
|
||||
xdg.dataFile = {
|
||||
"doom/templates/events.org".source = ../../../dotfiles/doom/templates/events.org;
|
||||
"doom/templates/default.org".source = ../../../dotfiles/doom/templates/default.org;
|
||||
"doom/templates/programming.org".source = ../../../dotfiles/doom/templates/programming.org;
|
||||
};
|
||||
services = {
|
||||
lorri.enable = true;
|
||||
emacs = {
|
||||
enable = true;
|
||||
defaultEditor = true;
|
||||
};
|
||||
};
|
||||
programs.${shellType}.shellAliases = inputs.self.lib.mergeAliases inputs.self.lib.commonAliases {
|
||||
edit = "emacsclient -t";
|
||||
e = "edit";
|
||||
};
|
||||
programs.doom-emacs = {
|
||||
enable = true;
|
||||
doomDir = ../../../dotfiles/doom;
|
||||
doomLocalDir = "${config.xdg.dataHome}/nix-doom";
|
||||
tangleArgs = "--all config.org";
|
||||
inherit (emacs) extraPackages;
|
||||
};
|
||||
})
|
||||
];
|
||||
}
|
||||
16
modules/dev/emacs/nixos.nix
Normal file
16
modules/dev/emacs/nixos.nix
Normal file
@@ -0,0 +1,16 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
options.my.emacs = {
|
||||
enable = lib.mkEnableOption "Doom Emacs configuration";
|
||||
users = lib.mkOption {
|
||||
type = inputs.self.lib.usersOptionType lib;
|
||||
default = config.my.toggleUsers.dev;
|
||||
description = "Users to install Emacs packages for";
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,60 +0,0 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
packages = builtins.attrValues {
|
||||
inherit (pkgs) nodejs; # Node.js runtime
|
||||
inherit (pkgs.nodePackages) pnpm; # Fast package manager alternative to npm
|
||||
};
|
||||
in
|
||||
{
|
||||
options = {
|
||||
my.dev.javascript = {
|
||||
enable = lib.mkEnableOption "Install JavaScript tooling globally";
|
||||
users = lib.mkOption {
|
||||
type = inputs.self.lib.usersOptionType lib;
|
||||
default = config.my.toggleUsers.dev;
|
||||
description = "Users to install JavaScript packages for";
|
||||
};
|
||||
};
|
||||
devShells.javascript = lib.mkOption {
|
||||
type = lib.types.package;
|
||||
default = pkgs.mkShell {
|
||||
inherit packages;
|
||||
name = "javascript-dev-shell";
|
||||
shellHook = ''
|
||||
echo "📦 JavaScript dev environment"
|
||||
'';
|
||||
};
|
||||
description = "JavaScript/Node development shell with npm/pnpm support";
|
||||
};
|
||||
};
|
||||
config = lib.mkMerge [
|
||||
(lib.mkIf config.my.dev.javascript.enable {
|
||||
users.users = inputs.self.lib.mkUserAttrs lib config.my.dev.javascript.users { inherit packages; };
|
||||
})
|
||||
{
|
||||
home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.dev.javascript.users (_user: {
|
||||
xdg.configFile = {
|
||||
"npm/npmrc".source = ../../dotfiles/npmrc;
|
||||
"configstore/update-notifier-npm-check.json".text = builtins.toJSON {
|
||||
optOut = false;
|
||||
lastUpdateCheck = 1646662583446;
|
||||
};
|
||||
};
|
||||
});
|
||||
environment.variables = {
|
||||
NPM_CONFIG_USERCONFIG = "\${XDG_CONFIG_HOME}/npm/npmrc";
|
||||
PNPM_HOME = "\${XDG_DATA_HOME}/pnpm";
|
||||
PATH = [
|
||||
"\${XDG_DATA_HOME}/npm/bin"
|
||||
"\${XDG_DATA_HOME}/pnpm"
|
||||
];
|
||||
};
|
||||
}
|
||||
];
|
||||
}
|
||||
25
modules/dev/javascript/common.nix
Normal file
25
modules/dev/javascript/common.nix
Normal file
@@ -0,0 +1,25 @@
|
||||
{ pkgs }:
|
||||
let
|
||||
packages = builtins.attrValues {
|
||||
inherit (pkgs) nodejs;
|
||||
inherit (pkgs.nodePackages) pnpm;
|
||||
};
|
||||
in
|
||||
{
|
||||
inherit packages;
|
||||
devShell = pkgs.mkShell {
|
||||
inherit packages;
|
||||
name = "javascript-dev-shell";
|
||||
shellHook = ''
|
||||
echo "📦 JavaScript dev environment"
|
||||
'';
|
||||
};
|
||||
sessionVariables = {
|
||||
NPM_CONFIG_USERCONFIG = "\${XDG_CONFIG_HOME}/npm/npmrc";
|
||||
PNPM_HOME = "\${XDG_DATA_HOME}/pnpm";
|
||||
};
|
||||
sessionPath = [
|
||||
"\${XDG_DATA_HOME}/npm/bin"
|
||||
"\${XDG_DATA_HOME}/pnpm"
|
||||
];
|
||||
}
|
||||
43
modules/dev/javascript/home.nix
Normal file
43
modules/dev/javascript/home.nix
Normal file
@@ -0,0 +1,43 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
osConfig ? null,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
hm = inputs.self.lib.hmModule {
|
||||
inherit
|
||||
config
|
||||
inputs
|
||||
osConfig
|
||||
;
|
||||
optionPath = [
|
||||
"dev"
|
||||
"javascript"
|
||||
];
|
||||
};
|
||||
cfg = config.my.dev.javascript;
|
||||
javascript = import ./common.nix { inherit pkgs; };
|
||||
in
|
||||
{
|
||||
options.my.dev.javascript.enable = lib.mkEnableOption "Install JavaScript tooling globally";
|
||||
config = lib.mkMerge [
|
||||
{
|
||||
my.dev.javascript.enable = lib.mkDefault hm.enabledByDefault;
|
||||
}
|
||||
(lib.mkIf cfg.enable {
|
||||
home.packages = javascript.packages;
|
||||
xdg.configFile = {
|
||||
"npm/npmrc".source = ../../../dotfiles/npmrc;
|
||||
"configstore/update-notifier-npm-check.json".text = builtins.toJSON {
|
||||
optOut = false;
|
||||
lastUpdateCheck = 1646662583446;
|
||||
};
|
||||
};
|
||||
home.sessionVariables = javascript.sessionVariables;
|
||||
home.sessionPath = javascript.sessionPath;
|
||||
})
|
||||
];
|
||||
}
|
||||
27
modules/dev/javascript/nixos.nix
Normal file
27
modules/dev/javascript/nixos.nix
Normal file
@@ -0,0 +1,27 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
javascript = import ./common.nix { inherit pkgs; };
|
||||
in
|
||||
{
|
||||
options = {
|
||||
my.dev.javascript = {
|
||||
enable = lib.mkEnableOption "Install JavaScript tooling globally";
|
||||
users = lib.mkOption {
|
||||
type = inputs.self.lib.usersOptionType lib;
|
||||
default = config.my.toggleUsers.dev;
|
||||
description = "Users to install JavaScript packages for";
|
||||
};
|
||||
};
|
||||
devShells.javascript = lib.mkOption {
|
||||
type = lib.types.package;
|
||||
default = javascript.devShell;
|
||||
description = "JavaScript/Node development shell with npm/pnpm support";
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,60 +0,0 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
shellType = config.my.shell.type;
|
||||
packages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
nixfmt-rfc-style # formatting
|
||||
cachix # binary cache management
|
||||
nixd # language server for Nix
|
||||
deadnix # detext unused/uneeded dependencies
|
||||
statix # linter for Nix expressions
|
||||
mcp-nixos # mcp server
|
||||
;
|
||||
};
|
||||
in
|
||||
{
|
||||
options = {
|
||||
my.dev.nix = {
|
||||
enable = lib.mkEnableOption "Install Nix tooling globally";
|
||||
users = lib.mkOption {
|
||||
type = inputs.self.lib.usersOptionType lib;
|
||||
default = config.my.toggleUsers.dev;
|
||||
description = "Users to install Nix packages for";
|
||||
};
|
||||
};
|
||||
devShells.nix = lib.mkOption {
|
||||
type = lib.types.package;
|
||||
default = pkgs.mkShell {
|
||||
inherit packages;
|
||||
name = "nix-dev-shell";
|
||||
shellHook = ''
|
||||
echo "❄️ Nix dev environment"
|
||||
'';
|
||||
};
|
||||
description = "Nix/NixOS development shell with formatter, linter, LSP, and Cachix";
|
||||
};
|
||||
};
|
||||
config = lib.mkIf config.my.dev.nix.enable {
|
||||
users.users = inputs.self.lib.mkUserAttrs lib config.my.dev.nix.users { inherit packages; };
|
||||
home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.dev.nix.users (_user: {
|
||||
programs.${shellType}.shellAliases = inputs.self.lib.mergeAliases inputs.self.lib.commonAliases {
|
||||
nixformat = ''
|
||||
deadnix -e && \
|
||||
nix run nixpkgs#nixfmt-tree && \
|
||||
statix fix
|
||||
'';
|
||||
nix-push-cache = ''
|
||||
nix build $NH_FLAKE#nixosConfigurations.${config.networking.hostName}.config.system.build.toplevel \
|
||||
--print-out-paths --fallback --max-jobs 100 --cores 0 |
|
||||
nix run nixpkgs#attic-client -- push lan:nixos --stdin
|
||||
'';
|
||||
};
|
||||
});
|
||||
};
|
||||
}
|
||||
45
modules/dev/nix/common.nix
Normal file
45
modules/dev/nix/common.nix
Normal file
@@ -0,0 +1,45 @@
|
||||
{
|
||||
pkgs,
|
||||
hostName ? null,
|
||||
}:
|
||||
let
|
||||
packages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
nixfmt-rfc-style
|
||||
cachix
|
||||
nixd
|
||||
deadnix
|
||||
statix
|
||||
mcp-nixos
|
||||
;
|
||||
};
|
||||
in
|
||||
{
|
||||
inherit packages;
|
||||
devShell = pkgs.mkShell {
|
||||
inherit packages;
|
||||
name = "nix-dev-shell";
|
||||
shellHook = ''
|
||||
echo "❄️ Nix dev environment"
|
||||
'';
|
||||
};
|
||||
shellAliases = {
|
||||
nixformat = ''
|
||||
deadnix -e && \
|
||||
nix run nixpkgs#nixfmt-tree && \
|
||||
statix fix
|
||||
'';
|
||||
}
|
||||
// (
|
||||
if hostName == null then
|
||||
{ }
|
||||
else
|
||||
{
|
||||
nix-push-cache = ''
|
||||
nix build $NH_FLAKE#nixosConfigurations.${hostName}.config.system.build.toplevel \
|
||||
--print-out-paths --fallback --max-jobs 100 --cores 0 |
|
||||
nix run nixpkgs#attic-client -- push lan:nixos --stdin
|
||||
'';
|
||||
}
|
||||
);
|
||||
}
|
||||
40
modules/dev/nix/home.nix
Normal file
40
modules/dev/nix/home.nix
Normal file
@@ -0,0 +1,40 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
osConfig ? null,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
shellType = inputs.self.lib.hmShellType config osConfig;
|
||||
hm = inputs.self.lib.hmModule {
|
||||
inherit
|
||||
config
|
||||
inputs
|
||||
osConfig
|
||||
;
|
||||
optionPath = [
|
||||
"dev"
|
||||
"nix"
|
||||
];
|
||||
};
|
||||
cfg = config.my.dev.nix;
|
||||
nix = import ./common.nix {
|
||||
inherit pkgs;
|
||||
hostName = if osConfig == null then null else osConfig.networking.hostName;
|
||||
};
|
||||
in
|
||||
{
|
||||
options.my.dev.nix.enable = lib.mkEnableOption "Install Nix tooling globally";
|
||||
config = lib.mkMerge [
|
||||
{
|
||||
my.dev.nix.enable = lib.mkDefault hm.enabledByDefault;
|
||||
}
|
||||
(lib.mkIf cfg.enable {
|
||||
home.packages = nix.packages;
|
||||
programs.${shellType}.shellAliases =
|
||||
inputs.self.lib.mergeAliases inputs.self.lib.commonAliases nix.shellAliases;
|
||||
})
|
||||
];
|
||||
}
|
||||
30
modules/dev/nix/nixos.nix
Normal file
30
modules/dev/nix/nixos.nix
Normal file
@@ -0,0 +1,30 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
nix = import ./common.nix {
|
||||
inherit pkgs;
|
||||
inherit (config.networking) hostName;
|
||||
};
|
||||
in
|
||||
{
|
||||
options = {
|
||||
my.dev.nix = {
|
||||
enable = lib.mkEnableOption "Install Nix tooling globally";
|
||||
users = lib.mkOption {
|
||||
type = inputs.self.lib.usersOptionType lib;
|
||||
default = config.my.toggleUsers.dev;
|
||||
description = "Users to install Nix packages for";
|
||||
};
|
||||
};
|
||||
devShells.nix = lib.mkOption {
|
||||
type = lib.types.package;
|
||||
default = nix.devShell;
|
||||
description = "Nix/NixOS development shell with formatter, linter, LSP, and Cachix";
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,66 +0,0 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
python = pkgs.python3.withPackages (
|
||||
ps:
|
||||
builtins.attrValues {
|
||||
inherit (ps)
|
||||
black # Python code formatter
|
||||
editorconfig # follow rules of contributin
|
||||
flake8 # wraper for pyflakes, pycodestyle and mccabe
|
||||
isort # sort Python imports
|
||||
pyflakes # checks source code for errors
|
||||
pylint # bug and style checker for python
|
||||
pytest # tests
|
||||
speedtest-cli # check internet speed from the comand line
|
||||
;
|
||||
}
|
||||
);
|
||||
packages = builtins.attrValues {
|
||||
inherit python;
|
||||
inherit (pkgs)
|
||||
pipenv # python development workflow for humans
|
||||
pyright # LSP
|
||||
;
|
||||
};
|
||||
in
|
||||
{
|
||||
options = {
|
||||
my.dev.python = {
|
||||
enable = lib.mkEnableOption "Install Python tools globally";
|
||||
users = lib.mkOption {
|
||||
type = inputs.self.lib.usersOptionType lib;
|
||||
default = config.my.toggleUsers.dev;
|
||||
description = "Users to install Python packages for";
|
||||
};
|
||||
};
|
||||
devShells.python = lib.mkOption {
|
||||
type = lib.types.package;
|
||||
default = pkgs.mkShell {
|
||||
inherit packages;
|
||||
name = "python-dev-shell";
|
||||
shellHook = ''
|
||||
echo "🐍 Python dev environment"
|
||||
which python
|
||||
'';
|
||||
description = "Python development shell";
|
||||
};
|
||||
};
|
||||
};
|
||||
config = lib.mkMerge [
|
||||
(lib.mkIf config.my.dev.python.enable {
|
||||
users.users = inputs.self.lib.mkUserAttrs lib config.my.dev.python.users { inherit packages; };
|
||||
})
|
||||
{
|
||||
home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.dev.python.users (_user: {
|
||||
xdg.configFile."python/pythonrc".source = ../../dotfiles/pythonrc;
|
||||
});
|
||||
environment.variables.PYTHONSTARTUP = "\${XDG_CONFIG_HOME}/python/pythonrc";
|
||||
}
|
||||
];
|
||||
}
|
||||
31
modules/dev/python/common.nix
Normal file
31
modules/dev/python/common.nix
Normal file
@@ -0,0 +1,31 @@
|
||||
{ pkgs }:
|
||||
let
|
||||
packages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
pipenv
|
||||
pyright
|
||||
;
|
||||
inherit (pkgs.python3Packages)
|
||||
black
|
||||
editorconfig
|
||||
flake8
|
||||
isort
|
||||
pyflakes
|
||||
pylint
|
||||
pytest
|
||||
speedtest-cli
|
||||
;
|
||||
};
|
||||
in
|
||||
{
|
||||
inherit packages;
|
||||
devShell = pkgs.mkShell {
|
||||
inherit packages;
|
||||
name = "python-dev-shell";
|
||||
shellHook = ''
|
||||
echo "🐍 Python dev environment"
|
||||
which python
|
||||
'';
|
||||
description = "Python development shell";
|
||||
};
|
||||
}
|
||||
36
modules/dev/python/home.nix
Normal file
36
modules/dev/python/home.nix
Normal file
@@ -0,0 +1,36 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
osConfig ? null,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
python = import ./common.nix { inherit pkgs; };
|
||||
hm = inputs.self.lib.hmModule {
|
||||
inherit
|
||||
config
|
||||
inputs
|
||||
osConfig
|
||||
;
|
||||
optionPath = [
|
||||
"dev"
|
||||
"python"
|
||||
];
|
||||
};
|
||||
cfg = config.my.dev.python;
|
||||
in
|
||||
{
|
||||
options.my.dev.python.enable = lib.mkEnableOption "Install Python tools globally";
|
||||
config = lib.mkMerge [
|
||||
{
|
||||
my.dev.python.enable = lib.mkDefault hm.enabledByDefault;
|
||||
}
|
||||
(lib.mkIf cfg.enable {
|
||||
home.packages = python.packages;
|
||||
xdg.configFile."python/pythonrc".source = ../../../dotfiles/pythonrc;
|
||||
home.sessionVariables.PYTHONSTARTUP = "\${XDG_CONFIG_HOME}/python/pythonrc";
|
||||
})
|
||||
];
|
||||
}
|
||||
26
modules/dev/python/nixos.nix
Normal file
26
modules/dev/python/nixos.nix
Normal file
@@ -0,0 +1,26 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
python = import ./common.nix { inherit pkgs; };
|
||||
in
|
||||
{
|
||||
options = {
|
||||
my.dev.python = {
|
||||
enable = lib.mkEnableOption "Install Python tools globally";
|
||||
users = lib.mkOption {
|
||||
type = inputs.self.lib.usersOptionType lib;
|
||||
default = config.my.toggleUsers.dev;
|
||||
description = "Users to install Python packages for";
|
||||
};
|
||||
};
|
||||
devShells.python = lib.mkOption {
|
||||
type = lib.types.package;
|
||||
default = python.devShell;
|
||||
};
|
||||
};
|
||||
}
|
||||
4
modules/home-manager.nix
Normal file
4
modules/home-manager.nix
Normal file
@@ -0,0 +1,4 @@
|
||||
{ inputs, ... }:
|
||||
{
|
||||
imports = inputs.self.lib.autoImportLeaf ./. "home.nix";
|
||||
}
|
||||
@@ -10,13 +10,21 @@ in
|
||||
{
|
||||
imports =
|
||||
inputs.self.lib.autoImport ./apps filterNames
|
||||
++ inputs.self.lib.autoImportLeaf ./apps "nixos.nix"
|
||||
++ inputs.self.lib.autoImport ./dev filterNames
|
||||
++ inputs.self.lib.autoImportLeaf ./dev "nixos.nix"
|
||||
++ inputs.self.lib.autoImport ./scripts filterNames
|
||||
++ inputs.self.lib.autoImportLeaf ./scripts "nixos.nix"
|
||||
++ inputs.self.lib.autoImport ./servers filterNames
|
||||
++ inputs.self.lib.autoImportLeaf ./servers "nixos.nix"
|
||||
++ inputs.self.lib.autoImport ./services filterNames
|
||||
++ inputs.self.lib.autoImportLeaf ./services "nixos.nix"
|
||||
++ inputs.self.lib.autoImport ./shell filterNames
|
||||
++ inputs.self.lib.autoImportLeaf ./shell "nixos.nix"
|
||||
++ inputs.self.lib.autoImport ./websites filterNames
|
||||
++ inputs.self.lib.autoImportLeaf ./websites "nixos.nix"
|
||||
++ inputs.self.lib.autoImport ./network filterNames
|
||||
++ inputs.self.lib.autoImportLeaf ./network "nixos.nix"
|
||||
++ [
|
||||
./factories/mkscript.nix
|
||||
./nix/build.nix
|
||||
|
||||
@@ -1,112 +0,0 @@
|
||||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
options.my.units = {
|
||||
download.enable = lib.mkEnableOption "media download automation scripts";
|
||||
downloadManga.enable = lib.mkEnableOption "manga download automation";
|
||||
};
|
||||
config =
|
||||
let
|
||||
inherit (inputs.jawz-scripts.packages.x86_64-linux) download;
|
||||
gallerySecretsPath = lib.attrByPath [ "sops" "secrets" "gallery-dl/secrets" "path" ] null config;
|
||||
wrappedDownload =
|
||||
if gallerySecretsPath != null then
|
||||
pkgs.symlinkJoin {
|
||||
name = "download-with-secrets";
|
||||
paths = [ download ];
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
postBuild = ''
|
||||
wrapProgram $out/bin/download --run 'if [ -r "${gallerySecretsPath}" ]; then set -a; source "${gallerySecretsPath}"; set +a; fi'
|
||||
'';
|
||||
}
|
||||
else
|
||||
download;
|
||||
in
|
||||
{
|
||||
home-manager.users.jawz.programs.${config.my.shell.type}.shellAliases =
|
||||
inputs.self.lib.mergeAliases inputs.self.lib.commonAliases
|
||||
{
|
||||
dl = "${wrappedDownload}/bin/download -u jawz -i";
|
||||
};
|
||||
systemd.user = {
|
||||
services =
|
||||
let
|
||||
mkDownloadService = desc: execStartCmd: {
|
||||
restartIfChanged = true;
|
||||
description = "Downloads ${desc}";
|
||||
wantedBy = [ "default.target" ];
|
||||
path = [ pkgs.bash ];
|
||||
serviceConfig = {
|
||||
TimeoutStartSec = 2000;
|
||||
TimeoutStopSec = 2000;
|
||||
Restart = "on-failure";
|
||||
RestartSec = 30;
|
||||
ExecStart = "${wrappedDownload}/bin/download ${execStartCmd}";
|
||||
}
|
||||
// lib.optionalAttrs (gallerySecretsPath != null) {
|
||||
EnvironmentFile = gallerySecretsPath;
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
tuhmayto = lib.mkIf config.my.units.download.enable (
|
||||
mkDownloadService "tuhmayto stuff" ''
|
||||
-u jawz -i https://x.com/tuhmayto/media \
|
||||
https://www.furaffinity.net/user/tuhmayto/ \
|
||||
https://bsky.app/profile/tumayto.bsky.social''
|
||||
);
|
||||
"download@" = lib.mkIf (config.my.units.download.enable || config.my.units.downloadManga.enable) (
|
||||
mkDownloadService "post from multiple sources" "%I"
|
||||
);
|
||||
"instagram@" = lib.mkIf config.my.units.download.enable (
|
||||
mkDownloadService "post types from instagram" "instagram -u jawz -t %I"
|
||||
);
|
||||
};
|
||||
timers =
|
||||
let
|
||||
downloadTimer = time: delay: {
|
||||
enable = true;
|
||||
description = "Downloads post types from different sites";
|
||||
wantedBy = [ "timers.target" ];
|
||||
timerConfig = {
|
||||
OnCalendar = time;
|
||||
RandomizedDelaySec = delay;
|
||||
Persistent = true;
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
# "instagram@stories" = lib.mkIf config.my.units.download.enable (
|
||||
# downloadTimer "*-*-* 12:34:00" 120 // { }
|
||||
# );
|
||||
"download@main" = lib.mkIf config.my.units.download.enable (
|
||||
downloadTimer "*-*-* 06,18:02:00" 30 // { }
|
||||
);
|
||||
"download@push" = lib.mkIf config.my.units.download.enable (downloadTimer "*:0/5" 30 // { });
|
||||
"download@manga" = lib.mkIf config.my.units.downloadManga.enable (
|
||||
downloadTimer "*-*-* 03:08:00" 30 // { }
|
||||
);
|
||||
tuhmayto = lib.mkIf config.my.units.download.enable {
|
||||
enable = true;
|
||||
description = "Downloads tuhmayto stuff";
|
||||
wantedBy = [ "timers.target" ];
|
||||
timerConfig = {
|
||||
OnCalendar = "*:0/10";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
my.scripts.download = {
|
||||
enable = lib.mkDefault false;
|
||||
install = true;
|
||||
service = false;
|
||||
name = "download";
|
||||
package = wrappedDownload;
|
||||
};
|
||||
};
|
||||
}
|
||||
25
modules/scripts/download/common.nix
Normal file
25
modules/scripts/download/common.nix
Normal file
@@ -0,0 +1,25 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
}:
|
||||
let
|
||||
inherit (inputs.jawz-scripts.packages.x86_64-linux) download;
|
||||
gallerySecretsPath = lib.attrByPath [ "sops" "secrets" "gallery-dl/secrets" "path" ] null config;
|
||||
in
|
||||
{
|
||||
inherit gallerySecretsPath;
|
||||
wrappedDownload =
|
||||
if gallerySecretsPath != null then
|
||||
pkgs.symlinkJoin {
|
||||
name = "download-with-secrets";
|
||||
paths = [ download ];
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
postBuild = ''
|
||||
wrapProgram $out/bin/download --run 'if [ -r "${gallerySecretsPath}" ]; then set -a; source "${gallerySecretsPath}"; set +a; fi'
|
||||
'';
|
||||
}
|
||||
else
|
||||
download;
|
||||
}
|
||||
25
modules/scripts/download/home.nix
Normal file
25
modules/scripts/download/home.nix
Normal file
@@ -0,0 +1,25 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
osConfig ? null,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
shellType = inputs.self.lib.hmShellType config osConfig;
|
||||
enabled =
|
||||
inputs.self.lib.hmOnlyUser config osConfig "jawz"
|
||||
&& (osConfig.my.units.download.enable || osConfig.my.units.downloadManga.enable);
|
||||
download = import ./common.nix {
|
||||
config = if osConfig == null then { } else osConfig;
|
||||
inherit inputs lib pkgs;
|
||||
};
|
||||
in
|
||||
{
|
||||
config = lib.mkIf enabled {
|
||||
programs.${shellType}.shellAliases = inputs.self.lib.mergeAliases inputs.self.lib.commonAliases {
|
||||
dl = "${download.wrappedDownload}/bin/download -u jawz -i";
|
||||
};
|
||||
};
|
||||
}
|
||||
95
modules/scripts/download/nixos.nix
Normal file
95
modules/scripts/download/nixos.nix
Normal file
@@ -0,0 +1,95 @@
|
||||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
let
|
||||
download = import ./common.nix {
|
||||
inherit
|
||||
config
|
||||
inputs
|
||||
lib
|
||||
pkgs
|
||||
;
|
||||
};
|
||||
in
|
||||
{
|
||||
options.my.units = {
|
||||
download.enable = lib.mkEnableOption "media download automation scripts";
|
||||
downloadManga.enable = lib.mkEnableOption "manga download automation";
|
||||
};
|
||||
config = {
|
||||
systemd.user = {
|
||||
services =
|
||||
let
|
||||
mkDownloadService = desc: execStartCmd: {
|
||||
restartIfChanged = true;
|
||||
description = "Downloads ${desc}";
|
||||
wantedBy = [ "default.target" ];
|
||||
path = [ pkgs.bash ];
|
||||
serviceConfig = {
|
||||
TimeoutStartSec = 2000;
|
||||
TimeoutStopSec = 2000;
|
||||
Restart = "on-failure";
|
||||
RestartSec = 30;
|
||||
ExecStart = "${download.wrappedDownload}/bin/download ${execStartCmd}";
|
||||
}
|
||||
// lib.optionalAttrs (download.gallerySecretsPath != null) {
|
||||
EnvironmentFile = download.gallerySecretsPath;
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
tuhmayto = lib.mkIf config.my.units.download.enable (
|
||||
mkDownloadService "tuhmayto stuff" ''
|
||||
-u jawz -i https://x.com/tuhmayto/media \
|
||||
https://www.furaffinity.net/user/tuhmayto/ \
|
||||
https://bsky.app/profile/tumayto.bsky.social''
|
||||
);
|
||||
"download@" = lib.mkIf (config.my.units.download.enable || config.my.units.downloadManga.enable) (
|
||||
mkDownloadService "post from multiple sources" "%I"
|
||||
);
|
||||
"instagram@" = lib.mkIf config.my.units.download.enable (
|
||||
mkDownloadService "post types from instagram" "instagram -u jawz -t %I"
|
||||
);
|
||||
};
|
||||
timers =
|
||||
let
|
||||
downloadTimer = time: delay: {
|
||||
enable = true;
|
||||
description = "Downloads post types from different sites";
|
||||
wantedBy = [ "timers.target" ];
|
||||
timerConfig = {
|
||||
OnCalendar = time;
|
||||
RandomizedDelaySec = delay;
|
||||
Persistent = true;
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
"download@main" = lib.mkIf config.my.units.download.enable (
|
||||
downloadTimer "*-*-* 06,18:02:00" 30 // { }
|
||||
);
|
||||
"download@push" = lib.mkIf config.my.units.download.enable (downloadTimer "*:0/5" 30 // { });
|
||||
"download@manga" = lib.mkIf config.my.units.downloadManga.enable (
|
||||
downloadTimer "*-*-* 03:08:00" 30 // { }
|
||||
);
|
||||
tuhmayto = lib.mkIf config.my.units.download.enable {
|
||||
enable = true;
|
||||
description = "Downloads tuhmayto stuff";
|
||||
wantedBy = [ "timers.target" ];
|
||||
timerConfig.OnCalendar = "*:0/10";
|
||||
};
|
||||
};
|
||||
};
|
||||
my.scripts.download = {
|
||||
enable = lib.mkDefault false;
|
||||
install = true;
|
||||
service = false;
|
||||
name = "download";
|
||||
package = download.wrappedDownload;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,21 +1,27 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
config.my.scripts.update-org-agenda-cache = {
|
||||
enable = lib.mkDefault false;
|
||||
install = config.my.emacs.enable;
|
||||
service = config.my.emacs.enable;
|
||||
name = "update-org-agenda-cache";
|
||||
timer = "*:0/30";
|
||||
description = "runs a function which builds a cache file.";
|
||||
package = pkgs.writeScriptBin "update-org-agenda-cache" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p bash
|
||||
${config.services.emacs.package}/bin/emacsclient --eval '(my/update-org-agenda-cache)'
|
||||
'';
|
||||
};
|
||||
config.my.scripts.update-org-agenda-cache =
|
||||
let
|
||||
user = inputs.self.lib.getFirstUser config.my.emacs.users;
|
||||
emacsPackage = config.home-manager.users.${user}.programs.doom-emacs.finalEmacsPackage;
|
||||
in
|
||||
{
|
||||
enable = lib.mkDefault false;
|
||||
install = config.my.emacs.enable;
|
||||
service = config.my.emacs.enable;
|
||||
name = "update-org-agenda-cache";
|
||||
timer = "*:0/30";
|
||||
description = "runs a function which builds a cache file.";
|
||||
package = pkgs.writeScriptBin "update-org-agenda-cache" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p bash
|
||||
${emacsPackage}/bin/emacsclient --eval '(my/update-org-agenda-cache)'
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,67 +0,0 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
options.my.shell.multimedia = {
|
||||
enable = lib.mkEnableOption "multimedia CLI tools and codecs";
|
||||
users = lib.mkOption {
|
||||
type = inputs.self.lib.usersOptionType lib;
|
||||
default = config.my.toggleUsers.shell;
|
||||
description = "Users to install multimedia shell tools for";
|
||||
};
|
||||
};
|
||||
config = lib.mkIf (config.my.shell.multimedia.enable && config.my.secureHost) {
|
||||
sops.secrets."gallery-dl/secrets" =
|
||||
let
|
||||
user = inputs.self.lib.getFirstUser config.my.shell.multimedia.users;
|
||||
in
|
||||
{
|
||||
sopsFile = ../../secrets/gallery.yaml;
|
||||
owner = user;
|
||||
mode = "0400";
|
||||
};
|
||||
home-manager.users =
|
||||
inputs.self.lib.mkHomeManagerUsers lib config.my.shell.multimedia.users
|
||||
(user: {
|
||||
programs = {
|
||||
yt-dlp = {
|
||||
enable = true;
|
||||
settings = {
|
||||
embed-thumbnail = true;
|
||||
embed-subs = true;
|
||||
sub-langs = "all";
|
||||
cookies-from-browser = "firefox+gnomekeyring:/home/${user}/.librewolf/${user}";
|
||||
};
|
||||
};
|
||||
gallery-dl = {
|
||||
enable = true;
|
||||
settings = inputs.self.lib.importDotfile ../../dotfiles/gallery-dl.nix;
|
||||
};
|
||||
${config.my.shell.type} = {
|
||||
initExtra = lib.mkAfter ''
|
||||
if [ -r "${config.sops.secrets."gallery-dl/secrets".path}" ]; then
|
||||
set -a # automatically export all variables
|
||||
source "${config.sops.secrets."gallery-dl/secrets".path}"
|
||||
set +a # stop automatically exporting
|
||||
fi
|
||||
'';
|
||||
};
|
||||
};
|
||||
});
|
||||
users.users =
|
||||
let
|
||||
packages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
ffmpeg # not ffmpreg, the coolest video conversion tool!
|
||||
imagemagick # photoshop what??
|
||||
ffpb # make ffmpeg encoding... a bit fun
|
||||
;
|
||||
};
|
||||
in
|
||||
inputs.self.lib.mkUserPackages lib config.my.shell.multimedia.users packages;
|
||||
};
|
||||
}
|
||||
10
modules/shell/multimedia/common.nix
Normal file
10
modules/shell/multimedia/common.nix
Normal file
@@ -0,0 +1,10 @@
|
||||
{ pkgs }:
|
||||
{
|
||||
packages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
ffmpeg
|
||||
imagemagick
|
||||
ffpb
|
||||
;
|
||||
};
|
||||
}
|
||||
62
modules/shell/multimedia/home.nix
Normal file
62
modules/shell/multimedia/home.nix
Normal file
@@ -0,0 +1,62 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
osConfig ? null,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
shellType = inputs.self.lib.hmShellType config osConfig;
|
||||
hm = inputs.self.lib.hmModule {
|
||||
inherit
|
||||
config
|
||||
inputs
|
||||
osConfig
|
||||
;
|
||||
optionPath = [
|
||||
"shell"
|
||||
"multimedia"
|
||||
];
|
||||
};
|
||||
cfg = config.my.shell.multimedia;
|
||||
multimedia = import ./common.nix { inherit pkgs; };
|
||||
in
|
||||
{
|
||||
options.my.shell.multimedia.enable = lib.mkEnableOption "multimedia CLI tools and codecs";
|
||||
config = lib.mkMerge [
|
||||
{
|
||||
my.shell.multimedia.enable = lib.mkDefault hm.enabledByDefault;
|
||||
}
|
||||
(lib.mkIf cfg.enable {
|
||||
home.packages = multimedia.packages;
|
||||
programs = {
|
||||
yt-dlp = {
|
||||
enable = true;
|
||||
settings = {
|
||||
embed-thumbnail = true;
|
||||
embed-subs = true;
|
||||
sub-langs = "all";
|
||||
cookies-from-browser = "firefox+gnomekeyring:${config.home.homeDirectory}/.librewolf/${config.home.username}";
|
||||
};
|
||||
};
|
||||
gallery-dl = {
|
||||
enable = true;
|
||||
settings = inputs.self.lib.importDotfile ../../../dotfiles/gallery-dl.nix;
|
||||
};
|
||||
${shellType}.initExtra = lib.mkAfter (
|
||||
if osConfig == null then
|
||||
""
|
||||
else
|
||||
''
|
||||
if [ -r "${osConfig.sops.secrets."gallery-dl/secrets".path}" ]; then
|
||||
set -a
|
||||
source "${osConfig.sops.secrets."gallery-dl/secrets".path}"
|
||||
set +a
|
||||
fi
|
||||
''
|
||||
);
|
||||
};
|
||||
})
|
||||
];
|
||||
}
|
||||
27
modules/shell/multimedia/nixos.nix
Normal file
27
modules/shell/multimedia/nixos.nix
Normal file
@@ -0,0 +1,27 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
options.my.shell.multimedia = {
|
||||
enable = lib.mkEnableOption "multimedia CLI tools and codecs";
|
||||
users = lib.mkOption {
|
||||
type = inputs.self.lib.usersOptionType lib;
|
||||
default = config.my.toggleUsers.shell;
|
||||
description = "Users to install multimedia shell tools for";
|
||||
};
|
||||
};
|
||||
config = lib.mkIf (config.my.shell.multimedia.enable && config.my.secureHost) {
|
||||
sops.secrets."gallery-dl/secrets" =
|
||||
let
|
||||
user = inputs.self.lib.getFirstUser config.my.shell.multimedia.users;
|
||||
in
|
||||
{
|
||||
sopsFile = ../../../secrets/gallery.yaml;
|
||||
owner = user;
|
||||
mode = "0400";
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -3,22 +3,46 @@
|
||||
lib,
|
||||
pkgs,
|
||||
inputs,
|
||||
osConfig ? null,
|
||||
...
|
||||
}:
|
||||
let
|
||||
shellType = config.my.shell.type;
|
||||
shellType = inputs.self.lib.hmShellType config osConfig;
|
||||
hm = inputs.self.lib.hmModule {
|
||||
inherit
|
||||
config
|
||||
inputs
|
||||
osConfig
|
||||
;
|
||||
optionPath = [
|
||||
"shell"
|
||||
"tools"
|
||||
];
|
||||
};
|
||||
cfg = config.my.shell.tools;
|
||||
in
|
||||
{
|
||||
options.my.shell.tools = {
|
||||
enable = lib.mkEnableOption "shell tools and utilities";
|
||||
users = lib.mkOption {
|
||||
type = inputs.self.lib.usersOptionType lib;
|
||||
default = config.my.toggleUsers.shell;
|
||||
description = "Users to install shell tools for";
|
||||
};
|
||||
};
|
||||
config = lib.mkIf config.my.shell.tools.enable {
|
||||
home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.shell.tools.users (user: {
|
||||
options.my.shell.tools.enable = lib.mkEnableOption "shell tools and utilities";
|
||||
config = lib.mkMerge [
|
||||
{
|
||||
my.shell.tools.enable = lib.mkDefault hm.enabledByDefault;
|
||||
}
|
||||
(lib.mkIf cfg.enable {
|
||||
home.packages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
ripgrep
|
||||
dust
|
||||
fd
|
||||
fzf
|
||||
gdu
|
||||
tealdeer
|
||||
trash-cli
|
||||
jq
|
||||
yq
|
||||
smartmontools
|
||||
rmlint
|
||||
;
|
||||
};
|
||||
programs = {
|
||||
hstr.enable = true;
|
||||
htop = {
|
||||
@@ -40,12 +64,12 @@ in
|
||||
config.pager = "less -FR";
|
||||
extraPackages = builtins.attrValues {
|
||||
inherit (pkgs.bat-extras)
|
||||
batman # man pages
|
||||
batpipe # piping
|
||||
batgrep # ripgrep
|
||||
batdiff # this is getting crazy!
|
||||
batwatch # probably my next best friend
|
||||
prettybat # trans your sourcecode!
|
||||
batman
|
||||
batpipe
|
||||
batgrep
|
||||
batdiff
|
||||
batwatch
|
||||
prettybat
|
||||
;
|
||||
};
|
||||
};
|
||||
@@ -60,7 +84,7 @@ in
|
||||
PASSWORD_STORE_NOPAGER = "false";
|
||||
PASSWORD_STORE_NOTIFICATIONS = "false";
|
||||
PASSWORD_STORE_PARSING = "true";
|
||||
PASSWORD_STORE_PATH = "/home/${user}/.local/share/pass";
|
||||
PASSWORD_STORE_PATH = "${config.home.homeDirectory}/.local/share/pass";
|
||||
PASSWORD_STORE_SAFECONTENT = "true";
|
||||
};
|
||||
};
|
||||
@@ -93,39 +117,11 @@ in
|
||||
fi
|
||||
'';
|
||||
};
|
||||
});
|
||||
programs = {
|
||||
starship.enable = true;
|
||||
tmux.enable = true;
|
||||
fzf.fuzzyCompletion = true;
|
||||
neovim = {
|
||||
enable = true;
|
||||
vimAlias = true;
|
||||
home.sessionVariables = {
|
||||
HISTFILE = "\${XDG_STATE_HOME}/bash/history";
|
||||
LESSHISTFILE = "-";
|
||||
RIPGREP_CONFIG_PATH = "\${XDG_CONFIG_HOME}/ripgrep/ripgreprc";
|
||||
};
|
||||
};
|
||||
users.users =
|
||||
let
|
||||
packages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
ripgrep # modern grep
|
||||
dust # rusty du similar to gdu
|
||||
fd # modern find, faster searches
|
||||
fzf # fuzzy finder! super cool and useful
|
||||
gdu # disk-space utility checker, somewhat useful
|
||||
tealdeer # man for retards
|
||||
trash-cli # oop! did not meant to delete that
|
||||
jq # json parser
|
||||
yq # yaml parser
|
||||
smartmontools # check hard drie health
|
||||
rmlint # amazing dupe finder that integrates well with BTRFS
|
||||
;
|
||||
};
|
||||
in
|
||||
inputs.self.lib.mkUserPackages lib config.my.shell.tools.users packages;
|
||||
environment.variables = {
|
||||
HISTFILE = "\${XDG_STATE_HOME}/bash/history";
|
||||
LESSHISTFILE = "-";
|
||||
RIPGREP_CONFIG_PATH = "\${XDG_CONFIG_HOME}/ripgrep/ripgreprc";
|
||||
};
|
||||
};
|
||||
})
|
||||
];
|
||||
}
|
||||
27
modules/shell/tools/nixos.nix
Normal file
27
modules/shell/tools/nixos.nix
Normal file
@@ -0,0 +1,27 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
options.my.shell.tools = {
|
||||
enable = lib.mkEnableOption "shell tools and utilities";
|
||||
users = lib.mkOption {
|
||||
type = inputs.self.lib.usersOptionType lib;
|
||||
default = config.my.toggleUsers.shell;
|
||||
description = "Users to install shell tools for";
|
||||
};
|
||||
};
|
||||
config = lib.mkIf config.my.shell.tools.enable {
|
||||
programs = {
|
||||
starship.enable = true;
|
||||
tmux.enable = true;
|
||||
fzf.fuzzyCompletion = true;
|
||||
neovim = {
|
||||
enable = true;
|
||||
vimAlias = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user