nix-config

commit 57cfc09164485cc39332c296209cdd29a509f01d
parent 9d156cc654a5b41c8c5b868f7d97476c9550992e
Author: GuyClicking <bpaul848@gmail.com>
Date:   Thu, 15 Apr 2021 23:02:56 +1000

nixpkgs-fmt also starship is its own file now

Diffstat:
M
flake.nix
 | 
12
+++++++-----
M
home/home.nix
 | 
8
+-------
M
home/polybar.nix
 | 
2
+-
M
home/zsh.nix
 | 
11
++++++-----
M
nixos/laptop/configuration.nix
 | 
3
++-
M
nixos/laptop/hardware-configuration.nix
 | 
9
++++++---
A
starship.nix
 | 
7
+++++++

7 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/flake.nix b/flake.nix
@@ -22,12 +22,14 @@
       overlays = [
         neovim.overlay
       ];
-    in {
+    in
+    {
       nixosConfigurations.laptop = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
-          ./nixos/laptop/configuration.nix 
-          home-manager.nixosModules.home-manager {
+          ./nixos/laptop/configuration.nix
+          home-manager.nixosModules.home-manager
+          {
             nixpkgs.overlays = overlays;
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
@@ -43,12 +45,12 @@
         system = "x86_64-linux";
         homeDirectory = "/home/benjamin";
         username = "benjamin";
-        configuration = { pkgs, ...}: {
+        configuration = { pkgs, ... }: {
           nixpkgs.overlays = overlays;
           imports = [
             ./home/home.nix
           ];
         };
       };
-  };
+    };
 }
diff --git a/home/home.nix b/home/home.nix
@@ -20,12 +20,6 @@
 
     zsh = import ./zsh.nix { inherit pkgs; };
 
-    starship = {
-      enable = true;
-
-      settings = {
-          add_newline = false;
-      };
-    };
+    starship = import ./starship.nix;
   };
 }
diff --git a/home/polybar.nix b/home/polybar.nix
@@ -5,7 +5,7 @@
 
   settings = {
     "module/bspwm" = {
-      type="internal/bspwm";
+      type = "internal/bspwm";
       # this isnt finished !
     };
   };
diff --git a/home/zsh.nix b/home/zsh.nix
@@ -1,7 +1,8 @@
 { pkgs, ... }:
 
 let editor = "nvim";
-in {
+in
+{
   enable = true;
 
   # use starship
@@ -43,10 +44,10 @@ in {
       name = "zsh-nix-shell";
       file = "nix-shell.plugin.zsh";
       src = pkgs.fetchFromGitHub {
-          owner = "chisui";
-          repo = "zsh-nix-shell";
-          rev = "v0.1.0";
-          sha256 = "0snhch9hfy83d4amkyxx33izvkhbwmindy0zjjk28hih1a9l2jmx";
+        owner = "chisui";
+        repo = "zsh-nix-shell";
+        rev = "v0.1.0";
+        sha256 = "0snhch9hfy83d4amkyxx33izvkhbwmindy0zjjk28hih1a9l2jmx";
       };
     }
   ];
diff --git a/nixos/laptop/configuration.nix b/nixos/laptop/configuration.nix
@@ -6,7 +6,8 @@
 
 {
   imports =
-    [ # Include the results of the hardware scan.
+    [
+      # Include the results of the hardware scan.
       ./hardware-configuration.nix
     ];
 
diff --git a/nixos/laptop/hardware-configuration.nix b/nixos/laptop/hardware-configuration.nix
@@ -12,17 +12,20 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/1f48f06c-0b18-4873-bba3-d5fd27c1e61e";
+    {
+      device = "/dev/disk/by-uuid/1f48f06c-0b18-4873-bba3-d5fd27c1e61e";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/9acb548b-d7b0-45c6-bf2e-39476d46b8be";
+    {
+      device = "/dev/disk/by-uuid/9acb548b-d7b0-45c6-bf2e-39476d46b8be";
       fsType = "ext4";
     };
 
   fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/682fecaa-c686-43c3-867e-0fa904205eb0";
+    {
+      device = "/dev/disk/by-uuid/682fecaa-c686-43c3-867e-0fa904205eb0";
       fsType = "ext4";
     };
 
diff --git a/starship.nix b/starship.nix
@@ -0,0 +1,7 @@
+{
+  enable = true;
+
+  settings = {
+    add_newline = false;
+  };
+};