chore: run alejandra

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

View file

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

View file

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

View file

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

View file

@ -10,41 +10,42 @@ let
infuse = lib.flip infuse-lib.v1.infuse;
in
# Why shouldn't I go crazy with overlays?
(final: infuse {
cmus.__input.alsaSupport = _: false;
(final:
infuse {
cmus.__input.alsaSupport = _: false;
fish.__input.usePython = _: false;
fish.__input.usePython = _: false;
tmux.__input.withSixel = _: false;
tmux.__input.withSixel = _: false;
ranger.__input.imagePreviewSupport = _: false;
ranger.__input.sixelPreviewSupport = _: false;
ranger.__input.imagePreviewSupport = _: false;
ranger.__input.sixelPreviewSupport = _: false;
vlc.__input.chromecastSupport = _: false;
vlc.__input.waylandSupport = _: false;
vlc.__input.chromecastSupport = _: false;
vlc.__input.waylandSupport = _: false;
# I don't really use helix, but it's nice to have the W alias just in case
helix.__output.patches.__append = [
./patches/helix/W-as-write.patch
];
# I don't really use helix, but it's nice to have the W alias just in case
helix.__output.patches.__append = [
./patches/helix/W-as-write.patch
];
fcitx5.__output.cmakeFlags.__append = [
(lib.cmakeFeature "ENABLE_EMOJI" "Off")
(lib.cmakeFeature "ENABLE_WAYLAND" "Off")
];
fcitx5.__output.patches.__append = [
./patches/fcitx5/disable-clipboard.patch
./patches/fcitx5/disable-quickphrase.patch
./patches/fcitx5/disable-unicode.patch
];
fcitx5-chinese-addons.__output.cmakeFlags.__append = [
(lib.cmakeFeature "ENABLE_BROWSER" "Off")
(lib.cmakeFeature "ENABLE_CLOUDPINYIN" "Off")
(lib.cmakeFeature "ENABLE_DATA" "Off")
];
fcitx5-chinese-addons.__output.patches.__append = [
./patches/fcitx5-chinese-addons/disable-chttrans.patch
./patches/fcitx5-chinese-addons/disable-fullwidth.patch
# Note: disabling pinyin helper breaks canjie
];
})
fcitx5.__output.cmakeFlags.__append = [
(lib.cmakeFeature "ENABLE_EMOJI" "Off")
(lib.cmakeFeature "ENABLE_WAYLAND" "Off")
];
fcitx5.__output.patches.__append = [
./patches/fcitx5/disable-clipboard.patch
./patches/fcitx5/disable-quickphrase.patch
./patches/fcitx5/disable-unicode.patch
];
fcitx5-chinese-addons.__output.cmakeFlags.__append = [
(lib.cmakeFeature "ENABLE_BROWSER" "Off")
(lib.cmakeFeature "ENABLE_CLOUDPINYIN" "Off")
(lib.cmakeFeature "ENABLE_DATA" "Off")
];
fcitx5-chinese-addons.__output.patches.__append = [
./patches/fcitx5-chinese-addons/disable-chttrans.patch
./patches/fcitx5-chinese-addons/disable-fullwidth.patch
# Note: disabling pinyin helper breaks canjie
];
})

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

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}"
'';

View file

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

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