diff --git a/common.nix b/common.nix index def516e..0bdf099 100644 --- a/common.nix +++ b/common.nix @@ -341,7 +341,7 @@ in home.sessionVariables = { PAGER = "less -RFX --tabs=4"; MANPAGER = "nvim +'setl filetype=terminal' +'Man!'"; - QT_QPA_PLATFORMTHEME = "qt5ct"; + QT_QPA_PLATFORMTHEME = "qt5ct"; }; xdg.mimeApps = { @@ -470,13 +470,14 @@ in bash # Compat jetbrains.idea-ultimate # IntelliJ Ultimate jetbrains.idea-community # IntelliJ Community + jetbrains.rust-rover # Rust IDE maven # Java Build tool jdk # Java development kit nixfmt-rfc-style # official nix formatter ripgrep # some nice grep alternative netcat-gnu # networking connection debugging - libsForQt5.qtstyleplugin-kvantum # qt theme - libsForQt5.qt5ct # qt theme + libsForQt5.qtstyleplugin-kvantum # qt theme + libsForQt5.qt5ct # qt theme ]; programs = { @@ -487,6 +488,7 @@ in syntaxHighlighting.enable = true; autocd = true; shellAliases = { + g = "git"; git-list-untracked = ''git fetch --prune && git branch -r | awk "{print \$1}" | egrep -v -f /dev/fd/0 <(git branch -vv | grep origin) | awk "{print \$1}"''; git-remove-untracked = ''git fetch --prune && git branch -r | awk "{print \$1}" | egrep -v -f /dev/fd/0 <(git branch -vv | grep origin) | awk "{print \$1}" | xargs git branch -d''; }; @@ -510,12 +512,17 @@ in userName = "Leon Wilzer"; aliases = { ci = "commit"; + ca = "commit --amend"; + ri = "rebase -i"; co = "checkout"; s = "status"; undo = "reset --soft 'HEAD^'"; - a = "add"; + a = "add -A"; p = "push"; - cl = "clone"; + c = "clone"; + cc = ''clone "$(wl-paste)"''; + d = "diff"; + dh = "diff HEAD"; }; diff-so-fancy = { enable = true; @@ -545,6 +552,7 @@ in in { enable = true; + package = pkgs.opensshWithKerberos; addKeysToAgent = "yes"; matchBlocks = { "libre.moe *.libre.moe" = { @@ -559,16 +567,18 @@ in user = "git"; identityFile = "${sshDir}/github"; }; - "*.cs.upb.de *.cs.uni-paderborn.de" = { - extraOptions = { - "GSSAPIAuthentication" = "yes"; - "GSSAPIDelegateCredentials" = "yes"; - }; - user = "lwilzer"; - }; - "*.cs.upb.de *.cs.uni-paderborn.de,!sshgate.*,!git.*" = lib.hm.dag.entryAfter ["*.cs.upb.de *.cs.uni-paderborn.de"] { - proxyJump = "sshgate.cs.uni-paderborn.de"; - }; + "*.cs.upb.de *.cs.uni-paderborn.de" = { + extraOptions = { + GSSAPIAuthentication = "yes"; + GSSAPIDelegateCredentials = "yes"; + }; + user = "lwilzer"; + }; + "*.cs.upb.de *.cs.uni-paderborn.de,!sshgate.*,!git.*" = + lib.hm.dag.entryAfter [ "*.cs.upb.de *.cs.uni-paderborn.de" ] + { + proxyJump = "sshgate.cs.uni-paderborn.de"; + }; } // config.programs.ssh.customMatchBlocks; }; @@ -689,23 +699,23 @@ in }; }; -systemd.user.services = { - hyprpolkitagent = { - Unit = { - Description = "hyprpolkit agent"; - After = "graphical-session.target"; - WantedBy = [ "graphical-session.target" ]; - Wants = [ "graphical-session.target" ]; - }; - Service = { - Type = "simple"; - ExecStart = "${pkgs.hyprpolkitagent}/libexec/hyprpolkitagent"; - Restart = "on-failure"; - RestartSec = 1; - TimeoutStopSec = 10; - }; - }; -}; + systemd.user.services = { + hyprpolkitagent = { + Unit = { + Description = "hyprpolkit agent"; + After = "graphical-session.target"; + WantedBy = [ "graphical-session.target" ]; + Wants = [ "graphical-session.target" ]; + }; + Service = { + Type = "simple"; + ExecStart = "${pkgs.hyprpolkitagent}/libexec/hyprpolkitagent"; + Restart = "on-failure"; + RestartSec = 1; + TimeoutStopSec = 10; + }; + }; + }; # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage diff --git a/firefox.nix b/firefox.nix index e71a91b..1276c34 100644 --- a/firefox.nix +++ b/firefox.nix @@ -60,7 +60,7 @@ in DontCheckDefaultBrowser = true; PrimaryPassword = false; OfferToSaveLoginsDefault = false; - DisableBuiltinPDFViewer = true; + #DisableBuiltinPDFViewer = true; PasswordManagerEnabled = false; DisableMasterPasswordCreation = true; AutofillAddressEnabled = false;