daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2025-01-22 03:07:31 -06:00
Code Issues Projects Releases Packages Wiki Activity

apply nixfmt

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
flake.nix
View file

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

2
hosts/othalan/services.nix
View file

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

17
lib/extended.nix
View file

@ -166,16 +166,15 @@ let
{ {
hostName, hostName,
pkgs, pkgs,
flake ? flakeFromSystem pkgs.system flake ? flakeFromSystem pkgs.system,
}: }:
hostName hostName
|> pathFromHostName |> pathFromHostName
|> (p: "${p}/settings/pkgs") |> (p: "${p}/settings/pkgs")
|> tryReadLinesNoComment |> tryReadLinesNoComment
|> map ( |> map (
line: line: if hasPrefix "flake:" line then (line |> removePrefix "flake:" |> flake.pkg) else pkgs.${line}
if hasPrefix "flake:" line then (line |> removePrefix "flake:" |> flake.pkg) else pkgs.${line} );
);
in in
{ {

42
modules/desktop/gui.nix
View file

@ -17,35 +17,35 @@ in
# For some reason it's not linked unless I include this. # For some reason it's not linked unless I include this.
# Though it's possible if I enabled plasma than it would be. # Though it's possible if I enabled plasma than it would be.
environment.pathsToLink = ["/share/Kvantum"]; environment.pathsToLink = [ "/share/Kvantum" ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
(catppuccin-gtk.override { (catppuccin-gtk.override {
accents = [ "pink" ]; accents = [ "pink" ];
variant = "mocha"; variant = "mocha";
}) })
(catppuccin-kvantum.override { (catppuccin-kvantum.override {
variant = "mocha"; variant = "mocha";
accent = "pink"; accent = "pink";
}) })
libsForQt5.qtstyleplugin-kvantum libsForQt5.qtstyleplugin-kvantum
libsForQt5.okular libsForQt5.okular
libsForQt5.qt5ct libsForQt5.qt5ct
papirus-icon-theme papirus-icon-theme
pcmanfm pcmanfm
alacritty # backup to ghostty alacritty # backup to ghostty
inkscape inkscape
gimp gimp
zotero zotero
libreoffice-qt libreoffice-qt
hunspell # spell check for libreoffice hunspell # spell check for libreoffice
]; ];
}; };
} }

10
modules/oizys.nix
View file

@ -7,7 +7,13 @@
... ...
}: }:
let let
inherit (lib) mkEnableOption mkOption loadOverlays oizysSettings tryPkgsFromFile; inherit (lib)
mkEnableOption
mkOption
loadOverlays
oizysSettings
tryPkgsFromFile
;
in in
{ {
imports = with self.nixosModules; [ imports = with self.nixosModules; [
@ -62,6 +68,6 @@ in
time.timeZone = "US/Central"; time.timeZone = "US/Central";
nixpkgs.overlays = import ../overlays { inherit inputs loadOverlays; }; nixpkgs.overlays = import ../overlays { inherit inputs loadOverlays; };
oizys = oizysSettings hostName; oizys = oizysSettings hostName;
environment.systemPackages = tryPkgsFromFile {inherit hostName pkgs;}; environment.systemPackages = tryPkgsFromFile { inherit hostName pkgs; };
}; };
} }

6
pkgs/distrobox/default.nix
View file

@ -21,7 +21,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
dontConfigure = true; dontConfigure = true;
dontBuild = true; dontBuild = true;
nativeBuildInputs = [ makeWrapper installShellFiles]; nativeBuildInputs = [
makeWrapper
installShellFiles
];
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
@ -43,7 +46,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
echo 'container_additional_volumes="/nix:/nix"' > $out/share/distrobox/distrobox.conf echo 'container_additional_volumes="/nix:/nix"' > $out/share/distrobox/distrobox.conf
''; '';
postInstall = '' postInstall = ''
ls completions/zsh ls completions/zsh
installShellCompletion --cmd distrbox --zsh completions/zsh/_distrobox installShellCompletion --cmd distrbox --zsh completions/zsh/_distrobox

31
pkgs/nim/nimble/default.nix
View file

@ -19,23 +19,22 @@ buildNimPackage (finalAttrs: {
hash = "sha256-yf/aTHvwWIEKvyIJ80pgryih0FKoZdzRoje2IPwMJZw="; hash = "sha256-yf/aTHvwWIEKvyIJ80pgryih0FKoZdzRoje2IPwMJZw=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ openssl ]; 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 = '' postInstall = ''
wrapProgram $out/bin/nimble \ wrapProgram $out/bin/nimble \
--suffix PATH : ${lib.makeBinPath [ nim ]} --suffix PATH : ${lib.makeBinPath [ nim ]}
''; '';
meta = { meta = {
description = "Package manager for the Nim programming language"; description = "Package manager for the Nim programming language";
homepage = "https://github.com/nim-lang/nimble"; homepage = "https://github.com/nim-lang/nimble";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
mainProgram = "nimble"; mainProgram = "nimble";
}; };
} })
)

5
pkgs/nim/nimlangserver/default.nix
View file

@ -1,5 +1,5 @@
{ fetchFromGitHub, buildNimPackage }: { fetchFromGitHub, buildNimPackage }:
buildNimPackage( finalAttrs: { buildNimPackage (finalAttrs: {
pname = "nimlangserver"; pname = "nimlangserver";
version = "1.6.0"; version = "1.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -12,5 +12,4 @@ buildNimPackage( finalAttrs: {
doCheck = false; doCheck = false;
lockFile = ./lock.json; lockFile = ./lock.json;
} })
)

5
pkgs/nim/procs/default.nix
View file

@ -1,5 +1,5 @@
{ fetchFromGitHub, buildNimPackage }: { fetchFromGitHub, buildNimPackage }:
buildNimPackage( finalAttrs: { buildNimPackage (finalAttrs: {
pname = "procs"; pname = "procs";
version = "0.7.3"; version = "0.7.3";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -11,5 +11,4 @@ buildNimPackage( finalAttrs: {
doCheck = false; doCheck = false;
lockFile = ./lock.json; lockFile = ./lock.json;
} })
)