From d143afc023d9233bcdb673180bf4c00682786bf3 Mon Sep 17 00:00:00 2001 From: dadada Date: Mon, 8 Mar 2021 10:08:22 +0100 Subject: [PATCH] Sync --- hosts/gorgon/home/default.nix | 1 - hosts/gorgon/home/pkgs.nix | 8 +++++--- modules/home/gtk.nix | 2 +- modules/home/vim/vimrc | 1 + modules/home/xdg.nix | 2 +- modules/profiles/laptop/default.nix | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/hosts/gorgon/home/default.nix b/hosts/gorgon/home/default.nix index 6541c9b..74b1d5d 100644 --- a/hosts/gorgon/home/default.nix +++ b/hosts/gorgon/home/default.nix @@ -19,7 +19,6 @@ let in { nixpkgs.overlays = [ - this.overlays.tubslatex this.overlays.dadadaScripts ]; diff --git a/hosts/gorgon/home/pkgs.nix b/hosts/gorgon/home/pkgs.nix index b7cf221..fa2f1fc 100644 --- a/hosts/gorgon/home/pkgs.nix +++ b/hosts/gorgon/home/pkgs.nix @@ -18,7 +18,7 @@ with pkgs; [ evince ffmpeg file - firefox-bin + firefox fractal fzf gimp @@ -37,6 +37,7 @@ with pkgs; [ inotify-tools irssi jameica + jupyter jq kcachegrind keepassxc @@ -47,6 +48,7 @@ with pkgs; [ libreoffice libvirt lsof + manpages mblaze mkpasswd mpv @@ -74,11 +76,11 @@ with pkgs; [ steam tcpdump tdesktop - tubslatex - thunderbird-bin + thunderbird unzip usbutils virtmanager + vscodium whois wireshark xdg_utils diff --git a/modules/home/gtk.nix b/modules/home/gtk.nix index 8c47571..779dfd3 100644 --- a/modules/home/gtk.nix +++ b/modules/home/gtk.nix @@ -19,7 +19,7 @@ in }; qt = { enable = true; - platformTheme = "gtk"; + platformTheme = "gnome"; }; }; } diff --git a/modules/home/vim/vimrc b/modules/home/vim/vimrc index fabd394..0bc8a24 100644 --- a/modules/home/vim/vimrc +++ b/modules/home/vim/vimrc @@ -93,6 +93,7 @@ nmap bb :Buffers nmap bl :Buffers nmap bn :bnext nmap bp :bprevious +nmap bd :bdelete nmap ll :Lines nmap mm :Marks diff --git a/modules/home/xdg.nix b/modules/home/xdg.nix index 8cba909..f3014b6 100644 --- a/modules/home/xdg.nix +++ b/modules/home/xdg.nix @@ -42,7 +42,7 @@ in }; }; home.packages = with pkgs; [ - firefox-bin + firefox xdg_utils zathura ]; diff --git a/modules/profiles/laptop/default.nix b/modules/profiles/laptop/default.nix index 0c28c29..d52ab8a 100644 --- a/modules/profiles/laptop/default.nix +++ b/modules/profiles/laptop/default.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: with lib; { - nixpkgs.overlays = attrValues (import ../../../overlays); + #nixpkgs.overlays = attrValues (import ../../../overlays); boot.kernelPackages = pkgs.linuxPackages_latest;