From f9d106e27d670773dfc123d9daca8610576ab03f Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Wed, 27 Apr 2022 09:23:26 -0400
Subject: [PATCH] more flakiness

---
 .envrc                             |  2 +-
 flake.nix                          | 12 ++++++++----
 modules/gaming/leagueoflegends.nix |  2 +-
 modules/gaming/lutris.nix          |  2 +-
 modules/gaming/steam.nix           |  2 +-
 modules/services/keybase.nix       |  7 +++++--
 nixos/home.nix                     |  2 +-
 7 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.envrc b/.envrc
index 1d953f4..3550a30 100644
--- a/.envrc
+++ b/.envrc
@@ -1 +1 @@
-use nix
+use flake
diff --git a/flake.nix b/flake.nix
index b82309c..70bf663 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,11 +21,10 @@
         config.allowUnfree = true;
       };
 
-      # Pull the library functions
-      lib = nixpkgs.lib;
+      user = "noah";
     in {
       nixosConfigurations = {
-        noah = lib.nixosSystem {
+        desktop = nixpkgs.lib.nixosSystem {
           inherit system;
           modules = [
             ./nixos/configuration.nix
@@ -33,10 +32,15 @@
             {
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
-              home-manager.users.noah = { imports = [ ./nixos/home.nix ]; };
+              home-manager.users.${user} = { imports = [ ./nixos/home.nix ]; };
             }
           ];
         };
       };
+
+      devShells.x86_64-linux.default = pkgs.mkShell {
+        buildInputs = with pkgs; [ stylua nixfmt shfmt shellcheck ];
+      };
+
     };
 }
diff --git a/modules/gaming/leagueoflegends.nix b/modules/gaming/leagueoflegends.nix
index 4f2c878..ea951aa 100644
--- a/modules/gaming/leagueoflegends.nix
+++ b/modules/gaming/leagueoflegends.nix
@@ -6,7 +6,7 @@ let cfg = config.modules.gaming.leagueoflegends;
 in {
 
   options.modules.gaming.leagueoflegends = {
-    enable = mkEnableOption "leagueoflegends";
+    enable = mkEnableOption "League of Legends";
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/gaming/lutris.nix b/modules/gaming/lutris.nix
index 7992302..123b4c1 100644
--- a/modules/gaming/lutris.nix
+++ b/modules/gaming/lutris.nix
@@ -5,7 +5,7 @@ let cfg = config.modules.gaming.lutris;
 
 in {
 
-  options.modules.gaming.lutris = { enable = mkEnableOption "lutris"; };
+  options.modules.gaming.lutris = { enable = mkEnableOption "Lutris"; };
 
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [ lutris amdvlk wine ];
diff --git a/modules/gaming/steam.nix b/modules/gaming/steam.nix
index fd79055..2593a34 100644
--- a/modules/gaming/steam.nix
+++ b/modules/gaming/steam.nix
@@ -5,7 +5,7 @@ let cfg = config.modules.gaming.steam;
 
 in {
 
-  options.modules.gaming.steam = { enable = mkEnableOption "steam"; };
+  options.modules.gaming.steam = { enable = mkEnableOption "Steam"; };
 
   config = mkIf cfg.enable {
     hardware.steam-hardware.enable = true;
diff --git a/modules/services/keybase.nix b/modules/services/keybase.nix
index 3a04647..fdd2513 100644
--- a/modules/services/keybase.nix
+++ b/modules/services/keybase.nix
@@ -1,10 +1,13 @@
 { config, pkgs, lib, ... }:
 
-{
+let gui = config.gui;
+
+in {
+
   config = {
     services.keybase.enable = true;
     services.kbfs.enable = true;
 
-    # home.packages = with pkgs lib; [ (mkIf config.gui keybase-gui) ];
+    # home.packages = with lib; with pkgs; [ (mkIf gui.enable keybase-gui) ];
   };
 }
diff --git a/nixos/home.nix b/nixos/home.nix
index aa4dbbd..7fcfb07 100644
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, user, ... }:
 
 let