From 87ff93fb31e82844883d10945b3dce8474d94ec9 Mon Sep 17 00:00:00 2001
From: Miguel Palhas <mpalhas@gmail.com>
Date: Sat, 5 Oct 2024 10:30:59 +0100
Subject: [PATCH] code review

---
 home/common/programs/default.nix              |  4 +-
 home/common/programs/git.nix                  | 35 ++++++++++++++++
 home/common/programs/rust.nix                 |  4 ++
 home/common/programs/rust/default.nix         | 42 -------------------
 home/common/programs/rust/rust-toolchain.toml |  2 -
 hosts/arrakis/default.nix                     |  4 +-
 6 files changed, 42 insertions(+), 49 deletions(-)
 create mode 100644 home/common/programs/git.nix
 create mode 100644 home/common/programs/rust.nix
 delete mode 100644 home/common/programs/rust/default.nix
 delete mode 100644 home/common/programs/rust/rust-toolchain.toml

diff --git a/home/common/programs/default.nix b/home/common/programs/default.nix
index 79c72eb..8b8dc79 100644
--- a/home/common/programs/default.nix
+++ b/home/common/programs/default.nix
@@ -1,11 +1,9 @@
 { lib, config, ... }: {
-  imports = [ ./zsh.nix ./neovim ./rust ./solidity.nix ];
+  imports = [ ./zsh.nix ./neovim ./rust.nix ./git.nix ./solidity.nix ];
 
   programs = {
     home-manager.enable = true;
-    git.enable = true;
     fzf.enable = true;
-    gh.enable = true;
   };
 
   home = {
diff --git a/home/common/programs/git.nix b/home/common/programs/git.nix
new file mode 100644
index 0000000..0b927f6
--- /dev/null
+++ b/home/common/programs/git.nix
@@ -0,0 +1,35 @@
+{ pkgs, ... }: {
+  programs.git = {
+    enable = true;
+    userName = "Miguel Palhas";
+    userEmail = "mpalhas@gmail.com";
+    aliases = {
+      ls =
+        "log --color --graph --oneline --decorate --topo-order --pretty=format:'%C(yellow)%d%Creset %Cgreen(%cr)%Creset %C(bold blue)[%an]%Creset %s %Cred(%h)%Creset' --abbrev-commit";
+      ll = ''
+        log --reverse --pretty=format:"%C(yellow)%h%Cred%d\ %Creset%s%Cblue\ [%an]" --decorate --numstat'';
+      conf = "diff --name-only --diff-filter=U";
+      br = "branch";
+      ba = "branch -a";
+      br = "checkout -b";
+      pb = "publish";
+      ps = "push -u";
+      pr = "pull-request";
+      ppr = "push-pr";
+      cpr = "close-pr";
+      opr = "open-pr";
+      pb = "publish";
+      f = "fetch";
+      c = "commit --verbose";
+      d = "diff";
+      dc = "diff --cached";
+      co = "checkout";
+      s = "status -sb";
+      b = "better-branch";
+      rb = "rebase";
+      rbc = "rebase --continue";
+    };
+  };
+
+  programs.gh.enable = true;
+}
diff --git a/home/common/programs/rust.nix b/home/common/programs/rust.nix
new file mode 100644
index 0000000..fd7d9c8
--- /dev/null
+++ b/home/common/programs/rust.nix
@@ -0,0 +1,4 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [ rustup ];
+  home.sessionPath = [ "\${CARGO_HOME:-~/.cargo}/bin" ];
+}
diff --git a/home/common/programs/rust/default.nix b/home/common/programs/rust/default.nix
deleted file mode 100644
index c6c1396..0000000
--- a/home/common/programs/rust/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ pkgs, ... }:
-let
-  overrides = (builtins.fromTOML (builtins.readFile ./rust-toolchain.toml));
-  libPath = with pkgs;
-    lib.makeLibraryPath [
-      # load external libraries that you need in your rust project here
-    ];
-in pkgs.mkShell rec {
-  buildInputs = with pkgs; [
-    clang
-    # Replace llvmPackages with llvmPackages_X, where X is the latest LLVM version (at the time of writing, 16)
-    llvmPackages.bintools
-    rustup
-  ];
-  RUSTC_VERSION = overrides.toolchain.channel;
-  # https://github.com/rust-lang/rust-bindgen#environment-variables
-  LIBCLANG_PATH =
-    pkgs.lib.makeLibraryPath [ pkgs.llvmPackages_latest.libclang.lib ];
-  shellHook = ''
-    export PATH=$PATH:''${CARGO_HOME:-~/.cargo}/bin
-    export PATH=$PATH:''${RUSTUP_HOME:-~/.rustup}/toolchains/$RUSTC_VERSION-x86_64-unknown-linux-gnu/bin/
-  '';
-  # Add precompiled library to rustc search path
-  RUSTFLAGS = (builtins.map (a: "-L ${a}/lib") [
-    # add libraries here (e.g. pkgs.libvmi)
-  ]);
-  LD_LIBRARY_PATH = libPath;
-  # Add glibc, clang, glib, and other headers to bindgen search path
-  BINDGEN_EXTRA_CLANG_ARGS =
-    # Includes normal include path
-    (builtins.map (a: ''-I"${a}/include"'') [
-      # add dev libraries here (e.g. pkgs.libvmi.dev)
-      pkgs.glibc.dev
-    ])
-    # Includes with special directory paths
-    ++ [
-      ''
-        -I"${pkgs.llvmPackages_latest.libclang.lib}/lib/clang/${pkgs.llvmPackages_latest.libclang.version}/include"''
-      ''-I"${pkgs.glib.dev}/include/glib-2.0"''
-      "-I${pkgs.glib.out}/lib/glib-2.0/include/"
-    ];
-}
diff --git a/home/common/programs/rust/rust-toolchain.toml b/home/common/programs/rust/rust-toolchain.toml
deleted file mode 100644
index 292fe49..0000000
--- a/home/common/programs/rust/rust-toolchain.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-[toolchain]
-channel = "stable"
diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix
index 4504141..66ea22d 100644
--- a/hosts/arrakis/default.nix
+++ b/hosts/arrakis/default.nix
@@ -32,8 +32,8 @@ in {
     description = "Miguel Palhas";
     extraGroups = [ "networkmanager" "input" "wheel" "docker" ];
     shell = pkgs.zsh;
-    hashedPassword =
-      "$y$j9T$0p/ZYQsSA/FroVjV59pI/0$LKyzass6W9GjJR0GLWI6xhVrLi0b5AYYMR3MvQKNK11";
+    initialHashedPassword =
+      "$y$j9T$uRTzF/sBdrqVGZTRhPuR00$wgLgEGlq.lEmlCPiy69jkbtfC9HKpyaVPDHDdBGtE5D";
   };
 
   services.nfs.server.enable = true;