From 0581dbff8652422cd46b50c38ccdde377e236aab Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Thu, 18 Sep 2025 10:43:20 -0500 Subject: [PATCH] switch to native chrome flatpak is cursed --- common/general/fonts.nix | 22 +++++++++++++-- common/general/shell/common.nix | 1 + hosts/lio/flake.lock | 49 ++++++++++----------------------- hosts/lio/flake.nix | 6 ++-- 4 files changed, 38 insertions(+), 40 deletions(-) diff --git a/common/general/fonts.nix b/common/general/fonts.nix index 3b58b08..ebc1014 100644 --- a/common/general/fonts.nix +++ b/common/general/fonts.nix @@ -33,9 +33,27 @@ in default = true; description = "Enable jetbrains mono font"; }; + japaneseFonts = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Enable japanese fonts"; + }; }; - config = lib.mkIf cfg.jetbrainsMonoFont { - fonts.packages = [ jetbrainsMonoFont ]; + config = { + fonts.packages = + lib.optionals cfg.jetbrainsMonoFont [ + jetbrainsMonoFont + ] + ++ lib.optionals cfg.japaneseFonts ( + with pkgs; + [ + ipafont + kochi-substitute + noto-fonts-cjk-sans # Or another CJK font + ] + ); + + fonts.fontconfig.enable = true; }; } diff --git a/common/general/shell/common.nix b/common/general/shell/common.nix index a2e1eeb..9660761 100644 --- a/common/general/shell/common.nix +++ b/common/general/shell/common.nix @@ -52,6 +52,7 @@ with lib; gcam = "git commit -a -m"; gcm = "git commit -m"; stashes = "git stash list"; + bd = "branch default"; # ripgrep rg = "rg --no-ignore"; diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index ee5e192..547d122 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -29,22 +29,17 @@ "inputs": { "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs_2", "ragenix": "ragenix" }, "locked": { - "lastModified": 1758052327, - "narHash": "sha256-QslqzX00YJOF5F7aTRDRbtGKaA4I/qu1UhCio+Wb0kg=", - "ref": "refs/heads/master", - "rev": "8ae9c6ecda7177670c631df040a1c465107d6657", - "revCount": 655, - "type": "git", - "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" + "path": "../../common", + "type": "path" }, "original": { - "type": "git", - "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" - } + "path": "../../common", + "type": "path" + }, + "parent": [] }, "crane": { "locked": { @@ -108,11 +103,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1753592768, - "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", + "lastModified": 1756245065, + "narHash": "sha256-aAZNbGcWrVRZgWgkQbkabSGcDVRDMgON4BipMy69gvI=", "owner": "rycee", "repo": "home-manager", - "rev": "fc3add429f21450359369af74c2375cb34a2d204", + "rev": "54b2879ce622d44415e727905925e21b8f833a98", "type": "github" }, "original": { @@ -194,22 +189,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1753694789, - "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1741379970, "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", @@ -225,7 +204,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1755471983, "narHash": "sha256-axUoWcm4cNQ36jOlnkD9D40LTfSQgk8ExfHSRm3rTtg=", @@ -241,7 +220,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1757952092, "narHash": "sha256-BcfTLFCU7elUJ2dwyt0iTjxsz/XLh+8ZygDcFwy6xPE=", @@ -1141,7 +1120,7 @@ "agenix": "agenix", "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay" }, "locked": { @@ -1161,14 +1140,14 @@ "root": { "inputs": { "common": "common", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "ros_neovim": "ros_neovim" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix index 8626992..4916043 100644 --- a/hosts/lio/flake.nix +++ b/hosts/lio/flake.nix @@ -4,8 +4,8 @@ nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Use relative to get current version for testing - # common.url = "path:../../common"; - common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; + common.url = "path:../../common"; + # common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; }; @@ -77,6 +77,7 @@ foot vlc upkgs.ladybird + google-chrome ]; # Also allow this key to work for root user, this will let us use this as a remote builder easier users.users.root.openssh.authorizedKeys.keys = [ @@ -122,7 +123,6 @@ "org.openscad.OpenSCAD" "org.blender.Blender" "com.rustdesk.RustDesk" - "com.google.Chrome" ]; }; };