diff --git a/profiles/work/configuration.nix b/profiles/work/configuration.nix index cf3e98f..561aa66 100644 --- a/profiles/work/configuration.nix +++ b/profiles/work/configuration.nix @@ -76,7 +76,7 @@ users.users.${userSettings.username} = { isNormalUser = true; description = userSettings.name; - extraGroups = [ "networkmanager" "wheel" ]; + extraGroups = [ "networkmanager" "wheel" "input" "dialout" ]; packages = []; uid = 1000; }; diff --git a/profiles/work/home.nix b/profiles/work/home.nix index 682701b..2dd19bd 100644 --- a/profiles/work/home.nix +++ b/profiles/work/home.nix @@ -56,6 +56,7 @@ openvpn protonmail-bridge texliveSmall + numbat wine bottles diff --git a/user/shell/cli-collection.nix b/user/shell/cli-collection.nix index aa5ae53..ce93f72 100644 --- a/user/shell/cli-collection.nix +++ b/user/shell/cli-collection.nix @@ -20,9 +20,10 @@ pandoc hwinfo pciutils + numbat (pkgs.callPackage ../pkgs/smartcalc.nix { }) - (pkgs.writeShellScriptBin "sc" ''smartcalc'') - (pkgs.callPackage ../pkgs/pokemon-colorscripts.nix { }) + #(pkgs.writeShellScriptBin "sc" ''smartcalc'') + #(pkgs.callPackage ../pkgs/pokemon-colorscripts.nix { }) #(pkgs.python3Packages.callPackage ../pkgs/impressive.nix { }) (pkgs.writeShellScriptBin "airplane-mode" '' #!/bin/sh diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index 1d2ca92..36a4ad3 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -110,6 +110,7 @@ bindm=SUPER,mouse:273,resizewindow bind=SUPER,T,togglefloating bind=SUPER,G,exec,hyprworkspace 9; pegasus-fe; + bind=,code:148,exec,''+ userSettings.term + " "+''-e numbat bind=,code:107,exec,grim -g "$(slurp)" bind=SHIFT,code:107,exec,grim -g "$(slurp -o)" @@ -432,7 +433,7 @@ margin = "7 7 3 7"; spacing = 2; - modules-left = [ "custom/os" "custom/hyprprofile" "battery" "backlight" "pulseaudio" "cpu" "memory" ]; + modules-left = [ "custom/os" "custom/hyprprofile" "battery" "backlight" "keyboard-state" "pulseaudio" "cpu" "memory" ]; modules-center = [ "hyprland/workspaces" ]; modules-right = [ "idle_inhibitor" "tray" "clock" ]; @@ -447,6 +448,14 @@ "interval" = 3; "on-click" = "hyprprofile-dmenu"; }; + "keyboard-state" = { + "numlock" = true; + "format" = " {icon} "; + "format-icons" = { + "locked" = "󰎠"; + "unlocked" = "󱧓"; + }; + }; "hyprland/workspaces" = { "format" = "{icon}"; "format-icons" = { @@ -702,6 +711,14 @@ color: #'' + config.lib.stylix.colors.base0A + ''; } + label.numlock { + color: #'' + config.lib.stylix.colors.base04 + ''; + } + + label.numlock.locked { + color: #'' + config.lib.stylix.colors.base0F + ''; + } + #pulseaudio { color: #'' + config.lib.stylix.colors.base0C + ''; }