Merge branch 'main' into b12f
This commit is contained in:
commit
6e2c227969
|
@ -15,7 +15,6 @@ in
|
||||||
services.pcscd.enable = true;
|
services.pcscd.enable = true;
|
||||||
|
|
||||||
services.gnome.gnome-keyring.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 ] {
|
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;
|
systemd.user.services.polkit-gnome-authentication-agent = import ./polkit-gnome-authentication-agent.service.nix pkgs;
|
||||||
|
|
|
@ -49,15 +49,7 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
services.greetd = {
|
services.getty.autologinUser = "${psCfg.user.name}";
|
||||||
enable = true;
|
|
||||||
restart = false;
|
|
||||||
settings = {
|
|
||||||
default_session = {
|
|
||||||
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd ${pkgs.sway-service}/bin/sway-service";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
qt5 = {
|
qt5 = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -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 systemctl --user stop graphical-session.target, mode "default"
|
bindsym e exec swaymsg exit, 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,4 +3,6 @@
|
||||||
# systemctl import-environment is complete, and services that require certain variables
|
# systemctl import-environment is complete, and services that require certain variables
|
||||||
# will fail to run.
|
# will fail to run.
|
||||||
# https://github.com/swaywm/sway/wiki/Systemd-integration
|
# 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"
|
||||||
|
|
|
@ -62,7 +62,6 @@ in
|
||||||
|
|
||||||
swaylock-bg
|
swaylock-bg
|
||||||
sway-launcher
|
sway-launcher
|
||||||
sway-service
|
|
||||||
import-gtk-settings
|
import-gtk-settings
|
||||||
s
|
s
|
||||||
wcwd
|
wcwd
|
||||||
|
@ -72,7 +71,6 @@ 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;
|
||||||
|
|
|
@ -9,6 +9,7 @@ pkgs:
|
||||||
};
|
};
|
||||||
Service = {
|
Service = {
|
||||||
Type = "simple";
|
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 \
|
ExecStart = ''${pkgs.swayidle}/bin/swayidle -w \
|
||||||
timeout 600 'swaylock-bg' \
|
timeout 600 'swaylock-bg' \
|
||||||
timeout 900 'swaymsg "output * dpms off"' \
|
timeout 900 'swaymsg "output * dpms off"' \
|
||||||
|
|
|
@ -10,6 +10,7 @@ pkgs:
|
||||||
|
|
||||||
Service = {
|
Service = {
|
||||||
Type = "dbus";
|
Type = "dbus";
|
||||||
|
Environment = "PATH=${pkgs.bash}/bin:${pkgs.pavucontrol}/bin";
|
||||||
BusName = "fr.arouillard.waybar";
|
BusName = "fr.arouillard.waybar";
|
||||||
ExecStart = "${pkgs.waybar}/bin/waybar";
|
ExecStart = "${pkgs.waybar}/bin/waybar";
|
||||||
};
|
};
|
||||||
|
|
|
@ -15,7 +15,9 @@ in
|
||||||
# Needed to get zsh completion for system packages (e.g. systemd).
|
# Needed to get zsh completion for system packages (e.g. systemd).
|
||||||
environment.pathsToLink = [ "/share/zsh" ];
|
environment.pathsToLink = [ "/share/zsh" ];
|
||||||
|
|
||||||
services.lorri.enable = true;
|
environment.shells = with pkgs; [
|
||||||
|
zsh
|
||||||
|
];
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
screen
|
screen
|
||||||
|
|
|
@ -79,7 +79,6 @@ in
|
||||||
|
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
ccls
|
ccls
|
||||||
code-minimap
|
|
||||||
gopls
|
gopls
|
||||||
nodejs
|
nodejs
|
||||||
nodePackages.bash-language-server
|
nodePackages.bash-language-server
|
||||||
|
@ -110,7 +109,6 @@ in
|
||||||
ack-vim
|
ack-vim
|
||||||
airline
|
airline
|
||||||
editorconfig-vim
|
editorconfig-vim
|
||||||
minimap-vim
|
|
||||||
nnn-vim
|
nnn-vim
|
||||||
suda
|
suda
|
||||||
syntastic
|
syntastic
|
||||||
|
@ -121,6 +119,7 @@ in
|
||||||
sonokai
|
sonokai
|
||||||
|
|
||||||
fugitive
|
fugitive
|
||||||
|
diffview-nvim
|
||||||
vim-gitgutter
|
vim-gitgutter
|
||||||
vim-rhubarb
|
vim-rhubarb
|
||||||
vimagit
|
vimagit
|
||||||
|
|
|
@ -18,6 +18,11 @@ in
|
||||||
size = 10000;
|
size = 10000;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
loginExtra = ''
|
||||||
|
[ "$(tty)" = "/dev/tty1" ] && exec sway
|
||||||
|
'';
|
||||||
|
|
||||||
|
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
nano = "nvim";
|
nano = "nvim";
|
||||||
vi = "nvim";
|
vi = "nvim";
|
||||||
|
|
|
@ -18,6 +18,8 @@ channels: final: prev: {
|
||||||
signal-desktop
|
signal-desktop
|
||||||
tdesktop
|
tdesktop
|
||||||
obs-studio
|
obs-studio
|
||||||
|
starship
|
||||||
|
deploy-rs
|
||||||
xdg-desktop-portal
|
xdg-desktop-portal
|
||||||
xdg-desktop-portal-gtk
|
xdg-desktop-portal-gtk
|
||||||
xdg-desktop-portal-wlr
|
xdg-desktop-portal-wlr
|
||||||
|
|
|
@ -13,14 +13,14 @@ in
|
||||||
pol = pull
|
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
|
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
|
# 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]
|
[mergetool]
|
||||||
prompt = false
|
prompt = false
|
||||||
|
[merge]
|
||||||
|
tool = nvim
|
||||||
|
[mergetool "nvim"]
|
||||||
|
cmd = /etc/profiles/per-user/${config.pub-solar.user.name}/bin/nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
|
||||||
|
|
||||||
[commit]
|
[commit]
|
||||||
gpgsign = true
|
gpgsign = true
|
||||||
[tag]
|
[tag]
|
||||||
|
|
|
@ -7,7 +7,10 @@ in
|
||||||
./home.nix
|
./home.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
users.users = with pkgs; pkgs.lib.setAttrByPath [ psCfg.user.name ] {
|
users = {
|
||||||
|
mutableUsers = false;
|
||||||
|
|
||||||
|
users = with pkgs; pkgs.lib.setAttrByPath [ psCfg.user.name ] {
|
||||||
# Indicates whether this is an account for a “real” user.
|
# Indicates whether this is an account for a “real” user.
|
||||||
# This automatically sets group to users, createHome to true,
|
# This automatically sets group to users, createHome to true,
|
||||||
# home to /home/username, useDefaultShell to true, and isSystemUser to false.
|
# home to /home/username, useDefaultShell to true, and isSystemUser to false.
|
||||||
|
@ -17,4 +20,5 @@ in
|
||||||
initialHashedPassword = if psCfg.user.password != null then psCfg.user.password else "";
|
initialHashedPassword = if psCfg.user.password != null then psCfg.user.password else "";
|
||||||
shell = pkgs.zsh;
|
shell = pkgs.zsh;
|
||||||
};
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue