apply nixfmt

This commit is contained in:
Daylin Morgan 2025-01-10 15:40:20 -06:00
parent 5acda7664c
commit 565082fd13
Signed by: daylin
GPG key ID: 950D13E9719334AD
9 changed files with 62 additions and 57 deletions

View file

@ -101,6 +101,7 @@
};
nixConfig = {
extra-substituters = [
"https://attic.dayl.in/oizys"
"https://nixpkgs-wayland.cachix.org"

View file

@ -1,6 +1,6 @@
{
config,
# pkgs,
# pkgs,
...
}:
# let

View file

@ -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
{

View file

@ -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
];
};
}

View file

@ -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; };
};
}

View file

@ -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

View file

@ -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";
};
})

View file

@ -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;
}
)
})

View file

@ -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;
}
)
})