From 1467c20e3d852bb10ddbc4da0ee11761678224b5 Mon Sep 17 00:00:00 2001
From: Matthew Ess <daringseal@gmail.com>
Date: Sun, 15 Nov 2020 00:08:06 -0500
Subject: [PATCH] Updates

---
 configuration.nix | 21 +++++++++++++--------
 home.nix          | 33 ++++++++++++++++++++++++++++-----
 i3.nix            | 10 +++++++++-
 3 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 169fc63..00319f3 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -53,10 +53,14 @@
       fira-code-symbols
       font-awesome_4
       aileron
+      gohufont
+      spleen
+      tamsyn
+      siji
+      unscii
     ];
     fontconfig = {
       enable = true;
-      penultimate.enable = true;
       defaultFonts = { monospace = [ "Fira Code" ]; };
     };
   };
@@ -95,7 +99,7 @@
   services = {
     fprintd = {
       enable = true;
-      package = pkgs.fprintd-thinkpad;
+      # package = pkgs.fprintd-thinkpad;
     };
     openssh.enable = true;
     clipmenu.enable = true;
@@ -132,12 +136,9 @@
       };
       displayManager = {
         defaultSession = "home-manager";
-        lightdm = {
+        autoLogin = {
           enable = true;
-          autoLogin = {
-            enable = true;
-            user = "mat";
-          };
+          user = "mat";
         };
       };
     };
@@ -148,6 +149,10 @@
 
   # Hardware switches
   hardware = {
+    logitech.wireless = {
+      enable = true;
+      # enableGraphical = true;
+    };
     opengl = {
       driSupport32Bit = true;
       extraPackages32 = [ pkgs.pkgsi686Linux.libva ];
@@ -178,7 +183,7 @@
     binaryCaches = [ "https://hydra.iohk.io" ];
     binaryCachePublicKeys =
       [ "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" ];
-  };
+    };
 
   # This value determines the NixOS release with which your system is to be
   # compatible, in order to avoid breaking some software such as database
diff --git a/home.nix b/home.nix
index 88e8660..85dbee8 100644
--- a/home.nix
+++ b/home.nix
@@ -7,6 +7,9 @@ let
   lockCmd = "i3lock -i ~/.lockscreen-image";
   statusCmd = "i3status-rs ~/.config/i3status.toml";
 
+  nixpkgs-lldb = import <nixpkgs-vscode-lldb> {};
+  nixpkgs-ra = import <nixpkgs-ra> {};
+
 in {
   nixpkgs = { config = { allowUnfree = true; }; };
   home = {
@@ -37,12 +40,15 @@ in {
       discord
       (dunst.override { dunstify = true; })
       enpass
+      fractal
       firefox
       httpie
       kitty
-      nheko
+      signal-desktop
       slack
       steam
+      xfce.thunar
+      xfce.thunar-archive-plugin
       # graphical utilities
       clipmenu
       clipnotify
@@ -50,6 +56,7 @@ in {
       i3lock
       i3status-rust
       libnotify
+      lxappearance
       rofi
       xclip
     ];
@@ -58,7 +65,6 @@ in {
       ".lockscreen-image".source = ./assets/lockscreen-image;
       ".config/fish/fishfile".text = ''
         laughedelic/pisces
-        sijad/gitignore
         joehillen/to-fish
         jethrokuan/z
         decors/fish-colored-man
@@ -155,6 +161,8 @@ in {
         alias i3="vim ~/dotfiles.nix/i3.nix +'cd %:p:h'"
         alias config="vim ~/dotfiles.nix/configuration.nix +'cd %:p:h'"
         alias vims="vim -S Session.vim"
+        alias bigscreen="xrandr --output eDP1 --off --output HDMI2 --auto"
+        alias smallscreen="xrandr --output eDP1 --auto --output HDMI2 --off"
 
         bind \cr 'fzy_select_history (commandline -b)'
         bind -M insert \cr 'fzy_select_history (commandline -b)'
@@ -169,12 +177,13 @@ in {
     git = {
       enable = true;
       userName = "${name}";
-      userEmail = "${workEmail}";
+      userEmail = "${email}";
       ignores = [ ".*.sw[a-z]" "tags" ];
       extraConfig = {
         color.ui = true;
         core.editor = "vim";
         push.default = "simple";
+        init.defaultBranch = "main";
       };
     };
     htop = {
@@ -224,8 +233,22 @@ in {
     starship.enable = true;
     vscode = {
       enable = true;
-      package = pkgs.vscodium;
-      # extensions = with pkgs.vscode-extensions; [];
+      package = pkgs.vscodium.overrideAttrs (_: {
+        preFixupPhases = [ "preFixup" ];
+        preFixup = ''
+          sed -i "s#open-vsx.org/vscode/gallery#marketplace.visualstudio.com/_apis/public/gallery#" $out/lib/vscode/resources/app/product.json
+          sed -i "s#open-vsx.org/vscode/item#marketplace.visualstudio.com/items#" $out/lib/vscode/resources/app/product.json
+          sed -i "s#open-vsx.org#marketplace.visualstudio.com#" $out/lib/vscode/resources/app/product.json
+        '';
+      });
+      extensions = with pkgs.vscode-extensions; [
+        # matklad.rust-analyzer
+        nixpkgs-ra.vscode-extensions.matklad.rust-analyzer
+        ms-python.python
+        skyapps.fish-vscode
+        # vadimcn.vscode-lldb
+        nixpkgs-lldb.vscode-extensions.vadimcn.vscode-lldb
+      ];
     };
   };
   services = {
diff --git a/i3.nix b/i3.nix
index 55614be..9991673 100644
--- a/i3.nix
+++ b/i3.nix
@@ -89,6 +89,8 @@
       "${modifier}+7" = "workspace number 7";
       "${modifier}+8" = "workspace number 8";
       "${modifier}+9" = "workspace number 9";
+      # "${modifier}+Shift+Right" = "workspace next";
+      # "${modifier}+Shift+Left" = "workspace prev";
       "${modifier}+d" = "exec --no-startup-id rofi -show run";
       "XF86AudioRaiseVolume" = "exec --no-startup-id amixer sset Master 5%+";
       "XF86AudioLowerVolume" = "exec --no-startup-id amixer sset Master 5%-";
@@ -98,11 +100,17 @@
     workspaceLayout = "tabbed";
     assigns = {
       "1: web" = [{ class = "Firefox"; }];
-      "2: devel" = [ { class = "(?i)kitty"; } { class = "(?i)(vsc|c)odium"; } ];
+      "2: devel" = [
+        { class = "(?i)kitty"; }
+        { class = "(?i)(vsc|c)odium"; }
+        { class = "(?i)thunar"; }
+      ];
       "3: social" = [
         { class = "(?i)nheko"; }
         { class = "Slack"; }
         { class = "discord"; }
+        { class = "(?i)signal(-desktop)?"; }
+        { class = "(?i)fractal"; }
       ];
       "4: other" = [{ class = ".*"; }];
     };