nixfmt fix

This commit is contained in:
2024-06-08 20:02:41 -06:00
parent 46cdbd8a09
commit 6ec6eb239a
22 changed files with 223 additions and 420 deletions

View File

@@ -1,10 +1,4 @@
{
config,
lib,
pkgs,
...
}:
{
{ config, lib, pkgs, ... }: {
options.my.apps.office.enable = lib.mkEnableOption "enable";
config = lib.mkIf config.my.apps.office.enable {
users.users.jawz.packages = with pkgs; [
@@ -17,8 +11,6 @@
# wike # gtk wikipedia wow!
# denaro # manage your finances
];
environment.variables = {
CALIBRE_USE_SYSTEM_THEME = "1";
};
environment.variables = { CALIBRE_USE_SYSTEM_THEME = "1"; };
};
}

View File

@@ -1,16 +1,8 @@
{
config,
lib,
pkgs,
...
}:
{
{ config, lib, pkgs, ... }: {
options.my.dev.docker.enable = lib.mkEnableOption "enable";
config = lib.mkIf config.my.dev.docker.enable {
users.users.jawz.packages =
(with pkgs; [ dockfmt ]) ++ (with pkgs.nodePackages; [ dockerfile-language-server-nodejs ]);
};
environment.variables = {
DOCKER_CONFIG = "${XDG_CONFIG_HOME}/docker";
users.users.jawz.packages = (with pkgs; [ dockfmt ])
++ (with pkgs.nodePackages; [ dockerfile-language-server-nodejs ]);
environment.variables.DOCKER_CONFIG = "\${XDG_CONFIG_HOME}/docker";
};
}

View File

@@ -1,10 +1,4 @@
{
config,
lib,
pkgs,
...
}:
{
{ config, lib, pkgs, ... }: {
options.my.dev.haskell.enable = lib.mkEnableOption "enable";
config = lib.mkIf config.my.dev.haskell.enable {
users.users.jawz.packages = with pkgs; ([
@@ -12,9 +6,8 @@
haskell-language-server # lsp
]);
environment.variables = {
CABAL_DIR = "${XDG_CACHE_HOME}/cabal";
CARGO_HOME = "${XDG_DATA_HOME}/cargo";
STACK_ROOT = "${XDG_DATA_HOME}/stack";
CABAL_DIR = "\${XDG_CACHE_HOME}/cabal";
STACK_ROOT = "\${XDG_DATA_HOME}/stack";
GHCUP_USE_XDG_DIRS = "true";
};
};

View File

@@ -1,28 +1,17 @@
{
config,
lib,
pkgs,
...
}:
{
{ config, lib, pkgs, ... }: {
options.my.dev.javascript.enable = lib.mkEnableOption "enable";
config = lib.mkIf config.my.dev.javascript.enable {
home-manager.users.jawz.programs.xdg.configFile = {
"npm/npmrc".source = ../dotfiles/npm/npmrc;
"configstore/update-notifier-npm-check.json".source = ../dotfiles/npm/update-notifier-npm-check.json;
"configstore/update-notifier-npm-check.json".source =
../dotfiles/npm/update-notifier-npm-check.json;
};
users.users.jawz.packages = (with pkgs; [ nodejs ]) ++ (with pkgs.nodePackages; [ pnpm ]);
users.users.jawz.packages = (with pkgs; [ nodejs ])
++ (with pkgs.nodePackages; [ pnpm ]);
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"
];
};
environment.variables = {
VISUAL = "emacsclient -ca emacs";
PATH = [ "${XDG_CONFIG_HOME}/emacs/bin" ];
NPM_CONFIG_USERCONFIG = "\${XDG_CONFIG_HOME}/npm/npmrc";
PNPM_HOME = "\${XDG_DATA_HOME}/pnpm";
PATH = [ "\${XDG_DATA_HOME}/npm/bin" "\${XDG_DATA_HOME}/pnpm" ];
};
};
}

View File

@@ -1,10 +1,4 @@
{
config,
lib,
pkgs,
...
}:
{
{ config, lib, pkgs, ... }: {
options.my.dev.nix.enable = lib.mkEnableOption "enable";
config = lib.mkIf config.my.dev.nix.enable {
users.users.jawz.packages = with pkgs; ([

View File

@@ -1,38 +1,28 @@
{
config,
lib,
pkgs,
...
}:
{
{ config, lib, pkgs, ... }: {
options.my.dev.python.enable = lib.mkEnableOption "enable";
config = lib.mkIf config.my.dev.python.enable {
home-manager.users.jawz.programs.xdg.configFile = {
"python/pythonrc".source = ../dotfiles/pythonrc;
};
users.users.jawz.packages =
(with pkgs; ([
pipenv # python development workflow for humans
(python3.withPackages (
ps: with 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
speedtest-cli # check internet speed from the comand line
# nose # testing and running python scripts
# poetry # dependency management made easy
# pytest # framework for writing tests
]
))
]))
++ (with pkgs.nodePackages; [
users.users.jawz.packages = (with pkgs; ([
pipenv # python development workflow for humans
(python3.withPackages (ps:
with 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
speedtest-cli # check internet speed from the comand line
# nose # testing and running python scripts
# poetry # dependency management made easy
# pytest # framework for writing tests
]))
])) ++ (with pkgs.nodePackages;
[
pyright # LSP
]);
environment.variables = {
PYTHONSTARTUP = "${XDG_CONFIG_HOME}/python/pythonrc";
};
environment.variables.PYTHONSTARTUP = "\${XDG_CONFIG_HOME}/python/pythonrc";
};
}

View File

@@ -1,18 +1,10 @@
{
config,
lib,
pkgs,
...
}:
{
{ config, lib, pkgs, ... }: {
options.my.dev.sh.enable = lib.mkEnableOption "enable";
config = lib.mkIf config.my.dev.sh.enable {
users.users.jawz.packages =
(with pkgs; [
bashdb # autocomplete
shellcheck # linting
shfmt # a shell parser and formatter
])
++ (with pkgs.nodePackages; [ bash-language-server ]);
users.users.jawz.packages = (with pkgs; [
bashdb # autocomplete
shellcheck # linting
shfmt # a shell parser and formatter
]) ++ (with pkgs.nodePackages; [ bash-language-server ]);
};
}

View File

@@ -1,10 +1,4 @@
{
config,
lib,
pkgs,
...
}:
{
{ config, lib, pkgs, ... }: {
options.my.emacs.enable = lib.mkEnableOption "enable";
config = lib.mkIf config.my.emacs.enable {
home-manager.users.jawz = {
@@ -14,35 +8,33 @@
};
services.lorri.enable = true;
};
users.users.jawz.packages =
(with pkgs; ([
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
users.users.jawz.packages = (with pkgs; ([
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
# doom everywhere
xorg.xwininfo
xdotool
xclip
# doom everywhere
xorg.xwininfo
xdotool
xclip
# lsps
yaml-language-server
markdownlint-cli
]))
++ (with pkgs.nodePackages; [
vscode-json-languageserver
# linters
prettier
]);
# lsps
yaml-language-server
markdownlint-cli
])) ++ (with pkgs.nodePackages; [
vscode-json-languageserver
# linters
prettier
]);
services.emacs = {
enable = true;
package =
with pkgs;
((emacsPackagesFor emacs-gtk).emacsWithPackages (epkgs: with epkgs; ([ vterm ])));
package = with pkgs;
((emacsPackagesFor emacs-gtk).emacsWithPackages
(epkgs: with epkgs; ([ vterm ])));
defaultEditor = true;
};
home-manager.users.jawz.programs.bash.initExtra = ''

View File

@@ -1,10 +1,4 @@
{
config,
lib,
pkgs,
...
}:
{
{ config, lib, pkgs, ... }: {
imports = [ ./base.nix ];
config = {
home-manager.users.jawz = {
@@ -14,8 +8,10 @@
};
bash = {
shellAliases = {
comic = ''download -u jawz -i "$(cat $LC | fzf --multi --exact -i)"'';
gallery = ''download -u jawz -i "$(cat $LW | fzf --multi --exact -i)"'';
comic =
''download -u jawz -i "$(cat $LC | fzf --multi --exact -i)"'';
gallery =
''download -u jawz -i "$(cat $LW | fzf --multi --exact -i)"'';
dl = "download -u jawz -i";
};
initExtra = ''
@@ -34,19 +30,14 @@
install = true;
service = false;
name = "download";
package =
with pkgs.python3Packages;
package = with pkgs.python3Packages;
(buildPythonApplication rec {
pname = "download";
version = "2.5";
src = ../../scripts/download/.;
doCheck = false;
buildInputs = [ setuptools ];
propagatedBuildInputs = [
pyyaml
types-pyyaml
yt-dlp
];
propagatedBuildInputs = [ pyyaml types-pyyaml yt-dlp ];
});
};
};

View File

@@ -1,18 +1,11 @@
{
config,
lib,
pkgs,
...
}:
{
{ config, lib, pkgs, ... }: {
imports = [ ./base.nix ];
config.my.scripts.find-dup-episodes = {
enable = true;
install = true;
service = false;
name = "find-dup-episodes";
package = pkgs.writeScriptBin "find-dup-episodes" (
builtins.readFile ../../scripts/find-dup-episodes.sh
);
package = pkgs.writeScriptBin "find-dup-episodes"
(builtins.readFile ../../scripts/find-dup-episodes.sh);
};
}

View File

@@ -1,10 +1,4 @@
{
config,
lib,
pkgs,
...
}:
{
{ config, lib, pkgs, ... }: {
imports = [ ./base.nix ];
config.my.scripts.manage-library = {
enable = true;
@@ -13,6 +7,7 @@
name = "manage-library";
timer = "00:30";
description = "scans the library directory and sorts files";
package = pkgs.writeScriptBin "manage-library" (builtins.readFile ../../scripts/manage-library.sh);
package = pkgs.writeScriptBin "manage-library"
(builtins.readFile ../../scripts/manage-library.sh);
};
}

View File

@@ -1,10 +1,4 @@
{
config,
lib,
pkgs,
...
}:
{
{ config, lib, pkgs, ... }: {
imports = [ ./base.nix ];
config.my.scripts.nextcloud-cronjob = {
enable = true;
@@ -13,8 +7,7 @@
timer = "*:0/10";
name = "nextcloud-cronjob";
description = "runs tasks for nextcloud";
package = pkgs.writeScriptBin "nextcloud-cronjob" (
builtins.readFile ../../scripts/nextcloud-cronjob.sh
);
package = pkgs.writeScriptBin "nextcloud-cronjob"
(builtins.readFile ../../scripts/nextcloud-cronjob.sh);
};
}

View File

@@ -1,16 +1,11 @@
{
config,
lib,
pkgs,
...
}:
{
{ config, lib, pkgs, ... }: {
imports = [ ./base.nix ];
config.my.scripts.run = {
enable = true;
install = true;
service = false;
name = "run";
package = pkgs.writeScriptBin "run" (builtins.readFile ../../scripts/run.sh);
package =
pkgs.writeScriptBin "run" (builtins.readFile ../../scripts/run.sh);
};
}

View File

@@ -1,10 +1,4 @@
{
config,
lib,
pkgs,
...
}:
{
{ config, lib, pkgs, ... }: {
imports = [ ./base.nix ];
config.my.scripts.sub-sync = {
enable = true;
@@ -13,6 +7,7 @@
name = "sub-sync";
timer = "22:00";
description = "Syncronixes subtitles downloaded and modified the last day";
package = pkgs.writeScriptBin "sub-sync" (builtins.readFile ../../scripts/sub-sync.sh);
package = pkgs.writeScriptBin "sub-sync"
(builtins.readFile ../../scripts/sub-sync.sh);
};
}

View File

@@ -1,10 +1,4 @@
{
config,
lib,
pkgs,
...
}:
{
{ config, lib, pkgs, ... }: {
imports = [ ./base.nix ];
config.my.scripts.update-dns = {
enable = true;
@@ -13,6 +7,7 @@
name = "update-dns";
timer = "*:0/30";
description = "Updates the IP of all my domains";
package = pkgs.writeScriptBin "update-dns" (builtins.readFile ../../scripts/update-dns.sh);
package = pkgs.writeScriptBin "update-dns"
(builtins.readFile ../../scripts/update-dns.sh);
};
}

View File

@@ -1,10 +1,4 @@
{
config,
lib,
pkgs,
...
}:
{
{ config, lib, pkgs, ... }: {
options.my.shell.tools.enable = lib.mkEnableOption "enable";
config = lib.mkIf config.my.shell.tools.enable {
home-manager.users.jawz.programs = {
@@ -28,9 +22,7 @@
uniq --count | sort -rn'';
};
};
xdg.configFile = {
"htop/htoprc".source = ../dotfiles/htop/htoprc;
};
xdg.configFile = { "htop/htoprc".source = ../dotfiles/htop/htoprc; };
hstr.enable = true;
htop = {
enable = true;
@@ -77,10 +69,10 @@
trash-cli # oop! did not meant to delete that
jq # linting
];
};
environment.variables = {
HISTFILE = "${XDG_STATE_HOME}/bash/history";
LESSHISTFILE = "-";
RIPGREP_CONFIG_PATH = "${XDG_CONFIG_HOME}/ripgrep/ripgreprc";
environment.variables = {
HISTFILE = "\${XDG_STATE_HOME}/bash/history";
LESSHISTFILE = "-";
RIPGREP_CONFIG_PATH = "\${XDG_CONFIG_HOME}/ripgrep/ripgreprc";
};
};
}