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

Reformat using nixpkgs-fmt

Browse source
This commit is contained in:
Tim Schubert 2021-01-02 14:23:50 +01:00
parent 368ed0797d
commit 5a734099bf
Signed by: dadada
GPG key ID: EEB8D1CE62C4DFEA
36 changed files with 209 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

20
modules/home/colors.nix
View file

@ -13,21 +13,21 @@ with lib;
cursor = "#e8e8e8";
cursorForeground = "#1f2022";
background = "#292b2e";
color0 = "#1f2022";
color8 = "#585858";
color7 = "#a3a3a3";
color0 = "#1f2022";
color8 = "#585858";
color7 = "#a3a3a3";
color15 = "#f8f8f8";
color1 = "#f2241f";
color9 = "#f2241f";
color2 = "#67b11d";
color1 = "#f2241f";
color9 = "#f2241f";
color2 = "#67b11d";
color10 = "#67b11d";
color3 = "#b1951d";
color3 = "#b1951d";
color11 = "#b1951d";
color4 = "#4f97d7";
color4 = "#4f97d7";
color12 = "#4f97d7";
color5 = "#a31db1";
color5 = "#a31db1";
color13 = "#a31db1";
color6 = "#2d9574";
color6 = "#2d9574";
color14 = "#2d9574";
color16 = "#ffa500";
color17 = "#b03060";

31
modules/home/fish.nix
View file

@ -2,7 +2,8 @@
with lib;
let
cfg = config.dadada.home.fish;
in {
in
{
options.dadada.home.fish = {
enable = mkEnableOption "Enable fish config";
};
@ -45,21 +46,21 @@ in {
#end
'';
promptInit = ''
function fish_prompt
set last_status $status
printf '%s %s:%s ' \
(set_color red
echo $last_status) \
(set_color green
hostname) \
(set_color blue
prompt_pwd)
set_color normal
end
function fish_prompt
set last_status $status
printf '%s %s:%s ' \
(set_color red
echo $last_status) \
(set_color green
hostname) \
(set_color blue
prompt_pwd)
set_color normal
end
function fish_right_prompt
printf '%s' (__fish_git_prompt)
end
function fish_right_prompt
printf '%s' (__fish_git_prompt)
end
'';
shellAliases = {
gst = "git status";

3
modules/home/gpg.nix
View file

@ -2,7 +2,8 @@
with lib;
let
cfg = config.dadada.home.gpg;
in {
in
{
options.dadada.home.gpg = {
enable = mkEnableOption "Enable GnuPG config";
};

3
modules/home/keyring.nix
View file

@ -2,7 +2,8 @@
with lib;
let
cfg = config.dadada.home.keyring;
in {
in
{
options.dadada.home.keyring = {
enable = mkEnableOption "Enable keyring config";
};

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

@ -2,7 +2,8 @@
with lib;
let
cfg = config.dadada.home.kitty;
in {
in
{
options.dadada.home.kitty = {
enable = mkEnableOption "Enable kitty config";
};

5
modules/home/mako.nix
View file

@ -1,8 +1,9 @@
{ 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";
};

5
modules/home/session.nix
View file

@ -2,13 +2,14 @@
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";

3
modules/home/ssh.nix
View file

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

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

@ -1,8 +1,9 @@
{ 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";
};
@ -21,18 +22,18 @@ in {
swaylock
]);
wayland.windowManager.sway = {
wayland.windowManager.sway = {
enable = true;
config = null;
extraConfig = (builtins.readFile ./config);
extraSessionCommands = ''
export SDL_VIDEODRIVER=wayland
# needs qt5.qtwayland in systemPackages
export QT_QPA_PLATFORM=wayland
export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
# Fix for some Java AWT applications (e.g. Android Studio),
# use this if they aren't displayed properly:
export _JAVA_AWT_WM_NONREPARENTING=1
export SDL_VIDEODRIVER=wayland
# needs qt5.qtwayland in systemPackages
export QT_QPA_PLATFORM=wayland
export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
# Fix for some Java AWT applications (e.g. Android Studio),
# use this if they aren't displayed properly:
export _JAVA_AWT_WM_NONREPARENTING=1
'';
};
};

3
modules/home/syncthing.nix
View file

@ -2,7 +2,8 @@
with lib;
let
cfg = config.dadada.home.syncthing;
in {
in
{
options.dadada.home.syncthing = {
enable = mkEnableOption "Enable Syncthing config";
};

14
modules/home/termite.nix
View file

@ -1,14 +1,14 @@
{
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";
};

11
modules/home/tmux.nix
View file

@ -2,7 +2,8 @@
with lib;
let
cfg = config.dadada.home.tmux;
in {
in
{
options.dadada.home.tmux = {
enable = mkEnableOption "Enable tmux config";
};
@ -11,10 +12,10 @@ in {
enable = true;
terminal = "xterm-256color";
extraConfig = ''
set -g status on
set-option -g set-titles on
set-option -g automatic-rename on
set-window-option -g mode-keys vi
set -g status on
set-option -g set-titles on
set-option -g automatic-rename on
set-window-option -g mode-keys vi
'';
};
};

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

@ -1,8 +1,8 @@
{ config, pkgs, lib, ... }:
with lib;
let
let
cfg = config.dadada.home.vim;
vimPlugins = pkgs.callPackage ../../../pkgs/vimPlugins {};
vimPlugins = pkgs.callPackage ../../../pkgs/vimPlugins { };
in
{
options.dadada.home.vim = {
@ -32,6 +32,9 @@ in
#pkgs.vimPlugins.clang_complete
];
};
home.packages = [ pkgs.languagetool ];
home.packages = with pkgs; [
languagetool
nixpkgs-fmt
];
};
}

7
modules/home/xdg.nix
View file

@ -19,7 +19,8 @@ let
"application/pdf" = "org.pwmt.zathura.desktop";
};
cfg = config.dadada.home.xdg;
in {
in
{
options.dadada.home.xdg = {
enable = mkEnableOption "Enable XDG config";
};
@ -32,9 +33,9 @@ in {
defaultApplications = apps;
};
userDirs = {
download ="\$HOME/tmp";
download = "\$HOME/tmp";
music = "\$HOME/lib/music";
videos ="\$HOME/lib/videos";
videos = "\$HOME/lib/videos";
pictures = "\$HOME/lib/pictures";
documents = "\$HOME/lib";
desktop = "$HOME/tmp";

25
modules/home/zsh.nix
View file

@ -2,7 +2,8 @@
with lib;
let
cfg = config.dadada.home.zsh;
in {
in
{
options.dadada.home.zsh = {
enable = mkEnableOption "Enable ZSH config";
};
@ -26,19 +27,19 @@ in {
plugins = [
];
initExtra = ''
source ~/.nix-profile/share/zsh-git-prompt/zshrc.sh
source ~/.nix-profile/share/fzf/key-bindings.zsh
source ~/.nix-profile/share/fzf/completion.zsh
source ~/.nix-profile/share/zsh-git-prompt/zshrc.sh
source ~/.nix-profile/share/fzf/key-bindings.zsh
source ~/.nix-profile/share/fzf/completion.zsh
preexec() { echo -n -e "\033]0;$1\007" }
preexec() { echo -n -e "\033]0;$1\007" }
PROMPT="%F{red}%?%f %F{green}%m%f:%F{blue}%~%f "
RPROMPT='$(git_super_status)'
#NIX_BUILD_SHELL="${pkgs.zsh}/bin/zsh"
if [ "$TMUX" = "" ]
then
tmux
fi
PROMPT="%F{red}%?%f %F{green}%m%f:%F{blue}%~%f "
RPROMPT='$(git_super_status)'
#NIX_BUILD_SHELL="${pkgs.zsh}/bin/zsh"
if [ "$TMUX" = "" ]
then
tmux
fi
'';
profileExtra = ''
'';