teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

Merge branch 'main' into fix/drone-ci-iso-target-path

Browse source
This commit is contained in:
teutat3s 2022-05-02 21:56:03 +02:00
parent 077ab8b4f4 c6b9ff43f1
commit ff69e1f8d6
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
7 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.drone.yml
View file

@ -123,7 +123,7 @@ steps:
- | - |
nix --print-build-logs --verbose \ nix --print-build-logs --verbose \
develop --command \ develop --command \
bud build bootstrap isoImage bud build bootstrap bootstrapIso
- cp $(readlink -f result)/iso/*.iso /var/nix/iso-cache/ - cp $(readlink -f result)/iso/*.iso /var/nix/iso-cache/
- name: "Publish ISO" - name: "Publish ISO"
@ -158,6 +158,6 @@ volumes:
--- ---
kind: signature kind: signature
hmac: 7aa9b1eadc2638d7c0b6da2eea92cce650232a8c44ce9ab4a2b0e563f7432693 hmac: bdbefb07b97dc8efc44d8eb36ee4d1bb89eec3b7255b49929e126e86a4b4a788
... ...

10
flake.lock
View file

@ -188,15 +188,15 @@
"nixpkgs-unstable": "nixpkgs-unstable" "nixpkgs-unstable": "nixpkgs-unstable"
}, },
"locked": { "locked": {
"lastModified": 1651349453, "lastModified": 1651210705,
"narHash": "sha256-0ZAYPYWXm16reXFT0bJi/4f6GeYubnlj2YruXcmp0hs=", "narHash": "sha256-2RzKrjEnWDhsBQ4Et2gm2LjV5pXyszeqV1xNe+LtNT8=",
"owner": "pub-solar", "owner": "divnix",
"repo": "digga", "repo": "digga",
"rev": "531dd67b7aef37d7828fb28c2e45f09de0425c6b", "rev": "0ffa2dff5ede12a03ca83fbc514972f94cf18f42",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "pub-solar", "owner": "divnix",
"repo": "digga", "repo": "digga",
"type": "github" "type": "github"
} }

2
flake.nix
View file

@ -11,7 +11,7 @@
nixos.url = "github:nixos/nixpkgs/nixos-21.11"; nixos.url = "github:nixos/nixpkgs/nixos-21.11";
latest.url = "github:nixos/nixpkgs/nixos-unstable"; latest.url = "github:nixos/nixpkgs/nixos-unstable";
digga.url = "github:pub-solar/digga"; digga.url = "github:divnix/digga";
digga.inputs.nixpkgs.follows = "nixos"; digga.inputs.nixpkgs.follows = "nixos";
digga.inputs.nixlib.follows = "nixos"; digga.inputs.nixlib.follows = "nixos";
digga.inputs.home-manager.follows = "home"; digga.inputs.home-manager.follows = "home";

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

@ -86,6 +86,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