diff --git a/README.md b/README.md index e51ac9a..c6fb8d5 100755 --- a/README.md +++ b/README.md @@ -22,5 +22,5 @@ each host should have these files: - divide steam and gamemode? - laptop specific configuration (power profiles daemon, battery, etc) - sddm cursors no work :( - - sddm x11 support, too. or maybe just remove x11 + - try out the [new sddm options](https://search.nixos.org/options?channel=unstable&from=0&size=50&sort=relevance&type=packages&query=sddm) - gnome keyring / gcr for saving passwords \ No newline at end of file diff --git a/config/dunst.conf b/config/dunst.conf index da4bc4e..12d9efc 100644 --- a/config/dunst.conf +++ b/config/dunst.conf @@ -1,54 +1,53 @@ # https://github.com/catppuccin/dunst/blob/main/src/mocha.conf [global] -frame_color = "#89B4FA" -separator_color= frame + frame_color = "#89B4FA" + separator_color= frame -follow = "mouse" -width = 300 -height = 145 -origin = top-right -alignment = "left" -vertical_alignment = "center" -ellipsize = "middle" -offset = "15x15" -padding = 15 -horizontal_padding = 15 -text_icon_padding = 15 -icon_position = "left" -min_icon_size = 48 -max_icon_size = 64 -progress_bar = true -progress_bar_height = 8 -progress_bar_frame_width = 1 -progress_bar_min_width = 150 -progress_bar_max_width = 300 -separator_height = 2 -frame_width = 2 -corner_radius = 8 -transparency = 0 -gap_size = 8 -line_height = 0 -notification_limit = 0 -idle_threshold = 120 -history_length = 20 -show_age_threshold = 60 -markup = "full" -format = "%a\n%s\n%b" -font = "Atkinson Hyperlegible Pro 11" -word_wrap = "yes" -sort = "yes" -shrink = "no" -indicate_hidden = "yes" -sticky_history = "yes" -ignore_newline = "no" -show_indicators = "no" -stack_duplicates = true -always_run_script = true -hide_duplicate_count = false -ignore_dbusclose = false -mouse_left_click = "do_action" -mouse_middle_click = "close_all" -mouse_right_click = "close_current" + follow = "mouse" + width = 300 + height = 145 + origin = top-right + alignment = "left" + vertical_alignment = "center" + ellipsize = "middle" + offset = "15x15" + padding = 15 + horizontal_padding = 15 + text_icon_padding = 15 + icon_position = "left" + min_icon_size = 48 + max_icon_size = 64 + progress_bar = true + progress_bar_height = 8 + progress_bar_frame_width = 1 + progress_bar_min_width = 150 + progress_bar_max_width = 300 + separator_height = 2 + frame_width = 2 + corner_radius = 8 + transparency = 0 + gap_size = 8 + line_height = 0 + notification_limit = 0 + idle_threshold = 120 + history_length = 20 + show_age_threshold = 60 + markup = "full" + font = "Atkinson Hyperlegible Pro 10" + word_wrap = "yes" + sort = "yes" + shrink = "no" + indicate_hidden = "yes" + sticky_history = "yes" + ignore_newline = "no" + show_indicators = "no" + stack_duplicates = true + always_run_script = true + hide_duplicate_count = false + ignore_dbusclose = false + mouse_left_click = "do_action" + mouse_middle_click = "close_all" + mouse_right_click = "close_current" [urgency_low] background = "#1E1E2E" diff --git a/config/waybar.css b/config/waybar.css index 0dd5959..305d5a1 100644 --- a/config/waybar.css +++ b/config/waybar.css @@ -79,30 +79,6 @@ window#waybar.floating #window { color: @lavender; } -#power-profiles-daemon { - color: @teal; -} - -#battery { - color: @green; -} - -#battery.charging { - color: @green; -} - -#battery.warning:not(.charging) { - color: @peach; -} - -#battery.critical:not(.charging) { - color: @maroon; -} - -#network { - color: @sapphire; -} - #pulseaudio { color: @pink; } diff --git a/default.nix b/default.nix index d00411f..b8e7203 100755 --- a/default.nix +++ b/default.nix @@ -85,4 +85,5 @@ in { xdg-utils git ]; + } diff --git a/flake.lock b/flake.lock index 8adaae6..d538ec3 100644 --- a/flake.lock +++ b/flake.lock @@ -487,11 +487,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "lastModified": 1711523803, + "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", "type": "github" }, "original": { diff --git a/hosts/goopnet-interface/default.nix b/hosts/goopnet-interface/default.nix index 381c89b..52ed123 100755 --- a/hosts/goopnet-interface/default.nix +++ b/hosts/goopnet-interface/default.nix @@ -40,7 +40,6 @@ enable = true; }; desktop = { - # sets magical variables; use `x11` or `wayland` envProto = "wayland"; hyprland.enable = true; @@ -49,16 +48,13 @@ hyprpaper.enable = true; polkit-gnome.enable = true; - gnome-keyring.enable = true; dunst.enable = true; rofi.enable = true; nwg-drawer.enable = true; waybar.enable = true; - # login manager sddm.enable = true; - # set active theme, see `modules/desktop/themes` themes.active = "catppuccin"; }; software = { diff --git a/hosts/goopnet-interface/hardware.nix b/hosts/goopnet-interface/hardware.nix index 7e06b8d..ecca96a 100755 --- a/hosts/goopnet-interface/hardware.nix +++ b/hosts/goopnet-interface/hardware.nix @@ -21,15 +21,8 @@ efi.canTouchEfiVariables = true; }; - # support power features such as suspend to ram - powerManagement.enable = true; - # tune power saving options on boot - # todo: fix usb mice and keyboards from suspending - #powerManagement.powertop.enable = true; # thermald proactively prevents overheating on intel CPUs and works well with other tools services.thermald.enable = true; - # power-profile-daemon for power management - services.power-profiles-daemon.enable = true; # nvidia driver services.xserver.videoDrivers = [ "nvidia" ]; diff --git a/modules/desktop/gnome-keyring.nix b/modules/desktop/gnome-keyring.nix deleted file mode 100644 index 14b3ebc..0000000 --- a/modules/desktop/gnome-keyring.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ lib, config, pkgs, ... }: - -with lib; -let - cfg = config.modules.desktop.gnome-keyring; -in { - options.modules.desktop.gnome-keyring = { - enable = mkEnableOption "Enable gnome-keyring, a lightweight keyring with git, gpg, and ssh integration"; - }; - - config = mkIf cfg.enable { - services.gnome.gnome-keyring.enable = true; - }; -} diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index 948d6ab..b0ceb0a 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -20,7 +20,7 @@ in { }; config = mkIf cfg.enable { - services.displayManager.sessionPackages = [ cfg.package ]; + services.xserver.displayManager.sessionPackages = [ cfg.package ]; xdg.portal = { enable = true; extraPortals = [ pkgs.xdg-desktop-portal-gtk cfg.portalPackage ]; @@ -53,11 +53,6 @@ in { bindl = [ # "bind locked" ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" ", XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle" - - ", XF86AudioPlay, exec, ${lib.getExe pkgs.playerctl} play-pause" - ", XF86AudioStop, exec, ${lib.getExe pkgs.playerctl} stop" - ", XF86AudioPrev, exec, ${lib.getExe pkgs.playerctl} previous" - ", XF86AudioNext, exec, ${lib.getExe pkgs.playerctl} next" ]; bindr = [ # "bind released" "SUPER, Super_L, exec, ${lib.getExe pkgs.nwg-drawer}" @@ -131,23 +126,17 @@ in { windowrulev2 = [ # common popups - "float, class:org.gnome.FileRoller" - "center, class:org.gnome.FileRoller" - "size 1100 730, class:org.gnome.FileRoller" + "float, class:file-roller" + "size 1100 730, class:file-roller" "float, class:org.gnome.Loupe" - "center, class:org.gnome.Loupe" "size 1100 730, class:org.gnome.Loupe" "float, initialTitle:^Open Folder$" - "center, initialTitle:^Open Folder$" "size 1100 730, initialTitle:^Open Folder$" "float, initialTitle:^Open File$" - "center, initialTitle:^Open File$" "size 1100 730, initialTitle:^Open File$" "float, initialTitle:^Open Files$" - "center, initialTitle:^Open Files$" "size 1100 730, initialTitle:^Open Files$" "float, initialTitle:^Save As$" - "center, initialTitle:^Save As%" "size 1100 730, initialTitle:^Save As$" "float, class:\.exe$" @@ -184,7 +173,7 @@ in { }; drop_shadow = false; - #shadow_range = 4; + #shadow_range = 30; #shadow_render_power = 3; }; diff --git a/modules/desktop/sddm.nix b/modules/desktop/sddm.nix index 69efeea..1ab2038 100644 --- a/modules/desktop/sddm.nix +++ b/modules/desktop/sddm.nix @@ -9,13 +9,15 @@ in { }; config = mkIf cfg.enable { + services.xserver.enable = true; # this is needed, unfortunately! + services.xserver.excludePackages = [ pkgs.xterm ]; # prevents xterm on wayland and x environment.systemPackages = with pkgs; [ config.modules.desktop.themes.sddmTheme.package libsForQt5.qt5.qtsvg libsForQt5.qt5.qtgraphicaleffects libsForQt5.qt5.qtquickcontrols2 ]; - services.displayManager.sddm = { + services.xserver.displayManager.sddm = { enable = true; wayland.enable = true; theme = config.modules.desktop.themes.sddmTheme.name; diff --git a/modules/desktop/waybar.nix b/modules/desktop/waybar.nix index 9c4e939..0e4df6d 100644 --- a/modules/desktop/waybar.nix +++ b/modules/desktop/waybar.nix @@ -49,11 +49,9 @@ in { orientation = "inherit"; modules = [ "pulseaudio" - #"network" "cpu" "memory" - "power-profiles-daemon" - "battery" + #"network" ]; }; "group/power" = { @@ -141,17 +139,6 @@ in { }; separate-outputs = true; }; - #network = { - # format = ""; - # format-ethernet = ""; - # format-wifi = " {signalStrength}%"; - # format-disconnected = ""; - # tooltip-format = "{ifname} via {gwaddr}"; - # tooltip-format-wifi = "connected to {essid}"; - # tooltip-format-ethernet = "{ifname}"; - # tooltip-format-disconnected = "Disconnected"; - # on-click = "${pkgs.networkmanagerapplet}/bin/nm-connection-editor"; - #}; pulseaudio = { format = "{icon} {volume}%"; format-bluetooth = "{icon} {volume}%"; @@ -178,31 +165,17 @@ in { format = " {percentage}%"; tooltip-format = "{used:0.1f}GiB/{avail:0.1f}GiB used\n{swapUsed:0.1f}GiB/{swapAvail:0.1f}GiB swap"; }; - power-profiles-daemon = { - format = "{icon}"; - tooltip-format = "Power profile: {profile}\nDriver: {driver}"; - tooltip = true; - format-icons = { - default = ""; - performance = " perf"; - balanced = " balance"; - power-saver = " save"; - }; + "network" = { + format = ""; + format-ethernet = ""; + format-wifi = " {signalStrength}%"; + format-disconnected = ""; + tooltip-format = "{ifname} via {gwaddr}"; + tooltip-format-wifi = "connected to {essid}"; + tooltip-format-ethernet = "{ifname}"; + tooltip-format-disconnected = "Disconnected"; }; - battery = { - interval = 30; - states = { - warning = 20; - critical = 10; - }; - full-at = 98; - format = "{icon} {capacity}%"; - format-icons = ["" "" "" "" ""]; - format-critical = " {capacity}%"; - tooltip-format = "{timeTo} ({power}W)"; - format-charging = " {capacity}%"; - }; - clock = { + "clock" = { format = "{:%H:%M}"; format-alt = "{:%a %b %d %R}"; tooltip-format = "{calendar}"; diff --git a/modules/hardware/bluetooth.nix b/modules/hardware/bluetooth.nix index b306481..e121d64 100644 --- a/modules/hardware/bluetooth.nix +++ b/modules/hardware/bluetooth.nix @@ -14,5 +14,6 @@ in { # frontend services.blueman.enable = true; + hm.services.blueman-applet.enable = true; }; } diff --git a/modules/software/editors/vscode.nix b/modules/software/editors/vscode.nix index 60e0785..f2ade51 100644 --- a/modules/software/editors/vscode.nix +++ b/modules/software/editors/vscode.nix @@ -34,7 +34,6 @@ in { "terminal.integrated.fontFamily" = "\"${monospace.family}\""; "terminal.integrated.fontSize" = monospace.size; - "terminal.integrated.smoothScrolling" = true; "telemetry.telemetryLevel" = "off"; @@ -45,7 +44,6 @@ in { "window.titleBarStyle" = "custom"; "workbench.tips.enabled" = false; - "workbench.list.smoothScrolling" = true; "nix.enableLanguageServer" = true; "nix.serverPath" = "${lib.getExe pkgs.nil}"; diff --git a/modules/software/system/fish.nix b/modules/software/system/fish.nix index d514dcf..6f816de 100644 --- a/modules/software/system/fish.nix +++ b/modules/software/system/fish.nix @@ -24,9 +24,7 @@ in { interactiveShellInit = '' sh ${colorScript} ''; - functions.fish_greeting = '' - ${lib.getExe pkgs.pfetch} - ''; + # TODO: add fish greeting? }; }; }