BeiNacht/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed gpg from non gui clients

Browse Source
This commit is contained in:
Alexander Szczepanski
2021-10-16 16:18:43 +02:00
parent 95dd547326
commit 9ed8216404
5 changed files with 272 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -1,3 +1,5 @@
.gitsecret/keys/random_seed .gitsecret/keys/random_seed
!*.secret !*.secret
configs/secrets.nix configs/secrets.nix
configs/secrets-desktop.nix
configs/secrets-wireguard-publickeys.nix

1
.gitsecret/paths/mapping.cfg
View File

@ -1 +1,2 @@
configs/secrets.nix:b18f9f61e87047362ace7028d25a48d42f3e2ee6c7047c9347279207d36ce182 configs/secrets.nix:b18f9f61e87047362ace7028d25a48d42f3e2ee6c7047c9347279207d36ce182
configs/secrets-desktop.nix

5
configs/common.nix
View File

@ -48,11 +48,6 @@ in
networkmanager.dns = "none"; networkmanager.dns = "none";
}; };
programs.gnupg.agent = {
enable = true;
pinentryFlavor = "curses";
};
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
ack ack
borgbackup borgbackup

119
configs/gui.nix
View File

@ -29,13 +29,25 @@
ponymix ponymix
pulseaudio-ctl pulseaudio-ctl
python39Packages.pyyaml python39Packages.pyyaml
i3pystatus (python38.withPackages(ps: with ps; [ i3pystatus keyring ]))
]; ];
programs = { programs = {
steam.enable = true; steam.enable = true;
dconf.enable = true; dconf.enable = true;
adb.enable = true; adb.enable = true;
seahorse.enable = true; # seahorse.enable = true;
ssh = {
startAgent = true;
};
gnupg.agent = {
enable = true;
pinentryFlavor = "curses";
# enableSSHSupport = true;
};
chromium = { chromium = {
enable = true; enable = true;
extensions = [ extensions = [
@ -72,6 +84,30 @@
"CloudPrintSubmitEnabled" = false; "CloudPrintSubmitEnabled" = false;
}; };
}; };
# sway = {
# enable = true;
# extraPackages = with pkgs; [
# dmenu
# swaylock
# swayidle
# xwayland
# mako
# kanshi
# grim
# slurp
# wl-clipboard
# wf-recorder
# (python38.withPackages(ps: with ps; [ i3pystatus keyring ]))
# ];
# extraSessionCommands = ''
# export SDL_VIDEODRIVER=wayland
# export QT_QPA_PLATFORM=wayland
# export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
# export _JAVA_AWT_WM_NONREPARENTING=1
# export MOZ_ENABLE_WAYLAND=1
# '';
# };
}; };
fonts = { fonts = {
@ -107,41 +143,72 @@
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
# systemd.user.targets.sway-session = {
# description = "Sway compositor session";
# documentation = [ "man:systemd.special(7)" ];
# bindsTo = [ "graphical-session.target" ];
# wants = [ "graphical-session-pre.target" ];
# after = [ "graphical-session-pre.target" ];
# };
# systemd.user.services.kanshi = {
# description = "Kanshi output autoconfig ";
# wantedBy = [ "graphical-session.target" ];
# partOf = [ "graphical-session.target" ];
# environment = { XDG_CONFIG_HOME="/home/alex/.config"; };
# serviceConfig = {
# # kanshi doesn't have an option to specifiy config file yet, so it looks
# # at .config/kanshi/config
# ExecStart = ''
# ${pkgs.kanshi}/bin/kanshi
# '';
# RestartSec = 5;
# Restart = "always";
# };
# };
services = { services = {
blueman.enable = true; blueman.enable = true;
udev.packages = with pkgs; [ gnome.gnome-settings-daemon ]; udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
gnome.gnome-keyring.enable = true;
printing = { printing = {
enable = true; enable = true;
drivers = [ pkgs.brlaser ]; drivers = [ pkgs.brlaser ];
}; };
xserver = { xserver = {
enable = true; enable = true;
displayManager = {
lightdm = {
enable = true;
# background = pkgs.nixos-artwork.wallpapers.nineish-dark-gray.gnomeFilePath;
greeters.gtk.theme = {
package = pkgs.pantheon.elementary-gtk-theme;
name = "elementary";
};
};
defaultSession = "xsession";
session = [{
manage = "desktop";
name = "xsession";
start = ''exec $HOME/.xsession'';
}];
};
desktopManager = { # displayManager.defaultSession = "sway";
xfce = { # displayManager.sddm.enable = true;
enable = true;
noDesktop = true; # displayManager = {
enableXfwm = true; # lightdm = {
thunarPlugins = [ pkgs.xfce.thunar-archive-plugin ]; # enable = true;
}; # background = pkgs.nixos-artwork.wallpapers.nineish-dark-gray.gnomeFilePath;
}; # # greeters.gtk.theme = {
# # package = pkgs.pantheon.elementary-gtk-theme;
# # name = "elementary";
# # };
# greeters.pantheon.enable = true;
# };
# defaultSession = "xsession";
# session = [{
# manage = "desktop";
# name = "xsession";
# start = ''exec $HOME/.xsession'';
# }];
# };
displayManager.gdm.enable = true;
desktopManager.gnome.enable = true;
# desktopManager = {
# xfce = {
# enable = true;
# noDesktop = true;
# enableXfwm = true;
# thunarPlugins = [ pkgs.xfce.thunar-archive-plugin ];
# };
# };
layout = "us"; layout = "us";
# Enable touchpad support. # Enable touchpad support.
libinput.enable = true; libinput.enable = true;

345
configs/user-gui.nix
View File

@ -28,13 +28,19 @@ in
arandr arandr
baobab baobab
barrier barrier
blueberry
evince evince
gnome.eog gnome.eog
gnome.file-roller gnome.file-roller
gnome.gnome-calculator gnome.gnome-calculator
keepassxc keepassxc
libnotify libnotify
swaylock
swayidle
wl-clipboard
mako # notification daemon
alacritty # Alacritty is the default terminal in the config
dmenu # Dmenu is the default in the config but i recommend wofi since its wayland native
]; ];
}; };
@ -65,25 +71,25 @@ in
extraConfig = { extraConfig = {
gtk-application-prefer-dark-theme = 1; gtk-application-prefer-dark-theme = 1;
}; };
extraCss = '' # extraCss = ''
decoration # decoration
{ # {
border-radius: 0px 0px 0 0; # border-radius: 0px 0px 0 0;
border-width: 0px; # border-width: 0px;
/*box-shadow: 1px 12px 12px 12px rgba(0, 0, 0, 0.4), 0 0 0 1px rgba(0, 0, 0, 0.18);*/ # /*box-shadow: 1px 12px 12px 12px rgba(0, 0, 0, 0.4), 0 0 0 1px rgba(0, 0, 0, 0.18);*/
box-shadow: none; # box-shadow: none;
margin: 0px; # margin: 0px;
} # }
decoration:backdrop # decoration:backdrop
{ # {
border-radius: 0px 0px 0 0; # border-radius: 0px 0px 0 0;
border-width: 0px; # border-width: 0px;
/*box-shadow: 1px 12px 12px 12px rgba(0, 0, 0, 0.4), 0 0 0 1px rgba(0, 0, 0, 0.18);*/ # /*box-shadow: 1px 12px 12px 12px rgba(0, 0, 0, 0.4), 0 0 0 1px rgba(0, 0, 0, 0.18);*/
box-shadow: none; # box-shadow: none;
margin: 0px; # margin: 0px;
} # }
''; # '';
}; };
iconTheme = { iconTheme = {
package = pkgs.pantheon.elementary-icon-theme; package = pkgs.pantheon.elementary-icon-theme;
@ -187,127 +193,121 @@ in
selection_foreground #000000 selection_foreground #000000
''; '';
}; };
# zsh = {
# sessionVariables = {
# SSH_AUTH_SOCK = "/run/user/1000/keyring/ssh";
# };
# };
}; };
services = { services = {
picom = { # picom = {
enable = true; # enable = true;
blur = true; # blur = true;
shadow = true; # shadow = true;
vSync = true; # vSync = true;
}; # };
dunst = { # dunst = {
enable = true; # enable = true;
settings = { # settings = {
global = { # global = {
font = "SF Pro Display Regular 12"; # font = "SF Pro Display Regular 12";
markup = "yes"; # markup = "yes";
format = "%s %p\n%b"; # format = "%s %p\n%b";
sort = "yes"; # sort = "yes";
indicate_hidden = "no"; # indicate_hidden = "no";
alignment = "center"; # alignment = "center";
bounce_freq = 0; # bounce_freq = 0;
show_age_threshold = 60; # show_age_threshold = 60;
word_wrap = "yes"; # word_wrap = "yes";
ignore_newline = "no"; # ignore_newline = "no";
geometry = "300x0-5-5"; # geometry = "300x0-5-5";
shrink = "yes"; # shrink = "yes";
transparency = 0; # transparency = 0;
idle_threshold = 120; # idle_threshold = 120;
monitor = 0; # monitor = 0;
follow = "mouse"; # follow = "mouse";
sticky_history = "yes"; # sticky_history = "yes";
history_length = 20; # history_length = 20;
show_indicators = "no"; # show_indicators = "no";
line_height = 0; # line_height = 0;
separator_height = 1; # separator_height = 1;
stack_duplicates = "no"; # stack_duplicates = "no";
padding = 8; # padding = 8;
horizontal_padding = 8; # horizontal_padding = 8;
separator_color = "frame"; # separator_color = "frame";
startup_notification = true; # startup_notification = true;
# dmenu = /usr/bin/dmenu -p dunst; # # dmenu = /usr/bin/dmenu -p dunst;
# browser = /usr/bin/firefox -new-tab; # # browser = /usr/bin/firefox -new-tab;
icon_position = "left"; # icon_position = "left";
icon_path = "/usr/share/icons/Arc"; # icon_path = "/usr/share/icons/Arc";
max_icon_size = 64; # max_icon_size = 64;
}; # };
frame = { # frame = {
width = 1; # width = 1;
color = "#A6A6A6"; # color = "#A6A6A6";
}; # };
urgency_low = { # urgency_low = {
background = "#000000"; # background = "#000000";
foreground = "#A6A6A6"; # foreground = "#A6A6A6";
timeout = 4; # timeout = 4;
}; # };
urgency_normal = { # urgency_normal = {
background = "#000000"; # background = "#000000";
foreground = "#A6A6A6"; # foreground = "#A6A6A6";
timeout = 4; # timeout = 4;
}; # };
urgency_critical = { # urgency_critical = {
background = "#900000"; # background = "#900000";
foreground = "#ffffff"; # foreground = "#ffffff";
timeout = 16; # timeout = 16;
}; # };
}; # };
}; # };
# sxhkd = {
# enable = true;
# keybindings = {
# "super + x" = "notify-send Time $(date '+%H:%M')";
# "super + z" = "notify-send Battery $(cat /sys/class/power_supply/BAT0/capacity)%";
# "alt + Tab" = "rofi -show window";
# "super + Return" = "kitty";
# "super + shift + Return" = "rofi -show drun";
# "super + Escape" = "pkill -USR1 -x sxhkd";
# "super {_,shift + }Tab" = "bspc node -f {next,prev}";
# "super + shift + c" = "bspc node -c";
# "super + a" = "bspc node @/ --flip vertical";
# "super + d" = ''layer=normal; \
# bspc query -N -n "focused.$\{layer\}" && layer=below; \
# bspc node -l "$layer"'';
# "super + {s,f,k}" =
# ''state={floating,fullscreen,pseudo_tiled}; \
# bspc query -N -n "focused.$\{state\}" && state=tiled; \
# bspc node -t "$state" '';
# "super + alt + {Left,Down,Up,Right}" = "bspc node -p {west,south,north,east}";
# "super + ctrl + {Left,Right,Up,Down}" = "xdo move {-x -50,-x +50,-y -50,-y +50}";
# "super + ctrl + alt + {Left,Right,Up,Down}" = "xdo resize {-w -50,-w +50,-h -50,-h +50}";
# "super + {_,shift + }{Left,Down,Up,Right}" = "bspc node -{f,s} {west,south,north,east}";
# "super + m" = "bspc node -s biggest";
# "super + l" = "~/.bin/lock";
# "super + ctrl + space" = "bspc node -p cancel";
# "super + apostrophe" = "bspc node -s last";
# "super + ctrl + comma" = "bspc node @/ --rotate 90";
# "super + shift + comma" = "bspc node @/ --circulate forward";
# "super + {1-9,0}" = "bspc desktop -f '{I,II,III,IV,V,VI,VII,VIII,IX,X}' && notify-send `bspc query -D -d --names`";
# "super + shift + {1-9,0}" = "bspc node -d '{I,II,III,IV,V,VI,VII,VIII,IX,X}'";
# # "XF86AudioMute" = "pulseaudio-ctl mute";
# # "XF86AudioLowerVolume" = "pulseaudio-ctl down";
# # "XF86AudioRaiseVolume" = "pulseaudio-ctl up";
# "Print" = "flameshot gui";
# };
# };
nextcloud-client = { nextcloud-client = {
enable = true; enable = true;
startInBackground = true; startInBackground = true;
}; };
sxhkd = {
enable = true;
keybindings = {
"super + x" = "notify-send Time $(date '+%H:%M')";
"super + z" = "notify-send Battery $(cat /sys/class/power_supply/BAT0/capacity)%";
"alt + Tab" = "rofi -show window";
"super + Return" = "kitty";
"super + shift + Return" = "rofi -show drun";
"super + Escape" = "pkill -USR1 -x sxhkd";
"super {_,shift + }Tab" = "bspc node -f {next,prev}";
"super + shift + c" = "bspc node -c";
"super + a" = "bspc node @/ --flip vertical";
"super + d" = ''layer=normal; \
bspc query -N -n "focused.$\{layer\}" && layer=below; \
bspc node -l "$layer"'';
"super + {s,f,k}" =
''state={floating,fullscreen,pseudo_tiled}; \
bspc query -N -n "focused.$\{state\}" && state=tiled; \
bspc node -t "$state" '';
"super + alt + {Left,Down,Up,Right}" = "bspc node -p {west,south,north,east}";
"super + ctrl + {Left,Right,Up,Down}" = "xdo move {-x -50,-x +50,-y -50,-y +50}";
"super + ctrl + alt + {Left,Right,Up,Down}" = "xdo resize {-w -50,-w +50,-h -50,-h +50}";
"super + {_,shift + }{Left,Down,Up,Right}" = "bspc node -{f,s} {west,south,north,east}";
"super + m" = "bspc node -s biggest";
"super + l" = "~/.bin/lock";
"super + ctrl + space" = "bspc node -p cancel";
"super + apostrophe" = "bspc node -s last";
"super + ctrl + comma" = "bspc node @/ --rotate 90";
"super + shift + comma" = "bspc node @/ --circulate forward";
"super + {1-9,0}" = "bspc desktop -f '{I,II,III,IV,V,VI,VII,VIII,IX,X}' && notify-send `bspc query -D -d --names`";
"super + shift + {1-9,0}" = "bspc node -d '{I,II,III,IV,V,VI,VII,VIII,IX,X}'";
# "XF86AudioMute" = "pulseaudio-ctl mute";
# "XF86AudioLowerVolume" = "pulseaudio-ctl down";
# "XF86AudioRaiseVolume" = "pulseaudio-ctl up";
"Print" = "flameshot gui";
};
};
redshift = { redshift = {
enable = true; enable = true;
duskTime = "21:00-22:00"; duskTime = "21:00-22:00";
@ -317,51 +317,56 @@ in
flameshot.enable = true; flameshot.enable = true;
}; };
xsession = { # xsession = {
enable = true; # enable = true;
pointerCursor = { # pointerCursor = {
defaultCursor = "left_ptr"; # defaultCursor = "left_ptr";
name = "elementary"; # name = "elementary";
package = pkgs.pantheon.elementary-icon-theme; # package = pkgs.pantheon.elementary-icon-theme;
}; # };
windowManager = { # windowManager = {
command = pkgs.lib.mkForce '' # command = pkgs.lib.mkForce ''
${pkgs.bspwm}/bin/bspwm -c ~/.config/bspwm/bspwmrc & # ${pkgs.bspwm}/bin/bspwm -c ~/.config/bspwm/bspwmrc &
${pkgs.xfce.xfce4-session}/bin/xfce4-session # ${pkgs.xfce.xfce4-session}/bin/xfce4-session
''; # '';
bspwm = { # bspwm = {
enable = true; # enable = true;
extraConfig = '' # extraConfig = ''
bspc wm --adopt-orphans # bspc wm --adopt-orphans
#
# bspc subscribe monitor_add monitor_remove| while read -r a event; do
# node /home/alex/Sync/windows.js
# done &
# '';
# settings = {
# border_width = 4;
# window_gap = 5;
# top_padding = 0;
# left_padding = 0;
# right_padding = 0;
# bottom_padding = 0;
# split_ratio = 0.50;
# borderless_monocle = true;
# single_monocle = true;
# gapless_monocle = true;
# focus_follows_pointer = true;
# pointer_follows_monitor = true;
# pointer_follows_focus = false;
# center_pseudo_tiled = true;
# automatic_scheme = "alternate";
# remove_unplugged_monitors = true;
# remove_disabled_monitors = true;
# normal_border_color = "#333333";
# focused_border_color = "#666666";
# presel_feedback_color = "#000000";
# };
# };
# };
# };
bspc subscribe monitor_add monitor_remove| while read -r a event; do wayland.windowManager.sway = {
node /home/alex/Sync/windows.js enable = true;
done & wrapperFeatures.gtk = true ;
'';
settings = {
border_width = 4;
window_gap = 5;
top_padding = 0;
left_padding = 0;
right_padding = 0;
bottom_padding = 0;
split_ratio = 0.50;
borderless_monocle = true;
single_monocle = true;
gapless_monocle = true;
focus_follows_pointer = true;
pointer_follows_monitor = true;
pointer_follows_focus = false;
center_pseudo_tiled = true;
automatic_scheme = "alternate";
remove_unplugged_monitors = true;
remove_disabled_monitors = true;
normal_border_color = "#333333";
focused_border_color = "#666666";
presel_feedback_color = "#000000";
};
};
};
}; };
}; };
} }