Merge remote-tracking branch 'origin/nixos' into nixos-work
This commit is contained in:
commit
c7b7378750
10 changed files with 89 additions and 72 deletions
|
|
@ -1,9 +1,12 @@
|
|||
{ lib, pkgs, ... }:
|
||||
{ lib, ... }:
|
||||
|
||||
with lib;
|
||||
{
|
||||
my = {
|
||||
services.openconnect.enable = true;
|
||||
services = {
|
||||
openconnect.enable = true;
|
||||
synology-drive.enable = true;
|
||||
};
|
||||
programs = {
|
||||
ssh.includeSecrets = mkDefault [ ../../secrets/ssh-home.age ];
|
||||
git.signing = mkDefault true;
|
||||
|
|
@ -57,8 +60,4 @@ with lib;
|
|||
};
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
synology-drive-client
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,31 +2,9 @@
|
|||
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
# nix
|
||||
nixpkgs-review
|
||||
|
||||
# ripping
|
||||
abcde
|
||||
handbrake
|
||||
picard
|
||||
|
||||
# other
|
||||
anki
|
||||
calibre
|
||||
jellyfin-media-player
|
||||
keepassxc
|
||||
stable.libreoffice # HACK to fix build error
|
||||
pavucontrol
|
||||
stable.signal-desktop
|
||||
tlaplusToolbox
|
||||
vlc
|
||||
thunderbird
|
||||
plantuml
|
||||
|
||||
jetbrains.pycharm-professional
|
||||
|
||||
synology-drive-client
|
||||
|
||||
texlive.combined.scheme-full
|
||||
];
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue