From b1cbafba2c25bd4e6350eb1bdbc7ef7d03a41fa6 Mon Sep 17 00:00:00 2001 From: jiriks74 Date: Thu, 24 Oct 2024 00:27:43 +0200 Subject: [PATCH] feat(fmt): Add a formatter and format the flake --- flake.nix | 134 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 82 insertions(+), 52 deletions(-) diff --git a/flake.nix b/flake.nix index 31d6ca9..7995fb9 100644 --- a/flake.nix +++ b/flake.nix @@ -11,11 +11,29 @@ nixpkgs, flake-utils, ... - } @ inputs: - { + } @ inputs: let + inherit (self) outputs; + # Supported systems for your flake packages, shell, etc. + systems = [ + "aarch64-linux" + "i686-linux" + "x86_64-linux" + "aarch64-darwin" + "x86_64-darwin" + ]; + # This is a function that generates an attribute by calling a function you + # pass to it, with each system as an argument + forAllSystems = nixpkgs.lib.genAttrs systems; + in { + formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); homeManagerModules = { - default = { config, lib, pkgs, ... }: { - home.packages = with pkgs;[ + default = { + config, + lib, + pkgs, + ... + }: { + home.packages = with pkgs; [ nix-zsh-completions asciinema # Terminal recording @@ -27,15 +45,15 @@ bat eza trash-cli - fzf # enhancd - fd # enhancd + fzf # enhancd + fd # enhancd # rofi # for fd gnutar # ex - bzip3 # ex - unzip # ex - p7zip # ex - unrar # ex - gzip # ex + bzip3 # ex + unzip # ex + p7zip # ex + unrar # ex + gzip # ex ]; programs = { @@ -59,20 +77,32 @@ zplug = { enable = true; plugins = [ - { name = "romkatv/powerlevel10k"; tags = [ "as:theme" "depth:1" ]; } # Installations with additional options. For the list of options, please refer to Zplug README. - { name = "z-shell/F-Sy-H"; } # Feature-rich Syntax Highlighting for Zsh + { + name = "romkatv/powerlevel10k"; + tags = ["as:theme" "depth:1"]; + } # Installations with additional options. For the list of options, please refer to Zplug README. + {name = "z-shell/F-Sy-H";} # Feature-rich Syntax Highlighting for Zsh # { name = "zsh-users/zsh-syntax-highlighting"; } - { name = "zsh-users/zsh-completions"; } # Adds some missing completions to zsh - { name = "zsh-users/zsh-autosuggestions"; } # Simple plugin installation - { name = "MichaelAquilina/zsh-you-should-use"; } # Did you forget to use an alias? - { name = "davidde/git"; } # Aliases for git - { name = "babarot/enhancd"; tags = [ "use:init.sh" ]; } # Includes simmilar functionality to zsh-z - { name = "supercrabtree/k"; } # Directory listings for Zsh with git features. - { name = "plugins/command-not-found"; tags = [ "from:oh-my-zsh" ]; } - { name = "gko/ssh-connect"; tags = [ "use:ssh-connect.sh" ]; } # List of most used ssh connections - { name = "agkozak/zsh-z"; } # Jump arount your filesystem with ease - { name = "sineto/web-search"; } - { name = "zsh-users/zaw"; } # Desctiptions for command outputs (afaik)zplug "plugins/git", from:oh-my-zsh + {name = "zsh-users/zsh-completions";} # Adds some missing completions to zsh + {name = "zsh-users/zsh-autosuggestions";} # Simple plugin installation + {name = "MichaelAquilina/zsh-you-should-use";} # Did you forget to use an alias? + {name = "davidde/git";} # Aliases for git + { + name = "babarot/enhancd"; + tags = ["use:init.sh"]; + } # Includes simmilar functionality to zsh-z + {name = "supercrabtree/k";} # Directory listings for Zsh with git features. + { + name = "plugins/command-not-found"; + tags = ["from:oh-my-zsh"]; + } + { + name = "gko/ssh-connect"; + tags = ["use:ssh-connect.sh"]; + } # List of most used ssh connections + {name = "agkozak/zsh-z";} # Jump arount your filesystem with ease + {name = "sineto/web-search";} + {name = "zsh-users/zaw";} # Desctiptions for command outputs (afaik)zplug "plugins/git", from:oh-my-zsh # { name = "plugins/dirhistory"; tags = [ "from:oh-my-zsh" ]; } ]; }; @@ -176,43 +206,43 @@ cat = "${pkgs.bat}/bin/bat -p"; # update = "sudo nixos-rebuild switch"; - ls="lsd"; + ls = "lsd"; # ls, the common ones I use a lot shortened for rapid fire usage - l="ls -lFh"; #size,show type,human readable - la="ls -lAFh"; #long list,show almost all,show type,human readable - lr="ls -tRFh"; #sorted by date,recursive,show type,human readable - lt="ls -ltFh"; #long list,sorted by date,show type,human readable - ll="ls -l"; #long list - ldot="ls -ld .*"; - lS="ls -1FSsh"; - lart="ls -1Fcart"; - lrt="ls -1Fcrt"; + l = "ls -lFh"; #size,show type,human readable + la = "ls -lAFh"; #long list,show almost all,show type,human readable + lr = "ls -tRFh"; #sorted by date,recursive,show type,human readable + lt = "ls -ltFh"; #long list,sorted by date,show type,human readable + ll = "ls -l"; #long list + ldot = "ls -ld .*"; + lS = "ls -1FSsh"; + lart = "ls -1Fcart"; + lrt = "ls -1Fcrt"; - grep="grep --color"; - sgrep="grep -R -n -H -C 5 --exclude-dir={.git,.svn,CVS} "; + grep = "grep --color"; + sgrep = "grep -R -n -H -C 5 --exclude-dir={.git,.svn,CVS} "; - t="tail -f"; + t = "tail -f"; - dud="du -d 1 -h"; - duf="du -sh *"; + dud = "du -d 1 -h"; + duf = "du -sh *"; # fd="find . -type d -name"; - ff="find . -type f -name"; + ff = "find . -type f -name"; - h="history"; - hgrep="fc -El 0 | grep"; - help="man"; - p="ps -f"; - sortnr="sort -n -r"; - unexport="unset"; + h = "history"; + hgrep = "fc -El 0 | grep"; + help = "man"; + p = "ps -f"; + sortnr = "sort -n -r"; + unexport = "unset"; # Use trash instead of rm if available - rm="trash"; - cp="cp -i"; - mv="mv -i"; + rm = "trash"; + cp = "cp -i"; + mv = "mv -i"; - cls="clear"; + cls = "clear"; - sshc="ssh-connect"; + sshc = "ssh-connect"; }; history = { @@ -224,7 +254,7 @@ }; }; }; - + home.file = { # ".zprofile".source = ./zprofile; };