Browse Source

Merge branch 'main' into b12f

pkg/wlstreamer
Benjamin Bädorf 2 months ago
parent
commit
6e2c227969
Signed by: b12f GPG Key ID: 4406E80E13CD656C
  1. 1
      modules/crypto/default.nix
  2. 10
      modules/graphical/default.nix
  3. 2
      modules/sway/config/config.d/custom-keybindings.conf
  4. 4
      modules/sway/config/config.d/systemd.conf
  5. 2
      modules/sway/default.nix
  6. 1
      modules/sway/swayidle.service.nix
  7. 1
      modules/sway/waybar.service.nix
  8. 4
      modules/terminal-life/default.nix
  9. 3
      modules/terminal-life/nvim/default.nix
  10. 5
      modules/terminal-life/zsh/default.nix
  11. 2
      overlays/overrides.nix
  12. 12
      profiles/base-user/.config/git/config.nix
  13. 22
      profiles/base-user/default.nix

1
modules/crypto/default.nix

@ -15,7 +15,6 @@ in
services.pcscd.enable = true;
services.gnome.gnome-keyring.enable = true;
security.pam.services.greetd.enableGnomeKeyring = true;
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
systemd.user.services.polkit-gnome-authentication-agent = import ./polkit-gnome-authentication-agent.service.nix pkgs;

10
modules/graphical/default.nix

@ -49,15 +49,7 @@ in
};
};
services.greetd = {
enable = true;
restart = false;
settings = {
default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd ${pkgs.sway-service}/bin/sway-service";
};
};
};
services.getty.autologinUser = "${psCfg.user.name}";
qt5 = {
enable = true;

2
modules/sway/config/config.d/custom-keybindings.conf

@ -37,7 +37,7 @@ set $mode_system (l)ock, (e)xit, (s)uspend, (h)ibernate, (r)eboot, (Shift+s)hutd
bindsym $mod+0 mode "$mode_system"
mode "$mode_system" {
bindsym l exec swaylock-bg, mode "default"
bindsym e exec systemctl --user stop graphical-session.target, mode "default"
bindsym e exec swaymsg exit, mode "default"
bindsym s exec systemctl suspend, mode "default"
bindsym h exec systemctl hibernate, mode "default"
bindsym r exec systemctl reboot, mode "default"

4
modules/sway/config/config.d/systemd.conf

@ -3,4 +3,6 @@
# systemctl import-environment is complete, and services that require certain variables
# will fail to run.
# https://github.com/swaywm/sway/wiki/Systemd-integration
exec "systemctl --user import-environment; systemctl --user start sway-session.target; dbus-update-activation-environment WAYLAND_DISPLAY"
# Also, import the most important environment variables into the D-Bus and systemd
# user environments (e.g. required for screen sharing and Pinentry prompts):
exec "systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP; systemctl --user start sway-session.target; exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP; systemd-cat --identifier=sway sway"

2
modules/sway/default.nix

@ -62,7 +62,6 @@ in
swaylock-bg
sway-launcher
sway-service
import-gtk-settings
s
wcwd
@ -72,7 +71,6 @@ in
#programs.waybar.systemd.enable = true;
systemd.user.services.mako = import ./mako.service.nix pkgs;
systemd.user.services.sway = import ./sway.service.nix pkgs;
systemd.user.services.swayidle = import ./swayidle.service.nix pkgs;
systemd.user.services.xsettingsd = import ./xsettingsd.service.nix pkgs;
systemd.user.services.waybar = import ./waybar.service.nix pkgs;

1
modules/sway/swayidle.service.nix

@ -9,6 +9,7 @@ pkgs:
};
Service = {
Type = "simple";
Environment = "PATH=/run/current-system/sw/bin:${pkgs.sway}/bin:${pkgs.swaylock}/bin:${pkgs.swaylock-bg}/bin";
ExecStart = ''${pkgs.swayidle}/bin/swayidle -w \
timeout 600 'swaylock-bg' \
timeout 900 'swaymsg "output * dpms off"' \

1
modules/sway/waybar.service.nix

@ -10,6 +10,7 @@ pkgs:
Service = {
Type = "dbus";
Environment = "PATH=${pkgs.bash}/bin:${pkgs.pavucontrol}/bin";
BusName = "fr.arouillard.waybar";
ExecStart = "${pkgs.waybar}/bin/waybar";
};

4
modules/terminal-life/default.nix

@ -15,7 +15,9 @@ in
# Needed to get zsh completion for system packages (e.g. systemd).
environment.pathsToLink = [ "/share/zsh" ];
services.lorri.enable = true;
environment.shells = with pkgs; [
zsh
];
environment.systemPackages = with pkgs; [
screen

3
modules/terminal-life/nvim/default.nix

@ -79,7 +79,6 @@ in
extraPackages = with pkgs; [
ccls
code-minimap
gopls
nodejs
nodePackages.bash-language-server
@ -110,7 +109,6 @@ in
ack-vim
airline
editorconfig-vim
minimap-vim
nnn-vim
suda
syntastic
@ -121,6 +119,7 @@ in
sonokai
fugitive
diffview-nvim
vim-gitgutter
vim-rhubarb
vimagit

5
modules/terminal-life/zsh/default.nix

@ -18,6 +18,11 @@ in
size = 10000;
};
loginExtra = ''
[ "$(tty)" = "/dev/tty1" ] && exec sway
'';
shellAliases = {
nano = "nvim";
vi = "nvim";

2
overlays/overrides.nix

@ -18,6 +18,8 @@ channels: final: prev: {
signal-desktop
tdesktop
obs-studio
starship
deploy-rs
xdg-desktop-portal
xdg-desktop-portal-gtk
xdg-desktop-portal-wlr

12
profiles/base-user/.config/git/config.nix

@ -13,14 +13,14 @@ in
pol = pull
ack = -c color.grep.linenumber=\"bold yellow\"\n -c color.grep.filename=\"bold green\"\n -c color.grep.match=\"reverse yellow\"\n grep --break --heading --line-number
# define command which will be used when "nvim"is set as a merge tool
[mergetool "nvim"]
cmd = /etc/profiles/per-user/${config.pub-solar.user.name}/bin/nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
# set "nvim" as tool for merging
[merge]
tool = /etc/profiles/per-user/${config.pub-solar.user.name}/bin/nvim
# automatically launch merge tool without displaying a prompt
[mergetool]
prompt = false
[merge]
tool = nvim
[mergetool "nvim"]
cmd = /etc/profiles/per-user/${config.pub-solar.user.name}/bin/nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
[commit]
gpgsign = true
[tag]

22
profiles/base-user/default.nix

@ -7,14 +7,18 @@ in
./home.nix
];
users.users = with pkgs; pkgs.lib.setAttrByPath [ psCfg.user.name ] {
# Indicates whether this is an account for a “real” user.
# This automatically sets group to users, createHome to true,
# home to /home/username, useDefaultShell to true, and isSystemUser to false.
isNormalUser = true;
description = psCfg.user.description;
extraGroups = [ "wheel" "docker" "input" "audio" "networkmanager" "lp" "scanner" ];
initialHashedPassword = if psCfg.user.password != null then psCfg.user.password else "";
shell = pkgs.zsh;
users = {
mutableUsers = false;
users = with pkgs; pkgs.lib.setAttrByPath [ psCfg.user.name ] {
# Indicates whether this is an account for a “real” user.
# This automatically sets group to users, createHome to true,
# home to /home/username, useDefaultShell to true, and isSystemUser to false.
isNormalUser = true;
description = psCfg.user.description;
extraGroups = [ "wheel" "docker" "input" "audio" "networkmanager" "lp" "scanner" ];
initialHashedPassword = if psCfg.user.password != null then psCfg.user.password else "";
shell = pkgs.zsh;
};
};
}

Loading…
Cancel
Save