1
0
mirror of https://github.com/kmein/niveum synced 2026-03-18 11:01:07 +01:00

feat: move ./modules to flake outputs

This commit is contained in:
2023-02-24 23:41:01 +01:00
parent c9af430f31
commit b1743f031c
18 changed files with 35 additions and 379 deletions

View File

@@ -3,6 +3,7 @@
lib,
config,
niveumPackages,
inputs,
...
}: let
inherit (lib.strings) makeBinPath;
@@ -10,16 +11,12 @@
defaultApplications = (import ../lib).defaultApplications {inherit pkgs;};
in {
imports = [
../modules/system-dependent.nix
inputs.self.nixosModules.system-dependent
inputs.self.nixosModules.traadfri
inputs.self.nixosModules.power-action
{
boot.supportedFilesystems = ["ntfs"];
}
{
nix.nixPath = [
"/var/src"
"nixpkgs-overlays=${toString ../overlays}"
];
}
{
nixpkgs = {
config = {

View File

@@ -3,10 +3,10 @@
pkgs,
...
}: {
imports = [../modules/hledger.nix];
environment.systemPackages = let
timeLedger = "$HOME/projects/ledger/time.timeclock";
ledgerDirectory = "$HOME/projects/ledger";
timeLedger = "${ledgerDirectory}/time.timeclock";
git = "${pkgs.git}/bin/git -C ${ledgerDirectory}";
in [
(pkgs.writers.writeDashBin "hora-edit" ''
$EDITOR + "${timeLedger}" && ${pkgs.git}/bin/git -C "$(${pkgs.coreutils}/bin/dirname ${timeLedger})" commit --all --message "$(${pkgs.coreutils}/bin/date -Im)"
@@ -21,16 +21,18 @@
| sed 's/(fillidefilla:\(.*\))/\1/g' \
| xsv select date,amount,total,account,description
'')
];
niveum.hledger = {
enable = true;
ledgerFile = "$HOME/projects/ledger/all.journal";
server = {
enable = false;
user = config.users.users.me;
package = pkgs.hledger-web;
};
package = pkgs.hledger;
};
(pkgs.writers.writeDashBin "hledger-git" ''
if [ "$1" = entry ]; then
${pkgs.hledger}/bin/hledger balance -V > "${ledgerDirectory}/balance.txt"
${git} add balance.txt
${git} commit --all --message="$(date -Im)"
else
${git} $*
fi
'')
(pkgs.writers.writeDashBin "hledger-edit" ''
$EDITOR ${ledgerDirectory}/current.journal
'')
];
}

View File

@@ -42,8 +42,6 @@
};
};
in {
imports = [../modules/networkmanager-declarative.nix];
programs.nm-applet.enable = true;
networking.networkmanager = {

View File

@@ -5,8 +5,6 @@
}: let
suspend = pkgs.writers.writeDash "suspend" "${pkgs.systemd}/bin/systemctl suspend";
in {
imports = [../modules/power-action.nix];
services.power-action = {
enable = true;
plans.suspend = {

View File

@@ -19,7 +19,6 @@ in {
./nachtischsatan.nix
./tlg-wotd.nix
./celan.nix
../../modules/telegram-bot.nix
];
systemd.tmpfiles.rules = map (path:

View File

@@ -7,8 +7,6 @@
inherit (import ../lib) localAddresses;
living-room-id = 131090;
in {
imports = [../modules/traadfri.nix];
environment.systemPackages = [
(pkgs.writers.writeDashBin "traadfri-party" ''
while true; do