diff --git a/assets/dotfiles/niri.kdl b/assets/dotfiles/niri.kdl index f5a22f5..730dbe2 100644 --- a/assets/dotfiles/niri.kdl +++ b/assets/dotfiles/niri.kdl @@ -86,13 +86,13 @@ binds { Mod+Period { spawn "noctalia" "msg" "panel-toggle" "control-center"; } Mod+Shift+P { spawn "noctalia" "msg" "panel-toggle" "session"; } Mod+V { spawn "noctalia" "msg" "panel-toggle" "clipboard"; } - Mod+N { spawn "noctalia" "msg" "panel-toggle" "control-center" "notifications"; } Mod+P { spawn "noctalia" "msg" "panel-toggle" "control-center" "power"; } + Ctrl+Shift+Escape { spawn "noctalia" "msg" "panel-toggle" "control-center" "system"; } - Mod+TouchpadScrollUp { focus-workspace-up; } - Mod+TouchpadScrollDown { focus-workspace-down; } - Mod+TouchpadScrollLeft { focus-column-left; } - Mod+TouchpadScrollRight { focus-column-right; } + Mod+TouchpadScrollUp cooldown-ms=250 { focus-workspace-up; } + Mod+TouchpadScrollDown cooldown-ms=250 { focus-workspace-down; } + Mod+TouchpadScrollLeft cooldown-ms=150 { focus-column-left; } + Mod+TouchpadScrollRight cooldown-ms=150 { focus-column-right; } Mod+Up { focus-workspace-up; } Mod+Down { focus-workspace-down; } @@ -107,8 +107,12 @@ binds { XF86AudioLowerVolume { spawn "noctalia" "msg" "volume-down" "5"; } XF86AudioRaiseVolume { spawn "noctalia" "msg" "volume-up" "5"; } XF86AudioMute { spawn "noctalia" "msg" "volume-mute"; } + XF86AudioMicMute { spawn "noctalia" "msg" "mic-mute"; } XF86MonBrightnessDown { spawn "noctalia" "msg" "brightness-down" "5"; } XF86MonBrightnessUp { spawn "noctalia" "msg" "brightness-up" "5"; } + XF86WLAN { spawn-sh "rfkill toggle 0 || rfkill toggle 1"; } + XF86NotificationCenter { spawn "noctalia" "msg" "panel-toggle" "control-center" "notifications"; } + XF86Display { toggle-overview; } } spawn-at-startup "noctalia" window-rule { diff --git a/assets/dotfiles/noctalia-state/settings.toml b/assets/dotfiles/noctalia-state/settings.toml index e2a938a..de447ed 100644 --- a/assets/dotfiles/noctalia-state/settings.toml +++ b/assets/dotfiles/noctalia-state/settings.toml @@ -5,7 +5,7 @@ tint_intensity = 0.14999999664723873 [bar.default] background_opacity = 0.74999998323619366 center = [ "workspaces" ] -end = [ "tray", "notifications", "network", "volume", "battery", "control-center" ] +end = [ "tray", "notifications", "bluetooth", "network", "volume", "battery", "control-center" ] margin_edge = 8 margin_ends = 80 margin_opposite_edge = 8 @@ -13,6 +13,9 @@ start = [ "clock", "media" ] thickness = 32 widget_spacing = 16 +[battery] +warning_threshold = 20 + [control_center] sidebar_section = "none" width = 750 @@ -43,12 +46,18 @@ widget_order = [ type = "clock" [desktop_widgets.widget.desktop-widget-0000000000000001.settings] + background = true + background_color = "surface" background_opacity = 0.75 - center_text = true + background_padding = 10 + background_radius = 12 + center_text = false + circle = true clock_style = "analog" - color = "primary" - format = "{:%H:%M\\n%a %d %B}" - shadow = false + color = "on_surface" + font_family = "" + format = "{:%H:%M}" + shadow = true [desktop_widgets.widget.desktop-widget-0000000000000002] box_height = 176.0 @@ -276,6 +285,9 @@ directory = "/home/grey/nixos/assets/wallpapers" [widget.battery] enabled = true +[widget.bluetooth] +enabled = true + [widget.brightness] enabled = true diff --git a/flake.lock b/flake.lock index a5699c5..bde57f4 100644 --- a/flake.lock +++ b/flake.lock @@ -76,11 +76,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1783224161, - "narHash": "sha256-SaSOAG03FE9FC0GV7uPPeyb7CHS59Yw9n0Go1gioidc=", + "lastModified": 1783569760, + "narHash": "sha256-debpliOeMVTrO3IpmFmqfSO/mgYVYxhPmxGwDrBpknU=", "owner": "rycee", "repo": "nur-expressions", - "rev": "3a074d910fc151b9fcfb67dff99b844d6ee530dd", + "rev": "32cdec83ac1c9d5219dbb2278b9d4e3f2f6b5dc3", "type": "gitlab" }, "original": { @@ -188,11 +188,11 @@ ] }, "locked": { - "lastModified": 1783155779, - "narHash": "sha256-QLg5u5W23sa31dFAlO95RHWbVFkwExsmpQ29NquLE0s=", + "lastModified": 1783516471, + "narHash": "sha256-pG1VyDQiVuhi/Jm/MqkGDs27hZAeuGpI/HnN7h7GdRc=", "owner": "nix-community", "repo": "nh", - "rev": "ab81553b6932fcc076cf4fb993a5daf47ab9ef0d", + "rev": "181b151744faed80ef66d3e86ebe023ba703bc23", "type": "github" }, "original": { @@ -203,11 +203,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1783148766, - "narHash": "sha256-uslt2pqShTIXDdAHRHv2QkYLsVdY8Oqwz0EA48/RSM8=", + "lastModified": 1783389287, + "narHash": "sha256-0xIy4dVLqq47rA+mRy0hXDfjhQd4E5PoIns/RmB7nR4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a50de1b7d8a586adc18d2395c19de7d6058e6030", + "rev": "0ad6f47ea4fe188f4bc8f0380f93ae8523337c6c", "type": "github" }, "original": { @@ -224,11 +224,11 @@ ] }, "locked": { - "lastModified": 1783535738, - "narHash": "sha256-jVLb5HXJ4hcNp5BKpiPpXdyCzEYZVKMhk8UpcbPLVzg=", + "lastModified": 1783614904, + "narHash": "sha256-ynxhCPezAjf6s2rGtTtE/3pSvWhs25CGjEbIdwumR3s=", "owner": "noctalia-dev", "repo": "noctalia", - "rev": "c0e0afc24db7ff7feb450fc5f5f316fdd1a273c6", + "rev": "bec3a3ad398e445b117c747a1242ff10664293b3", "type": "github" }, "original": { @@ -272,11 +272,11 @@ ] }, "locked": { - "lastModified": 1775856943, - "narHash": "sha256-b7Mp7P+q2Md5AGt4rjHfMcBykzMumFTen10ST++AuTU=", + "lastModified": 1783574839, + "narHash": "sha256-ICof1tV4/9XheBLBGf7dhMhfMq4dOs1zwTHrr7zGFlA=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "a524a6160e6df89f7673ba293cf7d78b559eb1a5", + "rev": "c551f0687658e4bb699cfff6015436ad7ee57a0d", "type": "github" }, "original": { @@ -457,11 +457,11 @@ ] }, "locked": { - "lastModified": 1783190846, - "narHash": "sha256-UcdKHKcDxLxBon0HsOjDRRA7l1vVT28R83LkCIAlYYc=", + "lastModified": 1783598313, + "narHash": "sha256-LAz4EAdT56VSCSF0oFJNjpIYFVmWW81nM5+3Ieocx5I=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "0758bc86f7a55bbe002f0cede9e1a49e5a6e34d9", + "rev": "175926c1007114b9d0f8465f23a7d7ce9b26fe33", "type": "github" }, "original": { diff --git a/global-configs/fastfetch.nix b/global-configs/fastfetch.nix index 2f1f698..e50b479 100644 --- a/global-configs/fastfetch.nix +++ b/global-configs/fastfetch.nix @@ -38,13 +38,15 @@ } { type = "os"; + format = "{pretty-name}"; + } + { + type = "host"; + format = "{version}"; } { type = "kernel"; } - { - type = "uptime"; - } { type = "shell"; } @@ -58,6 +60,7 @@ type = "cpu"; temp = false; showPeCoreCount = false; + format = "{name}"; } { type = "gpu"; @@ -119,6 +122,9 @@ showAllIps = false; namePrefix = ""; } + { + type = "uptime"; + } ]; }; }; diff --git a/global-default.nix b/global-default.nix index ccb0bc0..83d9caa 100644 --- a/global-default.nix +++ b/global-default.nix @@ -65,6 +65,11 @@ ''; }; + hardware.bluetooth = { + enable = true; + powerOnBoot = false; + }; + # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave diff --git a/hosts/kitagawa/default.nix b/hosts/kitagawa/default.nix index 842558b..479954d 100644 --- a/hosts/kitagawa/default.nix +++ b/hosts/kitagawa/default.nix @@ -38,8 +38,6 @@ in { }; services.fprintd.enable = true; - services.fprintd.tod.enable = true; - services.fprintd.tod.driver = pkgs.libfprint-2-tod1-goodix-550a; security.pam.services.grey.fprintAuth = true; programs.nautilus-open-any-terminal = { diff --git a/modules/window-managers/niri.nix b/modules/window-managers/niri.nix index c5a476c..96ae731 100644 --- a/modules/window-managers/niri.nix +++ b/modules/window-managers/niri.nix @@ -11,6 +11,7 @@ wayland-utils libsecret cage + wev ]; services.upower.enable = true;