Skip to content

Commit

Permalink
Update to nixos-24.11
Browse files Browse the repository at this point in the history
It seems like my existing overlays are not longer necessary, so I've
effectively removed them.

A few options needed to be renamed in configuration.nix.

Font rendering in wezterm broke. See here for more details:
wez/wezterm#5990

A few games in Steam that used to start no longer do.
shapez.io: Needs the nss library.
  • Loading branch information
michael-p-m-white committed Nov 27, 2024
1 parent 326507c commit dd47797
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .config/alacritty/alacritty.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import = [
"~/.nix-profile/share/alacritty-theme/xterm.toml",
general.import = [
#"~/.nix-profile/share/alacritty-theme/argonaut.toml",
#"~/.nix-profile/share/alacritty-theme/tokyo-night.toml",
#"~/.nix-profile/share/alacritty-theme/doom_one.toml",
Expand Down
8 changes: 4 additions & 4 deletions .config/nixos/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .config/nixos/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
type = "github";
owner = "NixOS";
repo = "nixpkgs";
ref = "nixos-24.05";
ref = "nixos-24.11";
};
};

Expand Down
15 changes: 12 additions & 3 deletions .config/nixos/laptop/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,8 @@
# order to ensure that input events are handled in order, we set IBUS_ENABLE_SYNC_MODE to 1 to force synchronous
# handling of input events by ibus.
i18n.inputMethod = {
enabled = "ibus";
type = "ibus";
enable = true;
ibus.engines = with pkgs.ibus-engines; [ anthy ];
};
environment.variables = {
Expand All @@ -191,12 +192,20 @@
"steam-original"
"steam-runtime"
"steam-run"
"steam-unwrapped"
];
programs.steam.enable = true;
programs.steam = {
enable = true;
package = pkgs.steam.override {
extraLibraries = p: with p; [
nss
];
};
};
programs.adb.enable = true;

# Add fuse as an extra module for steam (for use by steam-run, to get Beyond All Reason running)
hardware.opengl.extraPackages = with pkgs; [
hardware.graphics.extraPackages = with pkgs; [
fuse
];

Expand Down
14 changes: 8 additions & 6 deletions .config/nixpkgs/overlays.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
[
(import ./.overlays/descriptive.nix)
(import ./.overlays/j.nix)
(import ./.overlays/alacritty.nix)
(import ./.overlays/jujutsu.nix)
]
let overlays = [
(import ./.overlays/descriptive.nix)
(import ./.overlays/j.nix)
(import ./.overlays/alacritty.nix)
(import ./.overlays/jujutsu.nix)
];
in
[]
4 changes: 4 additions & 0 deletions .config/wezterm/wezterm.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ local wezterm = require 'wezterm'

local config = wezterm.config_builder()

-- Font rendering broke after updating to nixos 24.11.
-- Setting the frontend to "WebGpu" fixed the issue.
-- See here for details: https://github.com/wez/wezterm/issues/5990
config.front_end = "WebGpu"
config.colors = {

-- Custom colors, taken from ~/.Xdefaults
Expand Down

0 comments on commit dd47797

Please sign in to comment.