faukah/nichts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

set up ssh signing

Browse source
This commit is contained in:
Charlie Root 2024-07-21 13:18:00 +02:00
commit 917c7043ae
19 changed files with 389 additions and 323 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/editors/emacs.nix
View file

@ -167,6 +167,7 @@ in {
findutils
graphviz
djvulibre
hunspell
sqlite
];
services.emacs = {

1
modules/gui/qt.nix
View file

@ -42,7 +42,6 @@ in {
home-manager.users.${username} = {
qt = {
enable = true;
platformTheme.name = "qt5ct";
# style = {
# inherit (cfg) name package;
# };

3
modules/gui/spicetify.nix
View file

@ -21,8 +21,9 @@ in {
colorScheme = "mocha";
enabledExtensions = with spicePkgs.extensions; [
shuffle
hidePodcasts
adblock
genre
playlistIcons
];
};
};

7
modules/gui/waybar.nix
View file

@ -16,7 +16,7 @@ in {
settings.mainBar = {
gtk-layer-shell = true;
layer = "top";
modules-left = ["tray" "mpd" "hyprland/window"];
modules-left = ["custom/vpn" "tray" "mpd" "hyprland/window"];
modules-center = ["hyprland/workspaces"];
modules-right = [
"cpu"
@ -81,6 +81,11 @@ in {
icon-size = 12;
spacing = 5;
};
"custom/vpn" = {
interval = 10;
exec = ''if [[ $(systemctl is-active openvpn-air.service) == "active" ]]; then echo Vpn active; else echo Vpn inactive; fi'';
firmat = "{}";
};
# 󰃰
clock = {

2
modules/other/default.nix
View file

@ -1 +1 @@
_: {imports = [./home-manager.nix ./system.nix ./xdg.nix];}
_: {imports = [./home-manager.nix ./system.nix ./xdg.nix ./git.nix];}

13
modules/other/git.nix Normal file
View file

@ -0,0 +1,13 @@
{config, ...}: let
inherit (config.modules.other.system) username;
in {
home-manager.users.${username} = {
programs.git = {
signing = {
key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILPiRe9OH/VtWFWyy5QbAVcN7CLxr4zUtRCwmxD6aeN6";
signByDefault = true;
};
extraConfig.gpg.format = "ssh";
};
};
}

4
modules/other/system.nix
View file

@ -30,9 +30,5 @@ in {
isNormalUser = true;
extraGroups = ["wheel"];
};
users.users.test = {
isNormalUser = true;
extraGroups = ["wheel"];
};
};
}

2
modules/services/default.nix
View file

@ -1 +1 @@
_: {imports = [./pipewire.nix ./ssh.nix ./greetd.nix ./dunst.nix ./mpd.nix ./firewall.nix];}
_: {imports = [./pipewire.nix ./ssh.nix ./greetd.nix ./dunst.nix ./mpd.nix ./firewall.nix ./vpn.nix];}

27
modules/services/mpd.nix
View file

@ -28,24 +28,23 @@ in {
enable = true;
inherit (cfg) musicDirectory;
user = username;
startWhenNeeded = true;
extraConfig = ''
user "${username}"
playlist_directory "${cfg.musicDirectory}/.playlists"
restore_paused "yes"
auto_update "yes"
playlist_directory "${cfg.musicDirectory}/.playlists"
volume_normalization "yes"
audio_output {
type "pipewire"
name "PipeWire Sound Server"
}
audio_output {
type "pipewire"
name "PipeWire Sound Server"
}
audio_output {
type "fifo"
name "FIFO"
path "/tmp/mpd.fifo"
format "44100:16:2"
}
audio_output {
type "fifo"
name "FIFO"
path "/tmp/mpd.fifo"
format "44100:16:2"
}
'';
};
home-manager.users.${username} = {

12
modules/services/vpn.nix Normal file
View file

@ -0,0 +1,12 @@
{pkgs, ...}: {
services.openvpn.servers = {
# air = {
# config = ''
# config /home/vali/Documents/AirVPN_Netherlands_UDP-443-Entry3.ovpn
# script-security 2
# up ${pkgs.update-systemd-resolved}/libexec/openvpn/update-systemd-resolved
# down ${pkgs.update-systemd-resolved}/libexec/openvpn/update-systemd-resolved
# '';
# };
};
}

171
modules/wms/wayland/hypr/land.nix
View file

@ -56,58 +56,58 @@ in {
# Monitor config
monitor = [
"eDP-1,1920x1080,0x0,1"
# "DP-2,1920x1080,0x0,1"
# "HDMI-A-2,1920x1080,1920x0,1"
# "HDMI-A-1,1920x1080,3840x0,1"
# "eDP-1,1920x1080,0x0,1"
"DP-2,1920x1080,0x0,1"
"HDMI-A-2,1920x1080,1920x0,1"
"HDMI-A-1,1920x1080,3840x0,1"
# Had the shadow monitor bug, so had to disable all unknown monitors.
"Unknown-1,disable"
];
# Workspace config
workspace = [
"1,monitor:eDP-1, default:true"
"2,monitor:eDP-1"
"3,monitor:eDP-1"
"4,monitor:eDP-1"
"5,monitor:eDP-1"
"6,monitor:eDP-1"
"7,monitor:eDP-1"
"8,monitor:eDP-1"
"9,monitor:eDP-1"
"10,monitor:eDP-1"
# "1,monitor:eDP-1, default:true"
# "2,monitor:eDP-1"
# "3,monitor:eDP-1"
# "4,monitor:eDP-1"
# "5,monitor:eDP-1"
# "6,monitor:eDP-1"
# "7,monitor:eDP-1"
# "8,monitor:eDP-1"
# "9,monitor:eDP-1"
# "10,monitor:eDP-1"
# "1,monitor:HDMI-A-1, default:true"
# "2,monitor:HDMI-A-1"
# "3,monitor:HDMI-A-1"
# "4,monitor:HDMI-A-1"
# "5,monitor:HDMI-A-1"
# "6,monitor:HDMI-A-1"
# "7,monitor:HDMI-A-1"
# "8,monitor:HDMI-A-1"
# "9,monitor:HDMI-A-1"
# "10,monitor:HDMI-A-1"
"1,monitor:HDMI-A-1, default:true"
"2,monitor:HDMI-A-1"
"3,monitor:HDMI-A-1"
"4,monitor:HDMI-A-1"
"5,monitor:HDMI-A-1"
"6,monitor:HDMI-A-1"
"7,monitor:HDMI-A-1"
"8,monitor:HDMI-A-1"
"9,monitor:HDMI-A-1"
"10,monitor:HDMI-A-1"
#"11, monitor:HDMI-A-2, default:true"
#"12, monitor:HDMI-A-2"
#"13, monitor:HDMI-A-2"
#"14, monitor:HDMI-A-2"
#"15, monitor:HDMI-A-2"
#"16, monitor:HDMI-A-2"
#"17, monitor:HDMI-A-2"
#"18, monitor:HDMI-A-2"
#"19, monitor:HDMI-A-2"
#"20, monitor:HDMI-A-2"
#
#"21, monitor:DP-2, default:true"
#"22, monitor:DP-2"
#"23, monitor:DP-2"
#"24, monitor:DP-2"
#"25, monitor:DP-2"
#"26, monitor:DP-2"
#"27, monitor:DP-2"
#"28, monitor:DP-2"
#"29, monitor:DP-2"
#"30, monitor:DP-2"
"11, monitor:HDMI-A-2, default:true"
"12, monitor:HDMI-A-2"
"13, monitor:HDMI-A-2"
"14, monitor:HDMI-A-2"
"15, monitor:HDMI-A-2"
"16, monitor:HDMI-A-2"
"17, monitor:HDMI-A-2"
"18, monitor:HDMI-A-2"
"19, monitor:HDMI-A-2"
"20, monitor:HDMI-A-2"
"21, monitor:DP-2, default:true"
"22, monitor:DP-2"
"23, monitor:DP-2"
"24, monitor:DP-2"
"25, monitor:DP-2"
"26, monitor:DP-2"
"27, monitor:DP-2"
"28, monitor:DP-2"
"29, monitor:DP-2"
"30, monitor:DP-2"
# scratchpads
"special:btop, decorate:false"
@ -175,6 +175,7 @@ in {
cursor = {
hide_on_key_press = true;
no_hardware_cursors = true;
};
misc = {
enable_swallow = true;
@ -210,48 +211,48 @@ in {
"$mainMod, O, exec, obsidian --ozone-platform=wayland --enable-features=UseOzonePlatform --enable-features=WaylandWindowDecorations --enable-features=WebRTCPipeWireCpaturer --disable-gpu"
# workspaces
# split-workspace is because of the split-workspace plugin
"$mainMod, 1, workspace, 1"
"$mainMod, 2, workspace, 2"
"$mainMod, 3, workspace, 3"
"$mainMod, 4, workspace, 4"
"$mainMod, 5, workspace, 5"
"$mainMod, 6, workspace, 6"
"$mainMod, 7, workspace, 7"
"$mainMod, 8, workspace, 8"
"$mainMod, 9, workspace, 9"
"$mainMod, 0, workspace, 10"
"$mainMod SHIFT, 1, movetoworkspacesilent, 1"
"$mainMod SHIFT, 2, movetoworkspacesilent, 2"
"$mainMod SHIFT, 3, movetoworkspacesilent, 3"
"$mainMod SHIFT, 4, movetoworkspacesilent, 4"
"$mainMod SHIFT, 5, movetoworkspacesilent, 5"
"$mainMod SHIFT, 6, movetoworkspacesilent, 6"
"$mainMod SHIFT, 7, movetoworkspacesilent, 7"
"$mainMod SHIFT, 8, movetoworkspacesilent, 8"
"$mainMod SHIFT, 9, movetoworkspacesilent, 9"
"$mainMod SHIFT, 0, movetoworkspacesilent, 10"
# "$mainMod, 1, workspace, 1"
# "$mainMod, 2, workspace, 2"
# "$mainMod, 3, workspace, 3"
# "$mainMod, 4, workspace, 4"
# "$mainMod, 5, workspace, 5"
# "$mainMod, 6, workspace, 6"
# "$mainMod, 7, workspace, 7"
# "$mainMod, 8, workspace, 8"
# "$mainMod, 9, workspace, 9"
# "$mainMod, 0, workspace, 10"
# "$mainMod SHIFT, 1, movetoworkspacesilent, 1"
# "$mainMod SHIFT, 2, movetoworkspacesilent, 2"
# "$mainMod SHIFT, 3, movetoworkspacesilent, 3"
# "$mainMod SHIFT, 4, movetoworkspacesilent, 4"
# "$mainMod SHIFT, 5, movetoworkspacesilent, 5"
# "$mainMod SHIFT, 6, movetoworkspacesilent, 6"
# "$mainMod SHIFT, 7, movetoworkspacesilent, 7"
# "$mainMod SHIFT, 8, movetoworkspacesilent, 8"
# "$mainMod SHIFT, 9, movetoworkspacesilent, 9"
# "$mainMod SHIFT, 0, movetoworkspacesilent, 10"
# split-workspace is because of the split-workspace plugin
# "$mainMod, 1, split-workspace, 1"
# "$mainMod, 2, split-workspace, 2"
# "$mainMod, 3, split-workspace, 3"
# "$mainMod, 4, split-workspace, 4"
# "$mainMod, 5, split-workspace, 5"
# "$mainMod, 6, split-workspace, 6"
# "$mainMod, 7, split-workspace, 7"
# "$mainMod, 8, split-workspace, 8"
# "$mainMod, 9, split-workspace, 9"
# "$mainMod, 0, split-workspace, 10"
# "$mainMod SHIFT, 1, split-movetoworkspacesilent, 1"
# "$mainMod SHIFT, 2, split-movetoworkspacesilent, 2"
# "$mainMod SHIFT, 3, split-movetoworkspacesilent, 3"
# "$mainMod SHIFT, 4, split-movetoworkspacesilent, 4"
# "$mainMod SHIFT, 5, split-movetoworkspacesilent, 5"
# "$mainMod SHIFT, 6, split-movetoworkspacesilent, 6"
# "$mainMod SHIFT, 7, split-movetoworkspacesilent, 7"
# "$mainMod SHIFT, 8, split-movetoworkspacesilent, 8"
# "$mainMod SHIFT, 9, split-movetoworkspacesilent, 9"
# "$mainMod SHIFT, 0, split-movetoworkspacesilent, 10"
"$mainMod, 1, split-workspace, 1"
"$mainMod, 2, split-workspace, 2"
"$mainMod, 3, split-workspace, 3"
"$mainMod, 4, split-workspace, 4"
"$mainMod, 5, split-workspace, 5"
"$mainMod, 6, split-workspace, 6"
"$mainMod, 7, split-workspace, 7"
"$mainMod, 8, split-workspace, 8"
"$mainMod, 9, split-workspace, 9"
"$mainMod, 0, split-workspace, 10"
"$mainMod SHIFT, 1, split-movetoworkspacesilent, 1"
"$mainMod SHIFT, 2, split-movetoworkspacesilent, 2"
"$mainMod SHIFT, 3, split-movetoworkspacesilent, 3"
"$mainMod SHIFT, 4, split-movetoworkspacesilent, 4"
"$mainMod SHIFT, 5, split-movetoworkspacesilent, 5"
"$mainMod SHIFT, 6, split-movetoworkspacesilent, 6"
"$mainMod SHIFT, 7, split-movetoworkspacesilent, 7"
"$mainMod SHIFT, 8, split-movetoworkspacesilent, 8"
"$mainMod SHIFT, 9, split-movetoworkspacesilent, 9"
"$mainMod SHIFT, 0, split-movetoworkspacesilent, 10"
# Move Windows
"$mainMod SHIFT, H, movewindow, l"

2
modules/wms/wayland/variables.nix
View file

@ -36,7 +36,7 @@ in {
XDG_CURRENT_DESKTOP = "Hyprland";
XDG_SESSION_DESKTOP = "Hyprland";
ELECTRON_OZONE_PLATFORM_HINT = "auto";
#WLR_RENDERER_ALLOW_SOFTWARE = "1";
WLR_RENDERER_ALLOW_SOFTWARE = "1";
# Needed anymore?
LIBSEAT_BACKEND = "logind";
};