diff --git a/home-manager/modules/machine.nix b/home-manager/modules/machine.nix index 2e263cb..7c3b418 100644 --- a/home-manager/modules/machine.nix +++ b/home-manager/modules/machine.nix @@ -20,6 +20,7 @@ with lib; ./../programs/firefox.nix ./../programs/chromium.nix ./../programs/mpv.nix + ./../programs/syncthing.nix ./../../nix.nix ./packages.nix ]; diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix index 8b5f3af..61e610b 100644 --- a/home-manager/modules/packages.nix +++ b/home-manager/modules/packages.nix @@ -117,6 +117,8 @@ with lib; gnome.gnome-disk-utility inkscape musescore + obsidian + syncthingtray ] else [ ]) ++ (if config.machine.isGnome then [ gnomeExtensions.blur-my-shell gnomeExtensions.dash-to-panel diff --git a/home-manager/programs/git.nix b/home-manager/programs/git.nix index 21b5071..f649e00 100644 --- a/home-manager/programs/git.nix +++ b/home-manager/programs/git.nix @@ -3,6 +3,7 @@ { programs.git = { enable = true; + package = pkgs.gitFull; lfs.enable = true; userEmail = "thilo.billerbeck@officerent.de"; userName = "Thilo Billerbeck"; @@ -26,4 +27,7 @@ branch = { autosetuprebase = "always"; }; }; }; + programs.git-credential-oauth = { + enable = true; + }; } diff --git a/home-manager/programs/syncthing.nix b/home-manager/programs/syncthing.nix new file mode 100644 index 0000000..18a00d6 --- /dev/null +++ b/home-manager/programs/syncthing.nix @@ -0,0 +1,7 @@ +{ config, pkgs, lib, ... }: + +{ + services.syncthing = { + enable = true; + }; +} diff --git a/nixos/common.nix b/nixos/common.nix index 031cf5b..b56804e 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -24,6 +24,7 @@ config = { permittedInsecurePackages = [ "electron-24.8.6" + "electron-25.9.0" ]; allowUnfree = true; };