From 48c40f81247c503955ba5f19d62a5c5a6a75b726 Mon Sep 17 00:00:00 2001 From: worble Date: Wed, 12 Nov 2025 21:13:48 +0000 Subject: [PATCH] update --- configuration/modules/i18n.nix | 25 ++++++++++++++ devices/tuxedo/configuration.nix | 2 ++ devices/tuxedo/flake.lock | 43 +++++++++++++++++------- home-manager/default.nix | 7 ++++ home-manager/development/android.nix | 36 ++++++++++++++++++++ home-manager/development/default.nix | 1 + home-manager/firefox/firefox-profile.nix | 4 +-- home-manager/gaming.nix | 6 ++++ 8 files changed, 109 insertions(+), 15 deletions(-) create mode 100644 configuration/modules/i18n.nix create mode 100644 home-manager/development/android.nix diff --git a/configuration/modules/i18n.nix b/configuration/modules/i18n.nix new file mode 100644 index 0000000..9f8f188 --- /dev/null +++ b/configuration/modules/i18n.nix @@ -0,0 +1,25 @@ +{ pkgs, ... }: + +{ + # Install Japanese IME MOZC + i18n.inputMethod = { + enable = true; + type = "fcitx5"; + # ibus = { + # engines = with pkgs.ibus-engines; [ mozc anthy ]; + # panel = "${pkgs.kdePackages.plasma-desktop}/libexec/kimpanel-ibus-panel"; + # }; + fcitx5 = { + waylandFrontend = true; + plasma6Support = true; + addons = with pkgs; [ + fcitx5-mozc + fcitx5-anthy + ]; + }; + }; + + environment.systemPackages = [ + pkgs.kdePackages.fcitx5-configtool + ]; +} diff --git a/devices/tuxedo/configuration.nix b/devices/tuxedo/configuration.nix index 34751e5..ebc43c3 100644 --- a/devices/tuxedo/configuration.nix +++ b/devices/tuxedo/configuration.nix @@ -17,6 +17,7 @@ ../../configuration/modules/virtualisation.nix ../../configuration/modules/gaming.nix ../../configuration/modules/kde.nix + ../../configuration/modules/i18n.nix ]; networking.hostName = "tuxedo"; # Define your hostname. @@ -82,6 +83,7 @@ "podman" "cdrom" "wireshark" + "kvm" # for android studio ]; # Enable ‘sudo’ for the user. linger = true; }; diff --git a/devices/tuxedo/flake.lock b/devices/tuxedo/flake.lock index a1a1622..212946d 100644 --- a/devices/tuxedo/flake.lock +++ b/devices/tuxedo/flake.lock @@ -48,11 +48,11 @@ ] }, "locked": { - "lastModified": 1762055842, - "narHash": "sha256-Pu1v3mlFhRzZiSxVHb2/i/f5yeYyRNqr0RvEUJ4UgHo=", + "lastModified": 1762660502, + "narHash": "sha256-C9F1C31ys0V7mnp4EcDy7L1cLZw/sCTEXqqTtGnvu08=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "359ff6333a7b0b60819d4c20ed05a3a1f726771f", + "rev": "15c5451c63f4c612874a43846bfe3fa828b03eee", "type": "github" }, "original": { @@ -66,11 +66,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1762394210, - "narHash": "sha256-6WdUH74KlneHu5Pq6l3DbEBHgyrLify3YTCdT5JqEpg=", + "lastModified": 1762912605, + "narHash": "sha256-ekyaqHW6fidE5gAzO8zX+aXNMnb1O/kCsmEZ4n0PnMQ=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "20329b2085ba393e910e521afffe72ae8bbe0b65", + "rev": "6110f762f238177ba231e8726fabcf4706c9c378", "type": "github" }, "original": { @@ -95,13 +95,29 @@ "type": "github" } }, - "nixpkgs-unstable": { + "nixpkgs-master": { "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "lastModified": 1762981236, + "narHash": "sha256-+5mtk40MIILLdvoTw5gknZQTz+HQA36yrAeELY7Avxg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "rev": "d3eef293ea180ef8b46c4b977c5b33cda61563ef", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1762844143, + "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4", "type": "github" }, "original": { @@ -113,11 +129,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1762233356, - "narHash": "sha256-cGS3lLTYusbEP/IJIWGgnkzIl+FA5xDvtiHyjalGr4k=", + "lastModified": 1762756533, + "narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ca534a76c4afb2bdc07b681dbc11b453bab21af8", + "rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d", "type": "github" }, "original": { @@ -134,6 +150,7 @@ "nix-index-database": "nix-index-database", "nix-vscode-extensions": "nix-vscode-extensions", "nixpkgs": "nixpkgs_2", + "nixpkgs-master": "nixpkgs-master", "nixpkgs-unstable": "nixpkgs-unstable" } } diff --git a/home-manager/default.nix b/home-manager/default.nix index 21727d6..d21d207 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -11,6 +11,7 @@ thunderbird qbittorrent libreoffice-qt + # Can move to stable when https://github.com/NixOS/nixpkgs/pull/460058 gets backported inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".joplin-desktop # comms @@ -31,6 +32,12 @@ }; }; + xdg.configFile."capacitor/sysconfig.json".text = lib.generators.toJSON { } { + machine = "00000000-0000-0000-0000-000000000000"; + signup = false; + telemetry = false; + }; + home.sessionVariables = { NIXOS_OZONE_WL = "1"; }; diff --git a/home-manager/development/android.nix b/home-manager/development/android.nix new file mode 100644 index 0000000..72c688a --- /dev/null +++ b/home-manager/development/android.nix @@ -0,0 +1,36 @@ +# { pkgs, ... }: + +# let +# androidEnv = pkgs.androidenv.override { licenseAccepted = true; }; +# androidComp = ( +# androidEnv.composeAndroidPackages { +# toolsVersion = null; +# includeEmulator = true; +# includeNDK = true; +# platformVersions = [ +# "latest" +# "25" +# ]; +# includeSystemImages = true; +# systemImageTypes = [ +# "default" +# ]; +# abiVersions = [ +# "x86_64" +# "armeabi-v7a" +# "arm64-v8a" +# ]; +# } +# ); +# android-studio = (pkgs.android-studio.withSdk androidComp.androidsdk); +# in +# { +# home.sessionVariables = { +# ANDROID_HOME = "${androidComp.androidsdk}/libexec/android-sdk"; +# ANDROID_SDK_ROOT = "${androidComp.androidsdk}/libexec/android-sdk"; +# ANDROID_NDK_ROOT = "${androidComp.androidsdk}/libexec/android-sdk/ndk-bundle"; +# }; +# home.packages = [ +# pkgs.android-studio +# ]; +# } diff --git a/home-manager/development/default.nix b/home-manager/development/default.nix index 0796580..f68009b 100644 --- a/home-manager/development/default.nix +++ b/home-manager/development/default.nix @@ -2,6 +2,7 @@ { imports = [ + # ./android.nix ./dotnet.nix ./games.nix ./helix.nix diff --git a/home-manager/firefox/firefox-profile.nix b/home-manager/firefox/firefox-profile.nix index ff400a3..b842f2c 100644 --- a/home-manager/firefox/firefox-profile.nix +++ b/home-manager/firefox/firefox-profile.nix @@ -175,12 +175,12 @@ "browser.contentblocking.category" = "strict"; }; userChrome = '' - /* For old sidebar */ + /* Remove old sidebar header */ #sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"] #sidebar-header { display: none; } - /* Remove sidebar revamp */ + /* Remove sidebar revamp header */ #sidebar-panel-header { display: none; } diff --git a/home-manager/gaming.nix b/home-manager/gaming.nix index ca2e43e..8391e67 100644 --- a/home-manager/gaming.nix +++ b/home-manager/gaming.nix @@ -72,9 +72,15 @@ in programs = { mangohud = { enable = true; + enableSessionWide = true; settings = { preset = 1; }; + settingsPerApplication = { + mpv = { + no_display = true; + }; + }; }; }; }