CameronReed/NixOS-Configuration
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a few errors

Browse Source
This commit is contained in:
Cameron Reed 2024-01-21 20:31:14 -07:00
parent efc388197b
commit 564bf84f66
3 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/users/cameron/home-manager/hyprland.nix
View File

@ -1,7 +1,7 @@
{ pkgs, lib, osConfig, ... }: { pkgs, lib, osConfig, ... }:
{ {
config = lib.mkIf (builtins.elem "hyprland" osConfig.desktops) ( config = lib.mkIf (builtins.elem "hyprland" osConfig.desktop) (
let startup = pkgs.writeShellScript "startup.sh" '' let startup = pkgs.writeShellScript "startup.sh" ''
hyprctl setcursor Bibata-Original-Classic 24 hyprctl setcursor Bibata-Original-Classic 24
waybar & waybar &

69
common/users/cameron/home-manager/sway.nix
View File

@ -47,28 +47,6 @@
}; };
}; };
extraConfig = ''
for_window {
[shell="xwayland"] title_format "%title [XWayland]"
[shell="xwayland"] border normal 2
[window_role="pop-up"] floating enable
[window_role="bubble"] floating enable
[window_role="dialog"] floating enable
[window_type="dialog"] floating enable
[title="(?:Open|Save) (?:File|Folder|As)"] floating enable, resize set width 1030 height 710
[class="Minecraft.*"] floating enable
[con_mark="caffeine"] inhibit_idle title_format "%title [Caffeinated]"
}
bindgesture swipe:3:left workspace next
bindgesture swipe:3:right workspace prev
bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%- | sed -En 's/.*\(([0-9]+)%\).*/\1/p' > ${WOBSOCK}
bindsym --locked XF86MonBrightnessUp exec brightnessctl set 5%+ | sed -En 's/.*\(([0-9]+)%\).*/\1/p' > ${WOBSOCK}
bindsym --locked XF86AudioRaiseVolume exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ -l 1 && wpctl get-volume @DEFAULT_AUDIO_SINK@ | awk '{print substr($2, 3, length($2))}' > ${WOBSOCK}
bindsym --locked XF86AudioLowerVolume exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- -l 1 && wpctl get-volume @DEFAULT_AUDIO_SINK@ | awk '{print substr($2, 3, length($2))}' > ${WOBSOCK}
'';
keybindings = ( keybindings = (
let let
mod = config.wayland.windowManager.sway.config.modifier; mod = config.wayland.windowManager.sway.config.modifier;
@ -84,19 +62,44 @@
"${mod}+Shift+Escape" = "exec ${pkgs.swaylock}/bin/swaylock -f && sleep 2 && systemctl suspend"; "${mod}+Shift+Escape" = "exec ${pkgs.swaylock}/bin/swaylock -f && sleep 2 && systemctl suspend";
}); });
bars.swaybar = { bars = [
position = "top"; {
position = "top";
statusCommand = "${pkgs.i3status}/bin/i3status";
statusCommand = "${pkgs.i3status}/bin/i3status";
colors = {
statusline = "#ffffff"; colors = {
background = "#323232"; statusline = "#ffffff";
inactiveWorkspace = "#32323200 #32323200 #5c5c5c"; background = "#323232";
}; inactiveWorkspace = "#32323200 #32323200 #5c5c5c";
}; };
}
];
}; # config }; # config
extraConfig = ''
for_window {
[shell="xwayland"] title_format "%title [XWayland]"
[shell="xwayland"] border normal 2
[window_role="pop-up"] floating enable
[window_role="bubble"] floating enable
[window_role="dialog"] floating enable
[window_type="dialog"] floating enable
[title="(?:Open|Save) (?:File|Folder|As)"] floating enable, resize set width 1030 height 710
[class="Minecraft.*"] floating enable
[con_mark="caffeine"] inhibit_idle title_format "%title [Caffeinated]"
}
bindgesture swipe:3:left workspace next
bindgesture swipe:3:right workspace prev
bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%- | sed -En 's/.*\(([0-9]+)%\).*/\1/p' > ${WOBSOCK}
bindsym --locked XF86MonBrightnessUp exec brightnessctl set 5%+ | sed -En 's/.*\(([0-9]+)%\).*/\1/p' > ${WOBSOCK}
bindsym --locked XF86AudioRaiseVolume exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ -l 1 && wpctl get-volume @DEFAULT_AUDIO_SINK@ | awk '{print substr($2, 3, length($2))}' > ${WOBSOCK}
bindsym --locked XF86AudioLowerVolume exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- -l 1 && wpctl get-volume @DEFAULT_AUDIO_SINK@ | awk '{print substr($2, 3, length($2))}' > ${WOBSOCK}
'';
}; };
}); });
} }

5
hosts/nixos/home-manager/cameron.nix
View File

@ -1,6 +1,7 @@
{ lib, pkgs, osConfig, common_dir, ... }: { lib, pkgs, osConfig, ... }:
{ let common_dir = ../../../common;
in {
imports = [ imports = [
(common_dir + /users/cameron/home.nix) (common_dir + /users/cameron/home.nix)
]; ];