diff --git a/flake.nix b/flake.nix index d8a480e..7ca44c4 100644 --- a/flake.nix +++ b/flake.nix @@ -71,7 +71,6 @@ systems = ["x86_64-linux"]; imports = [ ./hosts - ./overlays ./shells ./lib ]; diff --git a/overlays/default.nix b/overlays/default.nix deleted file mode 100644 index 7efe347..0000000 --- a/overlays/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{self, ...}: { - flake.overlays.default = _final: prev: let - packages = { - amadaluzian-starship = prev.callPackage ./derivations/starship.nix {}; - amadaluzian-xonsh = prev.callPackage ./derivations/xonsh {inherit (packages) amadaluzian-starship;}; - amadaluzian-nu = prev.callPackage ./derivations/nu {inherit (packages) amadaluzian-starship;}; - fairfax = prev.callPackage ./derivations/fairfax.nix {}; - river-bedload = prev.callPackage ./derivations/river-bedload {}; - nicotine-plus = prev.symlinkJoin { - name = "nicotine"; - paths = [prev.nicotine-plus]; - nativeBuildInputs = [prev.makeWrapper]; - postBuild = '' - wrapProgram $out/bin/nicotine \ - --set-default NICOTINE_LIBADWAITA 1 - ''; - }; - rose-pine-gtk-theme = prev.rose-pine-gtk-theme.overrideAttrs (_prevAttrs: { - version = "master"; - src = prev.fetchFromGitHub { - owner = "rose-pine"; - repo = "gtk"; - rev = "master"; - hash = "sha256-vCWs+TOVURl18EdbJr5QAHfB+JX9lYJ3TPO6IklKeFE="; - }; - }); - }; - in - packages; - perSystem = {pkgs, ...}: { - packages = self.overlays.default null pkgs; - }; -} diff --git a/overlays/derivations/fairfax.nix b/overlays/derivations/fairfax.nix deleted file mode 100644 index cd8f2cd..0000000 --- a/overlays/derivations/fairfax.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - 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"; - hash = "sha256-rUl/C250pJBal69ThtWhPMFe182nnZmk5UUA7eDrZeA="; - stripRoot = false; - }; - }; - installPhase = '' - mkdir -p $out/share/fonts/Fairfax - cp *.ttf $out/share/fonts/Fairfax - ''; -} diff --git a/overlays/derivations/nu/cfg/config.nu b/overlays/derivations/nu/cfg/config.nu deleted file mode 100644 index e671b14..0000000 --- a/overlays/derivations/nu/cfg/config.nu +++ /dev/null @@ -1,54 +0,0 @@ -# config.nu -# -# Installed by: -# version = "0.101.0" -# -# This file is used to override default Nushell settings, define -# (or import) custom commands, or run any other startup tasks. -# See https://www.nushell.sh/book/configuration.html -# -# This file is loaded after env.nu and before login.nu -# -# You can open this file in your default editor using: -# config nu -# -# See `help config nu` for more options -# -# You can remove these comments if you want or leave -# them for future reference. - -# Alias the built-in ls command to `ls!`, I like to pretend it's like the Nix/Haskell prime. -alias ls! = ls - -# List the filenames, sizes, and modification times of items in a directory. -def ls [ - --all (-a), # Show hidden files - --long (-l), # Get all available columns for each entry (slower; columns are platform-dependent) - --short-names (-s), # Only print the file names, and not the path - --full-paths (-f), # display paths as absolute paths - --du (-d), # Display the apparent directory size ("disk usage") in place of the directory metadata size - --directory (-D), # List the specified directory itself instead of its contents - --mime-type (-m), # Show mime-type in type column instead of 'file' (based on filenames only; files' contents are not examined) - --threads (-t), # Use multiple threads to list contents. Output will be non-deterministic. - ...pattern: glob, # The glob pattern to use. -]: [ nothing -> table ] { - let pattern = if ($pattern | is-empty) { [ '.' ] } else { $pattern } - (ls! - --all=$all - --long=$long - --short-names=$short_names - --full-paths=$full_paths - --du=$du - --directory=$directory - --mime-type=$mime_type - --threads=$threads - ...$pattern - ) | sort-by type name -i -} - -alias nos = nh os -alias e = ^$env.EDITOR - -mkdir ($nu.data-dir | path join "vendor/autoload") -starship init nu | save -f ($nu.data-dir | path join "vendor/autoload/starship.nu") -zoxide init nushell --cmd j | save -f ($nu.data-dir | path join "vendor/autoload/zoxide.nu") diff --git a/overlays/derivations/nu/cfg/env.nu b/overlays/derivations/nu/cfg/env.nu deleted file mode 100644 index 6d578c6..0000000 --- a/overlays/derivations/nu/cfg/env.nu +++ /dev/null @@ -1,37 +0,0 @@ -# env.nu -# -# Installed by: -# version = "0.101.0" -# -# Previously, environment variables were typically configured in `env.nu`. -# In general, most configuration can and should be performed in `config.nu` -# or one of the autoload directories. -# -# This file is generated for backwards compatibility for now. -# It is loaded before config.nu and login.nu -# -# See https://www.nushell.sh/book/configuration.html -# -# Also see `help config env` for more options. -# -# You can remove these comments if you want or leave -# them for future reference. - -$env.config = { - hooks: { - pre_prompt: [{ || - if (which direnv | is-empty) { - return - } - - direnv export json | from json | default {} | load-env - if 'ENV_CONVERSIONS' in $env and 'PATH' in $env.ENV_CONVERSIONS { - $env.PATH = do $env.ENV_CONVERSIONS.PATH.from_string $env.PATH - } - }] - } - table: { - mode: "heavy" - } - show_banner: false -} diff --git a/overlays/derivations/nu/default.nix b/overlays/derivations/nu/default.nix deleted file mode 100644 index e4f8c9e..0000000 --- a/overlays/derivations/nu/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - symlinkJoin, - nushell, - amadaluzian-starship, - zoxide, - makeWrapper, -}: -symlinkJoin { - name = "nu"; - - paths = [ - nushell - amadaluzian-starship - zoxide - ]; - - nativeBuildInputs = [ - makeWrapper - ]; - - passthru = { - inherit (nushell.passthru) shellPath; - }; - - meta = { - inherit (nushell.meta) mainProgram; - }; - - postBuild = '' - wrapProgram $out/bin/nu \ - --set NU_CONFIG_DIR "${./cfg}" \ - --add-flags '--env-config' \ - --add-flags '$NU_CONFIG_DIR/env.nu' \ - --add-flags '--config' \ - --add-flags '$NU_CONFIG_DIR/config.nu' \ - ''; -} diff --git a/overlays/derivations/river-bedload/build.zig.zon.nix b/overlays/derivations/river-bedload/build.zig.zon.nix deleted file mode 100644 index 6e8f2cf..0000000 --- a/overlays/derivations/river-bedload/build.zig.zon.nix +++ /dev/null @@ -1,14 +0,0 @@ -# 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="; - }; - } -] diff --git a/overlays/derivations/river-bedload/default.nix b/overlays/derivations/river-bedload/default.nix deleted file mode 100644 index cbe2964..0000000 --- a/overlays/derivations/river-bedload/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - stdenv, - fetchgit, - zig_0_13, - callPackage, - wayland-scanner, - wayland-protocols, - wayland, - pkg-config, -}: -stdenv.mkDerivation (finalAttrs: { - pname = "river-bedload"; - version = "0.1.1"; - - src = fetchgit { - url = "https://git.sr.ht/~novakane/${finalAttrs.pname}"; - rev = "v${finalAttrs.version}"; - hash = "sha256-AMxFdKVy4E1xVdimqxm8KZW39krk/Mt27MWLxEiq1JA="; - }; - - deps = callPackage ./build.zig.zon.nix {}; - - zigBuildFlags = [ - "--system" - "${finalAttrs.deps}" - ]; - - nativeBuildInputs = [ - zig_0_13.hook - pkg-config - wayland-scanner - ]; - - buildInputs = [ - wayland - wayland-protocols - ]; -}) diff --git a/overlays/derivations/starship.nix b/overlays/derivations/starship.nix deleted file mode 100644 index bf8223e..0000000 --- a/overlays/derivations/starship.nix +++ /dev/null @@ -1,157 +0,0 @@ -{ - symlinkJoin, - starship, - makeWrapper, - writers, -}: let - config = writers.writeTOML "starship.toml" { - 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 ";}; - 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 ";}; - git_status = { - ahead = ">"; - behind = "<"; - deleted = "x"; - diverged = "<>"; - 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 ";}; - os = { - disabled = false; - symbols = { - AIX = "aix "; - AlmaLinux = "alma "; - Alpaquita = "alq "; - Alpine = "alp "; - Amazon = "amz "; - Android = "andr "; - Arch = "rch "; - Artix = "atx "; - CentOS = "cent "; - Debian = "deb "; - DragonFly = "dfbsd "; - Emscripten = "emsc "; - EndeavourOS = "ndev "; - Fedora = "fed "; - FreeBSD = "fbsd "; - Garuda = "garu "; - Gentoo = "gent "; - HardenedBSD = "hbsd "; - Illumos = "lum "; - Kali = "kali "; - Linux = "lnx "; - Mabox = "mbox "; - Macos = "mac "; - Manjaro = "mjo "; - Mariner = "mrn "; - MidnightBSD = "mid "; - Mint = "mint "; - NetBSD = "nbsd "; - NixOS = "nix "; - OpenBSD = "obsd "; - OpenCloudOS = "ocos "; - OracleLinux = "orac "; - Pop = "pop "; - Raspbian = "rasp "; - RedHatEnterprise = "rhel "; - Redhat = "rhl "; - Redox = "redox "; - RockyLinux = "rky "; - SUSE = "suse "; - Solus = "sol "; - Ubuntu = "ubnt "; - Ultramarine = "ultm "; - Unknown = "unk "; - Void = "void "; - Windows = "win "; - openEuler = "oeul "; - 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 ";}; - username = { - show_always = true; - format = "[$user]($style)@"; - }; - hostname = { - ssh_only = false; - format = "[$ssh_symbol$hostname]($style)"; - }; - }; -in - symlinkJoin { - name = "starship"; - paths = [ - starship - ]; - nativeBuildInputs = [ - makeWrapper - ]; - postBuild = '' - wrapProgram $out/bin/starship \ - --set STARSHIP_CONFIG ${config} - ''; - } diff --git a/overlays/derivations/tabler-icons.nix b/overlays/derivations/tabler-icons.nix deleted file mode 100644 index 3596e53..0000000 --- a/overlays/derivations/tabler-icons.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - stdenv, - fetchFromGitHub, - fontforge, - nodejs, - pnpm, - lib, -}: let - pname = "tabler-icons"; - version = "v3.24.0"; -in - stdenv.mkDerivation (finalAttrs: { - inherit pname version; - - src = fetchFromGitHub { - owner = "tabler"; - repo = pname; - rev = version; - hash = "sha256-6v7strSKsxSmUGXRhapOlImsCj035AX1Td+IQHPs+7g="; - }; - - buildInputs = [fontforge]; - - nativeBuildInputs = [ - nodejs - pnpm.configHook - ]; - - pnpmDeps = pnpm.fetchDeps { - inherit (finalAttrs) pname version src; - hash = "sha256-/BB1FaMR06uwv3Za6+PWSWMPLtoRXRTqsZDV3DIgaxs="; - }; - - # buildPhase = '' - # runHook preBuild - # npm run build:webfont - # runHook postBuild - # ''; - - installPhase = '' - mkdir -p $out/useless_dir_just_check_contents - mv .* $out/useless_dir_just_check_contents - mv */ $out/useless_dir_just_check_contents - ''; - - meta = { - description = "A set of over 5700 free MIT-licensed high-quality SVG icons for you to use in your web projects."; - homepage = "https://tabler.io/icons"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [amadaluzia]; - }; - }) diff --git a/overlays/derivations/xonsh/cfg/rc.xsh b/overlays/derivations/xonsh/cfg/rc.xsh deleted file mode 100644 index d585899..0000000 --- a/overlays/derivations/xonsh/cfg/rc.xsh +++ /dev/null @@ -1 +0,0 @@ -execx($(zoxide init xonsh --cmd j), 'exec', __xonsh__.ctx, filename='zoxide') diff --git a/overlays/derivations/xonsh/default.nix b/overlays/derivations/xonsh/default.nix deleted file mode 100644 index 8a4752d..0000000 --- a/overlays/derivations/xonsh/default.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ - makeWrapper, - fetchFromGitHub, - symlinkJoin, - python3, - amadaluzian-starship, - zoxide, -}: let - xonsh = - (python3.override { - packageOverrides = pyprev: _pyfinal: { - custom-xonsh = pyprev.xonsh.overrideAttrs (finalAttrs: { - src = fetchFromGitHub { - owner = "xonsh"; - repo = finalAttrs.pname; - rev = "0292b43e64c72ef16a75128d6346ce7d3b316d66"; - hash = "sha256-kCtn8ujD0UahOLxtV9DD81awOYl6xirgnBoW/ywZxs0="; - }; - }); - }; - }) - .withPackages (ps: [ - ps.custom-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.custom-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 { - name = "xonsh"; - - paths = [ - xonsh - amadaluzian-starship - zoxide - ]; - - nativeBuildInputs = [ - makeWrapper - ]; - - postBuild = '' - wrapProgram $out/bin/xonsh \ - --set XONSH_CONFIG_DIR ${./cfg} - ''; - - passthru = { - shellPath = "/bin/xonsh"; - }; - - meta = { - mainProgram = "xonsh"; - }; - }