various stuff

modules/desktop/applications/communication.nix

@@ -15,7 +15,7 @@ in
   config = mkIf cfg.enable
   {
     user.packages = attrValues {
-      inherit (pkgs) vesktop teamspeak_client whatsapp-for-linux;
+      inherit (pkgs) vesktop teamspeak_client;
     };
   };
 }

modules/desktop/editors/nvim.nix

@@ -9,39 +9,23 @@ in
   in { enable = mkEnableOption "neo-vim (nixvim)"; };
 
   config = mkIf config.modules.desktop.editors.nvim.enable {
-    programs.nixvim = {
+    programs.nvf = {
       enable = true;
+      settings = {
+        vim = {
+          statusline.lualine.enable = true;
+          telescope.enable = true;
+          autocomplete.nvim-cmp.enable = true;
 
-      opts = {
-        number = true;
+          languages = {
+            enableLSP = true;
+            enableTreesitter = true;
 
-        shiftwidth = 2;
-      };
-
-#       colorschemes.base16 = "${pkgs.base16-schemes}/share/themes/everforest.yaml";
-#       colorschemes.everforest.enable = true;
-
-      plugins = {
-        lualine.enable = true;
-        lightline.enable = true;
-
-        lsp = {
-          enable = true;
-          servers = {
-            ts_ls.enable = true;
-            lua_ls.enable = true;
-            rust_analyzer = {
-              enable = true;
-              installRustc = true;
-              installCargo = true;
-            };
+            nix.enable = true;
+            ts.enable = true;
+            rust.enable = true;
           };
         };
-
-        cmp = {
-          enable = true;
-          autoEnableSources = true;
-        };
       };
     };
   };

modules/desktop/plasma.nix

@@ -19,7 +19,7 @@ in
         };
         autoLogin = {
           enable = true;
-          user = "chris";
+          user = config.user.name;
         };
       };
 

modules/options.nix

@@ -1,16 +1,13 @@
 { inputs, config, options, lib, pkgs, ... }:
 let
-  inherit (builtins) elem isList pathExists toString;
-  inherit (lib.attrsets) mapAttrs mapAttrsToList;
+  inherit (builtins) pathExists toString;
   inherit (lib.lists) findFirst;
   inherit (lib.modules) mkAliasDefinitions;
-  inherit (lib.strings) concatMapStringsSep concatStringsSep;
-  inherit (lib.my) mkOpt mkOpt';
 in
 {
   options = let
-    inherit (lib.options) mkOption;
-    inherit (lib.types) attrs attrsOf either listOf oneOf path str;
+    inherit (lib.types) attrs path str;
+    inherit (lib.my) mkOpt;
   in
   {
     user = mkOpt attrs {};
@@ -31,19 +28,18 @@ in
       pkgs.sops
     ];
 
-    user = let
-      user = builtins.getEnv "USER";
-      name =
-        if builtins.elem user [ "" "root" ] then "chris"
-        else user;
-    in
-    {
-      inherit name;
-#       description = "Primary user account";
+    nixos-boot = {
+      enable = true;
+
+      bgColor = { red = 30; green = 30; blue = 30; };
+    };
+
+    user = {
+      name = "chris";
       description = "Chris Kruining";
       extraGroups = [ "wheel" ];
       isNormalUser = true;
-      home = "/home/${name}";
+      home = "/home/chris";
       group = "users";
       uid = 1000;
     };
@@ -53,7 +49,6 @@ in
       useUserPackages = true;
       sharedModules = [
         inputs.plasma-manager.homeManagerModules.plasma-manager
-        inputs.nixvim.homeManagerModules.nixvim
       ];
     };
 
@@ -62,7 +57,9 @@ in
       sessionPath = [ "$SNEEUWVLOK_BIN" "$XDG_BIN_HOME" "$PATH" ];
     };
 
-    users.users.${config.user.name} = mkAliasDefinitions options.user;
+    users.users = {
+      ${config.user.name} = mkAliasDefinitions options.user;
+    };
 
     nix.settings = let users = [ "root" config.user.name ]; in
     {

modules/services/games/minecraft.nix

@@ -48,7 +48,7 @@ in
               bypassesPlayerLimit = false;
             }
           ];
-          jvmOpts = "-Xms4092M -Xmx4092M -XX:+UseG1GC -Djava.net.preferIPv4Stack=true";
+          jvmOpts = "-Xms2048M -Xmx2048M -XX:+UseG1GC";
         in {
           vanilla = {
             enable = true;

modules/system/security.nix

@@ -9,9 +9,16 @@
     sudo.execWheelOnly = true;
     acme.acceptTerms = true;
     polkit.enable = true;
-    pam.services.kwallet = {
-      name = "kwallet";
-      enableKwallet = true;
+    pam = {
+      u2f = {
+        enable = true;
+        settings.cue = true;
+      };
+
+      services.kwallet = {
+        name = "kwallet";
+        enableKwallet = true;
+      };
     };
   };
 

modules/themes/default.nix

@@ -37,6 +37,14 @@ in {
       image = ./${cfg.theme}.jpg;
       polarity = cfg.polarity;
 
+      targets = {
+        grub.enable = true;
+        plymouth.enable = true;
+        console.enable = true;
+        nixos-icons.enable = true;
+        qt.enable = true;
+      };
+
       fonts = {
         serif = {
           package = pkgs.dejavu_fonts;