home/amneesh: update

Signed-off-by: Amneesh Singh <a-singh21@ti.com>

conf/network.nix

@@ -9,6 +9,7 @@
         marisa = "${ipPrefix}.2";
         satori = "${ipPrefix}.3";
         hina = "${ipPrefix}.4";
+        okina = "${ipPrefix}.5";
       };
     };
     domain = {

home/README

@@ -0,0 +1,7 @@
+natto        : default user for okina    (desktop      - NixOS Unstable)
+natto-laptop : default user for satori   (laptop       - NixOS Unstable)
+bat          : default user for remilia  (Oracle VM    - NixOS Unstable)
+spin         : default user for hina     (Oracle VM    - NixOS Unstable)
+spark        : default user for marisa   (RPi4         - NixOS Unstable)
+amneesh      : default user for nightbug (Workplace PC - Ubuntu 22.04)
+

home/amneesh.nix

@@ -0,0 +1,24 @@
+{ config, pkgs, inputs, ... }:
+{
+  home = {
+    homeDirectory = "/home/amneesh";
+    username = "amneesh";
+    stateVersion = "24.05";
+
+    packages = with pkgs; [
+      htop
+      nattovim
+      clang-tools
+      llvmPackages.clang
+    ];
+  };
+
+  imports = [
+    ./natto/emacs.nix
+   # ./natto/wayland.nix
+  ];
+
+  xdg.mime.enable = true;
+  targets.genericLinux.enable = true;
+  programs.bash.enable = true;
+}

home/common/zsh.nix

@@ -19,6 +19,7 @@
     };
     initExtra = ''
       unsetopt extendedGlob
+      [[ -f ~/.zsh_custom ]] && source ~/.zsh_custom
     '';
   };
 }

home/default.nix

@@ -80,5 +80,13 @@ in
         }] ++ common;
         pkgs = mkPkgs "x86_64-linux";
       };
+
+      amneesh = inputs.home-manager.lib.homeManagerConfiguration {
+        inherit extraSpecialArgs;
+        modules = [
+          ./amneesh.nix
+        ] ++ common;
+        pkgs = mkPkgs "x86_64-linux";
+      };
     };
 }

home/natto/config/emacs/config.org

@@ -501,7 +501,7 @@ not using this anymore
     "M-C-k" 'enlarge-window
     "C-q"  'delete-window
     "M-C-S-q"  'kill-buffer-and-window
-    "M-w"  'centaur-tabs--kill-this-buffer-dont-ask
+    "M-w"  (lambda () (interactive) (kill-buffer (current-buffer)))
     "M-S-w"  'kill-window)
 #+end_src
 

home/natto/pkgs.nix

@@ -23,7 +23,7 @@
 
     # GUI utils
     slack
-    webcord
+    vesktop
     (xfce.thunar.override {
       thunarPlugins = with xfce; [
         thunar-media-tags-plugin

hosts/default.nix

@@ -4,6 +4,7 @@ let
 
   commonModules = [
     ./nvim.nix
+    ./nix.nix
     {
       _module.args = globalArgs;
     }
@@ -11,7 +12,6 @@ let
   desktopModules = [
     ./xorg.nix
     ./wayland.nix
-    ./nix.nix
     ./desktop-pkgs.nix
     ./sound.nix
   ];

hosts/nix.nix

@@ -3,6 +3,7 @@
   nixpkgs = {
     config = {
       allowBroken = true;
+      allowUnfree = true;
     };
     overlays = [
       self.overlays.default
@@ -15,14 +16,12 @@
     '';
     settings = {
       auto-optimise-store = true;
-      trusted-users = [ "root" "natto" ];
+      trusted-users = [ "root" "@wheel" ];
       substituters = [
-        "https://nix-gaming.cachix.org"
         "https://nix-community.cachix.org"
-        #       "https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store"
+        "https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store"
       ];
       trusted-public-keys = [
-        "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       ];
     };

hosts/okina/hardware.nix

@@ -25,12 +25,13 @@
       fsType = "ext4";
     };
 
-  fileSystems."/media/real" =
+/*  fileSystems."/media/real" =
     {
       device = "/dev/disk/by-uuid/8086be20-c770-46be-bd8f-5bd2d7735c7d";
       fsType = "btrfs";
       options = [ "compress-force=zstd:3" ];
     };
+    */
 
   /* fileSystems."/media/ntfs" =
     {

hosts/okina/networking.nix

@@ -24,6 +24,20 @@
       };
     };
 
+    wireguard.interfaces.wg0 = with conf.network.addresses.wireguard.ips; {
+      ips = [ okina ];
+      listenPort = 17840;
+      privateKeyFile = "/var/secrets/wg.key";
+      peers = [{
+        #Oracle VM1
+        publicKey = "z0Y2VNEWcyVQVSqRHiwmiJ5/0MgSPM+HZfEcwIccSxM=";
+        allowedIPs = [ remilia ];
+        endpoint = "${conf.network.addresses.domain.natto}:17840";
+        persistentKeepalive = 25;
+      }];
+    };
+
+
     defaultGateway = "192.168.1.1";
     nameservers = [ "1.1.1.1" "8.8.8.8" ];
   };

hosts/remilia/networking.nix

@@ -65,13 +65,17 @@
             allowedIPs = [ ips.marisa ];
           }
           {
-            publicKey = "SqskEH7hz7Gv9ZS+FYLRFgKZyJCFbBFCyuvzBYnbfVU=";
+            publicKey = "oliAKHloLOulQrDwG+2NZIYg0sQAsuQ/q/lLkPCdcRE=";
             allowedIPs = [ ips.satori ];
           }
           {
             publicKey = "IHYIan9Xq2PBTSzcMdHpzx4PM67l09WdsGa6s+siyH0=";
             allowedIPs = [ ips.hina ];
           }
+          {
+            publicKey = "BRdWQYPyfZeEWGtghhoYZf90nOsU/kXB3vOFJ6A17Ao=";
+            allowedIPs = [ ips.okina ];
+          }
         ];
       };
     };

hosts/satori/hardware.nix

@@ -8,7 +8,13 @@
 
   fileSystems."/" =
     {
-      device = "/dev/disk/by-uuid/4c02ddf5-d00e-4d84-856f-c327ae44d047";
+      device = "/dev/disk/by-uuid/59af143c-1a87-4654-9b31-7594ac8ba530";
+      fsType = "ext4";
+    };
+
+  fileSystems."/media/real" =
+    {
+      device = "/dev/disk/by-uuid/8086be20-c770-46be-bd8f-5bd2d7735c7d";
       fsType = "btrfs";
       options = [ "compress-force=zstd:3" ];
     };