home/natto/secrets: add .gitconfig

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>

.gitignore

@@ -4,3 +4,4 @@
 ~*~
 *~
 *.html
+result

README.org

@@ -3,12 +3,9 @@
 #+OPTIONS: toc:nil num:nil
 
 #+begin_src sh
-├───hm-configs: unknown
+├───homeConfigurations: unknown
 ├───legacyPackages
-warning: │   ├───aarch64-darwin: omitted (use '--legacy' to show)
 warning: │   ├───aarch64-linux: omitted (use '--legacy' to show)
-warning: │   ├───i686-linux: omitted (use '--legacy' to show)
-warning: │   ├───x86_64-darwin: omitted (use '--legacy' to show)
 warning: │   └───x86_64-linux: omitted (use '--legacy' to show)
 └───nixosConfigurations
     ├───Marisa: NixOS configuration
@@ -24,7 +21,6 @@ warning: │   └───x86_64-linux: omitted (use '--legacy' to show)
 * How install workey
 Either do
 #+begin_src sh
-git clone https://github.com/natto1784/dotfiles
 cd dotfiles
 nixos-rebuild switch --flake .#Satori 
 #+end_src
@@ -35,17 +31,13 @@ nixos-rebuild switch --flake github:natto1784/dotfiles#Satori
 Replace ~Satori~ with whatever system you want or replace with whatever hostname you want in the config
 
 * How home-manager workey
-Either clone repo and do ~./hm-switch~ inside it (login as the user you want to change config as!!!)
-or
+Just do
 #+begin_src sh
-nix build github:natto1784/dotfiles#hm-configs.{USER}.activationPackage -o hm-result
-./hm-result/activate
+nix run nixpkgs#home-manager switch -- --flake github:natto1784/dotfiles
 #+end_src
-You can unlink ~hm-result~ after that
-replace ~{USER}~ with ~natto~ or whatever is availabe (or change it in the config)
 
 * How packages workey
-To build or run any of the packages in this flake do\
+To build or run any of the packages in this flake do
 #+begin_src sh
 nix <"run"/"build"> github:natto1784/dotfiles#pkgs.<your_arch>.<package_name>
 #+end_src

flake.nix

@@ -16,8 +16,10 @@
     rust.url = github:oxalica/rust-overlay;
   };
 
-  outputs = inputs@{ self, nixpkgs, stable, master, old, ... }:
-    inputs.utils.lib.eachDefaultSystem
+  outputs = inputs@{ self, utils, nixpkgs, stable, master, old, ... }:
+    with utils.lib; eachSystem
+      (with system;
+      [ x86_64-linux aarch64-linux ])
       (system:
         let
           mkPkgs = channel: system: import channel {
@@ -75,13 +77,14 @@
         builders = [ ./modules/x86builder.nix ];
       in
       {
-        hm-configs = {
+        homeConfigurations = {
           natto = inputs.home-manager.lib.homeManagerConfiguration rec {
             system = "x86_64-linux";
             configuration = { lib, ... }: {
               imports = [
                 ./home/natto
               ] ++ homeModules;
+              home.packages = [ inputs.home-manager.defaultPackage.${system} ];
               nixpkgs = {
                 overlays = self.legacyPackages.${system}.overlays;
                 config.allowUnfree = true;

home/natto/secrets/.gitconfig.age

@@ -0,0 +1,18 @@
+age-encryption.org/v1
+-> ssh-ed25519 kIk5ZQ cRvyfufswCAp25enq5lB9NnTQiTwDLpkfO/gmg15dAE
+ssslqj4+vnpkY2aEvoc7KLOwI6jgJUILd+WVU9bxNBo
+-> ssh-rsa lnK3Ng
+W19dLb89dOwpCYQkPEHi4gpuMkC6c4TnkBsqN3EiXvMaLMRmmxomWkYfAZ3Or5hL
+Wgmb9m/CaRjhb5gq54B9ZUwK09Hfuy+ZAnDEiVF0Yo81G9eBbfTf1R9oO1tpXPax
+t62t0FPUC9Qm6j9DXtub4Gfo6YA8ni2azJqC7fE4fNlbg+AC7qIeIUa4+3VWo9Yd
+hXCJK5ycHmaMkgyBVW8IikBZUjQ/OCKvsuc8tsZHwOgzh37y6JumOm1KPfJq7iMn
+DgZS8TDqlWOrUFfxOFsCDH1mtfKCXyGF4amB46dH7mIdik0F2+/pjwGI6yC1UZlP
+wXIO5rH5wOF22Vi90xldhk9l83597WbKe5ajrwUDFacWQOOPO+DF3gDoBqpQyfAS
+SSMb2+nK8sAPHbrKFirHVDKqpmUHFBmMAyzco63L/DvTM7lGpdcT7vUhttkv5Sfn
+ORD2GJm2gnJ7F0dmv/R1p5lUFmsDfZfD4y2VIQKWTJjzmVbA4TZu1cVGWD34oGy1
+
+-> cY/"GZ-grease R7 |0 <sw
+IxahyXa4xTqqwYHSzgNaOAy6ZB7k
+--- feJ9jihoDXZU7cgCUU5+DlnBiJrrIst6utMfZ6ZCFIg
+&}聅<><E88185>#5<>VGK+:<3A><>,B<>L<10>y<04><>0^A<><41><EFBFBD><EFBFBD><15><>Z@Ï<>P<04><>`$<24><><EFBFBD><03>c<><63>2`<60><><EFBFBD><EFBFBD><EFBFBD><16>ԣ<>
+6)…I<C285><49>"<22><><EFBFBD>.<2E>W<EFBFBD><57>-6/g<>F?<02>De<44><65><EFBFBD><1D><13><><EFBFBD>F<EFBFBD>a|<7C><>r`Y<>\<16><>EHo<48>mSq}w<><77><EFBFBD>6J<36><4A><EFBFBD><1B>#wl<0B>؉t<>"9Pb<50><62>_k$<24>l<02><>;!9<>Pi<10>"<22><><EFBFBD>2a<32>tut<75><74><EFBFBD><EFBFBD><EFBFBD><EFBFBD>~<7E>f<EFBFBD><66><EFBFBD><EFBFBD>)<29>4><3E><><EFBFBD><0F>`Sɢ<53><12><><EFBFBD>X<<3C>JF<4A>B<EFBFBD>^<5E><>?z<><17>
><1C><><EFBFBD><06><><EFBFBD><EFBFBD>+<2B>1<16><><0C><0F><>a<EFBFBD>m/+<2B><>eÿI#<23>w<EFBFBD>ųV<C5B3><56><EFBFBD>C<EFBFBD><43>;<3B>2ӯ||_r<5F><10>[}D<><44>ct<63>]T<><54>b<EFBFBD>[<5B><>qM<1D>PbstnaZG<5A><<3C><>0<EFBFBD><30>7<EFBFBD><13>à<EFBFBD>q<EFBFBD>A<EFBFBD>M<><4D>ph!<21>B<EFBFBD><42>7<EFBFBD>

home/natto/secrets/default.nix

@@ -15,6 +15,11 @@
           path = "${home}/.zshrc";
           mode = "660";
         };
+        gitconfig = {
+          file = ./.gitconfig.age;
+          path = "${home}/.gitconfig";
+          mode = "660";
+        };
       };
     };
 }

hosts/satori/boot.nix

@@ -2,7 +2,7 @@
 
 {
   boot = {
-    kernelPackages = pkgs.unstable.linuxPackages_zen;
+    kernelPackages = pkgs.unstable.linuxPackages_latest;
     initrd={
       availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "vfio-pci"];
  /*     preDeviceCommands = ''

hosts/satori/pkgs.nix

@@ -34,6 +34,7 @@
     haskell-language-server
     vulkan-tools
     vulkan-headers
+    msr-tools
     (steam.override {
       extraLibraries = pkgs: [ pkgs.pipewire ];
       extraProfile = ''
@@ -83,7 +84,7 @@
         fi
         }
       '';
-      histSize = 12000;
+      histSize = 30000;
       enableCompletion = true;
       enableBashCompletion = true;
       syntaxHighlighting.enable = true;

overlays/customscripts/src/hm-switch

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-flakeDir=$HM_CONF_DIR;
-if [ -z "$HM_CONF_DIR" ]; then
-  echo "HM_CONF_DIR is unset, using current directory as the flake directory"
-  flakeDir=.
-fi
-
-echo "You're about to switch your home-manager configuration as '$USER'"
-read -p "Continue (y/n)?" conf
-
-if [[ ${conf,,} =~ ^(y|yes)$ ]]; then
-  nix build "$flakeDir"\#hm-configs.$USER.activationPackage -o hm-result &&
-  ./hm-result/activate
-  unlink hm-result
-else
-  echo "If this is not you, then log into your profile first!"
-  exit 1
-fi