Merge pull request #1 from theobori/feature/flake-update

Feature/flake update

flake.nix

@@ -3,6 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs";
+    nixpkgs-85f7e66.url = "github:nixos/nixpkgs/85f7e662eda4fa3a995556527c87b2524b691933";
 
     home-manager = {
       url = "github:nix-community/home-manager";

modules/home/cli/shells/fish/default.nix

@@ -2,7 +2,6 @@
   pkgs,
   lib,
   config,
-  host,
   namespace,
   ...
 }:
@@ -51,8 +50,6 @@ in
 
         nd = "nix develop";
         nfu = "nix flake update";
-        hms = "home-manager switch --flake ~/${namespace}#${config.theobori-nix.user.name}@${host}";
-        nrs = "sudo nixos-rebuild switch --flake ~/${namespace}#${host}";
       };
 
       functions = {

modules/home/games/supermariowar/default.nix

@@ -0,0 +1,20 @@
+{
+  pkgs,
+  config,
+  lib,
+  namespace,
+  ...
+}:
+let
+  inherit (lib) mkIf;
+  inherit (lib.${namespace}) mkBoolOpt;
+
+  cfg = config.${namespace}.games.supermariowar;
+in
+{
+  options.${namespace}.games.supermariowar = {
+    enable = mkBoolOpt false "Enable supermariowar.";
+  };
+
+  config = mkIf cfg.enable { home.packages = with pkgs; [ supermariowar ]; };
+}

modules/home/roles/desktop/default.nix

@@ -26,7 +26,7 @@ in
     };
 
     home.packages = with pkgs; [
-      #spotify
+      spotify
       pavucontrol
       mplayer
       mtpfs

modules/home/roles/gaming/default.nix

@@ -20,6 +20,7 @@ in
       games = {
         teeworlds = enabled;
         taterclient-ddnet = enabled;
+        supermariowar = enabled;
       };
     };
   };

modules/nixos/display-managers/sddm/default.nix

@@ -1,12 +1,11 @@
 {
   config,
   lib,
-  pkgs,
   namespace,
   ...
 }:
 let
-  inherit (lib) mkIf mkForce;
+  inherit (lib) mkIf;
   inherit (lib.${namespace}) mkBoolOpt enabled;
 
   cfg = config.${namespace}.display-managers.sddm;
@@ -21,28 +20,28 @@ in
 
     services.displayManager.sddm = {
       enable = true;
-      package = mkForce pkgs.libsForQt5.sddm;
-      extraPackages =
-        with pkgs.libsForQt5;
-        mkForce [
-          qt5.qtquickcontrols
-          qt5.qtquickcontrols2
-          qt5.qtgraphicaleffects
-          qt5.qtdeclarative
-          qt5.qtbase
+      # package = mkForce pkgs.libsForQt5.sddm;
+      # extraPackages =
+      #   with pkgs.libsForQt5;
+      #   mkForce [
+      #     qt5.qtquickcontrols
+      #     qt5.qtquickcontrols2
+      #     qt5.qtgraphicaleffects
+      #     qt5.qtdeclarative
+      #     qt5.qtbase
 
-          plasma-framework
-          plasma-workspace
-          plasma-integration
-          kdeclarative
-        ];
+      #     plasma-framework
+      #     plasma-workspace
+      #     plasma-integration
+      #     kdeclarative
+      #   ];
 
       # Non-root X11 instance
-      settings.General.DisplayServer = "x11-user";
+      # settings.General.DisplayServer = "x11-user";
       # My custom dracula theme
-      theme = "Dracula";
+      # theme = "Dracula";
     };
 
-    environment.systemPackages = [ pkgs.${namespace}.my-dracula-theme ];
+    # environment.systemPackages = [ pkgs.${namespace}.my-dracula-theme ];
   };
 }

modules/nixos/security/doas/default.nix

@@ -25,8 +25,8 @@ in
       extraRules = [
         {
           users = builtins.attrNames config.${namespace}.user.users;
-          noPass = false;
           keepEnv = true;
+          persist = true;
         }
       ];
     };

overlays/base16-schemes/default.nix

@@ -0,0 +1,3 @@
+{ channels, ... }:
+
+_final: _prev: { inherit (channels.nixpkgs-85f7e66) base16-schemes; }

systems/x86_64-linux/laptop/default.nix

@@ -1,4 +1,5 @@
 {
+  pkgs,
   modulesPath,
   lib,
   namespace,
@@ -15,15 +16,17 @@ in
     ./hardware-configuration.nix
   ];
 
-  boot.loader.grub = {
-    # no need to set devices, disko will add all devices that have a EF02 partition to the list already
-    # devices = [ ];
-    efiSupport = true;
-    efiInstallAsRemovable = true;
+  boot = {
+    kernelPackages = pkgs.linuxPackages_latest;
+    loader.grub = {
+      # no need to set devices, disko will add all devices that have a EF02 partition to the list already
+      # devices = [ ];
+      efiSupport = true;
+      efiInstallAsRemovable = true;
+    };
+    supportedFilesystems = [ "ntfs" ];
   };
 
-  boot.supportedFilesystems = [ "ntfs" ];
-
   ${namespace} = {
     security.doas = enabled;