primrose/.files
1
0
Fork 0
mirror of https://codeberg.org/leana8959/.files.git synced 2025-12-06 06:39:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: run alejandra

Browse source
This commit is contained in:
Primrose 2025-06-20 21:41:16 +02:00
parent c509d80b58
commit 79ee2b4908
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
9 changed files with 169 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

5
nix/configurations/installer/tungsten.nix
View file

@ -1,7 +1,4 @@
{
lib,
...
}: {
{lib, ...}: {
imports = [
../../nixosModules/extra/macbook-swap-fn-ctrl.nix
../../configurations/tungsten/nixos/hardware-configuration.nix

1
nix/configurations/tungsten/home/misc.nix
View file

@ -28,7 +28,6 @@
pkgs.last-resort
];
home.file = {
".xscreensaver".source = "${./xscreensaver/.xscreensaver}";
};

5
nix/configurations/vanadium/nixos/programs.nix
View file

@ -1,7 +1,4 @@
{
lib,
...
}: {
{lib, ...}: {
imports = [
#
# Docker

3
nix/configurations/vanadium/overlay.nix
View file

@ -10,7 +10,8 @@ let
infuse = lib.flip infuse-lib.v1.infuse;
in
# Why shouldn't I go crazy with overlays?
(final: infuse {
(final:
infuse {
cmus.__input.alsaSupport = _: false;
fish.__input.usePython = _: false;

23
nix/devShells/flora.nix
View file

@ -14,19 +14,28 @@ in
hlib = pkgs.haskell.lib;
callHackage = {name, version}:
let pkg = pkgs.haskell.packages.ghc910.callHackage name version {};
in hlib.dontCheck (hlib.doJailbreak pkg);
callHackage = {
name,
version,
}: let
pkg = pkgs.haskell.packages.ghc910.callHackage name version {};
in
hlib.dontCheck (hlib.doJailbreak pkg);
in {
name = "flora";
packages = with pkgs;
let
packages = with pkgs; let
haskellPackages = haskell.packages.ghc910;
in
# These don't build directly and need to be pinned
map callHackage [
{name = "fourmolu"; version = "0.17.0.0";}
{name = "postgresql-migration"; version = "0.2.1.8";}
{
name = "fourmolu";
version = "0.17.0.0";
}
{
name = "postgresql-migration";
version = "0.2.1.8";
}
]
++ [
haskellPackages.ghcid

9
nix/homeModules/common/lazygit.nix
View file

@ -1,7 +1,10 @@
{config, lib, ...}: let
cfg = config.programs.lazygit;
in
{
config,
lib,
...
}: let
cfg = config.programs.lazygit;
in {
programs.tmux.extraConfig = lib.mkIf cfg.enable ''
bind -n C-g run-shell "tmux new-window ${lib.getExe cfg.package}"
'';

7
nix/homeModules/common/neovim.nix
View file

@ -1,4 +1,9 @@
{pkgs, lib, config, ...}: let
{
pkgs,
lib,
config,
...
}: let
cfg = config.programs.neovim;
in {
config = lib.mkIf cfg.enable {

15
nix/homeModules/extra/tmux-fish-integration.nix
View file

@ -1,11 +1,17 @@
# This module integrates tmux with fish
{pkgs, lib, config, ...}: {
{
pkgs,
lib,
config,
...
}: {
assertions = [
{ assertion = config.programs.fish.enable;
{
assertion = config.programs.fish.enable;
message = "Should have fish enabled";
}
{ assertion = config.programs.tmux.enable;
{
assertion = config.programs.tmux.enable;
message = "Should have tmux enabled";
}
];
@ -26,5 +32,4 @@
home.packages = with pkgs; [
tmux-sessionizer
];
}

120
npins/default.nix
View file

@ -13,8 +13,10 @@ let
version = data.version;
# https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295
range =
first: last: if first > last then [ ] else builtins.genList (n: first + n) (last - first + 1);
range = first: last:
if first > last
then []
else builtins.genList (n: first + n) (last - first + 1);
# https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257
stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1));
@ -27,47 +29,44 @@ let
# If the environment variable NPINS_OVERRIDE_${name} is set, then use
# the path directly as opposed to the fetched source.
# (Taken from Niv for compatibility)
mayOverride =
name: path:
let
mayOverride = name: path: let
envVarName = "NPINS_OVERRIDE_${saneName}";
saneName = stringAsChars (c: if (builtins.match "[a-zA-Z0-9]" c) == null then "_" else c) name;
saneName = stringAsChars (c:
if (builtins.match "[a-zA-Z0-9]" c) == null
then "_"
else c)
name;
ersatz = builtins.getEnv envVarName;
in
if ersatz == "" then
path
if ersatz == ""
then path
else
# this turns the string into an actual Nix path (for both absolute and
# relative paths)
builtins.trace "Overriding path of \"${name}\" with \"${ersatz}\" due to set \"${envVarName}\"" (
if builtins.substring 0 1 ersatz == "/" then
/. + ersatz
else
/. + builtins.getEnv "PWD" + "/${ersatz}"
if builtins.substring 0 1 ersatz == "/"
then /. + ersatz
else /. + builtins.getEnv "PWD" + "/${ersatz}"
);
mkSource =
name: spec:
assert spec ? type;
let
mkSource = name: spec:
assert spec ? type; let
path =
if spec.type == "Git" then
mkGitSource spec
else if spec.type == "GitRelease" then
mkGitSource spec
else if spec.type == "PyPi" then
mkPyPiSource spec
else if spec.type == "Channel" then
mkChannelSource spec
else if spec.type == "Tarball" then
mkTarballSource spec
else
builtins.throw "Unknown source type ${spec.type}";
if spec.type == "Git"
then mkGitSource spec
else if spec.type == "GitRelease"
then mkGitSource spec
else if spec.type == "PyPi"
then mkPyPiSource spec
else if spec.type == "Channel"
then mkChannelSource spec
else if spec.type == "Tarball"
then mkTarballSource spec
else builtins.throw "Unknown source type ${spec.type}";
in
spec // {outPath = mayOverride name path;};
mkGitSource =
{
mkGitSource = {
repository,
revision,
url ? null,
@ -79,32 +78,35 @@ let
assert repository ? type;
# At the moment, either it is a plain git repository (which has an url), or it is a GitHub/GitLab repository
# In the latter case, there we will always be an url to the tarball
if url != null && !submodules then
if url != null && !submodules
then
builtins.fetchTarball {
inherit url;
sha256 = hash; # FIXME: check nix version & use SRI hashes
}
else
let
else let
url =
if repository.type == "Git" then
repository.url
else if repository.type == "GitHub" then
"https://github.com/${repository.owner}/${repository.repo}.git"
else if repository.type == "GitLab" then
"${repository.server}/${repository.repo_path}.git"
else
throw "Unrecognized repository type ${repository.type}";
urlToName =
url: rev:
let
if repository.type == "Git"
then repository.url
else if repository.type == "GitHub"
then "https://github.com/${repository.owner}/${repository.repo}.git"
else if repository.type == "GitLab"
then "${repository.server}/${repository.repo_path}.git"
else throw "Unrecognized repository type ${repository.type}";
urlToName = url: rev: let
matched = builtins.match "^.*/([^/]*)(\\.git)?$" url;
short = builtins.substring 0 7 rev;
appendShort = if (builtins.match "[a-f0-9]*" rev) != null then "-${short}" else "";
in
"${if matched == null then "source" else builtins.head matched}${appendShort}";
appendShort =
if (builtins.match "[a-f0-9]*" rev) != null
then "-${short}"
else "";
in "${
if matched == null
then "source"
else builtins.head matched
}${appendShort}";
name = urlToName url revision;
in
builtins.fetchGit {
@ -114,22 +116,27 @@ let
inherit url submodules;
};
mkPyPiSource =
{ url, hash, ... }:
mkPyPiSource = {
url,
hash,
...
}:
builtins.fetchurl {
inherit url;
sha256 = hash;
};
mkChannelSource =
{ url, hash, ... }:
mkChannelSource = {
url,
hash,
...
}:
builtins.fetchTarball {
inherit url;
sha256 = hash;
};
mkTarballSource =
{
mkTarballSource = {
url,
locked_url ? url,
hash,
@ -140,7 +147,6 @@ let
sha256 = hash;
};
in
if version == 5 then
builtins.mapAttrs mkSource data.pins
else
throw "Unsupported format version ${toString version} in sources.json. Try running `npins upgrade`"
if version == 5
then builtins.mapAttrs mkSource data.pins
else throw "Unsupported format version ${toString version} in sources.json. Try running `npins upgrade`"