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, ... }:
{
config = lib.mkIf (builtins.elem "hyprland" osConfig.desktops) (
config = lib.mkIf (builtins.elem "hyprland" osConfig.desktop) (
let startup = pkgs.writeShellScript "startup.sh" ''
hyprctl setcursor Bibata-Original-Classic 24
waybar &

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

@ -47,6 +47,37 @@
};
};
keybindings = (
let
mod = config.wayland.windowManager.sway.config.modifier;
menu = config.wayland.windowManager.sway.config.menu;
in lib.mkOptionDefault {
"${mod}+c" = "mark --toggle caffeine";
"${mod}+Return" = "exec ${pkgs.kitty}/bin/kitty";
"${mod}+n" = "exec ${pkgs.firefox}/bin/firefox";
"${mod}+d" = "exec pkill wmenu || ${menu}";
"${mod}+Shift+q" = "kill";
"${mod}+Shift+e" = "exec ${./sway-scripts/logout.sh}";
"${mod}+Escape" = "exec ${pkgs.swaylock}/bin/swaylock -f";
"${mod}+Shift+Escape" = "exec ${pkgs.swaylock}/bin/swaylock -f && sleep 2 && systemctl suspend";
});
bars = [
{
position = "top";
statusCommand = "${pkgs.i3status}/bin/i3status";
colors = {
statusline = "#ffffff";
background = "#323232";
inactiveWorkspace = "#32323200 #32323200 #5c5c5c";
};
}
];
}; # config
extraConfig = ''
for_window {
[shell="xwayland"] title_format "%title [XWayland]"
@ -69,34 +100,6 @@
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 = (
let
mod = config.wayland.windowManager.sway.config.modifier;
menu = config.wayland.windowManager.sway.config.menu;
in lib.mkOptionDefault {
"${mod}+c" = "mark --toggle caffeine";
"${mod}+Return" = "exec ${pkgs.kitty}/bin/kitty";
"${mod}+n" = "exec ${pkgs.firefox}/bin/firefox";
"${mod}+d" = "exec pkill wmenu || ${menu}";
"${mod}+Shift+q" = "kill";
"${mod}+Shift+e" = "exec ${./sway-scripts/logout.sh}";
"${mod}+Escape" = "exec ${pkgs.swaylock}/bin/swaylock -f";
"${mod}+Shift+Escape" = "exec ${pkgs.swaylock}/bin/swaylock -f && sleep 2 && systemctl suspend";
});
bars.swaybar = {
position = "top";
statusCommand = "${pkgs.i3status}/bin/i3status";
colors = {
statusline = "#ffffff";
background = "#323232";
inactiveWorkspace = "#32323200 #32323200 #5c5c5c";
};
};
}; # config
};
});
}

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 = [
(common_dir + /users/cameron/home.nix)
];