From 73960667b60911c779f47031f5c778b31ff50f9d Mon Sep 17 00:00:00 2001
From: Matthew Ess <mat@mat.services>
Date: Wed, 5 May 2021 20:05:27 -0400
Subject: [PATCH] Moooore changes

---
 profiles/common.nix     |   4 +-
 profiles/laptop.nix     |   8 +-
 users/mat-hm-laptop.nix | 206 ++++++++++++++++----------------
 users/mat-hm.nix        | 259 +++++++++++++++++++---------------------
 4 files changed, 235 insertions(+), 242 deletions(-)

diff --git a/profiles/common.nix b/profiles/common.nix
index 68b1797..ab933cf 100644
--- a/profiles/common.nix
+++ b/profiles/common.nix
@@ -7,9 +7,11 @@
     ./caches.nix
     ./quicksudo.nix
     ../users/mat.nix
-    ../users/mat-hm.nix
+    <home-manager/nixos>
   ];
 
+  home-manager.users.mat = import ../users/mat-hm.nix { inherit pkgs; };
+
   system.autoUpgrade.enable = true;
   system.copySystemConfiguration = true;
 
diff --git a/profiles/laptop.nix b/profiles/laptop.nix
index 62631ef..de5dce5 100644
--- a/profiles/laptop.nix
+++ b/profiles/laptop.nix
@@ -2,8 +2,12 @@
 
 {
 
-  imports =
-    [ ./common.nix ./local.nix ./graphical.nix ../users/mat-hm-laptop.nix ];
+  imports = [ ./common.nix ./local.nix ./graphical.nix ];
+
+  home-manager.useUserPackages = true;
+  home-manager.useGlobalPkgs = true;
+
+  home-manager.users.mat = import ../users/mat-hm-laptop.nix { inherit pkgs; };
 
   # enable power management
   powerManagement.enable = true;
diff --git a/users/mat-hm-laptop.nix b/users/mat-hm-laptop.nix
index 33fd890..f60b379 100644
--- a/users/mat-hm-laptop.nix
+++ b/users/mat-hm-laptop.nix
@@ -1,116 +1,110 @@
-{ config, ... }:
-
-let
-
-  statusCmd = "i3status-rs ~/.config/i3status.toml";
-
+{ pkgs, ... }:
+let statusCmd = "i3status-rs ~/.config/i3status.toml";
 in {
-  home-manager.users.mat = { pkgs, lib, ... }: {
-    home = {
-      sessionVariables = {
-        BROWSER = "vivaldi";
-        TERMINAL = "kitty";
-        CM_LAUNCHER = "rofi";
-      };
-      packages = with pkgs; [
-        # command line utilities
-        asuka
-        bottom
-        dbus
-        du-dust
-        imagemagick
-        mdcat
-        pijul
-        unrar
-        wireguard-tools
-        # graphical applications
-        deluge
-        discord
-        dunst
-        element-desktop
-        enpass
-        kitty
-        lagrange
-        # mullvad-vpn
-        okular
-        signal-desktop
-        slack
-        steam
-        steam-run-native
-        vivaldi
-        vivaldi-ffmpeg-codecs
-        # vivaldi-widevine
-        vlc
-        xfce.thunar
-        xfce.thunar-archive-plugin
-        # graphical utilities
-        clipmenu
-        clipnotify
-        gnome3.gnome-disk-utility
-        i3status-rust
-        libappindicator
-        libnotify
-        lxappearance
-        rofi
-        xclip
-        xdg-dbus-proxy
-      ];
-      file = import ../hm-configs/files.nix;
+  home = {
+    sessionVariables = {
+      BROWSER = "vivaldi";
+      TERMINAL = "kitty";
+      CM_LAUNCHER = "rofi";
     };
-    programs = {
-      alacritty = {
-        enable = false;
-        settings = {
-          font = {
-            normal.family = "Fira Code";
-            size = 10.5;
-          };
+    packages = with pkgs; [
+      # command line utilities
+      asuka
+      bottom
+      dbus
+      du-dust
+      imagemagick
+      mdcat
+      pijul
+      unrar
+      wireguard-tools
+      # graphical applications
+      deluge
+      discord
+      dunst
+      element-desktop
+      enpass
+      kitty
+      lagrange
+      # mullvad-vpn
+      okular
+      signal-desktop
+      slack
+      steam
+      steam-run-native
+      vivaldi
+      vivaldi-ffmpeg-codecs
+      # vivaldi-widevine
+      vlc
+      xfce.thunar
+      xfce.thunar-archive-plugin
+      # graphical utilities
+      clipmenu
+      clipnotify
+      gnome3.gnome-disk-utility
+      i3status-rust
+      libappindicator
+      libnotify
+      lxappearance
+      rofi
+      xclip
+      xdg-dbus-proxy
+    ];
+    file = import ../hm-configs/files.nix;
+  };
+  programs = {
+    alacritty = {
+      enable = false;
+      settings = {
+        font = {
+          normal.family = "Fira Code";
+          size = 10.5;
         };
       };
-      feh.enable = true;
-      firefox.enable = false;
-      fish = import ../hm-configs/fish.nix { inherit pkgs; };
+    };
+    feh.enable = true;
+    firefox.enable = false;
+    fish = import ../hm-configs/fish.nix { inherit pkgs; };
 
-      go.enable = false;
-      jq.enable = true;
-      rofi = {
-        enable = true;
-        font = "Fira Code 14";
-        lines = 10;
-        location = "center";
-        theme = "~/.config/rofi/theme.rasi";
-      };
-      ssh = {
-        enable = true;
-        matchBlocks = {
-          "pi".hostname = "192.168.1.99";
-          "gagarin" = {
-            hostname = "gagarin.local";
-            forwardAgent = true;
-          };
-          "soviet".hostname = "soviet.circumlunar.space";
-        };
-      };
-      vscode = import ../hm-configs/vscode.nix { inherit pkgs; };
-    };
-    services = {
-      redshift = {
-        enable = true;
-        provider = "geoclue2";
-      };
-      dunst = import ../hm-configs/dunst.nix;
-      clipmenu.enable = true;
-      # disabled in favor of flakes
-      lorri.enable = false;
-    };
-    xdg = { mime.enable = true; };
-    xsession = {
+    go.enable = false;
+    jq.enable = true;
+    rofi = {
       enable = true;
-      scriptPath = ".hm-xsession";
-      windowManager = {
-        i3 = import ../hm-configs/i3.nix { inherit lib statusCmd; };
-        awesome = { enable = false; };
+      font = "Fira Code 14";
+      lines = 10;
+      location = "center";
+      theme = "~/.config/rofi/theme.rasi";
+    };
+    ssh = {
+      enable = true;
+      matchBlocks = {
+        "pi".hostname = "192.168.1.99";
+        "gagarin" = {
+          hostname = "gagarin.local";
+          forwardAgent = true;
+        };
+        "soviet".hostname = "soviet.circumlunar.space";
       };
     };
+    vscode = import ../hm-configs/vscode.nix { inherit pkgs; };
+  };
+  services = {
+    redshift = {
+      enable = true;
+      provider = "geoclue2";
+    };
+    dunst = import ../hm-configs/dunst.nix;
+    clipmenu.enable = true;
+    # disabled in favor of flakes
+    lorri.enable = false;
+  };
+  xdg = { mime.enable = true; };
+  xsession = {
+    enable = true;
+    scriptPath = ".hm-xsession";
+    windowManager = {
+      i3 = import ../hm-configs/i3.nix { inherit lib statusCmd; };
+      awesome = { enable = false; };
+    };
   };
 }
diff --git a/users/mat-hm.nix b/users/mat-hm.nix
index 27652d1..0be0686 100644
--- a/users/mat-hm.nix
+++ b/users/mat-hm.nix
@@ -1,153 +1,146 @@
-{ config, ... }:
+{ pkgs, ... }:
 let
   name = "Matthew Ess";
   email = "mat@mat.services";
 in {
-  imports = [ <home-manager/nixos> ];
+  home = {
+    sessionVariables = { EDITOR = "nvim"; };
+    packages = with pkgs; [
+      # nix utilities
+      cachix
+      niv
+      nixfmt
+      nix-prefetch-git
+      fishPlugins.foreign-env
+      # command line utils
+      dnsutils
+      fd
+      fzy
+      httpie
+      jq
+      neofetch
+      rlwrap
+      tealdeer
+    ];
+    file = import ../hm-configs/files-all.nix;
+  };
 
-  home-manager.useUserPackages = true;
-  home-manager.useGlobalPkgs = true;
-
-  home-manager.users.mat = { pkgs, ... }: {
-    home = {
-      sessionVariables = { EDITOR = "nvim"; };
-      packages = with pkgs; [
-        # nix utilities
-        cachix
-        niv
-        nixfmt
-        nix-prefetch-git
-        fishPlugins.foreign-env
-        # command line utils
-        dnsutils
-        fd
-        fzy
-        httpie
-        jq
-        neofetch
-        rlwrap
-        tealdeer
-      ];
-      file = import ../hm-configs/files-all.nix;
+  programs = {
+    bat.enable = true;
+    broot.enable = true;
+    command-not-found.enable = true;
+    direnv = {
+      enable = true;
+      enableNixDirenvIntegration = true;
     };
 
-    programs = {
-      bat.enable = true;
-      broot.enable = true;
-      command-not-found.enable = true;
-      direnv = {
-        enable = true;
-        enableNixDirenvIntegration = true;
+    fish = {
+      enable = true;
+      interactiveShellInit = ''
+        echo 'ヽ(´ᗜ｀)ノ welcome ヽ(´ᗜ｀)ノ'
+        if not functions -q fisher
+          set -q XDG_CONFIG_HOME; or set XDG_CONFIG_HOME ~/.config
+          curl -sL https://git.io/fisher | source && fisher install jorgebucaran/fisher
+          fish -c fisher update
+        end
+        fish_vi_key_bindings
+        set VIRTUAL_ENV_DISABLE_PROMPT true
+
+        alias cat=bat
+        alias br=broot
+        alias tree=br
+        alias ack=rg
+        alias ag=rg
+        alias grep=rg
+
+        alias sys="sudo systemctl"
+
+        alias rebuild="sudo nixos-rebuild switch"
+        alias rebuildd="sudo nixos-rebuild switch; and systemctl restart display-manager"
+        alias upgrade="sudo rm -rf /root/.cache/nix/tarballs; and sudo nix-channel --update; and sudo nixos-rebuild switch --upgrade"
+
+        bind \cr 'fzy_select_history (commandline -b)'
+        bind -M insert \cr 'fzy_select_history (commandline -b)'
+
+        bind \cf 'fzy_select_directory'
+        bind -M insert \cf 'fzy_select_directory'
+
+        bind -M insert ! __history_previous_command
+        bind -M insert '$' __history_previous_command_arguments
+      '';
+    };
+
+    git = {
+      enable = true;
+      userName = "${name}";
+      userEmail = "${email}";
+      ignores = [ ".*.sw[a-z]" "tags" ];
+      extraConfig = {
+        color.ui = true;
+        core.editor = "vim";
+        push.default = "simple";
+        init.defaultBranch = "main";
       };
+    };
 
-      fish = {
-        enable = true;
-        interactiveShellInit = ''
-          echo 'ヽ(´ᗜ｀)ノ welcome ヽ(´ᗜ｀)ノ'
-          if not functions -q fisher
-            set -q XDG_CONFIG_HOME; or set XDG_CONFIG_HOME ~/.config
-            curl -sL https://git.io/fisher | source && fisher install jorgebucaran/fisher
-            fish -c fisher update
-          end
-          fish_vi_key_bindings
-          set VIRTUAL_ENV_DISABLE_PROMPT true
+    htop = {
+      enable = true;
+      highlightBaseName = true;
+    };
 
-          alias cat=bat
-          alias br=broot
-          alias tree=br
-          alias ack=rg
-          alias ag=rg
-          alias grep=rg
-
-          alias sys="sudo systemctl"
-
-          alias rebuild="sudo nixos-rebuild switch"
-          alias rebuildd="sudo nixos-rebuild switch; and systemctl restart display-manager"
-          alias upgrade="sudo rm -rf /root/.cache/nix/tarballs; and sudo nix-channel --update; and sudo nixos-rebuild switch --upgrade"
-
-          bind \cr 'fzy_select_history (commandline -b)'
-          bind -M insert \cr 'fzy_select_history (commandline -b)'
-
-          bind \cf 'fzy_select_directory'
-          bind -M insert \cf 'fzy_select_directory'
-
-          bind -M insert ! __history_previous_command
-          bind -M insert '$' __history_previous_command_arguments
-        '';
-      };
-
-      git = {
-        enable = true;
-        userName = "${name}";
-        userEmail = "${email}";
-        ignores = [ ".*.sw[a-z]" "tags" ];
-        extraConfig = {
-          color.ui = true;
-          core.editor = "vim";
-          push.default = "simple";
-          init.defaultBranch = "main";
+    kakoune = {
+      enable = false;
+      config = {
+        numberLines = {
+          enable = true;
+          highlightCursor = true;
+          relative = true;
+        };
+        ui = {
+          enableMouse = true;
+          assistant = "cat";
+        };
+        wrapLines = {
+          enable = true;
+          indent = true;
+          marker = "⏎";
+          word = true;
         };
       };
+    };
 
-      htop = {
-        enable = true;
-        highlightBaseName = true;
-      };
+    keychain = {
+      enable = true;
+      extraFlags = [ "--quiet" "--nogui" ];
+      enableFishIntegration = true;
+      enableXsessionIntegration = false;
+    };
 
-      kakoune = {
-        enable = false;
-        config = {
-          numberLines = {
-            enable = true;
-            highlightCursor = true;
-            relative = true;
-          };
-          ui = {
-            enableMouse = true;
-            assistant = "cat";
-          };
-          wrapLines = {
-            enable = true;
-            indent = true;
-            marker = "⏎";
-            word = true;
-          };
-        };
-      };
+    man.enable = true;
+    neovim = import ../hm-configs/neovim.nix { inherit pkgs; };
 
-      keychain = {
-        enable = true;
-        extraFlags = [ "--quiet" "--nogui" ];
-        enableFishIntegration = true;
-        enableXsessionIntegration = false;
-      };
+    ssh = {
+      enable = true;
+      serverAliveInterval = 60;
+      extraOptionOverrides = { "AddKeysToAgent" = "true"; };
+    };
 
-      man.enable = true;
-      neovim = import ../hm-configs/neovim.nix { inherit pkgs; };
+    starship.enable = true;
 
-      ssh = {
-        enable = true;
-        serverAliveInterval = 60;
-        extraOptionOverrides = { "AddKeysToAgent" = "true"; };
-      };
-
-      starship.enable = true;
-
-      tmux = {
-        enable = true;
-        keyMode = "vi";
-        newSession = true;
-        shortcut = "a";
-        baseIndex = 1;
-        terminal = "tmux-256color";
-        extraConfig = ''
-          set -g mouse on
-          setw -g pane-base-index 1
-          unbind %
-          bind | split-window -h
-          bind _ split-window -v
-        '';
-      };
+    tmux = {
+      enable = true;
+      keyMode = "vi";
+      newSession = true;
+      shortcut = "a";
+      baseIndex = 1;
+      terminal = "tmux-256color";
+      extraConfig = ''
+        set -g mouse on
+        setw -g pane-base-index 1
+        unbind %
+        bind | split-window -h
+        bind _ split-window -v
+      '';
     };
   };
 }