From 3c86475c020fc6492f8da42a70ab7c89789e01e7 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 24 Jan 2025 22:56:53 -0600 Subject: [PATCH] feat: tidying up some stuff --- home/default.nix | 7 +++++ .../cli/development/langauges/default.nix | 0 home/modules/cli/files/fileRoller/default.nix | 11 ++++++++ home/modules/cli/files/unzip/default.nix | 11 ++++++++ .../code/zed/config/userSettings/default.nix | 7 ++++- .../gui/desktop/hypridle/config/settings.nix | 26 +++++++++---------- .../gui/desktop/hyprland/config/exec-once.nix | 4 ++- .../gui/desktop/swaylock/config/settings.nix | 1 + .../gui/desktop/waybar/config/settings.nix | 20 +++++++------- nixos/default.nix | 2 +- nixos/modules/hyprland/default.nix | 1 - nixos/modules/hyprland/hyprlock.nix | 10 ------- systems/desktop/config/boot.nix | 3 ++- 13 files changed, 65 insertions(+), 38 deletions(-) mode change 100644 => 100755 home/modules/cli/development/langauges/default.nix create mode 100755 home/modules/cli/files/fileRoller/default.nix create mode 100755 home/modules/cli/files/unzip/default.nix delete mode 100755 nixos/modules/hyprland/hyprlock.nix diff --git a/home/default.nix b/home/default.nix index e3a5d69..22f6f18 100755 --- a/home/default.nix +++ b/home/default.nix @@ -37,6 +37,13 @@ in ; }; }; + laptop = { + imports = builtins.attrValues { + inherit (modules) + apps + ; + }; + }; server = { imports = builtins.attrValues { inherit (modules) diff --git a/home/modules/cli/development/langauges/default.nix b/home/modules/cli/development/langauges/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/files/fileRoller/default.nix b/home/modules/cli/files/fileRoller/default.nix new file mode 100755 index 0000000..3e8046c --- /dev/null +++ b/home/modules/cli/files/fileRoller/default.nix @@ -0,0 +1,11 @@ +{ + pkgs, + ... +}: +{ + home.packages = builtins.attrValues { + inherit (pkgs) + file-roller + ; + }; +} diff --git a/home/modules/cli/files/unzip/default.nix b/home/modules/cli/files/unzip/default.nix new file mode 100755 index 0000000..1fad41f --- /dev/null +++ b/home/modules/cli/files/unzip/default.nix @@ -0,0 +1,11 @@ +{ + pkgs, + ... +}: +{ + home.packages = builtins.attrValues { + inherit (pkgs) + unzip + ; + }; +} diff --git a/home/modules/gui/apps/code/zed/config/userSettings/default.nix b/home/modules/gui/apps/code/zed/config/userSettings/default.nix index 49b8ae5..2c37cb9 100755 --- a/home/modules/gui/apps/code/zed/config/userSettings/default.nix +++ b/home/modules/gui/apps/code/zed/config/userSettings/default.nix @@ -31,7 +31,12 @@ let ; }; gitPath = import (configPath + /git); - miscPath = import (configPath + /misc) { inherit lib pkgs; }; + miscPath = import (configPath + /misc) { + inherit + lib + pkgs + ; + }; in { git = gitPath; diff --git a/home/modules/gui/desktop/hypridle/config/settings.nix b/home/modules/gui/desktop/hypridle/config/settings.nix index 3fac7d5..f7236b5 100755 --- a/home/modules/gui/desktop/hypridle/config/settings.nix +++ b/home/modules/gui/desktop/hypridle/config/settings.nix @@ -1,23 +1,23 @@ -{ pkgs, ... }: +{ + pkgs, + ... +}: { general = { - lock_cmd = "pidof swaylock || swaylock"; - before_sleep_cmd = "loginctl lock-session"; + after_sleep_cmd = "hyprctl dispatch dpms on"; + ignore_dbus_inhibit = false; + lock_cmd = "swaylock"; }; + listener = [ { - timeout = 150; - on-timeout = "${pkgs.brightnessctl}/bin/brightnessctl -s set 0"; - on-resume = "${pkgs.brightnessctl}/bin/brightnessctl -r"; + timeout = 900; + on-timeout = "swaylock"; } { - timeout = 150; - on-timeout = "${pkgs.brightnessctl}/bin/brightnessctl -sd rgb:kbd_backlight set 0"; - on-resume = "${pkgs.brightnessctl}/bin/brightnessctl -rd rgb:kbd_backlight"; - } - { - timeout = 300; - on-timeout = "systemctl suspend"; + timeout = 1800; + on-timeout = "hyprctl dispatch dpms off"; + on-resume = "hyprctl dispatch dpms on"; } ]; } diff --git a/home/modules/gui/desktop/hyprland/config/exec-once.nix b/home/modules/gui/desktop/hyprland/config/exec-once.nix index 98ebbcd..66c742b 100755 --- a/home/modules/gui/desktop/hyprland/config/exec-once.nix +++ b/home/modules/gui/desktop/hyprland/config/exec-once.nix @@ -6,6 +6,7 @@ let in [ "swaylock" + "hypridle" "wl-clipboard" "wpaperd" "gammastep" @@ -14,10 +15,11 @@ in "waybar" "nm-applet" "blueman-applet" + "blueman-manager" "easyeffects -r" "emote" "flameshot" - "pactl set-default-sink alsa_output.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Line1__sink" + "pactl set-default-sink bluez_output.00_16_94_35_0D_5F.1" "pactl set-default-source alsa_input.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Mic1__source" "gsettings set org.gnome.desktop.interface cursor-theme 'catppuccin-mocha-dark-cursors'" "gsettings set org.gnome.desktop.interface cursor-size ${builtins.toString cursor.size}" diff --git a/home/modules/gui/desktop/swaylock/config/settings.nix b/home/modules/gui/desktop/swaylock/config/settings.nix index 60ddcc1..9b7be55 100755 --- a/home/modules/gui/desktop/swaylock/config/settings.nix +++ b/home/modules/gui/desktop/swaylock/config/settings.nix @@ -10,6 +10,7 @@ let in { font = font.name; + font-size = font.size.desktop; indicator-idle-visible = true; indicator-radius = 100; indicator-thickness = 20; diff --git a/home/modules/gui/desktop/waybar/config/settings.nix b/home/modules/gui/desktop/waybar/config/settings.nix index 9a6b4c3..e43c4ae 100755 --- a/home/modules/gui/desktop/waybar/config/settings.nix +++ b/home/modules/gui/desktop/waybar/config/settings.nix @@ -29,7 +29,7 @@ in "memory" "disk" "pulseaudio" - # "network" + "network" "clock" ]; @@ -56,7 +56,7 @@ in "3" = "◉"; "4" = "◉"; urgent = ""; - default = ""; + default = "◉"; sort-by-number = true; }; persistent-workspaces = { @@ -85,13 +85,13 @@ in interval = 60; }; - # network = { - # format-wifi = " {signalStrength}%"; - # format-ethernet = "󰀂 "; - # tooltip-format = "Connected to {essid} {ifname} via {gwaddr}"; - # format-linked = "{ifname} (No IP)"; - # format-disconnected = "󰖪 "; - # }; + network = { + format-wifi = " {signalStrength}%"; + format-ethernet = "󰀂 "; + tooltip-format = "Connected to {essid} {ifname} via {gwaddr}"; + format-linked = "{ifname} (No IP)"; + format-disconnected = "󰖪 "; + }; tray = { icon-size = 12; @@ -151,7 +151,7 @@ in }; "custom/weather" = { - exec = "/home/${user0}/Files/Projects/dotfiles/home/modules/waybar/config/scripts/get_weather.sh Winnipeg"; + exec = "/home/${user0}/Files/Projects/dotfiles/home/modules/gui/desktop/waybar/config/scripts/get_weather.sh Winnipeg"; return-type = "json"; format = "{}"; tooltip = true; diff --git a/nixos/default.nix b/nixos/default.nix index ae32b8f..7a04a50 100755 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -60,7 +60,7 @@ in inherit (modules) syncthing ollama - hledger + # hledger # plasma # sddm ; diff --git a/nixos/modules/hyprland/default.nix b/nixos/modules/hyprland/default.nix index e294e97..7389e7b 100755 --- a/nixos/modules/hyprland/default.nix +++ b/nixos/modules/hyprland/default.nix @@ -5,7 +5,6 @@ "network" "hypridle" "hyprland" - "hyprlock" "regreet" "swaylock" "thunar" diff --git a/nixos/modules/hyprland/hyprlock.nix b/nixos/modules/hyprland/hyprlock.nix deleted file mode 100755 index dd7fdd6..0000000 --- a/nixos/modules/hyprland/hyprlock.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - flake, - pkgs, - ... -}: { - programs.hyprlock = { - enable = true; - package = flake.inputs.hyprlock.packages.${pkgs.system}.hyprlock; - }; -} diff --git a/systems/desktop/config/boot.nix b/systems/desktop/config/boot.nix index 9cfcc97..cc3f996 100755 --- a/systems/desktop/config/boot.nix +++ b/systems/desktop/config/boot.nix @@ -2,7 +2,8 @@ pkgs, config, ... -}: { +}: +{ boot = { extraModulePackages = [ config.boot.kernelPackages.v4l2loopback.out