diff --git a/home/fhauser/applications/default.nix b/home/fhauser/applications/default.nix index 72e3241..7266326 100644 --- a/home/fhauser/applications/default.nix +++ b/home/fhauser/applications/default.nix @@ -64,8 +64,8 @@ pandoc texliveSmall simple-scan - pkgs.gnome-online-accounts - gnome.gnome-control-center + gnome-online-accounts + gnome-control-center todoist-electron marktext ] diff --git a/home/fhauser/applications/git.nix b/home/fhauser/applications/git.nix index ddeca61..95f01f9 100644 --- a/home/fhauser/applications/git.nix +++ b/home/fhauser/applications/git.nix @@ -1,5 +1,7 @@ { pkgs, ... }: { + + home.packages = [ pkgs.git-absorb ]; programs.git = { enable = true; package = pkgs.gitAndTools.gitFull; @@ -50,12 +52,19 @@ diff = "auto"; status = "auto"; }; - push.default = "current"; + push = { + default = "current"; + autoSetupRemote = true; + }; pull.rebase = "true"; branch.autosetuprebase = "always"; log.follow = true; rerere.enabled = true; fetch.recurseSubmodules = "on-demand"; + credential.helper = [ + "libsecret" + "cache --timeout 21600" + ]; }; ignores = [ "*~" @@ -87,4 +96,5 @@ "~/shares/drive.switch.ch/" ]; }; + programs.git-credential-oauth.enable = true; } diff --git a/home/fhauser/applications/vim.nix b/home/fhauser/applications/vim.nix index b416c43..4fb3f3d 100644 --- a/home/fhauser/applications/vim.nix +++ b/home/fhauser/applications/vim.nix @@ -17,7 +17,6 @@ set mouse= set hidden set expandtab - set ignorecase set tabstop=2 set softtabstop=2 diff --git a/home/fhauser/multimedia.nix b/home/fhauser/multimedia.nix index ce01caa..717b7d9 100644 --- a/home/fhauser/multimedia.nix +++ b/home/fhauser/multimedia.nix @@ -16,6 +16,7 @@ force-window = true; profile = "gpu-hq"; }; + scripts = [ pkgs.mpvScripts.mpris ]; }; home.packages = with pkgs;