Merge pull request #15 from redyf/dev

Auto lint/format
redyf · Jan 12, 2024 · dc58f34 · dc58f34
2 parents bc75aa8 + c7dbbd7
commit dc58f34
Show file tree

Hide file tree

Showing 8 changed files with 161 additions and 123 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -86,34 +86,36 @@
                 { programs.hyprland.enable = true; }
               ];
             };
-      wsl = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          {nix.registry.nixpkgs.flake = nixpkgs;}
-          ./hosts/wsl/configuration.nix
-          home-manager.nixosModules.home-manager
-          {
-            home-manager = {
-              useUserPackages = true;
-              useGlobalPkgs = false;
-              users.red = ./home/wsl/home.nix;
-            };
-          }
-          NixOS-WSL.nixosModules.wsl
-        ];
-      };
-    };
-    devShells = forAllSystems (system: let
-      pkgs = nixpkgsFor.${system};
-    in {
-      default = pkgs.mkShell {
-        buildInputs = with pkgs; [
-          git
-          nixpkgs-fmt
-          statix
-        ];
+        wsl = nixpkgs.lib.nixosSystem {
+          system = "x86_64-linux";
+          modules = [
+            { nix.registry.nixpkgs.flake = nixpkgs; }
+            ./hosts/wsl/configuration.nix
+            home-manager.nixosModules.home-manager
+            {
+              home-manager = {
+                useUserPackages = true;
+                useGlobalPkgs = false;
+                users.red = ./home/wsl/home.nix;
+              };
+            }
+            NixOS-WSL.nixosModules.wsl
+          ];
+        };
       };
-    });
+      devShells = forAllSystems (system:
+        let
+          pkgs = nixpkgsFor.${system};
+        in
+        {
+          default = pkgs.mkShell {
+            buildInputs = with pkgs; [
+              git
+              nixpkgs-fmt
+              statix
+            ];
+          };
+        });
       formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;
     };
 }
diff --git a/home/desktop/cli/rice/btop/default.nix b/home/desktop/cli/rice/btop/default.nix
@@ -1,7 +1,6 @@
-{
-  config,
-  pkgs,
-  ...
+{ config
+, pkgs
+, ...
 }: {
   programs.btop = {
     enable = true;

diff --git a/home/desktop/cli/rice/cava/default.nix b/home/desktop/cli/rice/cava/default.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{ pkgs, ... }: {
   home.packages = with pkgs; [
     cava
   ];

diff --git a/home/desktop/cli/shell/starship/default.nix b/home/desktop/cli/shell/starship/default.nix
@@ -1,93 +1,95 @@
-{pkgs, ...}: {
-  programs.starship = let
-    flavour = "macchiato"; # One of `latte`, `frappe`, `macchiato`, or `mocha`
-  in {
-    enable = true;
-    enableZshIntegration = true;
-    settings =
-      # Catppuccin
-      {
-        scan_timeout = 10;
-        add_newline = false;
-        line_break.disabled = false;
-        right_format = "$time";
-        character = {
-          success_symbol = "[](#cbced3)";
-          error_symbol = "[](#dd6777)";
-          vicmd_symbol = "[](#ecd3a0)";
-          format = "$symbol[ ](bold #b4befe) ";
-          # format = "$symbol[λ ](bold #3fdaa4) ";
-          # format = "$symbol[✘ ](bold #3fdaa4) ";
-        };
-        # Oxocarbon
-        # {
-        #   scan_timeout = 10;
-        #   add_newline = true;
-        #   line_break.disabled = false;
-        #   format = "$symbol[󰉊 ](bold #ee5396) $directory$character";
-        #   right_format = "$time";
-        #   character = {
-        #     success_symbol = "[󰅂 ](bold #393939)";
-        #     error_symbol = "[󰅂 ](bold #393939)";
-        #     vicmd_symbol = "[󰅂 ](bold #393939)";
-        #   };
+{ pkgs, ... }: {
+  programs.starship =
+    let
+      flavour = "macchiato"; # One of `latte`, `frappe`, `macchiato`, or `mocha`
+    in
+    {
+      enable = true;
+      enableZshIntegration = true;
+      settings =
+        # Catppuccin
+        {
+          scan_timeout = 10;
+          add_newline = false;
+          line_break.disabled = false;
+          right_format = "$time";
+          character = {
+            success_symbol = "[](#cbced3)";
+            error_symbol = "[](#dd6777)";
+            vicmd_symbol = "[](#ecd3a0)";
+            format = "$symbol[ ](bold #b4befe) ";
+            # format = "$symbol[λ ](bold #3fdaa4) ";
+            # format = "$symbol[✘ ](bold #3fdaa4) ";
+          };
+          # Oxocarbon
+          # {
+          #   scan_timeout = 10;
+          #   add_newline = true;
+          #   line_break.disabled = false;
+          #   format = "$symbol[󰉊 ](bold #ee5396) $directory$character";
+          #   right_format = "$time";
+          #   character = {
+          #     success_symbol = "[󰅂 ](bold #393939)";
+          #     error_symbol = "[󰅂 ](bold #393939)";
+          #     vicmd_symbol = "[󰅂 ](bold #393939)";
+          #   };
 
-        palette = "catppuccin_${flavour}";
-        git_commit = {commit_hash_length = 5;};
+          palette = "catppuccin_${flavour}";
+          git_commit = { commit_hash_length = 5; };
 
-        lua.symbol = "[](blue) ";
-        python.symbol = "[](blue) ";
-        nix_shell.symbol = "[](blue) ";
-        rust.symbol = "[](red) ";
-        dart.symbol = "[](blue) ";
-        # nodejs.symbol = "[󰎙](#3fdaa4) ";
-        # nodejs.symbol = "[󰎙](#7aa2f7) ";
-        nodejs.version_format = "v$raw(blue)";
-        package.symbol = "📦  ";
+          lua.symbol = "[](blue) ";
+          python.symbol = "[](blue) ";
+          nix_shell.symbol = "[](blue) ";
+          rust.symbol = "[](red) ";
+          dart.symbol = "[](blue) ";
+          # nodejs.symbol = "[󰎙](#3fdaa4) ";
+          # nodejs.symbol = "[󰎙](#7aa2f7) ";
+          nodejs.version_format = "v$raw(blue)";
+          package.symbol = "📦  ";
 
-        username = {
-          show_always = false;
-          style_user = "bold bg:none fg:#7aa2f7";
-          format = "[$user]($style)";
-        };
+          username = {
+            show_always = false;
+            style_user = "bold bg:none fg:#7aa2f7";
+            format = "[$user]($style)";
+          };
 
-        hostname = {
-          disabled = true;
-          ssh_only = false;
-          style = "bold bg:none fg:#CDD6F4";
-          format = "@[$hostname]($style) ";
-        };
+          hostname = {
+            disabled = true;
+            ssh_only = false;
+            style = "bold bg:none fg:#CDD6F4";
+            format = "@[$hostname]($style) ";
+          };
 
-        directory = {
-          read_only = " ";
-          truncation_length = 3;
-          truncation_symbol = "./";
-          # style = "bold bg:none fg:#393939";
-          # style = "bold bg:none fg:#7aa2f7";
-          style = "bold bg:none fg:#b4befe";
-          # style = "bold bg:none fg:#7dcfff";
-          # style = "bold bg:none fg:#ec6a88";
-        };
+          directory = {
+            read_only = " ";
+            truncation_length = 3;
+            truncation_symbol = "./";
+            # style = "bold bg:none fg:#393939";
+            # style = "bold bg:none fg:#7aa2f7";
+            style = "bold bg:none fg:#b4befe";
+            # style = "bold bg:none fg:#7dcfff";
+            # style = "bold bg:none fg:#ec6a88";
+          };
 
-        time = {
-          disabled = true;
-          use_12hr = true;
-          time_range = "-";
-          time_format = "%R";
-          utc_time_offset = "local";
-          format = "[ $time 󰥔]($style) ";
-          style = "bold #393939";
-        };
-      }
-      // builtins.fromTOML (builtins.readFile (pkgs.fetchFromGitHub
-        {
-          owner = "catppuccin";
-          repo = "starship";
-          rev = "HEAD";
-          sha256 = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0=";
+          time = {
+            disabled = true;
+            use_12hr = true;
+            time_range = "-";
+            time_format = "%R";
+            utc_time_offset = "local";
+            format = "[ $time 󰥔]($style) ";
+            style = "bold #393939";
+          };
         }
+        // builtins.fromTOML (builtins.readFile (pkgs.fetchFromGitHub
+          {
+            owner = "catppuccin";
+            repo = "starship";
+            rev = "HEAD";
+            sha256 = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0=";
+          }
         + /palettes/${flavour}.toml));
-  };
+    };
 
   # Mocha
   # programs.starship = {

diff --git a/home/desktop/dev/misc.nix b/home/desktop/dev/misc.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{ pkgs, ... }: {
   home.packages = with pkgs; [
     # TODO: Convert all packages to nix modules
 

diff --git a/home/desktop/graphical/wms/hyprland/default.nix b/home/desktop/graphical/wms/hyprland/default.nix
@@ -1,8 +1,8 @@
-{
-  inputs,
-  pkgs,
-  ...
-}: let
+{ inputs
+, pkgs
+, ...
+}:
+let
   hyprland_flake = inputs.hyprland.packages.${pkgs.system}.hyprland;
   fontsize = "12";
   oxocarbon_pink = "ff7eb6";
@@ -14,7 +14,8 @@
   catppuccin_border = "rgba(b4befeee)";
   opacity = ".85";
   cursor = "macOS-BigSur";
-in {
+in
+{
   environment.systemPackages = with pkgs; [
     grim
     slurp

diff --git a/home/desktop/system/fonts/default.nix b/home/desktop/system/fonts/default.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{ pkgs, ... }: {
   home.packages = with pkgs; [
     noto-fonts
     dejavu_fonts
@@ -7,6 +7,6 @@
     powerline-symbols
     material-design-icons
     commit-mono
-    (nerdfonts.override {fonts = ["IBMPlexMono" "CascadiaCode" "FiraCode" "FiraMono" "JetBrainsMono" "Ubuntu"];})
+    (nerdfonts.override { fonts = [ "IBMPlexMono" "CascadiaCode" "FiraCode" "FiraMono" "JetBrainsMono" "Ubuntu" ]; })
   ];
 }