From fa60053c449cff0984d58735afdfa3c9d510cf9c Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Tue, 12 Apr 2022 19:26:08 +0200 Subject: [PATCH] cleanup --- home-manager/home.nix | 15 ++++----------- misc/.stow-local-ignore | 1 - misc/dupignore | 31 ------------------------------- 3 files changed, 4 insertions(+), 43 deletions(-) delete mode 100644 misc/.stow-local-ignore delete mode 100644 misc/dupignore diff --git a/home-manager/home.nix b/home-manager/home.nix index caee713..0fd6815 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -45,8 +45,6 @@ in { extraConfig.help.autocorrect = 5; extraConfig.push.default = "simple"; extraConfig.pull.ff = "only"; - extraConfig."includeIf \"gitdir:~/serokell/\"".path = - "~/serokell/.gitconfig"; aliases = { lg = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative"; @@ -147,12 +145,9 @@ in { player = mpv --cache 2048 default-stream = best ''; - services = { - lorri.enable = true; - gpg-agent = { - enable = true; - enableSshSupport = true; - }; + services.gpg-agent = { + enable = true; + enableSshSupport = true; }; home.packages = (with pkgs; [ ## utils @@ -196,7 +191,6 @@ in { sshfs-fuse sshuttle thefuck - w3m wakelan ## media @@ -264,7 +258,6 @@ in { discord fanficfare feh - gajim gimp gopass hledger @@ -274,7 +267,7 @@ in { virt-manager wireshark y-firefox - yubioath-desktop # todo + yubioath-desktop ## games minecraft diff --git a/misc/.stow-local-ignore b/misc/.stow-local-ignore deleted file mode 100644 index 9165206..0000000 --- a/misc/.stow-local-ignore +++ /dev/null @@ -1 +0,0 @@ -dupignore diff --git a/misc/dupignore b/misc/dupignore deleted file mode 100644 index 69118a3..0000000 --- a/misc/dupignore +++ /dev/null @@ -1,31 +0,0 @@ -- /home/yorick/projects/**/journal/prealloc.* -- /home/yorick/backups/*.zip.gpg -- /home/yorick/frumar -- /home/yorick/Downloads -- /home/yorick/media -- /home/yorick/annex -- /home/yorick/dotfiles -- /home/yorick/public -- /home/yorick/builds -- /home/yorick/tmp -- /home/yorick/VirtualBox VMs -+ /home/yorick/*/wallet.dat -+ /home/yorick/.electrum -+ /home/yorick/.gnupg -- /home/yorick/.config/Chromium -- /home/yorick/.config/sublime-text-2/Backup -- /home/yorick/.config/sublime-text-3/Backup -- /home/yorick/.config/VirtualBox -+ /home/yorick/.config/* -- /home/yorick/.mozilla/firefox/*/storage -- /home/yorick/.mozilla/firefox/*/epub -- /home/yorick/.mozilla/firefox/*/webappsstore.sqlite -+ /home/yorick/.mozilla/ -- /home/yorick/ru/ext/ -- /home/yorick/ru/netsec/netsec2015 -- /home/yorick/ru/netsec/NetSec-Debian-root.vdi -- /home/yorick/ru/ossec/ossec2015 -- /home/yorick/ru/**/lectures -- /home/yorick/ru/**/opnames -+ /home/yorick/ru/ -- /home/yorick/.*