From 5364156d58b2bec8868b9768d5486b5f3a47f2af Mon Sep 17 00:00:00 2001
From: natto <singh.amneesh1784@gmail.com>
Date: Sat, 22 May 2021 11:35:23 +0530
Subject: [PATCH] updated stuff

---
 flake.nix             |  2 +-
 home/ottan.nix        | 11 +++++++++++
 marisa.nix            |  9 +++++----
 marisa/boot.nix       | 18 ++++++++++++++++++
 marisa/hardware.nix   | 22 ++++++++++++++++++++++
 marisa/networking.nix |  3 ++-
 marisa/pkgs.nix       |  8 +-------
 marisa/services.nix   |  6 ++++++
 marisa/stuff.nix      |  0
 9 files changed, 66 insertions(+), 13 deletions(-)
 mode change 100644 => 100755 flake.nix
 mode change 100644 => 100755 marisa.nix
 create mode 100755 marisa/boot.nix
 create mode 100755 marisa/hardware.nix
 mode change 100644 => 100755 marisa/networking.nix
 mode change 100644 => 100755 marisa/pkgs.nix
 create mode 100755 marisa/services.nix
 mode change 100644 => 100755 marisa/stuff.nix

diff --git a/flake.nix b/flake.nix
old mode 100644
new mode 100755
index 8608d7b..6ae66b8
--- a/flake.nix
+++ b/flake.nix
@@ -1,4 +1,4 @@
-{
+{ 
   inputs = {
     stable.url = github:nixos/nixpkgs/nixos-20.09;
     nixpkgs.url = github:nixos/nixpkgs/nixos-unstable;
diff --git a/home/ottan.nix b/home/ottan.nix
index ff8256a..ce5882a 100644
--- a/home/ottan.nix
+++ b/home/ottan.nix
@@ -6,7 +6,18 @@ in
   imports = [
     ./stuff/programs/nvim.nix
     ./stuff/programs/emacs.nix
+    ./stuff/secret.nix
   ];
+ /* age = {
+    sshKeyPaths = [ "${home}/.ssh/id_ed25519" ];
+    secrets = {
+      zshrc = {
+        file = ./secrets/.zshrc.age;
+        path = "${home}/.zshrc";
+        mode = "660";
+      };
+    };
+  };*/
   home = {
     packages = with pkgs; [
       pamixer
diff --git a/marisa.nix b/marisa.nix
old mode 100644
new mode 100755
index 8dcc5a2..38e89d0
--- a/marisa.nix
+++ b/marisa.nix
@@ -2,12 +2,13 @@
 {
   imports = 
   [
-    ./modules/xorg.nix
-    ./modules/pipewire.nix
+    #<nixpkgs/nixos/modules/profiles/all-hardware.nix>
     ./marisa/pkgs.nix
     ./marisa/networking.nix
     ./marisa/stuff.nix
-    ./satori/hardware.nix
+    ./marisa/hardware.nix
+    ./marisa/boot.nix
+    ./marisa/services.nix
   ];
-  boot.loader.grub.enable = false;
+  system.stateVersion = "21.05";
 }
diff --git a/marisa/boot.nix b/marisa/boot.nix
new file mode 100755
index 0000000..7de7c5b
--- /dev/null
+++ b/marisa/boot.nix
@@ -0,0 +1,18 @@
+{config, ...}:
+{
+  boot = {
+    initrd.availableKernelModules = [ "xhci_pci" "usb_storage" "usbhid" "uas"];
+    initrd.kernelModules = [ ];
+    kernelModules = [ ];
+    extraModulePackages = [ ];
+    loader = {
+      grub.enable = false;
+      generic-extlinux-compatible.enable= true;
+      raspberryPi= {
+        version = 4;
+        firmwareConfig = "dtparam=sd_poll_once=on";
+        enable = true;  
+      };
+    };
+  };
+}
diff --git a/marisa/hardware.nix b/marisa/hardware.nix
new file mode 100755
index 0000000..ba0ad5c
--- /dev/null
+++ b/marisa/hardware.nix
@@ -0,0 +1,22 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, ... }:
+
+{
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888";
+      fsType = "ext4";
+    };
+
+  fileSystems."/nix/store" =
+    { device = "/nix/store";
+      fsType = "none";
+      options = [ "bind" ];
+    };
+
+  swapDevices = [ ];
+
+  powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
+  hardware.firmware = with pkgs; [ raspberrypiWirelessFirmware ]; 
+}
diff --git a/marisa/networking.nix b/marisa/networking.nix
old mode 100644
new mode 100755
index 3af125c..7a1d487
--- a/marisa/networking.nix
+++ b/marisa/networking.nix
@@ -2,7 +2,8 @@
 {
   networking = {
     hostName = "Marisa";
-    wireless.enable = true;
+    wireless.enable = false;
+    wireless.iwd.enable = true;
     interfaces = {
       wlan0 = {
         useDHCP = false;
diff --git a/marisa/pkgs.nix b/marisa/pkgs.nix
old mode 100644
new mode 100755
index 912adb0..73342c2
--- a/marisa/pkgs.nix
+++ b/marisa/pkgs.nix
@@ -1,16 +1,12 @@
 {lib, config, pkgs, ...}:
 {
   environment.systemPackages = with pkgs; [
-    xclip
-    xorg.xkbcomp
     p7zip
     git
     gnumake
     neofetch
+    kbd
     htop
-    feh
-    st
-    dwm
     vim
     wget
   ];
@@ -26,9 +22,7 @@
     };
     gnupg = {
       agent = {
-        enableSSHSupport = true;
         enable = true;
-        pinentryFlavor = "curses";
       };
     };
   };
diff --git a/marisa/services.nix b/marisa/services.nix
new file mode 100755
index 0000000..c43ec10
--- /dev/null
+++ b/marisa/services.nix
@@ -0,0 +1,6 @@
+{config, ...}:
+{
+  services = {
+    sshd.enable = true;
+  };
+}
diff --git a/marisa/stuff.nix b/marisa/stuff.nix
old mode 100644
new mode 100755