Merge remote-tracking branch 'origin/nixos' into nixos

modules/programs/default.nix

@@ -1,5 +0,0 @@
-{ lib, ... }:
-
-{
-  imports = lib.my.listModules ./.;
-}

modules/programs/hyprland/default.nix

@@ -48,7 +48,7 @@ in
         enable = true;
         package = hyprland;
         recommendedEnvironment = true;
-        extraConfig = import ./config.nix args;
+        extraConfig = import ./_config.nix args;
       };
     };
 

modules/programs/nix.nix

@@ -1,6 +1,7 @@
 { config
 , lib
 , inputs
+, self
 , ...
 }:
 
@@ -22,6 +23,8 @@ in
   };
 
   config.nix = {
+    extraOptions = "experimental-features = nix-command flakes";
+
     gc = {
       automatic = cfg.gc.enable;
       options = "--max-freed ${cfg.gc.minimumFreedGB} --delete-older-than 14d";
@@ -42,6 +45,7 @@ in
       master.flake = inputs.master;
       nixpkgs.flake = inputs.nixpkgs;
       stable.flake = inputs.stable;
+      dotfiles.flake = self;
     };
 
     settings = {

modules/programs/wallpaper/wallpaper.sh

@@ -5,7 +5,7 @@ WALLPAPERS=$(find "$WALLPAPERS_PATH" -type f,l)
 
 function help() {
 	echo "Usage:"
-  echo -e "  wallpaper [OPTIONS] [PATH]"
+	echo -e "  wallpaper [OPTIONS] [PATH]"
 	echo ""
 	echo "Options:"
 	echo -e "  -h, --help \n\t Show this help message and exit"
@@ -60,12 +60,12 @@ done
 set -- "${POSITIONAL[@]}" # restore positional arguments
 
 if [[ $# -gt 1 ]]; then
-  help
-  exit 1
+	help
+	exit 1
 fi
 
 if [[ $# -eq 1 ]]; then
-  WALLPAPER="$1"
+	WALLPAPER="$1"
 fi
 
 if [[ -z ${WALLPAPER+x} ]]; then