From 8f820769f741a7856ff0daff72dae305772d4970 Mon Sep 17 00:00:00 2001
From: fredrikr79 <fredrikrobertsen7@gmail.com>
Date: Thu, 30 Oct 2025 13:53:37 +0100
Subject: [PATCH] SWITCH FROM MASTER

---
 configuration.nix | 2 +-
 flake.nix         | 2 +-
 home.nix          | 9 +++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index cf5a8e4..1ebf379 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -83,7 +83,7 @@ in
       fcitx5-rime
       fcitx5-mozc
       fcitx5-gtk
-      fcitx5-configtool
+      qt6Packages.fcitx5-configtool
       libsForQt5.fcitx5-qt
     ];
   };
diff --git a/flake.nix b/flake.nix
index 9b44116..def2e25 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "A very basic flake";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs";
+    nixpkgs.url = "nixos/nixos-unstable";
 
     home-manager = {
       url = "github:nix-community/home-manager";
diff --git a/home.nix b/home.nix
index e960c1a..db30b63 100644
--- a/home.nix
+++ b/home.nix
@@ -73,7 +73,6 @@ in
     zoxide
     libgit2
     jujutsu
-    ungoogled-chromium
     mpv
     # inputs.uiua.packages."${system}".default
     odin
@@ -798,7 +797,7 @@ in
 
       diffview = {
         enable = true;
-        view.mergeTool.layout = "diff3_mixed";
+        settings.view.merge_tool.layout = "diff3_mixed";
       };
 
       # markview = {
@@ -1139,8 +1138,10 @@ in
 
   programs.git = {
     enable = true;
-    userName = "fredrikr79";
-    userEmail = "fredrikrobertsen7@gmail.com";
+    settings.user = {
+      name = "fredrikr79";
+      email = "fredrikrobertsen7@gmail.com";
+    };
     ignores = [
       ".direnv"
       ".jj"