dadada/nix-config
dadada/nix-config
1
0
Fork 0
Code Issues 2 Pull requests 5 Projects Releases Packages Wiki Activity Actions

switch to nixpkgs-fmt

Browse source
This commit is contained in:
Tim Schubert 2022-08-04 21:13:54 +02:00
parent 8cd6ed1502
commit c43341a8b2
Signed by: dadada
GPG key ID: EEB8D1CE62C4DFEA
69 changed files with 664 additions and 665 deletions
Download patch file Download diff file Expand all files Collapse all files

12
home/modules/alacritty/default.nix
View file

@ -1,12 +1,12 @@
{
pkgs,
lib,
config,
...
{ pkgs
, lib
, config
, ...
}:
with lib; let
cfg = config.dadada.home.alacritty;
in {
in
{
options.dadada.home.alacritty = {
enable = mkEnableOption "Enable alacritty config";
};

7
home/modules/colors.nix
View file

@ -1,7 +1,6 @@
{
config,
lib,
...
{ config
, lib
, ...
}:
with lib; {
options.dadada.home.colors = mkOption {

9
home/modules/default.nix
View file

@ -1,12 +1,11 @@
{
self,
nix-doom-emacs,
...
{ self
, nix-doom-emacs
, ...
} @ inputs: {
alacritty = import ./alacritty;
colors = import ./colors.nix;
direnv = import ./direnv.nix;
emacs = import ./emacs {inherit nix-doom-emacs;};
emacs = import ./emacs { inherit nix-doom-emacs; };
fish = import ./fish.nix;
git = import ./git.nix;
gpg = import ./gpg.nix;

12
home/modules/direnv.nix
View file

@ -1,12 +1,12 @@
{
config,
pkgs,
lib,
...
{ config
, pkgs
, lib
, ...
}:
with lib; let
cfg = config.dadada.home.direnv;
in {
in
{
options.dadada.home.direnv = {
enable = mkEnableOption "Enable direnv config";
};

82
home/modules/emacs/default.nix
View file

@ -1,13 +1,13 @@
{nix-doom-emacs, ...}: {
config,
pkgs,
lib,
...
}:
{ nix-doom-emacs, ... }: { config
, pkgs
, lib
, ...
}:
with lib; let
cfg = config.dadada.home.emacs;
in {
imports = [nix-doom-emacs.hmModule];
in
{
imports = [ nix-doom-emacs.hmModule ];
options.dadada.home.emacs = {
enable = mkEnableOption "Enable dadada emacs config";
};
@ -17,40 +17,42 @@ in {
doomPrivateDir = ./doom.d;
emacsPackagesOverlay = self: super:
with pkgs; {
tsc = super.tsc.overrideAttrs (old: let
libtsc_dyn = rustPlatform.buildRustPackage rec {
pname = "emacs-tree-sitter";
version = "0.15.1";
src = fetchFromGitHub {
owner = "ubolonton";
repo = "emacs-tree-sitter";
rev = version;
sha256 = "sha256-WgkGtmw63+kRLTRiSEO4bFF2IguH5g4odCujyazkwJc=";
tsc = super.tsc.overrideAttrs (old:
let
libtsc_dyn = rustPlatform.buildRustPackage rec {
pname = "emacs-tree-sitter";
version = "0.15.1";
src = fetchFromGitHub {
owner = "ubolonton";
repo = "emacs-tree-sitter";
rev = version;
sha256 = "sha256-WgkGtmw63+kRLTRiSEO4bFF2IguH5g4odCujyazkwJc=";
};
preBuild = ''
export BINDGEN_EXTRA_CLANG_ARGS="$(< ${stdenv.cc}/nix-support/libc-crt1-cflags) \
$(< ${stdenv.cc}/nix-support/libc-cflags) \
$(< ${stdenv.cc}/nix-support/cc-cflags) \
$(< ${stdenv.cc}/nix-support/libcxx-cxxflags) \
${lib.optionalString stdenv.cc.isClang "-idirafter ${stdenv.cc.cc}/lib/clang/${lib.getVersion stdenv.cc.cc}/include"} \
${lib.optionalString stdenv.cc.isGNU
"-isystem ${stdenv.cc.cc}/lib/gcc/${stdenv.hostPlatform.config}/${lib.getVersion stdenv.cc.cc}/include/"} \
${lib.optionalString stdenv.cc.isGNU
"-isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc} -isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/${stdenv.hostPlatform.config}"} \
$NIX_CFLAGS_COMPILE"
'';
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
cargoHash = "sha256-HB5tFR1slY2D6jb2mt4KrGrGBUUVrxiBjmVycO+qfYY=";
};
in
{
inherit (libtsc_dyn) src;
preBuild = ''
export BINDGEN_EXTRA_CLANG_ARGS="$(< ${stdenv.cc}/nix-support/libc-crt1-cflags) \
$(< ${stdenv.cc}/nix-support/libc-cflags) \
$(< ${stdenv.cc}/nix-support/cc-cflags) \
$(< ${stdenv.cc}/nix-support/libcxx-cxxflags) \
${lib.optionalString stdenv.cc.isClang "-idirafter ${stdenv.cc.cc}/lib/clang/${lib.getVersion stdenv.cc.cc}/include"} \
${lib.optionalString stdenv.cc.isGNU
"-isystem ${stdenv.cc.cc}/lib/gcc/${stdenv.hostPlatform.config}/${lib.getVersion stdenv.cc.cc}/include/"} \
${lib.optionalString stdenv.cc.isGNU
"-isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc} -isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/${stdenv.hostPlatform.config}"} \
$NIX_CFLAGS_COMPILE"
ext=${stdenv.hostPlatform.extensions.sharedLibrary}
dest=$out/share/emacs/site-lisp/elpa/tsc-${old.version}
install -D ${libtsc_dyn}/lib/libtsc_dyn$ext $dest/tsc-dyn$ext
echo -n "0.15.1" > $dest/DYN-VERSION
'';
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
cargoHash = "sha256-HB5tFR1slY2D6jb2mt4KrGrGBUUVrxiBjmVycO+qfYY=";
};
in {
inherit (libtsc_dyn) src;
preBuild = ''
ext=${stdenv.hostPlatform.extensions.sharedLibrary}
dest=$out/share/emacs/site-lisp/elpa/tsc-${old.version}
install -D ${libtsc_dyn}/lib/libtsc_dyn$ext $dest/tsc-dyn$ext
echo -n "0.15.1" > $dest/DYN-VERSION
'';
});
});
tree-sitter-langs = super.tree-sitter-langs.overrideAttrs (old: {
postInstall = ''
dest=$out/share/emacs/site-lisp/elpa/tree-sitter-langs-${old.version}
@ -61,7 +63,7 @@ in {
});
};
};
home.file.".tree-sitter".source = pkgs.runCommand "grammars" {} ''
home.file.".tree-sitter".source = pkgs.runCommand "grammars" { } ''
mkdir -p $out/bin
echo -n "0.10.2" > $out/BUNDLE-VERSION
${lib.concatStringsSep "\n"

14
home/modules/fish.nix
View file

@ -1,12 +1,12 @@
{
config,
pkgs,
lib,
...
{ config
, pkgs
, lib
, ...
}:
with lib; let
cfg = config.dadada.home.fish;
in {
in
{
options.dadada.home.fish = {
enable = mkEnableOption "Enable fish config";
};
@ -80,6 +80,6 @@ in {
};
};
home.packages = [pkgs.exa];
home.packages = [ pkgs.exa ];
};
}

14
home/modules/git.nix
View file

@ -1,12 +1,12 @@
{
config,
lib,
pkgs,
...
{ config
, lib
, pkgs
, ...
}:
with lib; let
cfg = config.dadada.home.git;
in {
in
{
options.dadada.home.git = {
enable = mkEnableOption "Enable git config";
};
@ -19,7 +19,7 @@ in {
tab-in-indent = true;
tabwidth = 4;
};
alias = {};
alias = { };
pager = "delta";
};
column.ui = "never";

12
home/modules/gpg.nix
View file

@ -1,11 +1,11 @@
{
config,
lib,
...
{ config
, lib
, ...
}:
with lib; let
cfg = config.dadada.home.gpg;
in {
in
{
options.dadada.home.gpg = {
enable = mkEnableOption "Enable GnuPG config";
};
@ -31,7 +31,7 @@ in {
};
programs.git.extraConfig = {
commit = {gpgSign = true;};
commit = { gpgSign = true; };
};
};
}

12
home/modules/gtk.nix
View file

@ -1,12 +1,12 @@
{
config,
lib,
pkgs,
...
{ config
, lib
, pkgs
, ...
}:
with lib; let
cfg = config.dadada.home.gtk;
in {
in
{
options.dadada.home.gtk = {
enable = mkEnableOption "Enable GTK config";
};

12
home/modules/keyring.nix
View file

@ -1,18 +1,18 @@
{
config,
lib,
...
{ config
, lib
, ...
}:
with lib; let
cfg = config.dadada.home.keyring;
in {
in
{
options.dadada.home.keyring = {
enable = mkEnableOption "Enable keyring config";
};
config = mkIf cfg.enable {
services.gnome-keyring = {
enable = false;
components = ["pkcs11" "secrets"];
components = [ "pkcs11" "secrets" ];
};
};
}

14
home/modules/kitty/default.nix
View file

@ -1,12 +1,12 @@
{
pkgs,
lib,
config,
...
{ pkgs
, lib
, config
, ...
}:
with lib; let
cfg = config.dadada.home.kitty;
in {
in
{
options.dadada.home.kitty = {
enable = mkEnableOption "Enable kitty config";
};
@ -15,6 +15,6 @@ in {
enable = true;
extraConfig = builtins.readFile ./config;
};
home.packages = [pkgs.source-code-pro];
home.packages = [ pkgs.source-code-pro ];
};
}

14
home/modules/mako.nix
View file

@ -1,13 +1,13 @@
{
config,
lib,
pkgs,
colors,
...
{ config
, lib
, pkgs
, colors
, ...
}:
with lib; let
cfg = config.dadada.home.mako;
in {
in
{
options.dadada.home.mako = {
enable = mkEnableOption "Enable mako config";
};

12
home/modules/session.nix
View file

@ -1,17 +1,17 @@
{
config,
lib,
...
{ config
, lib
, ...
}:
with lib; let
cfg = config.dadada.home.session;
in {
in
{
options.dadada.home.session = {
enable = mkEnableOption "Enable session variable management";
sessionVars = mkOption {
description = "Session variables";
type = types.attrs;
default = {};
default = { };
example = ''
EDITOR = "vim";
PAGER = "less";

10
home/modules/ssh.nix
View file

@ -1,11 +1,11 @@
{
config,
lib,
...
{ config
, lib
, ...
}:
with lib; let
cfg = config.dadada.home.ssh;
in {
in
{
options.dadada.home.ssh = {
enable = mkEnableOption "Enable SSH config";
};

14
home/modules/sway/default.nix
View file

@ -1,13 +1,13 @@
{
config,
pkgs,
lib,
colors,
...
{ config
, pkgs
, lib
, colors
, ...
}:
with lib; let
cfg = config.dadada.home.sway;
in {
in
{
options.dadada.home.sway = {
enable = mkEnableOption "Enable Sway config";
};

12
home/modules/syncthing.nix
View file

@ -1,12 +1,12 @@
{
config,
pkgs,
lib,
...
{ config
, pkgs
, lib
, ...
}:
with lib; let
cfg = config.dadada.home.syncthing;
in {
in
{
options.dadada.home.syncthing = {
enable = mkEnableOption "Enable Syncthing config";
};

14
home/modules/termite.nix
View file

@ -1,13 +1,13 @@
{
config,
lib,
pkgs,
colors ? ../../lib/colors.nix,
...
{ config
, lib
, pkgs
, colors ? ../../lib/colors.nix
, ...
}:
with lib; let
cfg = config.dadada.home.termite;
in {
in
{
options.dadada.home.termite = {
enable = mkEnableOption "Enable termite config";
};

10
home/modules/tmux.nix
View file

@ -1,11 +1,11 @@
{
config,
lib,
...
{ config
, lib
, ...
}:
with lib; let
cfg = config.dadada.home.tmux;
in {
in
{
options.dadada.home.tmux = {
enable = mkEnableOption "Enable tmux config";
};

14
home/modules/vim/default.nix
View file

@ -1,13 +1,13 @@
{
config,
pkgs,
lib,
...
{ config
, pkgs
, lib
, ...
}:
with lib; let
cfg = config.dadada.home.vim;
vimPlugins = pkgs.callPackage ../../../pkgs/vimPlugins {};
in {
vimPlugins = pkgs.callPackage ../../../pkgs/vimPlugins { };
in
{
options.dadada.home.vim = {
enable = mkEnableOption "Enable VIM config";
};

12
home/modules/xdg.nix
View file

@ -1,8 +1,7 @@
{
config,
pkgs,
lib,
...
{ config
, pkgs
, lib
, ...
}:
with lib; let
apps = {
@ -23,7 +22,8 @@ with lib; let
"application/pdf" = "org.pwmt.zathura.desktop";
};
cfg = config.dadada.home.xdg;
in {
in
{
options.dadada.home.xdg = {
enable = mkEnableOption "Enable XDG config";
};

12
home/modules/zsh.nix
View file

@ -1,12 +1,12 @@
{
config,
pkgs,
lib,
...
{ config
, pkgs
, lib
, ...
}:
with lib; let
cfg = config.dadada.home.zsh;
in {
in
{
options.dadada.home.zsh = {
enable = mkEnableOption "Enable ZSH config";
};