Tidy

DanNixon · Oct 12, 2023 · b3551f7 · b3551f7
1 parent bbd80be
commit b3551f7
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 108 deletions.
diff --git a/modules/home-manager/terminal_environment/direnv.nix b/modules/home-manager/terminal_environment/direnv.nix
@@ -1,6 +1,7 @@
 {...}: {
   programs.direnv = {
     enable = true;
+
     nix-direnv.enable = true;
   };
 }
diff --git a/modules/home-manager/terminal_environment/fzf.nix b/modules/home-manager/terminal_environment/fzf.nix
@@ -1,6 +1,7 @@
 {...}: {
   programs.fzf = {
     enable = true;
+
     defaultOptions = [
       "--no-mouse"
       "--cycle"

diff --git a/modules/home-manager/terminal_environment/git.nix b/modules/home-manager/terminal_environment/git.nix
@@ -1,8 +1,4 @@
 {pkgs, ...}: {
-  home.packages = with pkgs; [
-    gfold
-  ];
-
   programs.git = {
     enable = true;
 
@@ -106,4 +102,8 @@
   };
 
   programs.lazygit.enable = true;
+
+  home.packages = with pkgs; [
+    gfold
+  ];
 }
diff --git a/modules/home-manager/terminal_environment/nnn.nix b/modules/home-manager/terminal_environment/nnn.nix
@@ -1,7 +1,7 @@
 {...}: {
+  programs.nnn.enable = true;
+
   home.sessionVariables = {
     NNN_OPTS = "d";
   };
-
-  programs.nnn.enable = true;
 }
diff --git a/modules/home-manager/terminal_environment/pass.nix b/modules/home-manager/terminal_environment/pass.nix
@@ -1,6 +1,7 @@
 {pkgs, ...}: {
   programs.password-store = {
     enable = true;
+
     package = pkgs.pass.withExtensions (exts: [
       exts.pass-otp
     ]);

diff --git a/modules/home-manager/terminal_environment/taskwarrior.nix b/modules/home-manager/terminal_environment/taskwarrior.nix
diff --git a/modules/home-manager/terminal_environment/tmux.nix b/modules/home-manager/terminal_environment/tmux.nix
@@ -1,9 +1,11 @@
 {...}: {
   programs.tmux = {
     enable = true;
+
     escapeTime = 1;
     prefix = "M-Space";
     baseIndex = 1;
+
     extraConfig = ''
       bind-key -T root M-";" choose-tree -Z
 

diff --git a/modules/home-manager/terminal_environment/zsh.nix b/modules/home-manager/terminal_environment/zsh.nix
@@ -1,6 +1,7 @@
 {...}: {
   programs.zsh = {
     enable = true;
+
     initExtraBeforeCompInit = ''
       zstyle ':completion:*' completer _expand _complete _ignored _approximate
       zstyle ':completion:*' completions 1
@@ -14,6 +15,7 @@
       zstyle ':completion:*' verbose true
       zstyle :compinstall filename '/home/dan/.zshrc'
     '';
+
     initExtra = ''
       # Vi style key bindings
       bindkey -v

diff --git a/modules/nixos/desktop-environment.nix b/modules/nixos/desktop-environment.nix
@@ -3,17 +3,15 @@
     fontDir.enable = true;
 
     fonts = with pkgs; [
-      (nerdfonts.override {
-        fonts = ["DejaVuSansMono"];
-      })
+      (nerdfonts.override {fonts = ["DejaVuSansMono"];})
     ];
   };
 
   xdg.portal = {
     enable = true;
 
-    extraPortals = [
-      pkgs.xdg-desktop-portal-gtk
+    extraPortals = with pkgs; [
+      xdg-desktop-portal-gtk
     ];
   };
 

diff --git a/modules/nixos/peripherals/ddcutil.nix b/modules/nixos/peripherals/ddcutil.nix
@@ -1,4 +1,5 @@
 {...}: {
   hardware.i2c.enable = true;
+
   users.users.dan.extraGroups = ["i2c"];
 }
diff --git a/modules/nixos/peripherals/scanner.nix b/modules/nixos/peripherals/scanner.nix
@@ -1,5 +1,5 @@
 {...}: {
-  users.users.dan.extraGroups = ["dialout" "scanner" "lp"];
-
   hardware.sane.enable = true;
+
+  users.users.dan.extraGroups = ["dialout" "scanner" "lp"];
 }