From 59091672430c4af3f736819affe36858680c458c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Wed, 3 Apr 2024 07:56:07 +0200 Subject: [PATCH] feat: restructure home directory --- configs/backup.nix | 11 +++-------- configs/default.nix | 3 ++- configs/fritzbox.nix | 19 +++++++++++++++++++ configs/hledger.nix | 2 +- configs/zsh.nix | 2 +- 5 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 configs/fritzbox.nix diff --git a/configs/backup.nix b/configs/backup.nix index cc4dc61..7c9a23f 100644 --- a/configs/backup.nix +++ b/configs/backup.nix @@ -14,21 +14,16 @@ in { }; passwordFile = config.age.secrets.restic.path; extraBackupArgs = [ - "--exclude=/home/kfm/projects/nixpkgs/.git" + "--exclude=/home/kfm/sync/src/nixpkgs/.git" "--exclude=node_modules" "--exclude=.parcel-cache" ]; paths = [ - "/home/kfm/work" - "/home/kfm/projects" - "/home/kfm/Zotero" - "/home/kfm/notes" - "/home/kfm/Maildir" + "/home/kfm/sync" + "/home/kfm/state" "/home/kfm/cloud" "/home/kfm/.gnupg" "/home/kfm/.ssh" - "/mnt/sd-card/music" - "/mnt/sd-card/Books" ]; }; diff --git a/configs/default.nix b/configs/default.nix index aee7177..35ffeb9 100644 --- a/configs/default.nix +++ b/configs/default.nix @@ -96,7 +96,7 @@ in { home-manager.users.me.xdg.enable = true; } { - environment.interactiveShellInit = "export PATH=$PATH:$HOME/projects/niveum"; + environment.interactiveShellInit = "export PATH=$PATH"; environment.shellAliases = let swallow = command: "${niveumPackages.swallow}/bin/swallow ${command}"; in { @@ -264,6 +264,7 @@ in { ./zsh.nix ./tor.nix ./stw-berlin.nix + ./fritzbox.nix ./mastodon-bot.nix ]; } diff --git a/configs/fritzbox.nix b/configs/fritzbox.nix new file mode 100644 index 0000000..47c9458 --- /dev/null +++ b/configs/fritzbox.nix @@ -0,0 +1,19 @@ +{ config, ... }: +{ + fileSystems."/media/fritzbox" = { + device = "//192.168.178.1/FRITZ.NAS"; + fsType = "cifs"; + options = [ + "username=ftpuser" + "password=ftppassword" + "noauto" + "uid=${toString config.users.users.me.uid}" + "gid=${toString config.users.groups.users.gid}" + "rw" + "nounix" + "x-systemd.automount" + "x-systemd.device-timeout=1" + "x-systemd.idle-timeout=1min" + ]; + }; +} diff --git a/configs/hledger.nix b/configs/hledger.nix index d86b5c0..aba6ba7 100644 --- a/configs/hledger.nix +++ b/configs/hledger.nix @@ -2,7 +2,7 @@ pkgs, ... }: let - ledgerDirectory = "/home/kfm/projects/ledger"; + ledgerDirectory = "/home/kfm/sync/src/ledger"; hora = pkgs.callPackage ../packages/hora.nix { timeLedger = "${ledgerDirectory}/time.timeclock"; }; in { environment.systemPackages = let diff --git a/configs/zsh.nix b/configs/zsh.nix index f183911..8ec7c00 100644 --- a/configs/zsh.nix +++ b/configs/zsh.nix @@ -52,7 +52,7 @@ export KEYTIMEOUT=1 - hash -d nixos=/etc/nixos niveum=${config.users.users.me.home}/projects/niveum + hash -d nixos=/etc/nixos niveum=${config.users.users.me.home}/sync/src/niveum autoload -U zmv run-help edit-command-line