add back nvim

diff --git a/audio.nix b/audio.nix
index f146189ceb805efe83ea2698e21fbe46e3a04a9e..14323dadee6d4fc0115a10f0e6f44d385c064b03 100644 (file)
--- a/audio.nix
+++ b/audio.nix
@@ -2,7 +2,8 @@
   config,
   pkgs,
   ...
-}: {
+}:
+{
   services.pipewire = {
     enable = true;
     audio.enable = true;
@@ -32,7 +33,7 @@
 
   systemd.user.services.mpd = {
     description = "Music Player Daemon";
-    wantedBy = ["default.target"];
+    wantedBy = [ "default.target" ];
     serviceConfig = {
       ExecStart = "${pkgs.mpd}/bin/mpd --no-daemon /home/andrew/.config/mpd/mpd.conf";
       Restart = "on-failure";

diff --git a/flake.nix b/flake.nix
index 9b76d894d92a170b178d30255c4fc349a3cdb12d..c2d3d660f885f848ef501fd1ecb22a2c75212fd1 100644 (file)
--- a/flake.nix
+++ b/flake.nix
@@ -37,42 +37,45 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
-  outputs = {
-    self,
-    nixpkgs,
-    hjem,
-    my-slstatus,
-    my-surf,
-    my-dwm,
-    my-st,
-    my-dmenu,
-    nvf,
-  } @ inputs: let
-    system = "x86_64-linux";
-    pkgs = nixpkgs.legacyPackages.${system};
-    customNeovim = nvf.lib.neovimConfiguration {
-      inherit pkgs;
-      modules = [./nvf/nvf.nix];
-    };
-  in {
-    nixosConfigurations.nepsis = nixpkgs.lib.nixosSystem {
-      specialArgs = {inherit inputs customNeovim;};
-      modules = [
-        hjem.nixosModules.default
-        ./linux-common.nix
-        ./hosts/nepsis/configuration.nix
-        ./overlays.nix
-      ];
-    };
-    nixosConfigurations.icon = nixpkgs.lib.nixosSystem {
-      modules = [
-        hjem.nixosModules.default
-        ./linux-common.nix
-        ./hosts/icon/configuration.nix
-        ./overlays.nix
-      ];
-    };
+  outputs =
+    {
+      self,
+      nixpkgs,
+      hjem,
+      my-slstatus,
+      my-surf,
+      my-dwm,
+      my-st,
+      my-dmenu,
+      nvf,
+    }@inputs:
+    let
+      system = "x86_64-linux";
+      pkgs = nixpkgs.legacyPackages.${system};
+      customNeovim = nvf.lib.neovimConfiguration {
+        inherit pkgs;
+        modules = [ ./nvf/nvf.nix ];
+      };
+    in
+    {
+      nixosConfigurations.nepsis = nixpkgs.lib.nixosSystem {
+        specialArgs = { inherit inputs customNeovim; };
+        modules = [
+          hjem.nixosModules.default
+          ./linux-common.nix
+          ./hosts/nepsis/configuration.nix
+          ./overlays.nix
+        ];
+      };
+      nixosConfigurations.icon = nixpkgs.lib.nixosSystem {
+        modules = [
+          hjem.nixosModules.default
+          ./linux-common.nix
+          ./hosts/icon/configuration.nix
+          ./overlays.nix
+        ];
+      };
 
-    packages.${system}.my-neovim = customNeovim.neovim;
-  };
+      packages.${system}.my-neovim = customNeovim.neovim;
+    };
 }

diff --git a/hosts/icon/configuration.nix b/hosts/icon/configuration.nix
index 7a263c687738911afa01cb21517dedaf5ffc0c68..469e7649a16e1c889b784351d2bcd29c2ab6bffb 100644 (file)
--- a/hosts/icon/configuration.nix
+++ b/hosts/icon/configuration.nix
@@ -3,7 +3,8 @@
   pkgs,
   inputs,
   ...
-}: {
+}:
+{
   imports = [
     ./hardware-configuration.nix
   ];

diff --git a/hosts/icon/hardware-configuration.nix b/hosts/icon/hardware-configuration.nix
index e22a29312efbd55d232b5241c838c262d2d89a25..4fdf9381695d60d4bf4c3a566e73ed0735906774 100644 (file)
--- a/hosts/icon/hardware-configuration.nix
+++ b/hosts/icon/hardware-configuration.nix
@@ -1,32 +1,47 @@
 # 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, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "ehci_pci"
+    "ahci"
+    "usb_storage"
+    "usbhid"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/2e969677-74d5-4c22-a708-fa27ba11f2f9";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/2e969677-74d5-4c22-a708-fa27ba11f2f9";
+    fsType = "ext4";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/C246-075A";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/c562b7b7-2a7e-4416-8223-120956671eae"; }
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/C246-075A";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
     ];
+  };
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/c562b7b7-2a7e-4416-8223-120956671eae"; }
+  ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

diff --git a/hosts/nepsis/configuration.nix b/hosts/nepsis/configuration.nix
index 6dc148e59e71728d2dc1f37d034f0626786c4de1..7fe2b9567211827e97b9e22e7f329db51ad1c5c1 100644 (file)
--- a/hosts/nepsis/configuration.nix
+++ b/hosts/nepsis/configuration.nix
@@ -3,13 +3,16 @@
   pkgs,
   inputs,
   ...
-}: {
+}:
+{
   imports = [
     ./hardware-configuration.nix
     ./../../lockscreen.nix
     ./../../x11.nix
     ./../../hjem.nix
     ./../../audio.nix
+    ./../../vim.nix
+    ./../../sh.nix
   ];
 
   networking.hostName = "nepsis";

diff --git a/linux-common.nix b/linux-common.nix
index 101d7eb0f874e87886e2c4720155350883348834..27e4464db72595c2b154e322f03a863565b40b72 100644 (file)
--- a/linux-common.nix
+++ b/linux-common.nix
@@ -3,7 +3,8 @@
   pkgs,
   inputs,
   ...
-}: {
+}:
+{
   imports = [
     ./sh.nix
   ];
@@ -11,7 +12,7 @@
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
-  boot.supportedFilesystems = ["exfat"];
+  boot.supportedFilesystems = [ "exfat" ];
 
   # Use latest kernel.
   boot.kernelPackages = pkgs.linuxPackages_latest;