pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

Merge branch 'main' into b12f

Browse source
This commit is contained in:
Benjamin Bädorf 2022-05-05 09:12:35 +02:00
parent ef0755ef57 b751593368
commit 403893ed56
No known key found for this signature in database
GPG key ID: 4406E80E13CD656C
7 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.drone.yml
View file

@ -140,7 +140,7 @@ steps:
from_secret: ssh_port from_secret: ssh_port
key: key:
from_secret: ssh_key from_secret: ssh_key
target: /var/www/pub.solar target: /srv/os
source: source:
- /var/nix/iso-cache/*.iso - /var/nix/iso-cache/*.iso
strip_components: 3 strip_components: 3
@ -158,6 +158,6 @@ volumes:
--- ---
kind: signature kind: signature
hmac: e806a6980afdc1bf451be231db1a61e7917822a1f78afe3f2136eadfd632d521 hmac: bdbefb07b97dc8efc44d8eb36ee4d1bb89eec3b7255b49929e126e86a4b4a788
... ...

7
modules/graphical/default.nix
View file

@ -26,6 +26,11 @@ in
default = { }; default = { };
}; };
}; };
autologin.enable = mkOption {
type = types.bool;
default = true;
description = "Feature flag enabling autologin after boot.";
};
wayland.software-renderer.enable = mkOption { wayland.software-renderer.enable = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
@ -54,7 +59,7 @@ in
}; };
}; };
services.getty.autologinUser = mkForce "${psCfg.user.name}"; services.getty.autologinUser = mkIf cfg.autologin.enable "${psCfg.user.name}";
qt5 = { qt5 = {
enable = true; enable = true;

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

@ -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" bindsym $mod+0 mode "$mode_system"
mode "$mode_system" { mode "$mode_system" {
bindsym l exec swaylock-bg, mode "default" bindsym l exec swaylock-bg, mode "default"
bindsym e exec swaymsg exit, mode "default" bindsym e exec systemctl --user stop graphical-session.target, mode "default"
bindsym s exec systemctl suspend, mode "default" bindsym s exec systemctl suspend, mode "default"
bindsym h exec systemctl hibernate, mode "default" bindsym h exec systemctl hibernate, mode "default"
bindsym r exec systemctl reboot, mode "default" bindsym r exec systemctl reboot, mode "default"

3
modules/sway/config/config.d/theme.conf
View file

@ -11,3 +11,6 @@ exec_always import-gtk-settings \
gtk-theme:gtk-theme-name \ gtk-theme:gtk-theme-name \
icon-theme:gtk-icon-theme-name \ icon-theme:gtk-icon-theme-name \
cursor-theme:gtk-cursor-theme-name cursor-theme:gtk-cursor-theme-name
# Workaround to fix cursor scaling, see https://github.com/swaywm/sway/issues/4112
seat seat0 xcursor_theme Adwaita

1
modules/sway/default.nix
View file

@ -90,6 +90,7 @@ in
#programs.waybar.systemd.enable = true; #programs.waybar.systemd.enable = true;
systemd.user.services.mako = import ./mako.service.nix pkgs; 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.swayidle = import ./swayidle.service.nix pkgs;
systemd.user.services.xsettingsd = import ./xsettingsd.service.nix pkgs; systemd.user.services.xsettingsd = import ./xsettingsd.service.nix pkgs;
systemd.user.services.waybar = import ./waybar.service.nix pkgs; systemd.user.services.waybar = import ./waybar.service.nix pkgs;

4
modules/terminal-life/zsh/default.nix
View file

@ -19,7 +19,7 @@ in
}; };
loginExtra = '' loginExtra = ''
[ "$(tty)" = "/dev/tty1" ] && exec sway [ "$(tty)" = "/dev/tty1" ] && exec ${pkgs.sway-service}/bin/sway-service
''; '';
shellAliases = { shellAliases = {
@ -86,7 +86,7 @@ in
precmd () { precmd () {
DIR_NAME=$(pwd | sed "s|^$HOME|~|g") DIR_NAME=$(pwd | sed "s|^$HOME|~|g")
echo -e "\e]2;$DIR_NAME\e\\" echo -e -n "\e]2;$DIR_NAME\e\\"
} }
# If a command is not found, show me where it is # If a command is not found, show me where it is

12
profiles/base-user/.config/git/gitmessage.nix
View file

@ -18,15 +18,5 @@ in
# ^ Remember ending with an extra blank line # ^ Remember ending with an extra blank line
# At the end: Include Co-authored-by for all contributors. # At the end: Include Co-authored-by for all contributors.
# #
Co-authored-by: ${user.fullName} <${user.email}> # Co-authored-by: Example Name <email@example.com>
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch master
# Your branch is up to date with 'origin/main'.
#
# Changes to be committed:
# new file: installation.md
#
'' ''