mirror of
https://codeberg.org/leana8959/.files.git
synced 2025-12-06 06:39:14 +00:00
tree-wide: format with nixfmt
Another saturday another useless formatter change. It's my dotfiles, after all alejandra doesn't handle c-style inline comments well.
This commit is contained in:
parent
ec704b5272
commit
ebf8468807
116 changed files with 1895 additions and 1689 deletions
|
|
@ -3,7 +3,8 @@
|
|||
lib,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
}:
|
||||
{
|
||||
home.packages = [
|
||||
# preview markdown
|
||||
pkgs.python3Packages.grip
|
||||
|
|
@ -42,10 +43,11 @@
|
|||
"haskell/cabal"
|
||||
];
|
||||
};
|
||||
includes = let
|
||||
fromList = import ../../../git-identities/git-compat.nix;
|
||||
identities = import ../../../git-identities/list.nix;
|
||||
in
|
||||
includes =
|
||||
let
|
||||
fromList = import ../../../git-identities/git-compat.nix;
|
||||
identities = import ../../../git-identities/list.nix;
|
||||
in
|
||||
fromList identities;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,9 +2,11 @@
|
|||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
inherit (pkgs) nur;
|
||||
in {
|
||||
in
|
||||
{
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
|
||||
|
|
@ -106,26 +108,29 @@ in {
|
|||
font-family: monospace;
|
||||
}
|
||||
'';
|
||||
extensions.packages = let
|
||||
addons = nur.repos.rycee.firefox-addons;
|
||||
in [
|
||||
addons.sponsorblock
|
||||
addons.return-youtube-dislikes
|
||||
addons.consent-o-matic
|
||||
];
|
||||
extensions.packages =
|
||||
let
|
||||
addons = nur.repos.rycee.firefox-addons;
|
||||
in
|
||||
[
|
||||
addons.sponsorblock
|
||||
addons.return-youtube-dislikes
|
||||
addons.consent-o-matic
|
||||
];
|
||||
};
|
||||
|
||||
junk = {
|
||||
id = 1;
|
||||
inherit
|
||||
(config.programs.firefox.profiles.default)
|
||||
inherit (config.programs.firefox.profiles.default)
|
||||
settings
|
||||
userChrome
|
||||
;
|
||||
|
||||
extensions.packages = let
|
||||
addons = nur.repos.rycee.firefox-addons;
|
||||
in [addons.multi-account-containers];
|
||||
extensions.packages =
|
||||
let
|
||||
addons = nur.repos.rycee.firefox-addons;
|
||||
in
|
||||
[ addons.multi-account-containers ];
|
||||
|
||||
containers = {
|
||||
raisin = {
|
||||
|
|
@ -144,15 +149,16 @@ in {
|
|||
# Isolate it because it's proprietary
|
||||
tampermonkey = {
|
||||
id = 2;
|
||||
inherit
|
||||
(config.programs.firefox.profiles.default)
|
||||
inherit (config.programs.firefox.profiles.default)
|
||||
settings
|
||||
userChrome
|
||||
;
|
||||
|
||||
extensions.packages = let
|
||||
addons = nur.repos.rycee.firefox-addons;
|
||||
in [addons.tampermonkey];
|
||||
extensions.packages =
|
||||
let
|
||||
addons = nur.repos.rycee.firefox-addons;
|
||||
in
|
||||
[ addons.tampermonkey ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,19 +1,23 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
nixosConfig ? {},
|
||||
nixosConfig ? { },
|
||||
...
|
||||
}: {
|
||||
}:
|
||||
{
|
||||
#
|
||||
# fonts
|
||||
#
|
||||
fonts.fontconfig = {
|
||||
enable = true;
|
||||
defaultFonts = lib.mapAttrsRecursive (_: v: v ++ ["Last Resort"]) {
|
||||
sansSerif = ["Ubuntu" "Noto Sans CJK TC"];
|
||||
serif = ["Noto Serif CJK TC"];
|
||||
monospace = ["Iosevka"];
|
||||
emoji = ["Noto Color Emoji"];
|
||||
defaultFonts = lib.mapAttrsRecursive (_: v: v ++ [ "Last Resort" ]) {
|
||||
sansSerif = [
|
||||
"Ubuntu"
|
||||
"Noto Sans CJK TC"
|
||||
];
|
||||
serif = [ "Noto Serif CJK TC" ];
|
||||
monospace = [ "Iosevka" ];
|
||||
emoji = [ "Noto Color Emoji" ];
|
||||
};
|
||||
};
|
||||
home.packages = [
|
||||
|
|
@ -39,8 +43,7 @@
|
|||
x11.enable = true;
|
||||
gtk.enable = true;
|
||||
|
||||
inherit
|
||||
(nixosConfig.services.xserver.displayManager.lightdm.greeters.gtk.cursorTheme)
|
||||
inherit (nixosConfig.services.xserver.displayManager.lightdm.greeters.gtk.cursorTheme)
|
||||
name
|
||||
package
|
||||
size
|
||||
|
|
@ -55,7 +58,7 @@
|
|||
xdg.mimeApps = {
|
||||
enable = true;
|
||||
defaultApplications = {
|
||||
"x-scheme-handler/mailto" = ["org.gnome.Evolution.desktop"];
|
||||
"x-scheme-handler/mailto" = [ "org.gnome.Evolution.desktop" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,16 +3,19 @@
|
|||
lib,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
}:
|
||||
{
|
||||
home.sessionPath = [
|
||||
"${config.home.homeDirectory}/.local/bin"
|
||||
];
|
||||
|
||||
home.sessionVariables = let
|
||||
fishCfg = config.programs.fish;
|
||||
in {
|
||||
"SHELL" = lib.mkIf fishCfg.enable (lib.getExe fishCfg.package);
|
||||
};
|
||||
home.sessionVariables =
|
||||
let
|
||||
fishCfg = config.programs.fish;
|
||||
in
|
||||
{
|
||||
"SHELL" = lib.mkIf fishCfg.enable (lib.getExe fishCfg.package);
|
||||
};
|
||||
|
||||
home.packages = [
|
||||
pkgs.ghc # my favorite calculator
|
||||
|
|
@ -37,9 +40,7 @@
|
|||
# lol
|
||||
pkgs.macchanger
|
||||
|
||||
/*
|
||||
The file picker is not ergonomic enough, sadly
|
||||
*/
|
||||
# The file picker is not ergonomic enough, sadly
|
||||
# pkgs.helix
|
||||
# pkgs.nushell
|
||||
|
||||
|
|
@ -172,7 +173,7 @@
|
|||
|
||||
gnome-keyring = {
|
||||
enable = true;
|
||||
components = ["secrets"];
|
||||
components = [ "secrets" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,23 +1,31 @@
|
|||
{pkgs, ...}: {
|
||||
home.packages = let
|
||||
inherit (pkgs) lib;
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
home.packages =
|
||||
let
|
||||
inherit (pkgs) lib;
|
||||
|
||||
ghc = pkgs.haskellPackages.ghc.withPackages (haskellPackages: [
|
||||
haskellPackages.xmobar
|
||||
]);
|
||||
ghc = pkgs.haskellPackages.ghc.withPackages (haskellPackages: [
|
||||
haskellPackages.xmobar
|
||||
]);
|
||||
|
||||
wrapped-xmobar = pkgs.symlinkJoin {
|
||||
name = "xmobar";
|
||||
paths = [pkgs.xmobar];
|
||||
buildInputs = [pkgs.makeWrapper];
|
||||
postBuild = ''
|
||||
wrapProgram $out/bin/xmobar \
|
||||
--prefix PATH : "${lib.makeBinPath [ghc pkgs.libnotify]}"
|
||||
'';
|
||||
};
|
||||
in [
|
||||
wrapped-xmobar
|
||||
];
|
||||
wrapped-xmobar = pkgs.symlinkJoin {
|
||||
name = "xmobar";
|
||||
paths = [ pkgs.xmobar ];
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
postBuild = ''
|
||||
wrapProgram $out/bin/xmobar \
|
||||
--prefix PATH : "${
|
||||
lib.makeBinPath [
|
||||
ghc
|
||||
pkgs.libnotify
|
||||
]
|
||||
}"
|
||||
'';
|
||||
};
|
||||
in
|
||||
[
|
||||
wrapped-xmobar
|
||||
];
|
||||
|
||||
xdg.configFile = {
|
||||
"xmobar" = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue