diff --git a/flake.lock b/flake.lock index 7fb08cce..4bb1a2d5 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1752473542, - "narHash": "sha256-PhowmGOEqpVHSijrb/5f2HHwaH2uaGxS6kWQKdGyIgM=", + "lastModified": 1756437736, + "narHash": "sha256-ph2EiF6mVdl3LKqnMhGIEkbHzQQxMYfSHuIV0u6afYw=", "owner": "arcnmx", "repo": "nixexprs", - "rev": "194e3d4a292d441187f2f386120b1b07db3dc72e", + "rev": "aae2391ff35114a820999e1718f86e2a39607eb4", "type": "github" }, "original": { @@ -150,11 +150,11 @@ ] }, "locked": { - "lastModified": 1755545956, - "narHash": "sha256-/dqfdlsu8jonCbwWTlYXC4vVU4/71Yvz/NZMu1NMwos=", + "lastModified": 1756471819, + "narHash": "sha256-vKcFkgjcQaxja/B5Q9fk4xwn1AB0Fa1S/uUbnSvVAPM=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "f14fadaa130cc0e222271acde3dddc3596b97c69", + "rev": "a65b368d67e78606f89241259eca6b67eaf70f99", "type": "github" }, "original": { @@ -223,11 +223,11 @@ ] }, "locked": { - "lastModified": 1755275010, - "narHash": "sha256-lEApCoWUEWh0Ifc3k1JdVjpMtFFXeL2gG1qvBnoRc2I=", + "lastModified": 1755825449, + "narHash": "sha256-XkiN4NM9Xdy59h69Pc+Vg4PxkSm9EWl6u7k6D5FZ5cM=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "7220b01d679e93ede8d7b25d6f392855b81dd475", + "rev": "8df64f819698c1fee0c2969696f54a843b2231e8", "type": "github" }, "original": { @@ -520,11 +520,11 @@ ] }, "locked": { - "lastModified": 1755446520, - "narHash": "sha256-I0Ok1OGDwc1jPd8cs2VvAYZsHriUVFGIUqW+7uSsOUM=", + "lastModified": 1755960406, + "narHash": "sha256-RF7j6C1TmSTK9tYWO6CdEMtg6XZaUKcvZwOCD2SICZs=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "4b04db83821b819bbbe32ed0a025b31e7971f22e", + "rev": "e891a93b193fcaf2fc8012d890dc7f0befe86ec2", "type": "github" }, "original": { @@ -617,11 +617,11 @@ ] }, "locked": { - "lastModified": 1755538029, - "narHash": "sha256-XVsragfuN8A/tMiPToejH7RofH15toeIGhlXraX+yBo=", + "lastModified": 1756496801, + "narHash": "sha256-IYIsnPy+cJxe8RbDHBrCtfJY0ry2bG2H7WvMcewiGS8=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf450a0844e80e6aa22652d3f3728f20cd974527", + "rev": "77a71380c38fb2a440b4b5881bbc839f6230e1cb", "type": "github" }, "original": { @@ -722,11 +722,11 @@ ] }, "locked": { - "lastModified": 1755151620, - "narHash": "sha256-fVMalQZ+tRXR8oue2SdWu4CdlsS2NII+++rI40XQ8rU=", + "lastModified": 1756201372, + "narHash": "sha256-bK5j5cwJgO5AZXlDl5AgISzpOv9YV1Fcv2nDr9RW/5o=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "16e12d22754d97064867006acae6e16da7a142a6", + "rev": "9f6745bd704ab7f2617d41c2b02f4fd5f9ed0e89", "type": "github" }, "original": { @@ -831,11 +831,11 @@ ] }, "locked": { - "lastModified": 1751239988, - "narHash": "sha256-/yAP5zHAs5hT3NUYWaKnVuaLuxVLDMmn3jPdWAMOVNo=", + "lastModified": 1756126040, + "narHash": "sha256-fGKofLHVsro1kE/vZK9Jbdn4DT10IsifO++TLbD+u6U=", "ref": "release-2.92", - "rev": "91b03e3ace9005f50b2fbe81d2533d988e19df6e", - "revCount": 136, + "rev": "1392ba36a33db0328796e23d3cdc57ab656a709b", + "revCount": 141, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -856,11 +856,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1755102374, - "narHash": "sha256-v6xhTSgnGQoF1a51BB6OQWN8HXiYbZtVL+54TRuk9zk=", + "lastModified": 1755911232, + "narHash": "sha256-ujvJhZ175zzmsVVE75MQUkviS4FIJU1YjbnXfZ08W9c=", "owner": "microvm-nix", "repo": "microvm.nix", - "rev": "0a5cda80e48191959cf5a9c0552532599ef2cee4", + "rev": "4fe0a520d929aa462e6d874573e601e7568f184c", "type": "github" }, "original": { @@ -883,11 +883,11 @@ ] }, "locked": { - "lastModified": 1755483699, - "narHash": "sha256-dj5cNx+WvDv5fbsE4h/Q6UuTttc/BHBE3BVGVn2TUNk=", + "lastModified": 1756432557, + "narHash": "sha256-kSrp0L5JFa94qG3rTZaYjLMhkifmeqmFz3rbRnvY9WY=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "aa5ed59e2570c7adfd6f5ca6ec08fff3140d7565", + "rev": "3bad7922c749fe4bc26c34452cd83f3818158855", "type": "github" }, "original": { @@ -951,11 +951,11 @@ ] }, "locked": { - "lastModified": 1755296276, - "narHash": "sha256-xvY9lYZHLp0xw+LTgZVmWFbVFl5O/M2eRVwB+MolaXY=", + "lastModified": 1756430430, + "narHash": "sha256-+kJK5tCok/+3/SQkJJQaTFTlzdMMw/ztC+vG1FZjkd0=", "owner": "nvim-neorg", "repo": "nixpkgs-neorg-overlay", - "rev": "66b25e0d47de5830de00e91e119f00b7ac9b17e1", + "rev": "8c9e1bead4ef207e8d5b14cd13acc5791dbb4b53", "type": "github" }, "original": { @@ -987,11 +987,11 @@ ] }, "locked": { - "lastModified": 1755510252, - "narHash": "sha256-IPwAGaR9LO4LasxIFPqOTmIfliDsnzWVgzsaIekzRG4=", + "lastModified": 1755960929, + "narHash": "sha256-28NHVSsYAp4vdSApAmbbdkG4bjhBODPDiyx/E4uMGpc=", "owner": "nix-community", "repo": "nh", - "rev": "8d690296fb3b898da565b33455a4227aed8a3133", + "rev": "6cd62b00023932effbf57f21879f4d2deae4b256", "type": "github" }, "original": { @@ -1014,11 +1014,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1755424351, - "narHash": "sha256-xcorYLNdtLpb0wH5CPlUcpmYQUxeK95j1X855xQw+DY=", + "lastModified": 1756451209, + "narHash": "sha256-zrFKbXArvNjUKYYd1I48cnvlgB6cGA/mFoRvgp/wRHc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "9aa137af01f05386e5bb5050e983750017007a66", + "rev": "cdfffe0b009582f5161dcd030a5549236287767b", "type": "github" }, "original": { @@ -1047,11 +1047,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1755419373, - "narHash": "sha256-EFH3zbpyLYjEboNV2Lmkxf9joEuFCmeYX+MMLRPStpg=", + "lastModified": 1756448032, + "narHash": "sha256-ZIRj8dt8FmJdQeJjNvyK1RirYBmun+e/K3TMG8Qdodc=", "owner": "YaLTeR", "repo": "niri", - "rev": "a6febb86aa5af0df7bf2792ca027ef95a503d599", + "rev": "dfe463ed7dcf36cc706f5540c5d0804775b5c86b", "type": "github" }, "original": { @@ -1086,11 +1086,11 @@ ] }, "locked": { - "lastModified": 1755396822, - "narHash": "sha256-gID7ynpJuflQ/+ibrhYUWybiGPduNvvMJSk27oqfK24=", + "lastModified": 1756432252, + "narHash": "sha256-jOBNNFSQg+PDT1TYzvyKjsy9OYkTmKhKFmqyIyXyA2U=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "f2bf778502254d8852402a83ae346fd803095ccc", + "rev": "80cf8e61fa8d7760eb45da43beba7bf2aabe1395", "type": "github" }, "original": { @@ -1129,11 +1129,11 @@ ] }, "locked": { - "lastModified": 1755404379, - "narHash": "sha256-Q6ZxZDBmD/B988Jjbx7/NchxOKIpOKBBrx9Yb0zMzpQ=", + "lastModified": 1756008611, + "narHash": "sha256-rfTBWuTXi9/X7GhtF562FKNXKh2kvKb6dwI5lV1SjPE=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "ebbc1c05f786ae39bb5e04e57bf2c10c44a649e3", + "rev": "52dec1cb33a614accb9e01307e17816be974d24d", "type": "github" }, "original": { @@ -1200,11 +1200,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1755330281, - "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=", + "lastModified": 1756245047, + "narHash": "sha256-9bHzrVbjAudbO8q4vYFBWlEkDam31fsz0J7GB8k4AsI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0", + "rev": "a65b650d6981e23edd1afa1f01eb942f19cdcbb7", "type": "github" }, "original": { @@ -1274,11 +1274,11 @@ ] }, "locked": { - "lastModified": 1755481576, - "narHash": "sha256-XMxUEKhucJR6v/OBv5PW4xZOvdAWrF+SSct2s+POoz0=", + "lastModified": 1756499981, + "narHash": "sha256-zN8ob0PGuQp9vkPrr7bLt6V0n5kajEjCKFwCJHmJq0Q=", "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "cc31049a24af3cf85a85cc66bb72dda88b2512e9", + "rev": "e90636270fd0aa5105c8bef398a43bc7f6230189", "type": "github" }, "original": { @@ -1289,11 +1289,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1756266583, + "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", "type": "github" }, "original": { @@ -1366,11 +1366,11 @@ ] }, "locked": { - "lastModified": 1755551744, - "narHash": "sha256-YbIFASCxQicuwfTLjCFAQ/IZDJ8R5+QnnmxjUejgjVs=", + "lastModified": 1756507985, + "narHash": "sha256-CkgOkYB/DPAZD4YHbpz64AgWA+unWiR06eGLDzhtYGo=", "owner": "nix-community", "repo": "NUR", - "rev": "d57e71d6f02cf7614577b1f5e5bff948c48aa361", + "rev": "ef21027c9847f69026ee1d83885dc416593422c8", "type": "github" }, "original": { @@ -1499,11 +1499,11 @@ ] }, "locked": { - "lastModified": 1752967352, - "narHash": "sha256-YFnjO54+J80Bs38SXuzinuavvdAMdD7iLqN0ROUSvz0=", + "lastModified": 1756075077, + "narHash": "sha256-2VamQFxS9T0+daQgz6qaUIxcR8kc66/JDRkmkFM/uuU=", "owner": "arcnmx", "repo": "nixexprs-rust", - "rev": "c321b373b8189df1c5eafe4da590a58a33cdadcf", + "rev": "f231b0016984ee50b132cd4bf592a065ed4b73fe", "type": "github" }, "original": { @@ -1536,11 +1536,11 @@ ] }, "locked": { - "lastModified": 1755485198, - "narHash": "sha256-C3042ST2lUg0nh734gmuP4lRRIBitA6Maegg2/jYRM4=", + "lastModified": 1756434910, + "narHash": "sha256-5UJRyxZ8QCm+pgh5pNHXFJMmopMqHVraUhRA1g2AmA0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "aa45e63d431b28802ca4490cfc796b9e31731df7", + "rev": "86e5140961c91a9ee1dde1c17d18a787d44ceef8", "type": "github" }, "original": { @@ -1647,11 +1647,11 @@ ] }, "locked": { - "lastModified": 1755405549, - "narHash": "sha256-0vJD6WhL1jfXbnpH6r8yr1RgzB8mGFWIWokKHaJMJ/4=", + "lastModified": 1756009939, + "narHash": "sha256-lD4Zn37DWEx0X1DqM3npH68b7oh81H8BaaO3c6Ol/DQ=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "df1f5d4c0633040937358755defff9f07e9c0a73", + "rev": "2bedaf52261ef2adbe71af70820aeb41dfe9a5ef", "type": "github" }, "original": { @@ -1725,11 +1725,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1755546184, - "narHash": "sha256-KxRj/8SydDk3gzamS0VEewo5pu8JAYhSZ5GPcImPGNQ=", + "lastModified": 1755997543, + "narHash": "sha256-/fejmCQ7AWa655YxyPxRDbhdU7c5+wYsFSjmEMXoBCM=", "owner": "nix-community", "repo": "stylix", - "rev": "9810b32b9b7520e3b37358ff8e793fb5034c3299", + "rev": "f47c0edcf71e802378b1b7725fa57bb44fe85ee8", "type": "github" }, "original": { @@ -1882,11 +1882,11 @@ ] }, "locked": { - "lastModified": 1754847726, - "narHash": "sha256-2vX8QjO5lRsDbNYvN9hVHXLU6oMl+V/PsmIiJREG4rE=", + "lastModified": 1755934250, + "narHash": "sha256-CsDojnMgYsfshQw3t4zjRUkmMmUdZGthl16bXVWgRYU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "7d81f6fb2e19bf84f1c65135d1060d829fae2408", + "rev": "74e1a52d5bd9430312f8d1b8b0354c92c17453e5", "type": "github" }, "original": { @@ -1931,16 +1931,16 @@ "xwayland-satellite-stable": { "flake": false, "locked": { - "lastModified": 1748488455, - "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", + "lastModified": 1755491097, + "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", + "rev": "388d291e82ffbc73be18169d39470f340707edaa", "type": "github" }, "original": { "owner": "Supreeeme", - "ref": "v0.6", + "ref": "v0.7", "repo": "xwayland-satellite", "type": "github" } @@ -1948,11 +1948,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1755219541, - "narHash": "sha256-yKV6xHaPbEbh5RPxAJnb9yTs1wypr7do86hFFGQm1w8=", + "lastModified": 1756260173, + "narHash": "sha256-wcf04fl5ncbOqAK7OCWIgILERIbMfL/eeM3UThqgErI=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "5a184d435927c3423f0ad189ea2b490578450fb7", + "rev": "af33f7eb124b51ff6d9cdf9b428643e2246c8cbb", "type": "github" }, "original": { @@ -1969,11 +1969,11 @@ ] }, "locked": { - "lastModified": 1755484558, - "narHash": "sha256-1dlhluaqrePy1L8ShBCkiF/KF9ci5tSZzdUI60NjzOI=", + "lastModified": 1756455934, + "narHash": "sha256-Mf9G8l2GcMpBBxnR7DXnBzlyI8aaxWR02FTyddybiys=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d169f16140842d7ba3183c0321f984368bdd2ee3", + "rev": "de77ec882dce3dd60e9e5431d375e64fd58bdc74", "type": "github" }, "original": { diff --git a/home/environments/niri/autostart.nix b/home/environments/niri/autostart.nix index f0d46316..7fd9cbfc 100644 --- a/home/environments/niri/autostart.nix +++ b/home/environments/niri/autostart.nix @@ -98,6 +98,7 @@ in { "discord" "--enable-features=WaylandLinuxDrmSyncobj,UseOzonePlatform" "--ozone-platform=wayland" + "--enable-wayland-ime" ]; } { diff --git a/home/profiles/common/stylix.nix b/home/profiles/common/stylix.nix index a6485f0a..06b001ae 100644 --- a/home/profiles/common/stylix.nix +++ b/home/profiles/common/stylix.nix @@ -38,6 +38,6 @@ }; autoEnable = true; polarity = "light"; - base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine-dawn.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/monokai.yaml"; }; } diff --git a/home/profiles/graphical/aliases.nix b/home/profiles/graphical/aliases.nix new file mode 100644 index 00000000..323a3b02 --- /dev/null +++ b/home/profiles/graphical/aliases.nix @@ -0,0 +1,20 @@ +{ + config, + pkgs, + lib, + ... +}: let + inherit (lib.meta) getExe; +in { + home.packages = let + packages = with pkgs; [ + ungoogled-chromium + sidequest + ]; + aliaser = package: + pkgs.writeShellScriptBin package.name '' + ${getExe config.nix.package} run nixpkgs#${package.name} -- "$@" + ''; + in + map aliaser packages; +} diff --git a/home/profiles/graphical/firefox/config.nix b/home/profiles/graphical/firefox/config.nix index 42885976..55360ed4 100644 --- a/home/profiles/graphical/firefox/config.nix +++ b/home/profiles/graphical/firefox/config.nix @@ -2,7 +2,11 @@ _: { programs.zen-browser.profiles.main.settings = { "zen.welcome-screen.seen" = true; "zen.watermark.enabled" = false; - + "browser.ml.chat.enabled" = false; + "extensions.ml.enabled" = false; + "browser.ml.linkPreview.enabled" = false; + "browser.tabs.groups.smart.enabled" = false; + "browser.tabs.groups.smart.userEnabled" = false; # Derived from https://github.com/arcnmx/home/blob/9eb1cd4dd43883e1a0c6a2a55c00d7c3bede1776/cfg/firefox/default.nix#L7 # and https://git.ztn.sh/zotan/snowleopard/src/branch/dev/assets/prefs.js "services.sync.engine.prefs" = false; diff --git a/home/profiles/graphical/firefox/main.nix b/home/profiles/graphical/firefox/main.nix index 78eb43fb..3a5a5ed8 100644 --- a/home/profiles/graphical/firefox/main.nix +++ b/home/profiles/graphical/firefox/main.nix @@ -48,6 +48,7 @@ ff2mpv terms-of-service-didnt-read web-clipper-obsidian + yomitan ]; force = true; }; diff --git a/home/profiles/neovim/init.lua b/home/profiles/neovim/init.lua index 1bd9aa2d..31e0b63c 100644 --- a/home/profiles/neovim/init.lua +++ b/home/profiles/neovim/init.lua @@ -35,7 +35,7 @@ opt.smartcase = true -- Ignore lowercase for the whole opt.wrap = true -- Wrap on word boundary opt.linebreak = true -- Wrap on word boundary opt.showbreak = " ↳" -- Character to use to display word boundary -opt.termguicolors = false -- Enable 24-bit RGB colors +opt.termguicolors = true -- Enable 24-bit RGB colors opt.laststatus = 3 -- Set global statusline opt.cursorline = true -- Highlight cursor screenline opt.cmdheight = 1 -- Command entry line height diff --git a/home/profiles/shell/git.nix b/home/profiles/shell/git.nix index 7848f33e..81672451 100644 --- a/home/profiles/shell/git.nix +++ b/home/profiles/shell/git.nix @@ -7,28 +7,34 @@ gitAndTools.git-remote-gcrypt git-crypt git-revise + radicle-tui ]; - programs.git = { - inherit (tree.home.user.data) userName userEmail; - package = pkgs.gitAndTools.gitFull; - enable = true; - delta = { + programs = { + jujutsu = { enable = true; }; - extraConfig = { - init = {defaultBranch = "main";}; - protocol.gcrypt.allow = "always"; - merge.conflictstyle = "diff3"; - annex = { - autocommit = false; - backend = "BLAKE2B512"; - synccontent = true; + git = { + inherit (tree.home.user.data) userName userEmail; + package = pkgs.gitAndTools.gitFull; + enable = true; + delta = { + enable = true; + }; + extraConfig = { + init = {defaultBranch = "main";}; + protocol.gcrypt.allow = "always"; + merge.conflictstyle = "diff3"; + annex = { + autocommit = false; + backend = "BLAKE2B512"; + synccontent = true; + }; + }; + signing = { + inherit (tree.home.user.data) key; + signByDefault = true; }; - }; - signing = { - inherit (tree.home.user.data) key; - signByDefault = true; }; }; } diff --git a/home/profiles/shell/zsh.nix b/home/profiles/shell/zsh.nix index 4e45ac99..22f0e9c0 100644 --- a/home/profiles/shell/zsh.nix +++ b/home/profiles/shell/zsh.nix @@ -6,7 +6,6 @@ pkgs, ... }: let - inherit (lib.attrsets) nameValuePair listToAttrs; inherit (lib.modules) mkMerge mkIf; inherit (std) string list; in { @@ -89,29 +88,20 @@ in { else "" } ''; - shellAliases = let - packages = [ - "sidequest" - "ungoogled-chromium" - ]; - makeAliasForBin = package: nameValuePair package "nix run kat#${package}"; - packages' = builtins.listToAttrs (map makeAliasForBin packages); - in - mkMerge [ - packages' - { - nixdirfmt = "nixpkgs-fmt $(fd -e nix)"; - dmesg = "dmesg -HP"; - hg = "history 0 | rg"; - } - (mkIf pkgs.hostPlatform.isLinux { - sys = "systemctl"; - sysu = "systemctl --user"; - logu = "journalctl --user"; - log = "journalctl"; - lg = "log --no-pager | rg"; - }) - ]; + shellAliases = mkMerge [ + { + nixdirfmt = "nixpkgs-fmt $(fd -e nix)"; + dmesg = "dmesg -HP"; + hg = "history 0 | rg"; + } + (mkIf pkgs.hostPlatform.isLinux { + sys = "systemctl"; + sysu = "systemctl --user"; + logu = "journalctl --user"; + log = "journalctl"; + lg = "log --no-pager | rg"; + }) + ]; localVariables = { ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE = "fg=3,bold"; ZSH_AUTOSUGGEST_USE_ASYNC = 1; diff --git a/nixos/common/stylix.nix b/nixos/common/stylix.nix index cecf748d..e655fcbf 100644 --- a/nixos/common/stylix.nix +++ b/nixos/common/stylix.nix @@ -39,6 +39,6 @@ }; }; autoEnable = true; - base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine-dawn.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/monokai.yaml"; }; } diff --git a/nixos/profiles/graphical/fonts.nix b/nixos/profiles/graphical/fonts.nix index c6caba62..92f47594 100644 --- a/nixos/profiles/graphical/fonts.nix +++ b/nixos/profiles/graphical/fonts.nix @@ -2,6 +2,7 @@ fonts = { packages = with pkgs; [ font-awesome + noto-fonts-cjk-sans twitter-color-emoji iosevka-bin monaspace diff --git a/nixos/profiles/graphical/ime.nix b/nixos/profiles/graphical/ime.nix new file mode 100644 index 00000000..1c9a7fe6 --- /dev/null +++ b/nixos/profiles/graphical/ime.nix @@ -0,0 +1,14 @@ +{pkgs, ...}: { + services.xserver.desktopManager.runXdgAutostartIfNone = true; + i18n.inputMethod = { + type = "fcitx5"; + enable = true; + fcitx5 = { + waylandFrontend = true; + addons = with pkgs; [ + fcitx5-anthy + fcitx5-gtk + ]; + }; + }; +} diff --git a/systems/goliath.nix b/systems/goliath.nix index 60ec5afc..3f918034 100644 --- a/systems/goliath.nix +++ b/systems/goliath.nix @@ -197,7 +197,7 @@ _: let }; services.scx = { - enable = true; + enable = false; package = pkgs.scx_git.full; scheduler = "scx_lavd"; };