From 11c396e244657324291fbbd894972f7655badb6b Mon Sep 17 00:00:00 2001 From: Grey Jones Date: Wed, 7 Oct 2026 01:03:43 +0100 Subject: [PATCH] small laptop tweaks --- .../kitagawa/equibop/equicord-settings.json | 2 +- .../plugins/data/dunarand/bookmarks/data.json | 2 +- dotfiles/kitagawa/noctalia/settings.toml | 36 ++++++------ modules/capabilities/graphics.nix | 5 ++ modules/features/applications/gui/floorp.nix | 6 +- modules/hosts/kitagawa/kitagawa.nix | 57 +++++++++++++------ 6 files changed, 67 insertions(+), 41 deletions(-) diff --git a/dotfiles/kitagawa/equibop/equicord-settings.json b/dotfiles/kitagawa/equibop/equicord-settings.json index 23ef2eb..298b239 100644 --- a/dotfiles/kitagawa/equibop/equicord-settings.json +++ b/dotfiles/kitagawa/equibop/equicord-settings.json @@ -4,7 +4,7 @@ "authenticated": false, "settingsSync": false, "url": "https://cloud.equicord.org/", - "settingsSyncVersion": 1789776786680 + "settingsSyncVersion": 1790690445480 }, "enableOnlineThemes": true, "enabledThemeLinks": [ diff --git a/dotfiles/kitagawa/noctalia/plugins/data/dunarand/bookmarks/data.json b/dotfiles/kitagawa/noctalia/plugins/data/dunarand/bookmarks/data.json index c178470..ba62972 100644 --- a/dotfiles/kitagawa/noctalia/plugins/data/dunarand/bookmarks/data.json +++ b/dotfiles/kitagawa/noctalia/plugins/data/dunarand/bookmarks/data.json @@ -1 +1 @@ -[{"glyph":"folder","items":[{"cmd":"ssh sakamoto .local/bin/wake-takamaki","description":"","glyph":"coffee","label":"Wake","runInBackground":false,"runInTerminal":false,"type":"bookmark"},{"cmd":"ssh takamaki universal-shutdown","description":"","glyph":"shutdown","label":"Shutdown","runInBackground":false,"runInTerminal":false,"type":"bookmark"},{"cmd":"ssh takamaki switch-os","description":"","glyph":"switch","label":"Switch OS","runInBackground":false,"runInTerminal":false,"type":"bookmark"},{"cmd":"moonlight stream takamaki Desktop","description":"","glyph":"brand-redhat","label":"Remote Desktop (Linux)","runInBackground":true,"runInTerminal":false,"type":"bookmark"},{"cmd":"remmina -c /home/grey/.local/share/remmina/group_rdp_takamaki_greyweather-dev.remmina","description":"","glyph":"brand-windows","label":"Remote Desktop (Windows)","runInBackground":false,"runInTerminal":false,"type":"bookmark"}],"label":"takamaki","type":"folder"}] \ No newline at end of file +[{"glyph":"folder","items":[{"cmd":"ssh sakamoto .local/bin/wake-takamaki","description":"","glyph":"coffee","label":"Wake","runInBackground":false,"runInTerminal":false,"type":"bookmark"},{"cmd":"ssh takamaki universal-shutdown","description":"","glyph":"shutdown","label":"Shutdown","runInBackground":false,"runInTerminal":false,"type":"bookmark"},{"cmd":"ssh takamaki switch-os","description":"","glyph":"switch","label":"Switch OS","runInBackground":false,"runInTerminal":false,"type":"bookmark"},{"cmd":"moonlight stream takamaki Desktop","description":"","glyph":"brand-redhat","label":"Remote Desktop (Linux)","runInBackground":true,"runInTerminal":false,"type":"bookmark"},{"cmd":"remmina -c /home/grey/.local/share/remmina/group_rdp_takamaki_greyweather-dev.remmina","description":"","glyph":"brand-windows","label":"Remote Desktop (Windows)","runInBackground":true,"runInTerminal":false,"type":"bookmark"}],"label":"takamaki","type":"folder"}] \ No newline at end of file diff --git a/dotfiles/kitagawa/noctalia/settings.toml b/dotfiles/kitagawa/noctalia/settings.toml index 0b75c3d..05c09d2 100644 --- a/dotfiles/kitagawa/noctalia/settings.toml +++ b/dotfiles/kitagawa/noctalia/settings.toml @@ -289,6 +289,9 @@ gen_special = true server_url = "https://vault.bitwarden.eu" vault_timeout = "30" +[plugin_settings."piero-93/thinkpad-fan"] +panel_placement = "floating" + [plugin_settings."rylos/remmina"] connections_placement = "floating" @@ -301,7 +304,14 @@ panel_open_near_click = false panel_placement = "floating" [plugins] -enabled = [ "noctalia/bitwarden", "dunarand/bookmarks", "rylos/remmina", "yuuto/calculator", "noctalia/wallhaven" ] +enabled = [ + "noctalia/bitwarden", + "dunarand/bookmarks", + "rylos/remmina", + "yuuto/calculator", + "noctalia/wallhaven", + "piero-93/thinkpad-fan" +] [shell] corner_radius_scale = 1.2500000186264515 @@ -336,20 +346,6 @@ polkit_agent = true [shell.screenshot] confirm_region = true - [[shell.session.actions]] - action = "lock" - countdown_seconds = 0.0 - enabled = true - shortcut = "1" - variant = "default" - - [[shell.session.actions]] - action = "logout" - countdown_seconds = 0.0 - enabled = true - shortcut = "2" - variant = "default" - [[shell.session.actions]] action = "command" command = "noctalia msg session lock && systemctl hibernate" @@ -357,22 +353,22 @@ polkit_agent = true enabled = true glyph = "hibernate" label = "Hibernate" - shortcut = "3" + shortcut = "1" variant = "default" [[shell.session.actions]] action = "reboot" countdown_seconds = 0.0 enabled = true - shortcut = "4" + shortcut = "2" variant = "default" [[shell.session.actions]] action = "shutdown" countdown_seconds = 0.0 enabled = true - shortcut = "5" - variant = "destructive" + shortcut = "3" + variant = "primary" [shell.shadow] alpha = 0.4999999888241291 @@ -442,7 +438,7 @@ enabled = true enabled = true [widget.control-center] -custom_image = "/nix/store/gpf2ydsxn993c3rrrnj40d0kvygf0i9a-nixos-icons-0-unstable-2025-06-28/share/icons/hicolor/512x512/apps/nix-snowflake.png" +custom_image = "~/.local/share/icons/hicolor/512x512/apps/nix-snowflake.png" enabled = true glyph = "" diff --git a/modules/capabilities/graphics.nix b/modules/capabilities/graphics.nix index 12e3c55..1bc868a 100644 --- a/modules/capabilities/graphics.nix +++ b/modules/capabilities/graphics.nix @@ -61,5 +61,10 @@ in { gtk2.configLocation = "${config.xdg.configHome}/.gtkrc-2.0"; # prevents file conflicts between this and other parts of the nix config gtk2.force = true; }; + + xdg.desktopEntries.ocr = { + name = "OCR image"; + exec = "${pkgs.writeScript "ocr" "${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | ${pkgs.tesseract}/bin/tesseract - - | ${pkgs.wl-clipboard}/bin/wl-copy"}"; + }; }; } \ No newline at end of file diff --git a/modules/features/applications/gui/floorp.nix b/modules/features/applications/gui/floorp.nix index 98ff8af..a86b223 100644 --- a/modules/features/applications/gui/floorp.nix +++ b/modules/features/applications/gui/floorp.nix @@ -109,9 +109,9 @@ "browser.newtabpage.activity-stream.newtabWallpapers.user.enabled" = true; "browser.newtabpage.activity-stream.widgets.enabled" = false; "browser.newtabpage.activity-stream.discoverystream.enabled" = false; - "browser.newtabpage.activity-stream.newtabWallpapers.wallpaper" = "custom"; - "browser.newtabpage.activity-stream.newtabWallpapers.customWallpaper.uploadedPreviously" = true; - "browser.newtabpage.activity-stream.newtabWallpapers.customWallpaper.uuid" = "c521696c-f5c9-4932-998f-8d0c245c4eb0"; + "browser.newtabpage.activity-stream.newtabWallpapers.wallpaper" = "gradient-orange"; + #"browser.newtabpage.activity-stream.newtabWallpapers.customWallpaper.uploadedPreviously" = true; + #"browser.newtabpage.activity-stream.newtabWallpapers.customWallpaper.uuid" = "c521696c-f5c9-4932-998f-8d0c245c4eb0"; "floorp.design.configs" = { globalConfigs = { userInterface = "proton"; diff --git a/modules/hosts/kitagawa/kitagawa.nix b/modules/hosts/kitagawa/kitagawa.nix index 5c17685..efd2236 100644 --- a/modules/hosts/kitagawa/kitagawa.nix +++ b/modules/hosts/kitagawa/kitagawa.nix @@ -61,6 +61,9 @@ extraPackages = with pkgs; [ moonlight-qt github-desktop + godot + libreoffice + sysfsutils ]; }; }; @@ -69,25 +72,33 @@ nixos-icons.enable = false; }; - nix.buildMachines = [ - { - hostName = "nixremote"; - systems = [ "x86_64-linux" "i686-linux" ]; - protocol = "ssh-ng"; - maxJobs = 250; - speedFactor = 1000; - supportedFeatures = [ "benchmark" "kvm" "big-parallel" ]; - } - ]; + nix = { + buildMachines = [ + { + hostName = "nixremote"; + systems = [ "x86_64-linux" "i686-linux" ]; + protocol = "ssh-ng"; + maxJobs = 250; + speedFactor = 1000; + supportedFeatures = [ "benchmark" "kvm" "big-parallel" ]; + } + ]; - nix.distributedBuilds = true; - nix.settings.builders-use-substitutes = true; + distributedBuilds = true; + settings.builders-use-substitutes = true; + }; - services.blueman.enable = true; + services = { + blueman.enable = true; - services.tailscale = { - enable = true; - openFirewall = true; + tailscale = { + enable = true; + openFirewall = true; + }; + + udev.extraRules = '' + ACTION=="add|bind", SUBSYSTEM=="platform", DRIVER=="thinkpad_acpi", RUN+="${pkgs.coreutils}/bin/chgrp fan_ctl /proc/acpi/ibm/fan", RUN+="${pkgs.coreutils}/bin/chmod 0664 /proc/acpi/ibm/fan" + ''; }; boot = { @@ -99,6 +110,17 @@ "rd.udev.log_level=3" "rd.systemd.show_status=auto" ]; + kernelModules = [ + "thinkpad_acpi" + ]; + extraModprobeConfig = '' + options thinkpad_acpi fan_control=1 + ''; + }; + + users = { + users.grey.extraGroups = [ "fan_ctl" ]; + groups.fan_ctl = { }; }; }; @@ -114,6 +136,7 @@ extraPackages = with pkgs; [ jetbrains.clion jetbrains.idea + jetbrains.rider xarchiver kdePackages.kate loupe @@ -164,6 +187,8 @@ "x-scheme-handler/https" = [ "floorp.desktop" ]; "text/calendar" = [ "thunderbird.desktop" ]; }; + + dataFile."icons/hicolor/512x512/apps/nix-snowflake.png".source = "${pkgs.nixos-icons}/share/icons/hicolor/512x512/apps/nix-snowflake.png"; }; programs.ssh = {