diff --git a/flake.nix b/flake.nix index 44abb07..1fb12bc 100644 --- a/flake.nix +++ b/flake.nix @@ -1,34 +1,53 @@ { description = "Alqages, packages from alqueva to here."; - inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; }; + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + }; - outputs = inputs@{ self, nixpkgs, }: + outputs = + inputs@{ self, nixpkgs }: let inherit (nixpkgs) lib; - eachSystem = f: - nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ] (system: + eachSystem = + f: + nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ] ( + system: f { inherit system; pkgs = nixpkgs.legacyPackages.${system}; - }); - in { - overlays.default = _: prev: + } + ); + in + { + overlays.default = + _: prev: lib.pipe (builtins.readDir ./packages) [ (lib.filterAttrs (_: v: v == "directory")) - (lib.concatMapAttrs (name: _: { - ${name} = prev.callPackage ./packages/${name} { inherit inputs; }; - })) + (lib.concatMapAttrs ( + name: _: { + ${name} = prev.callPackage ./packages/${name} { inherit inputs; }; + } + )) ]; packages = eachSystem ({ pkgs, ... }: self.overlays.default pkgs pkgs); - devShells = eachSystem ({ pkgs, ... }: { - default = pkgs.mkShell { - name = "alqages-dev"; - packages = - builtins.attrValues { inherit (pkgs) nil nixfmt deadnix statix; }; - }; - }); - formatter = eachSystem ({ pkgs, ... }: pkgs.nixfmt); + devShells = eachSystem ( + { pkgs, ... }: + { + default = pkgs.mkShell { + name = "alqages-dev"; + packages = builtins.attrValues { + inherit (pkgs) + nil + nixfmt + deadnix + statix + ; + }; + }; + } + ); + formatter = eachSystem ({ pkgs, ... }: pkgs.nixfmt-rfc-style); }; } diff --git a/packages/amadaluzian-neovide/default.nix b/packages/amadaluzian-neovide/default.nix index 7496b3f..aa32a49 100644 --- a/packages/amadaluzian-neovide/default.nix +++ b/packages/amadaluzian-neovide/default.nix @@ -1,10 +1,15 @@ -{ symlinkJoin, makeWrapper, neovide, ... }: +{ + symlinkJoin, + makeWrapper, + neovide, + ... +}: let custom-neovide = neovide.overrideAttrs (finalAttrs: { - patches = (finalAttrs.patches or [ ]) - ++ [ ./0001-feat-env-add-NEOVIDE_CONFIG-env-var.patch ]; + patches = (finalAttrs.patches or [ ]) ++ [ ./0001-feat-env-add-NEOVIDE_CONFIG-env-var.patch ]; }); -in symlinkJoin { +in +symlinkJoin { name = "neovide"; paths = [ custom-neovide ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/packages/amadaluzian-niri/default.nix b/packages/amadaluzian-niri/default.nix index 2d66b67..3e95f16 100644 --- a/packages/amadaluzian-niri/default.nix +++ b/packages/amadaluzian-niri/default.nix @@ -6,7 +6,6 @@ niri.overrideAttrs (finalAttrs: { rev = "master"; hash = "sha256-BVTlrmelSAq+rlxwlRvsyZxHrmcviRu3aHJYG37Yq8c="; }; - patches = (finalAttrs.patches or [ ]) - ++ [ ./0001-ipc-_-90-180-270-Normal-90-180-270.patch ]; + patches = (finalAttrs.patches or [ ]) ++ [ ./0001-ipc-_-90-180-270-Normal-90-180-270.patch ]; cargoHash = ""; }) diff --git a/packages/amadaluzian-nu/default.nix b/packages/amadaluzian-nu/default.nix index 5a36189..c173e42 100644 --- a/packages/amadaluzian-nu/default.nix +++ b/packages/amadaluzian-nu/default.nix @@ -1,9 +1,19 @@ -{ symlinkJoin, nushell, zoxide, makeWrapper, system, inputs, }: +{ + symlinkJoin, + nushell, + zoxide, + makeWrapper, + system, + inputs, +}: symlinkJoin { name = "nu"; - paths = - [ nushell inputs.self.packages.${system}.amadaluzian-starship zoxide ]; + paths = [ + nushell + inputs.self.packages.${system}.amadaluzian-starship + zoxide + ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/packages/amadaluzian-starship/default.nix b/packages/amadaluzian-starship/default.nix index d2e655b..e5dacaf 100644 --- a/packages/amadaluzian-starship/default.nix +++ b/packages/amadaluzian-starship/default.nix @@ -1,36 +1,84 @@ -{ symlinkJoin, starship, makeWrapper, writers, ... }: +{ + symlinkJoin, + starship, + makeWrapper, + writers, + ... +}: let config = writers.writeTOML "starship.toml" { - aws = { symbol = "aws "; }; - azure = { symbol = "az "; }; - bun = { symbol = "bun "; }; - c = { symbol = "C "; }; + aws = { + symbol = "aws "; + }; + azure = { + symbol = "az "; + }; + bun = { + symbol = "bun "; + }; + c = { + symbol = "C "; + }; character = { error_symbol = "[x](bold red)"; success_symbol = "[>](bold green)"; vimcmd_symbol = "[<](bold green)"; }; - cmake = { symbol = "cmake "; }; - cmd_duration = { format = "\\[[$duration]($style)\\] "; }; - cobol = { symbol = "cobol "; }; - conda = { symbol = "conda "; }; - crystal = { symbol = "cr "; }; - daml = { symbol = "daml "; }; - dart = { symbol = "dart "; }; - deno = { symbol = "deno "; }; + cmake = { + symbol = "cmake "; + }; + cmd_duration = { + format = "\\[[$duration]($style)\\] "; + }; + cobol = { + symbol = "cobol "; + }; + conda = { + symbol = "conda "; + }; + crystal = { + symbol = "cr "; + }; + daml = { + symbol = "daml "; + }; + dart = { + symbol = "dart "; + }; + deno = { + symbol = "deno "; + }; directory = { read_only = " ro"; format = ":[$path]($style) "; }; - docker_context = { symbol = "docker "; }; - dotnet = { symbol = ".NET "; }; - elixir = { symbol = "exs "; }; - elm = { symbol = "elm "; }; - fennel = { symbol = "fnl "; }; - fossil_branch = { symbol = "fossil "; }; - gcloud = { symbol = "gcp "; }; - git_branch = { format = "\\[[$branch(:$remote_branch)]($style)\\] "; }; - git_commit = { tag_symbol = " tag "; }; + docker_context = { + symbol = "docker "; + }; + dotnet = { + symbol = ".NET "; + }; + elixir = { + symbol = "exs "; + }; + elm = { + symbol = "elm "; + }; + fennel = { + symbol = "fnl "; + }; + fossil_branch = { + symbol = "fossil "; + }; + gcloud = { + symbol = "gcp "; + }; + git_branch = { + format = "\\[[$branch(:$remote_branch)]($style)\\] "; + }; + git_commit = { + tag_symbol = " tag "; + }; git_status = { ahead = ">"; behind = "<"; @@ -39,23 +87,57 @@ let renamed = "r"; format = "\\[[$all_status$ahead_behind]($style)\\] "; }; - gleam = { symbol = "gleam "; }; - golang = { symbol = "go "; }; - gradle = { symbol = "gradle "; }; - guix_shell = { symbol = "guix "; }; - hg_branch = { symbol = "hg "; }; - java = { symbol = "java "; }; - julia = { symbol = "jl "; }; - kotlin = { symbol = "kt "; }; - lua = { symbol = "lua "; }; - memory_usage = { symbol = "memory "; }; - meson = { symbol = "meson "; }; - nats = { symbol = "nats "; }; - nim = { symbol = "nim "; }; - nix_shell = { format = "\\[[$state( ($name))]($style)\\] "; }; - nodejs = { symbol = "nodejs "; }; - ocaml = { symbol = "ml "; }; - opa = { symbol = "opa "; }; + gleam = { + symbol = "gleam "; + }; + golang = { + symbol = "go "; + }; + gradle = { + symbol = "gradle "; + }; + guix_shell = { + symbol = "guix "; + }; + hg_branch = { + symbol = "hg "; + }; + java = { + symbol = "java "; + }; + julia = { + symbol = "jl "; + }; + kotlin = { + symbol = "kt "; + }; + lua = { + symbol = "lua "; + }; + memory_usage = { + symbol = "memory "; + }; + meson = { + symbol = "meson "; + }; + nats = { + symbol = "nats "; + }; + nim = { + symbol = "nim "; + }; + nix_shell = { + format = "\\[[$state( ($name))]($style)\\] "; + }; + nodejs = { + symbol = "nodejs "; + }; + ocaml = { + symbol = "ml "; + }; + opa = { + symbol = "opa "; + }; os = { disabled = false; symbols = { @@ -108,26 +190,66 @@ let openSUSE = "osuse "; }; }; - package = { symbol = "pkg "; }; - perl = { symbol = "pl "; }; - php = { symbol = "php "; }; - pijul_channel = { symbol = "pijul "; }; - pulumi = { symbol = "pulumi "; }; - purescript = { symbol = "purs "; }; - python = { symbol = "py "; }; - quarto = { symbol = "quarto "; }; - raku = { symbol = "raku "; }; - ruby = { symbol = "rb "; }; - rust = { symbol = "rs "; }; - scala = { symbol = "scala "; }; - solidity = { symbol = "solidity "; }; - spack = { symbol = "spack "; }; - status = { symbol = "[x](bold red) "; }; - sudo = { symbol = "sudo "; }; - swift = { symbol = "swift "; }; - terraform = { symbol = "terraform "; }; - typst = { symbol = "typst "; }; - zig = { symbol = "zig "; }; + package = { + symbol = "pkg "; + }; + perl = { + symbol = "pl "; + }; + php = { + symbol = "php "; + }; + pijul_channel = { + symbol = "pijul "; + }; + pulumi = { + symbol = "pulumi "; + }; + purescript = { + symbol = "purs "; + }; + python = { + symbol = "py "; + }; + quarto = { + symbol = "quarto "; + }; + raku = { + symbol = "raku "; + }; + ruby = { + symbol = "rb "; + }; + rust = { + symbol = "rs "; + }; + scala = { + symbol = "scala "; + }; + solidity = { + symbol = "solidity "; + }; + spack = { + symbol = "spack "; + }; + status = { + symbol = "[x](bold red) "; + }; + sudo = { + symbol = "sudo "; + }; + swift = { + symbol = "swift "; + }; + terraform = { + symbol = "terraform "; + }; + typst = { + symbol = "typst "; + }; + zig = { + symbol = "zig "; + }; username = { show_always = true; format = "[$user]($style)@"; @@ -137,7 +259,8 @@ let format = "[$ssh_symbol$hostname]($style)"; }; }; -in symlinkJoin { +in +symlinkJoin { name = "starship"; paths = [ starship ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/packages/amadaluzian-xonsh/default.nix b/packages/amadaluzian-xonsh/default.nix index 1ca37a0..7cfd618 100644 --- a/packages/amadaluzian-xonsh/default.nix +++ b/packages/amadaluzian-xonsh/default.nix @@ -1,65 +1,92 @@ -{ makeWrapper, fetchFromGitHub, symlinkJoin, python3, inputs, system, zoxide -, ... # ffs nixpkgs +{ + makeWrapper, + fetchFromGitHub, + symlinkJoin, + python3, + inputs, + system, + zoxide, + ... # ffs nixpkgs }: let xonsh = python3.withPackages (ps: [ ps.xonsh - (let - pname = "xontrib-fish-completer"; - version = "0.0.1"; - in ps.buildPythonPackage { - inherit pname version; - src = fetchFromGitHub { - owner = "xonsh"; - repo = pname; - rev = version; - hash = "sha256-PhhdZ3iLPDEIG9uDeR5ctJ9zz2+YORHBhbsiLrJckyA="; - }; - }) - (let - pname = "xontrib-prompt-starship"; - version = "0.3.6"; - in ps.buildPythonPackage { - inherit pname version; - src = fetchFromGitHub { - owner = "anki-code"; - repo = pname; - tag = version; - hash = "sha256-CLOvMa3L4XnH53H/k6/1W9URrPakPjbX1T1U43+eSR0="; - }; - }) - (let - pname = "xontrib-init-ssh-agent"; - version = "1.0.1"; - in ps.buildPythonPackage { - inherit pname version; - pyproject = true; - build-system = [ ps.setuptools ps.wheel ]; - dependencies = [ ps.xonsh ]; - src = fetchFromGitHub { - owner = "amadaluzia"; - repo = pname; - rev = "cac9cfec70ec15b0ed4f1c8a18154ea9b4f8fb47"; - hash = "sha256-UkRPdaZFNP8qv7lMwsTUalnre3k2UMfqMzmiTveLiBM="; - }; - }) - (let - pname = "xonsh-direnv"; - version = "1.6.5"; - in ps.buildPythonPackage { - inherit pname version; - src = fetchFromGitHub { - owner = "74th"; - repo = pname; - tag = version; - hash = "sha256-huBJ7WknVCk+WgZaXHlL+Y1sqsn6TYqMP29/fsUPSyU="; - }; - }) + ( + let + pname = "xontrib-fish-completer"; + version = "0.0.1"; + in + ps.buildPythonPackage { + inherit pname version; + src = fetchFromGitHub { + owner = "xonsh"; + repo = pname; + rev = version; + hash = "sha256-PhhdZ3iLPDEIG9uDeR5ctJ9zz2+YORHBhbsiLrJckyA="; + }; + } + ) + ( + let + pname = "xontrib-prompt-starship"; + version = "0.3.6"; + in + ps.buildPythonPackage { + inherit pname version; + src = fetchFromGitHub { + owner = "anki-code"; + repo = pname; + tag = version; + hash = "sha256-CLOvMa3L4XnH53H/k6/1W9URrPakPjbX1T1U43+eSR0="; + }; + } + ) + ( + let + pname = "xontrib-init-ssh-agent"; + version = "1.0.1"; + in + ps.buildPythonPackage { + inherit pname version; + pyproject = true; + build-system = [ + ps.setuptools + ps.wheel + ]; + dependencies = [ ps.xonsh ]; + src = fetchFromGitHub { + owner = "amadaluzia"; + repo = pname; + rev = "cac9cfec70ec15b0ed4f1c8a18154ea9b4f8fb47"; + hash = "sha256-UkRPdaZFNP8qv7lMwsTUalnre3k2UMfqMzmiTveLiBM="; + }; + } + ) + ( + let + pname = "xonsh-direnv"; + version = "1.6.5"; + in + ps.buildPythonPackage { + inherit pname version; + src = fetchFromGitHub { + owner = "74th"; + repo = pname; + tag = version; + hash = "sha256-huBJ7WknVCk+WgZaXHlL+Y1sqsn6TYqMP29/fsUPSyU="; + }; + } + ) ]); -in symlinkJoin { +in +symlinkJoin { name = "xonsh"; - paths = [ xonsh inputs.self.packages.${system}.amadaluzian-starship zoxide ]; + paths = [ + xonsh + inputs.self.packages.${system}.amadaluzian-starship + zoxide + ]; nativeBuildInputs = [ makeWrapper ]; @@ -68,7 +95,11 @@ in symlinkJoin { --set XONSH_CONFIG_DIR ${./cfg} ''; - passthru = { shellPath = "/bin/xonsh"; }; + passthru = { + shellPath = "/bin/xonsh"; + }; - meta = { mainProgram = "xonsh"; }; + meta = { + mainProgram = "xonsh"; + }; } diff --git a/packages/amadaluzian-zsh/config/.zshrc b/packages/amadaluzian-zsh/config/.zshrc index a3b5889..d6e2aaf 100644 --- a/packages/amadaluzian-zsh/config/.zshrc +++ b/packages/amadaluzian-zsh/config/.zshrc @@ -1,6 +1,5 @@ eval "$(@starshipPath@ init zsh)" -eval "$(@zoxidePath@ init zsh)" - +eval "$(@zoxidePath@ init zsh --cmd j)" source "@zsh-deferPath@" diff --git a/packages/amadaluzian-zsh/default.nix b/packages/amadaluzian-zsh/default.nix index eca4501..f4633c5 100644 --- a/packages/amadaluzian-zsh/default.nix +++ b/packages/amadaluzian-zsh/default.nix @@ -1,4 +1,18 @@ -{ symlinkJoin, zsh, makeWrapper, inputs, system, zoxide, eza, zsh-fzf-tab, zsh-defer, zsh-autosuggestions, zsh-syntax-highlighting, lib, fzf }: +{ + symlinkJoin, + zsh, + makeWrapper, + inputs, + system, + zoxide, + eza, + zsh-fzf-tab, + zsh-defer, + zsh-autosuggestions, + zsh-syntax-highlighting, + lib, + fzf, +}: symlinkJoin { name = "amadaluzian-zsh"; paths = [ @@ -15,7 +29,9 @@ symlinkJoin { --subst-var-by zsh-deferPath ${zsh-defer}/share/zsh-defer/zsh-defer.plugin.zsh \ --subst-var-by zsh-syntax-highlightingPath ${zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh \ --subst-var-by zsh-autosuggestionsPath ${zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh \ - --subst-var-by starshipPath ${lib.getExe' inputs.self.packages.${system}.amadaluzian-starship "starship"} \ + --subst-var-by starshipPath ${ + lib.getExe' inputs.self.packages.${system}.amadaluzian-starship "starship" + } \ --subst-var-by zoxidePath ${lib.getExe' zoxide "zoxide"} \ --subst-var-by fzfPath ${lib.getExe' fzf "fzf"} \ diff --git a/packages/fairfax/default.nix b/packages/fairfax/default.nix index 82fce47..0f1203a 100644 --- a/packages/fairfax/default.nix +++ b/packages/fairfax/default.nix @@ -1,12 +1,16 @@ -{ stdenvNoCC, fetchzip, lib, ... }: +{ + stdenvNoCC, + fetchzip, + lib, + ... +}: stdenvNoCC.mkDerivation { pname = "fairfax"; version = "20240601"; src = lib.cleanSourceWith { filter = _path: type: type == "regular"; src = fetchzip { - url = - "https://github.com/kreativekorp/open-relay/releases/download/2024-06-01/Fairfax.zip"; + url = "https://github.com/kreativekorp/open-relay/releases/download/2024-06-01/Fairfax.zip"; hash = "sha256-rUl/C250pJBal69ThtWhPMFe182nnZmk5UUA7eDrZeA="; stripRoot = false; }; diff --git a/packages/nicotine-plus-libadwaita/default.nix b/packages/nicotine-plus-libadwaita/default.nix index f966982..24e1c67 100644 --- a/packages/nicotine-plus-libadwaita/default.nix +++ b/packages/nicotine-plus-libadwaita/default.nix @@ -1,4 +1,9 @@ -{ symlinkJoin, nicotine-plus, makeWrapper, ... }: +{ + symlinkJoin, + nicotine-plus, + makeWrapper, + ... +}: symlinkJoin { name = "nicotine"; paths = [ nicotine-plus ]; diff --git a/packages/river-bedload/build.zig.zon.nix b/packages/river-bedload/build.zig.zon.nix index acfb99f..93f1595 100644 --- a/packages/river-bedload/build.zig.zon.nix +++ b/packages/river-bedload/build.zig.zon.nix @@ -1,9 +1,11 @@ # generated by zon2nix (https://github.com/nix-community/zon2nix) -{ linkFarm, fetchzip, }: -linkFarm "zig-packages" [{ - name = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242"; - path = fetchzip { - url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz"; - hash = "sha256-dvit+yvc0MnipqWjxJdfIsA6fJaJZOaIpx4w4woCxbE="; - }; -}] +{ linkFarm, fetchzip }: +linkFarm "zig-packages" [ + { + name = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242"; + path = fetchzip { + url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz"; + hash = "sha256-dvit+yvc0MnipqWjxJdfIsA6fJaJZOaIpx4w4woCxbE="; + }; + } +] diff --git a/packages/river-bedload/default.nix b/packages/river-bedload/default.nix index 40c448c..eab8cd4 100644 --- a/packages/river-bedload/default.nix +++ b/packages/river-bedload/default.nix @@ -1,5 +1,14 @@ -{ stdenv, fetchgit, zig_0_13, callPackage, wayland-scanner, wayland-protocols -, wayland, pkg-config, ... }: +{ + stdenv, + fetchgit, + zig_0_13, + callPackage, + wayland-scanner, + wayland-protocols, + wayland, + pkg-config, + ... +}: stdenv.mkDerivation (finalAttrs: { pname = "river-bedload"; version = "0.1.1"; @@ -12,9 +21,19 @@ stdenv.mkDerivation (finalAttrs: { deps = callPackage ./build.zig.zon.nix { }; - zigBuildFlags = [ "--system" "${finalAttrs.deps}" ]; + zigBuildFlags = [ + "--system" + "${finalAttrs.deps}" + ]; - nativeBuildInputs = [ zig_0_13.hook pkg-config wayland-scanner ]; + nativeBuildInputs = [ + zig_0_13.hook + pkg-config + wayland-scanner + ]; - buildInputs = [ wayland wayland-protocols ]; + buildInputs = [ + wayland + wayland-protocols + ]; }) diff --git a/packages/tela-circle-icon-theme-patched/default.nix b/packages/tela-circle-icon-theme-patched/default.nix index 0145818..15705cd 100644 --- a/packages/tela-circle-icon-theme-patched/default.nix +++ b/packages/tela-circle-icon-theme-patched/default.nix @@ -1,5 +1,4 @@ { tela-circle-icon-theme, ... }: tela-circle-icon-theme.overrideAttrs (finalAttrs: { - patches = (finalAttrs.patches or [ ]) - ++ [ ./0001-fix-links-remove-symbolic-links.patch ]; + patches = (finalAttrs.patches or [ ]) ++ [ ./0001-fix-links-remove-symbolic-links.patch ]; })