diff --git a/home.nix b/home.nix index 1d33ef8..c3146c5 100644 --- a/home.nix +++ b/home.nix @@ -1,4 +1,9 @@ -{ config, pkgs, lib, ... }: +{ + config + ,pkgs + ,lib + ,... +}: let ownLib = import ./home/packages/lib; diff --git a/home/accounts.nix b/home/accounts.nix index 8006af3..265ce85 100644 Binary files a/home/accounts.nix and b/home/accounts.nix differ diff --git a/home/dconf.nix b/home/dconf.nix index d6f5697..dc90c13 100644 --- a/home/dconf.nix +++ b/home/dconf.nix @@ -1,4 +1,6 @@ -{ lib }: +{ + lib +}: { enable = true; diff --git a/home/gtk.nix b/home/gtk.nix index 6eec37b..9211fd7 100644 --- a/home/gtk.nix +++ b/home/gtk.nix @@ -1,4 +1,7 @@ -{ config, pkgs }: +{ + config + ,pkgs +}: # Possible alternatives: # https://github.com/FedoraQt/adwaita-qt diff --git a/home/modules/programs/cmus.nix b/home/modules/programs/cmus.nix index 0ec267d..a7be242 100644 --- a/home/modules/programs/cmus.nix +++ b/home/modules/programs/cmus.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config + ,lib + ,pkgs + ,... +}: with lib; diff --git a/home/modules/programs/khal-notification.nix b/home/modules/programs/khal-notification.nix index 71b64ee..2d40203 100644 --- a/home/modules/programs/khal-notification.nix +++ b/home/modules/programs/khal-notification.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config + ,lib + ,pkgs + ,... +}: with lib; diff --git a/home/modules/programs/languagetool.nix b/home/modules/programs/languagetool.nix index b3d3535..cec1e16 100644 --- a/home/modules/programs/languagetool.nix +++ b/home/modules/programs/languagetool.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config + ,lib + ,pkgs + ,... +}: with lib; diff --git a/home/modules/programs/mailhog.nix b/home/modules/programs/mailhog.nix index 080e3ba..b58c03b 100644 --- a/home/modules/programs/mailhog.nix +++ b/home/modules/programs/mailhog.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config + ,lib + ,pkgs + ,... +}: with lib; diff --git a/home/modules/programs/my-pidgin.nix b/home/modules/programs/my-pidgin.nix index a31dd6b..af7d044 100644 --- a/home/modules/programs/my-pidgin.nix +++ b/home/modules/programs/my-pidgin.nix @@ -1,4 +1,8 @@ -{ config, pkgs, ... }: +{ + config + ,pkgs + ,... +}: { config = { diff --git a/home/packages.nix b/home/packages.nix index e437809..1ae5432 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -1,4 +1,7 @@ -{ pkgs, ownLib }: +{ + pkgs + ,ownLib +}: with pkgs; [ nix diff --git a/home/packages/custom/backup/default.nix b/home/packages/custom/backup/default.nix index 8cf576c..e00de7f 100644 --- a/home/packages/custom/backup/default.nix +++ b/home/packages/custom/backup/default.nix @@ -1,9 +1,9 @@ { writeShellApplication - , borgbackup - , git - , rsync - , callPackage + ,borgbackup + ,git + ,rsync + ,callPackage }: writeShellApplication { diff --git a/home/packages/custom/default.nix b/home/packages/custom/default.nix index 8a97d38..f9b5702 100644 --- a/home/packages/custom/default.nix +++ b/home/packages/custom/default.nix @@ -1,6 +1,6 @@ { callPackage - , ownLib + ,ownLib }: [ diff --git a/home/packages/custom/dmenu-scripts/default.nix b/home/packages/custom/dmenu-scripts/default.nix index c4efd12..62048eb 100644 --- a/home/packages/custom/dmenu-scripts/default.nix +++ b/home/packages/custom/dmenu-scripts/default.nix @@ -1,11 +1,11 @@ { - writeShellApplication, - dmenu, - dunst, - libnotify, - bc, - i3, - xdg-utils + writeShellApplication + ,dmenu + ,dunst + ,libnotify + ,bc + ,i3 + ,xdg-utils }: let diff --git a/home/packages/custom/nextcloud-sync/from-local.nix b/home/packages/custom/nextcloud-sync/from-local.nix index da04bda..84cc129 100644 --- a/home/packages/custom/nextcloud-sync/from-local.nix +++ b/home/packages/custom/nextcloud-sync/from-local.nix @@ -1,6 +1,6 @@ { - writeShellApplication, - rclone + writeShellApplication + ,rclone }: writeShellApplication { diff --git a/home/packages/custom/nextcloud-sync/from-remote.nix b/home/packages/custom/nextcloud-sync/from-remote.nix index 44be9d4..84a2447 100644 --- a/home/packages/custom/nextcloud-sync/from-remote.nix +++ b/home/packages/custom/nextcloud-sync/from-remote.nix @@ -1,6 +1,6 @@ { - writeShellApplication, - rclone + writeShellApplication + ,rclone }: writeShellApplication { diff --git a/home/packages/custom/project/default.nix b/home/packages/custom/project/default.nix index 91ea56b..539156b 100644 --- a/home/packages/custom/project/default.nix +++ b/home/packages/custom/project/default.nix @@ -1,8 +1,8 @@ { - writeShellApplication, - bash, - gnused, - ownLib + writeShellApplication + ,bash + ,gnused + ,ownLib }: let diff --git a/home/packages/custom/push-etckeeper/default.nix b/home/packages/custom/push-etckeeper/default.nix index e136ce2..275f397 100644 --- a/home/packages/custom/push-etckeeper/default.nix +++ b/home/packages/custom/push-etckeeper/default.nix @@ -1,6 +1,6 @@ { - writeShellApplication, - git + writeShellApplication + ,git }: writeShellApplication { diff --git a/home/packages/custom/typo3-documentation-rendering-old/default.nix b/home/packages/custom/typo3-documentation-rendering-old/default.nix index eaf5cac..3f54ce6 100644 --- a/home/packages/custom/typo3-documentation-rendering-old/default.nix +++ b/home/packages/custom/typo3-documentation-rendering-old/default.nix @@ -1,6 +1,6 @@ { - writeShellApplication, - podman + writeShellApplication + ,podman }: writeShellApplication { diff --git a/home/packages/custom/typo3-documentation-rendering/default.nix b/home/packages/custom/typo3-documentation-rendering/default.nix index 20419b9..28e39aa 100644 --- a/home/packages/custom/typo3-documentation-rendering/default.nix +++ b/home/packages/custom/typo3-documentation-rendering/default.nix @@ -1,6 +1,6 @@ { - writeShellApplication, - podman + writeShellApplication + ,podman }: writeShellApplication { diff --git a/home/packages/custom/update-nixos-system/default.nix b/home/packages/custom/update-nixos-system/default.nix index a659388..1ecdae3 100644 --- a/home/packages/custom/update-nixos-system/default.nix +++ b/home/packages/custom/update-nixos-system/default.nix @@ -1,4 +1,6 @@ -{ writeShellApplication }: +{ + writeShellApplication +}: writeShellApplication { name = "custom-update-operating-system"; diff --git a/home/packages/custom/update-system/default.nix b/home/packages/custom/update-system/default.nix index bf43bdd..8f9bbf6 100644 --- a/home/packages/custom/update-system/default.nix +++ b/home/packages/custom/update-system/default.nix @@ -1,4 +1,6 @@ -{ writeShellApplication }: +{ + writeShellApplication +}: writeShellApplication { name = "custom-update-system"; diff --git a/home/packages/custom/update-ubuntu-system/default.nix b/home/packages/custom/update-ubuntu-system/default.nix index dfc2ba1..29ab25d 100644 --- a/home/packages/custom/update-ubuntu-system/default.nix +++ b/home/packages/custom/update-ubuntu-system/default.nix @@ -1,6 +1,6 @@ { writeShellApplication - , callPackage + ,callPackage }: writeShellApplication { diff --git a/home/packages/custom/vpn-reuter-dynamics/default.nix b/home/packages/custom/vpn-reuter-dynamics/default.nix index a8ae542..31d2a64 100644 Binary files a/home/packages/custom/vpn-reuter-dynamics/default.nix and b/home/packages/custom/vpn-reuter-dynamics/default.nix differ diff --git a/home/packages/custom/zcat-progress/default.nix b/home/packages/custom/zcat-progress/default.nix index f51c381..fe3b9c1 100644 --- a/home/packages/custom/zcat-progress/default.nix +++ b/home/packages/custom/zcat-progress/default.nix @@ -1,7 +1,7 @@ { writeShellApplication - , pv - , gzip + ,pv + ,gzip }: writeShellApplication { diff --git a/home/packages/purple-events/default.nix b/home/packages/purple-events/default.nix index c3381f4..9d6f0a3 100644 --- a/home/packages/purple-events/default.nix +++ b/home/packages/purple-events/default.nix @@ -1,11 +1,11 @@ { - stdenv, - fetchFromGitHub, - meson, - ninja, - lib, - pidgin, - libnotify + stdenv + ,fetchFromGitHub + ,meson + ,ninja + ,lib + ,pidgin + ,libnotify }: stdenv.mkDerivation rec { diff --git a/home/packages/purple-libnotify/default.nix b/home/packages/purple-libnotify/default.nix index 1fa0b28..189fa3e 100644 --- a/home/packages/purple-libnotify/default.nix +++ b/home/packages/purple-libnotify/default.nix @@ -1,12 +1,12 @@ { - stdenv, - fetchFromGitHub, - callPackage, - meson, - ninja, - lib, - pidgin, - libnotify + stdenv + ,fetchFromGitHub + ,callPackage + ,meson + ,ninja + ,lib + ,pidgin + ,libnotify }: stdenv.mkDerivation rec { diff --git a/home/packages/purple-mattermost/default.nix b/home/packages/purple-mattermost/default.nix index 8084830..446fd9a 100644 --- a/home/packages/purple-mattermost/default.nix +++ b/home/packages/purple-mattermost/default.nix @@ -1,12 +1,12 @@ { - stdenv, - fetchFromGitHub, - lib, - git, - pidgin, - glib, - json-glib, - discount # markdown implementation + stdenv + ,fetchFromGitHub + ,lib + ,git + ,pidgin + ,glib + ,json-glib + ,discount # markdown implementation }: stdenv.mkDerivation rec { diff --git a/home/packages/purple-microsoft-teams/default.nix b/home/packages/purple-microsoft-teams/default.nix index 0b4ec20..7084fde 100644 --- a/home/packages/purple-microsoft-teams/default.nix +++ b/home/packages/purple-microsoft-teams/default.nix @@ -1,10 +1,10 @@ { - stdenv, - fetchFromGitHub, - lib, - pidgin, - glib, - json-glib + stdenv + ,fetchFromGitHub + ,lib + ,pidgin + ,glib + ,json-glib }: stdenv.mkDerivation rec { diff --git a/home/packages/sqlformat/default.nix b/home/packages/sqlformat/default.nix index b22e3ea..ab346ea 100644 --- a/home/packages/sqlformat/default.nix +++ b/home/packages/sqlformat/default.nix @@ -1,6 +1,6 @@ { - writeShellApplication, - python3 + writeShellApplication + ,python3 }: let diff --git a/home/programs/fzf.nix b/home/programs/fzf.nix index 61dbbb2..f2eeacd 100644 --- a/home/programs/fzf.nix +++ b/home/programs/fzf.nix @@ -1,4 +1,4 @@ -{ }: +_: { enable = true; diff --git a/home/programs/git.nix b/home/programs/git.nix index 0ca01df..ee40f2b 100644 --- a/home/programs/git.nix +++ b/home/programs/git.nix @@ -1,4 +1,6 @@ -{ pkgs }: +{ + pkgs +}: { enable = true; diff --git a/home/programs/gpg.nix b/home/programs/gpg.nix index 2e776b2..3d20d9b 100644 --- a/home/programs/gpg.nix +++ b/home/programs/gpg.nix @@ -1,4 +1,6 @@ -{ config }: +{ + config +}: { enable = true; diff --git a/home/programs/htop.nix b/home/programs/htop.nix index 586e529..3a49f8b 100644 --- a/home/programs/htop.nix +++ b/home/programs/htop.nix @@ -1,4 +1,6 @@ -{ config }: +{ + config +}: { enable = true; diff --git a/home/programs/jq.nix b/home/programs/jq.nix index 44732e8..b540eed 100644 --- a/home/programs/jq.nix +++ b/home/programs/jq.nix @@ -1,4 +1,7 @@ -{ config }: +{ + config +}: + { enable = true; colors = { diff --git a/home/programs/khal.nix b/home/programs/khal.nix index 1e09961..9c9497a 100644 --- a/home/programs/khal.nix +++ b/home/programs/khal.nix @@ -1,4 +1,6 @@ -{ config }: +{ + config +}: { enable = true; diff --git a/home/programs/nix.nix b/home/programs/nix.nix index 998a0e5..20a6bed 100644 --- a/home/programs/nix.nix +++ b/home/programs/nix.nix @@ -1,4 +1,6 @@ -{ pkgs }: +{ + pkgs +}: { enable = true; diff --git a/home/programs/tmux.nix b/home/programs/tmux.nix index 587c005..968a70a 100644 --- a/home/programs/tmux.nix +++ b/home/programs/tmux.nix @@ -1,4 +1,6 @@ -{ pkgs }: +{ + pkgs +}: { enable = true; diff --git a/home/programs/zsh.nix b/home/programs/zsh.nix index 4e332e4..645af78 100644 --- a/home/programs/zsh.nix +++ b/home/programs/zsh.nix @@ -1,4 +1,7 @@ -{ config, pkgs }: +{ + config + ,pkgs +}: # Sources: # https://thevaluable.dev/zsh-install-configure-mouseless/ diff --git a/home/qt.nix b/home/qt.nix index 7f37602..9b57677 100644 --- a/home/qt.nix +++ b/home/qt.nix @@ -1,4 +1,6 @@ -{ pkgs }: +{ + pkgs +}: { enable = true; diff --git a/home/services.nix b/home/services.nix index 0f3fe72..ae02f0c 100644 --- a/home/services.nix +++ b/home/services.nix @@ -1,4 +1,8 @@ -{ config, ownLib, pkgs }: +{ + config + ,ownLib + ,pkgs +}: { diff --git a/home/services/batteryicon.nix b/home/services/batteryicon.nix index 5fd3b84..712021c 100644 --- a/home/services/batteryicon.nix +++ b/home/services/batteryicon.nix @@ -1,4 +1,6 @@ -{ pkgs }: +{ + pkgs +}: { Unit = { diff --git a/home/services/dunst.nix b/home/services/dunst.nix index 0e8a9c9..3a802ed 100644 --- a/home/services/dunst.nix +++ b/home/services/dunst.nix @@ -1,4 +1,6 @@ -{ config }: +{ + config +}: { enable = true; diff --git a/home/services/gpg-agent.nix b/home/services/gpg-agent.nix index d039a79..75d4404 100644 --- a/home/services/gpg-agent.nix +++ b/home/services/gpg-agent.nix @@ -1,4 +1,6 @@ -{ pkgs }: +{ + pkgs +}: { enable = true; diff --git a/home/systemd.nix b/home/systemd.nix index bb32494..b74bd08 100644 --- a/home/systemd.nix +++ b/home/systemd.nix @@ -1,4 +1,7 @@ -{ config, pkgs }: +{ + config + ,pkgs +}: { services = { diff --git a/home/xdg.nix b/home/xdg.nix index 53b623b..1502171 100644 --- a/home/xdg.nix +++ b/home/xdg.nix @@ -1,4 +1,6 @@ -{ pkgs }: +{ + pkgs +}: { enable = true; diff --git a/home/xsession.nix b/home/xsession.nix index beca896..472c3dc 100644 --- a/home/xsession.nix +++ b/home/xsession.nix @@ -1,4 +1,8 @@ -{ config, pkgs, ownLib }: +{ + config + ,pkgs + ,ownLib +}: let initExtraHikari = ''