updated stuff

flake.nix

@@ -1,4 +1,4 @@
-{
+{ 
   inputs = {
     stable.url = github:nixos/nixpkgs/nixos-20.09;
     nixpkgs.url = github:nixos/nixpkgs/nixos-unstable;

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

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";
 }

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;  
+      };
+    };
+  };
+}

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 ]; 
+}

marisa/networking.nix

@@ -2,7 +2,8 @@
 {
   networking = {
     hostName = "Marisa";
-    wireless.enable = true;
+    wireless.enable = false;
+    wireless.iwd.enable = true;
     interfaces = {
       wlan0 = {
         useDHCP = false;

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";
       };
     };
   };

marisa/services.nix

@@ -0,0 +1,6 @@
+{config, ...}:
+{
+  services = {
+    sshd.enable = true;
+  };
+}