diff --git a/flake.nix b/flake.nix index 73cd09e..856031a 100644 --- a/flake.nix +++ b/flake.nix @@ -101,6 +101,7 @@ }; nixConfig = { + extra-substituters = [ "https://attic.dayl.in/oizys" "https://nixpkgs-wayland.cachix.org" diff --git a/hosts/othalan/services.nix b/hosts/othalan/services.nix index 5edb8b8..861e35f 100644 --- a/hosts/othalan/services.nix +++ b/hosts/othalan/services.nix @@ -1,6 +1,6 @@ { config, -# pkgs, + # pkgs, ... }: # let diff --git a/lib/extended.nix b/lib/extended.nix index 34c1f70..c55586b 100644 --- a/lib/extended.nix +++ b/lib/extended.nix @@ -166,16 +166,15 @@ let { hostName, pkgs, - flake ? flakeFromSystem pkgs.system + flake ? flakeFromSystem pkgs.system, }: - hostName - |> pathFromHostName - |> (p: "${p}/settings/pkgs") - |> tryReadLinesNoComment - |> map ( - line: - if hasPrefix "flake:" line then (line |> removePrefix "flake:" |> flake.pkg) else pkgs.${line} - ); + hostName + |> pathFromHostName + |> (p: "${p}/settings/pkgs") + |> tryReadLinesNoComment + |> map ( + line: if hasPrefix "flake:" line then (line |> removePrefix "flake:" |> flake.pkg) else pkgs.${line} + ); in { diff --git a/modules/desktop/gui.nix b/modules/desktop/gui.nix index 7aab587..41989a1 100644 --- a/modules/desktop/gui.nix +++ b/modules/desktop/gui.nix @@ -17,35 +17,35 @@ in # For some reason it's not linked unless I include this. # Though it's possible if I enabled plasma than it would be. - environment.pathsToLink = ["/share/Kvantum"]; + environment.pathsToLink = [ "/share/Kvantum" ]; environment.systemPackages = with pkgs; [ - (catppuccin-gtk.override { - accents = [ "pink" ]; - variant = "mocha"; - }) + (catppuccin-gtk.override { + accents = [ "pink" ]; + variant = "mocha"; + }) - (catppuccin-kvantum.override { - variant = "mocha"; - accent = "pink"; - }) + (catppuccin-kvantum.override { + variant = "mocha"; + accent = "pink"; + }) - libsForQt5.qtstyleplugin-kvantum - libsForQt5.okular - libsForQt5.qt5ct - papirus-icon-theme + libsForQt5.qtstyleplugin-kvantum + libsForQt5.okular + libsForQt5.qt5ct + papirus-icon-theme - pcmanfm - alacritty # backup to ghostty + pcmanfm + alacritty # backup to ghostty - inkscape - gimp + inkscape + gimp - zotero + zotero - libreoffice-qt - hunspell # spell check for libreoffice - ]; + libreoffice-qt + hunspell # spell check for libreoffice + ]; }; } diff --git a/modules/oizys.nix b/modules/oizys.nix index 63616f5..b593a2f 100644 --- a/modules/oizys.nix +++ b/modules/oizys.nix @@ -7,7 +7,13 @@ ... }: let - inherit (lib) mkEnableOption mkOption loadOverlays oizysSettings tryPkgsFromFile; + inherit (lib) + mkEnableOption + mkOption + loadOverlays + oizysSettings + tryPkgsFromFile + ; in { imports = with self.nixosModules; [ @@ -62,6 +68,6 @@ in time.timeZone = "US/Central"; nixpkgs.overlays = import ../overlays { inherit inputs loadOverlays; }; oizys = oizysSettings hostName; - environment.systemPackages = tryPkgsFromFile {inherit hostName pkgs;}; + environment.systemPackages = tryPkgsFromFile { inherit hostName pkgs; }; }; } diff --git a/pkgs/distrobox/default.nix b/pkgs/distrobox/default.nix index 6d6d682..6368b13 100644 --- a/pkgs/distrobox/default.nix +++ b/pkgs/distrobox/default.nix @@ -21,7 +21,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontConfigure = true; dontBuild = true; - nativeBuildInputs = [ makeWrapper installShellFiles]; + nativeBuildInputs = [ + makeWrapper + installShellFiles + ]; installPhase = '' runHook preInstall @@ -43,7 +46,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { echo 'container_additional_volumes="/nix:/nix"' > $out/share/distrobox/distrobox.conf ''; - postInstall = '' ls completions/zsh installShellCompletion --cmd distrbox --zsh completions/zsh/_distrobox diff --git a/pkgs/nim/nimble/default.nix b/pkgs/nim/nimble/default.nix index 2ee9564..48a20a6 100644 --- a/pkgs/nim/nimble/default.nix +++ b/pkgs/nim/nimble/default.nix @@ -19,23 +19,22 @@ buildNimPackage (finalAttrs: { hash = "sha256-yf/aTHvwWIEKvyIJ80pgryih0FKoZdzRoje2IPwMJZw="; fetchSubmodules = true; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ openssl ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ openssl ]; - nimFlags = [ "--define:git_revision_override=${finalAttrs.src.rev}" ]; + nimFlags = [ "--define:git_revision_override=${finalAttrs.src.rev}" ]; - doCheck = false; # it works on their machine + doCheck = false; # it works on their machine - postInstall = '' - wrapProgram $out/bin/nimble \ - --suffix PATH : ${lib.makeBinPath [ nim ]} - ''; + postInstall = '' + wrapProgram $out/bin/nimble \ + --suffix PATH : ${lib.makeBinPath [ nim ]} + ''; - meta = { - description = "Package manager for the Nim programming language"; - homepage = "https://github.com/nim-lang/nimble"; - license = lib.licenses.bsd3; - mainProgram = "nimble"; - }; - } -) + meta = { + description = "Package manager for the Nim programming language"; + homepage = "https://github.com/nim-lang/nimble"; + license = lib.licenses.bsd3; + mainProgram = "nimble"; + }; +}) diff --git a/pkgs/nim/nimlangserver/default.nix b/pkgs/nim/nimlangserver/default.nix index 5abf76c..3855e72 100644 --- a/pkgs/nim/nimlangserver/default.nix +++ b/pkgs/nim/nimlangserver/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, buildNimPackage }: -buildNimPackage( finalAttrs: { +buildNimPackage (finalAttrs: { pname = "nimlangserver"; version = "1.6.0"; src = fetchFromGitHub { @@ -12,5 +12,4 @@ buildNimPackage( finalAttrs: { doCheck = false; lockFile = ./lock.json; -} -) +}) diff --git a/pkgs/nim/procs/default.nix b/pkgs/nim/procs/default.nix index 4c32c58..49f4ad9 100644 --- a/pkgs/nim/procs/default.nix +++ b/pkgs/nim/procs/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, buildNimPackage }: -buildNimPackage( finalAttrs: { +buildNimPackage (finalAttrs: { pname = "procs"; version = "0.7.3"; src = fetchFromGitHub { @@ -11,5 +11,4 @@ buildNimPackage( finalAttrs: { doCheck = false; lockFile = ./lock.json; -} -) +})