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

switching to laptop

Browse source
This commit is contained in:
Charlie Root 2024-08-17 11:19:57 +02:00
commit c2df2cb6fe
4 changed files with 100 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

1
hosts/vali/hermit/configuration.nix
View file

@ -23,7 +23,6 @@
security.polkit.enable = true; security.polkit.enable = true;
programs.kdeconnect.enable = true; programs.kdeconnect.enable = true;
programs.dconf.enable = true; programs.dconf.enable = true;
virtualisation.docker.enable = true;
boot.kernelPackages = pkgs.linuxPackages_xanmod_latest; boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
modules = { modules = {

9
hosts/vali/hermit/programs.nix
View file

@ -22,8 +22,7 @@ in {
cmus cmus
difftastic difftastic
dig dig
discordo # easyeffects #broken
easyeffects
element-desktop element-desktop
evince evince
eza eza
@ -75,14 +74,9 @@ in {
pidgin pidgin
playerctl playerctl
polkit polkit
pyradio
python3 python3
qbittorrent
ripgrep ripgrep
rnote
rustdesk
scc scc
scummvm
sherlock sherlock
signal-desktop-beta signal-desktop-beta
smartmontools smartmontools
@ -100,7 +94,6 @@ in {
ventoy-full ventoy-full
vlc vlc
weechat weechat
wezterm
wget wget
wireguard-tools wireguard-tools
wl-clipboard wl-clipboard

5
modules/options/usrEnv/desktop.nix
View file

@ -39,6 +39,11 @@ in {
The Hyprland package to be used. The Hyprland package to be used.
''; '';
}; };
portalPackage = mkOption {
type = package;
default = inputs'.hyprland.packages.xdg-desktop-portal-hyprland;
description = "The hyprland portal package";
};
}; };
awesomwm.enable = mkOption { awesomwm.enable = mkOption {

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

@ -19,20 +19,19 @@
(inputs'.split-monitor-workspaces.packages) (inputs'.split-monitor-workspaces.packages)
split-monitor-workspaces split-monitor-workspaces
; ;
inherit (lib) mkIf; inherit (lib) mkIf mkDefault;
inherit (builtins) toString; inherit (builtins) toString;
in { in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.hyprland = { programs.hyprland = {
enable = true; enable = false;
inherit (cfg) package; inherit (cfg) package portalPackage;
portalPackage = inputs'.hyprland.packages.xdg-desktop-portal-hyprland;
}; };
# xdg Portal # xdg Portal
xdg.portal = { xdg.portal = {
enable = true; enable = true;
configPackages = [ configPackages = mkDefault [
cfg.package # TODO Fix hyprland package inputs'.hyprland.packages.xdg-desktop-portal-hyprland
]; ];
extraPortals = [ extraPortals = [
pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-gtk
@ -41,7 +40,6 @@ in {
config = { config = {
common.default = ["hyprland"]; common.default = ["hyprland"];
}; };
#config.common.default = "hyprland";
}; };
home-manager.users.${username} = { home-manager.users.${username} = {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
@ -67,59 +65,59 @@ in {
# Monitor config # Monitor config
monitor = [ monitor = [
# "eDP-1,1920x1080,0x0,1" "eDP-1,1920x1080,0x0,1"
"DP-2,1920x1080,0x0,1" # "DP-2,1920x1080,0x0,1"
"HDMI-A-2,1920x1080,1920x0,1" # "HDMI-A-2,1920x1080,1920x0,1"
"HDMI-A-1,1920x1080,3840x0,1" # "HDMI-A-1,1920x1080,3840x0,1"
# Had the shadow monitor bug, so had to disable all unknown monitors. # Had the shadow monitor bug, so had to disable all unknown monitors.
"Unknown-1,disable" "Unknown-1,disable"
]; ];
# Workspace config # Workspace config
workspace = [ workspace = [
# "1,monitor:eDP-1, default:true" "1,monitor:eDP-1, default:true"
# "2,monitor:eDP-1" "2,monitor:eDP-1"
# "3,monitor:eDP-1" "3,monitor:eDP-1"
# "4,monitor:eDP-1" "4,monitor:eDP-1"
# "5,monitor:eDP-1" "5,monitor:eDP-1"
# "6,monitor:eDP-1" "6,monitor:eDP-1"
# "7,monitor:eDP-1" "7,monitor:eDP-1"
# "8,monitor:eDP-1" "8,monitor:eDP-1"
# "9,monitor:eDP-1" "9,monitor:eDP-1"
# "10,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"
"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"
# "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"
#
# scratchpads # scratchpads
"special:pipewire, decorate:false" "special:pipewire, decorate:false"
"special:nixos, decorate:false" "special:nixos, decorate:false"
@ -225,49 +223,49 @@ in {
# workspaces # workspaces
# split-workspace is because of the split-workspace plugin # split-workspace is because of the split-workspace plugin
# "$mainMod, 1, workspace, 1" "$mainMod, 1, workspace, 1"
# "$mainMod, 2, workspace, 2" "$mainMod, 2, workspace, 2"
# "$mainMod, 3, workspace, 3" "$mainMod, 3, workspace, 3"
# "$mainMod, 4, workspace, 4" "$mainMod, 4, workspace, 4"
# "$mainMod, 5, workspace, 5" "$mainMod, 5, workspace, 5"
# "$mainMod, 6, workspace, 6" "$mainMod, 6, workspace, 6"
# "$mainMod, 7, workspace, 7" "$mainMod, 7, workspace, 7"
# "$mainMod, 8, workspace, 8" "$mainMod, 8, workspace, 8"
# "$mainMod, 9, workspace, 9" "$mainMod, 9, workspace, 9"
# "$mainMod, 0, workspace, 10" "$mainMod, 0, workspace, 10"
# "$mainMod SHIFT, 1, movetoworkspacesilent, 1" "$mainMod SHIFT, 1, movetoworkspacesilent, 1"
# "$mainMod SHIFT, 2, movetoworkspacesilent, 2" "$mainMod SHIFT, 2, movetoworkspacesilent, 2"
# "$mainMod SHIFT, 3, movetoworkspacesilent, 3" "$mainMod SHIFT, 3, movetoworkspacesilent, 3"
# "$mainMod SHIFT, 4, movetoworkspacesilent, 4" "$mainMod SHIFT, 4, movetoworkspacesilent, 4"
# "$mainMod SHIFT, 5, movetoworkspacesilent, 5" "$mainMod SHIFT, 5, movetoworkspacesilent, 5"
# "$mainMod SHIFT, 6, movetoworkspacesilent, 6" "$mainMod SHIFT, 6, movetoworkspacesilent, 6"
# "$mainMod SHIFT, 7, movetoworkspacesilent, 7" "$mainMod SHIFT, 7, movetoworkspacesilent, 7"
# "$mainMod SHIFT, 8, movetoworkspacesilent, 8" "$mainMod SHIFT, 8, movetoworkspacesilent, 8"
# "$mainMod SHIFT, 9, movetoworkspacesilent, 9" "$mainMod SHIFT, 9, movetoworkspacesilent, 9"
# "$mainMod SHIFT, 0, movetoworkspacesilent, 10" "$mainMod SHIFT, 0, movetoworkspacesilent, 10"
# split-workspace is because of the split-workspace plugin # split-workspace is because of the split-workspace plugin
"$mainMod, 1, split-workspace, 1" # "$mainMod, 1, split-workspace, 1"
"$mainMod, 2, split-workspace, 2" # "$mainMod, 2, split-workspace, 2"
"$mainMod, 3, split-workspace, 3" # "$mainMod, 3, split-workspace, 3"
"$mainMod, 4, split-workspace, 4" # "$mainMod, 4, split-workspace, 4"
"$mainMod, 5, split-workspace, 5" # "$mainMod, 5, split-workspace, 5"
"$mainMod, 6, split-workspace, 6" # "$mainMod, 6, split-workspace, 6"
"$mainMod, 7, split-workspace, 7" # "$mainMod, 7, split-workspace, 7"
"$mainMod, 8, split-workspace, 8" # "$mainMod, 8, split-workspace, 8"
"$mainMod, 9, split-workspace, 9" # "$mainMod, 9, split-workspace, 9"
"$mainMod, 0, split-workspace, 10" # "$mainMod, 0, split-workspace, 10"
"$mainMod SHIFT, 1, split-movetoworkspacesilent, 1" # "$mainMod SHIFT, 1, split-movetoworkspacesilent, 1"
"$mainMod SHIFT, 2, split-movetoworkspacesilent, 2" # "$mainMod SHIFT, 2, split-movetoworkspacesilent, 2"
"$mainMod SHIFT, 3, split-movetoworkspacesilent, 3" # "$mainMod SHIFT, 3, split-movetoworkspacesilent, 3"
"$mainMod SHIFT, 4, split-movetoworkspacesilent, 4" # "$mainMod SHIFT, 4, split-movetoworkspacesilent, 4"
"$mainMod SHIFT, 5, split-movetoworkspacesilent, 5" # "$mainMod SHIFT, 5, split-movetoworkspacesilent, 5"
"$mainMod SHIFT, 6, split-movetoworkspacesilent, 6" # "$mainMod SHIFT, 6, split-movetoworkspacesilent, 6"
"$mainMod SHIFT, 7, split-movetoworkspacesilent, 7" # "$mainMod SHIFT, 7, split-movetoworkspacesilent, 7"
"$mainMod SHIFT, 8, split-movetoworkspacesilent, 8" # "$mainMod SHIFT, 8, split-movetoworkspacesilent, 8"
"$mainMod SHIFT, 9, split-movetoworkspacesilent, 9" # "$mainMod SHIFT, 9, split-movetoworkspacesilent, 9"
"$mainMod SHIFT, 0, split-movetoworkspacesilent, 10" # "$mainMod SHIFT, 0, split-movetoworkspacesilent, 10"
#
# Move Windows # Move Windows
"$mainMod SHIFT, H, movewindow, l" "$mainMod SHIFT, H, movewindow, l"
"$mainMod SHIFT, J, movewindow, d" "$mainMod SHIFT, J, movewindow, d"
@ -342,7 +340,7 @@ in {
"${pkgs.waybar}/bin/waybar" "${pkgs.waybar}/bin/waybar"
# run persistent special workspace windows # run persistent special workspace windows
"[workspace special:nixos; silent;tile] ${foot}/bin/foot -D ~/projects/nichts nix develop" "[workspace special:nixos; silent;tile] ${foot}/bin/foot -D ~/projects/nichts"
"[workspace special:keepassxc; silent;tile] ${pkgs.keepassxc}/bin/keepassxc" "[workspace special:keepassxc; silent;tile] ${pkgs.keepassxc}/bin/keepassxc"