aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock18
-rw-r--r--home/gtk.nix15
-rw-r--r--system/keyboard.nix3
3 files changed, 13 insertions, 23 deletions
diff --git a/flake.lock b/flake.lock
index 812d91d..ef2610b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
]
},
"locked": {
- "lastModified": 1718788307,
- "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=",
+ "lastModified": 1721135958,
+ "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca",
+ "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d",
"type": "github"
},
"original": {
@@ -22,11 +22,11 @@
},
"impermanence": {
"locked": {
- "lastModified": 1717932370,
- "narHash": "sha256-7C5lCpiWiyPoIACOcu2mukn/1JRtz6HC/1aEMhUdcw0=",
+ "lastModified": 1719091691,
+ "narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=",
"owner": "nix-community",
"repo": "impermanence",
- "rev": "27979f1c3a0d3b9617a3563e2839114ba7d48d3f",
+ "rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a",
"type": "github"
},
"original": {
@@ -37,11 +37,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1718530797,
- "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=",
+ "lastModified": 1720957393,
+ "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "b60ebf54c15553b393d144357375ea956f89e9a9",
+ "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
"type": "github"
},
"original": {
diff --git a/home/gtk.nix b/home/gtk.nix
index b32ed77..a5de43d 100644
--- a/home/gtk.nix
+++ b/home/gtk.nix
@@ -5,19 +5,8 @@
enable = true;
theme = {
- # nixpkgs 24.05 version
- # Unstable doesn't work, and, frankly, I can't be bothered to fix it
- #TODO: update to latest version, eventually
- package = (pkgs.gruvbox-gtk-theme.overrideAttrs {
- version = "unstable-2023-05-28";
- src = pkgs.fetchFromGitHub {
- owner = "Fausto-Korpsvart";
- repo = "Gruvbox-GTK-Theme";
- rev = "c0b7fb501938241a3b6b5734f8cb1f0982edc6b4";
- hash = "sha256-Y+6HuWaVkNqlYc+w5wLkS2LpKcDtpeOpdHnqBmShm5Q=";
- };
- });
- name = "Gruvbox-Dark-B";
+ package = pkgs.gruvbox-gtk-theme;
+ name = "Gruvbox-Dark";
};
font = {
diff --git a/system/keyboard.nix b/system/keyboard.nix
index 69d10e8..1a3de2f 100644
--- a/system/keyboard.nix
+++ b/system/keyboard.nix
@@ -22,7 +22,8 @@
};
i18n.inputMethod = {
- enabled = "fcitx5";
+ enable = true;
+ type = "fcitx5";
fcitx5.addons = with pkgs; [ fcitx5-mozc ];
};