diff --git a/common/base-packages.nix b/common/base-packages.nix index 36af91f..713da95 100644 --- a/common/base-packages.nix +++ b/common/base-packages.nix @@ -23,6 +23,7 @@ keychain ledger gnupg ledger2beancount beancount fava hledger + ledger-autosync mailutils pandoc texlive.combined.scheme-full texlivePackages.noto @@ -72,6 +73,17 @@ # chromaprint lxml + + # RedditArchiver dependencies + pyyaml + anytree + colored + markdown2 + praw + colored + prawcore + + ofxclient ])) chromaprint diff --git a/home/users/benson.nix b/home/users/benson.nix index 0aa2a0a..0f07bce 100644 --- a/home/users/benson.nix +++ b/home/users/benson.nix @@ -12,7 +12,9 @@ my.beets-config.enable = true; my.tmux-config.enable = true; - my.flakeLocation = lib.mkIf (builtins.hasAttr "osConfig" args) args.osConfig.my.flakeLocation; + my.flakeLocation = if (builtins.hasAttr "osConfig" args) + then args.osConfig.my.flakeLocation + else "/home/benson/nixos-config"; # Home Manager needs a bit of information about you and the paths it should # manage. diff --git a/modules/secrets/default.nix b/modules/secrets/default.nix index aff8bfe..585df0e 100644 --- a/modules/secrets/default.nix +++ b/modules/secrets/default.nix @@ -1,3 +1,20 @@ { inputs, config, pkgs, lib, ... }: { + fileSystems."/mnt/media" = { + device = "//atlantis.local/media2"; + fsType = "cifs"; + options = [ "username=bchu" "password=Mathexpert457" "uid=1000" "x-systemd.automount" "noauto"]; + }; + + fileSystems."/mnt/dump" = { + device = "//atlantis.local/dump"; + fsType = "cifs"; + options = [ "username=bchu" "password=Mathexpert457" "uid=1000" "x-systemd.automount" "noauto"]; + }; + + fileSystems."/mnt/puppet_recordings" = { + device = "//atlantis.local/Puppet Recordings"; + fsType = "cifs"; + options = [ "username=bchu" "password=Mathexpert457" "uid=1000" "x-systemd.automount" "noauto"]; + }; } diff --git a/submodules/default.nix b/submodules/default.nix index a45e389..5d7b238 100644 --- a/submodules/default.nix +++ b/submodules/default.nix @@ -55,7 +55,8 @@ in "tmux/tmux.conf" = (mkIfFlakeLoc tmux-cfg.enable "I won't symlink tmux's tmux.conf into place" { - source = getPath "${flakeSubmodules}/tmux-config/tmux.conf"; + source = config.lib.file.mkOutOfStoreSymlink + "${flakeSubmodules}/tmux-config/tmux.conf"; }); "wezterm/" = (mkIfFlakeLoc beets-cfg.enable