diff --git a/assets/dotfiles/niri.kdl b/assets/dotfiles/niri.kdl index 86e6d89..9b8c758 100644 --- a/assets/dotfiles/niri.kdl +++ b/assets/dotfiles/niri.kdl @@ -21,7 +21,7 @@ input { click-method "clickfinger" } mouse { - accel-speed 0.050000 + accel-speed -1 accel-profile "flat" } } @@ -116,6 +116,7 @@ binds { XF86WLAN { spawn-sh "rfkill toggle 0 || rfkill toggle 1"; } XF86NotificationCenter { spawn "noctalia" "msg" "panel-toggle" "control-center" "notifications"; } XF86Display { toggle-overview; } + XF86Favorites { spawn-sh "niri msg action toggle-dwt && noctalia msg notification-show \"Touchpad DWT toggled\""; } Print { screenshot; } } spawn-at-startup "noctalia" diff --git a/assets/dotfiles/noctalia-state/settings.toml b/assets/dotfiles/noctalia-state/settings.toml index b6e303c..94adb8a 100644 --- a/assets/dotfiles/noctalia-state/settings.toml +++ b/assets/dotfiles/noctalia-state/settings.toml @@ -23,10 +23,19 @@ widget_spacing = 16 [battery] warning_threshold = 20 +[calendar] +enabled = true + + [calendar.account.personal_google] + type = "google" + [control_center] sidebar_section = "none" width = 750 + [control_center.calendar] + show_events_card = true + [desktop_widgets] schema_version = 2 widget_order = [ @@ -38,7 +47,6 @@ widget_order = [ "desktop-widget-0000000000000008", "desktop-widget-0000000000000009", "desktop-widget-000000000000000a", - "desktop-widget-000000000000000b", "desktop-widget-000000000000000c" ] @@ -179,27 +187,11 @@ widget_order = [ label = "Remote Desktop" variant = "default" - [desktop_widgets.widget.desktop-widget-000000000000000b] - box_height = 0.0 - box_width = 0.0 - cx = 154.0 - cy = 237.0 - output = "eDP-1" - rotation = 0.0 - type = "button" - - [desktop_widgets.widget.desktop-widget-000000000000000b.settings] - background = true - command = "ssh takamaki switch-os" - glyph = "switch-horizontal" - label = "Switch OS" - variant = "default" - [desktop_widgets.widget.desktop-widget-000000000000000c] box_height = 0.0 box_width = 0.0 cx = 188.5 - cy = 301.0 + cy = 240.0 output = "eDP-1" rotation = 0.0 type = "button" diff --git a/assets/dotfiles/remmina-presets/group_rdp_takamaki_greyweather-dev.remmina b/assets/dotfiles/remmina-presets/group_rdp_takamaki_greyweather-dev.remmina index 7842b5d..154fd67 100644 --- a/assets/dotfiles/remmina-presets/group_rdp_takamaki_greyweather-dev.remmina +++ b/assets/dotfiles/remmina-presets/group_rdp_takamaki_greyweather-dev.remmina @@ -9,7 +9,7 @@ preferipv6=0 ssh_tunnel_loopback=1 serialname= tls-seclevel= -freerdp_log_level=INFO +sound=local scale=2 printer_overrides= name=takamaki @@ -41,7 +41,7 @@ protocol=RDP old-license=0 labels= ssh_tunnel_password= -resolution_mode=1 +resolution_mode=2 cert_ignore=0 assistance_mode=0 pth= @@ -77,7 +77,7 @@ ssh_tunnel_passphrase= shareparallel=0 smartcardname= disablepasswordstoring=0 -quality=1 +quality=0 shareprinter=0 viewmode=4 span=0 @@ -105,6 +105,6 @@ gateway_usage=0 keyboard_grab=1 window_width=1536 no-suppress=0 +freerdp_log_level=INFO websockets=0 -sound=local disable-smooth-scrolling=0 diff --git a/global-configs/niri.nix b/global-configs/niri.nix index 023a208..0c9111f 100644 --- a/global-configs/niri.nix +++ b/global-configs/niri.nix @@ -31,17 +31,17 @@ ln -s /home/grey/nixos/assets/dotfiles/noctalia-state/plugins /home/grey/.local/state/noctalia/plugins ''; - symlinkNoctaliaConfig = lib.hm.dag.entryAfter ["writeBoundary"] '' + copyNoctaliaConfig = lib.hm.dag.entryAfter ["writeBoundary"] '' #!/bin/bash if [ -f /home/grey/.config/noctalia/settings.toml ]; then rm /home/grey/.config/noctalia/settings.toml fi - ln -s /home/grey/nixos/assets/dotfiles/noctalia-state/settings.toml /home/grey/.config/noctalia/settings.toml + cp /home/grey/nixos/assets/dotfiles/noctalia-state/settings.toml /home/grey/.config/noctalia/settings.toml if [ -d /home/grey/.config/noctalia/plugins ]; then rm -rf /home/grey/.config/noctalia/plugins fi - ln -s /home/grey/nixos/assets/dotfiles/noctalia-state/plugins /home/grey/.config/noctalia/plugins + cp -r /home/grey/nixos/assets/dotfiles/noctalia-state/plugins /home/grey/.config/noctalia/plugins ''; }; } \ No newline at end of file diff --git a/hosts/kitagawa/default.nix b/hosts/kitagawa/default.nix index 41b7e71..6a7ccd2 100644 --- a/hosts/kitagawa/default.nix +++ b/hosts/kitagawa/default.nix @@ -18,6 +18,21 @@ in { ./modules/hardware-fixes.nix ]; + services.tailscale = { + enable = true; + openFirewall = true; + }; + + services.spotifyd = { + enable = true; + }; + + environment.systemPackages = with pkgs; [ + spotifyd + ]; + + hardware.steam-hardware.enable = true; + boot.loader.limine = { enable = true; maxGenerations = 10; diff --git a/hosts/kitagawa/home.nix b/hosts/kitagawa/home.nix index 8f8d555..f6f74e6 100644 --- a/hosts/kitagawa/home.nix +++ b/hosts/kitagawa/home.nix @@ -16,7 +16,7 @@ in { "${global-configs}/vscode.nix" "${global-configs}/gnome.nix" "${global-configs}/equibop.nix" - "${global-configs}/spicetify.nix" + #"${global-configs}/spicetify.nix" "${global-configs}/niri.nix" ]; diff --git a/modules/window-managers/niri.nix b/modules/window-managers/niri.nix index 3838e24..df7f051 100644 --- a/modules/window-managers/niri.nix +++ b/modules/window-managers/niri.nix @@ -2,6 +2,7 @@ config, pkgs, inputs, + lib, ... }: { environment.systemPackages = with pkgs; [ @@ -20,5 +21,21 @@ programs.niri = { enable = true; useNautilus = true; + # override niri source to use https://github.com/niri-wm/niri/pull/3642 + package = (pkgs.niri.overrideAttrs (finalAttrs: prevAttrs: + { + cargoHash = "sha256-jGORNwJ/F9UrajObXdGLbOTGEpCv919puUuWojbuVwo="; + src = pkgs.fetchFromGitHub { + owner = "niri-wm"; + repo = "niri"; + rev = "pull/3642"; + sha256 = "sha256-SiE5xZ0btBLDLAD4InmABPu/mHVE8yFexPHmx9FQ3FA="; + }; + cargoDeps = pkgs.rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname src version; + hash = finalAttrs.cargoHash; + }; + } + )); }; }