@@ -7,11 +7,11 @@ "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1709348262,
-        "narHash": "sha256-eYTA1uZtYGFKrDOKiAz1wlE6aIC9WSdBNF8bSS818zM=",
+        "lastModified": 1711763326,
+        "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "8a15cb36fffa0b5fbe31ef16ede0a479bef4b365",
+        "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083",
         "type": "github"
       },
       "original": {
@@ -28,11 +28,11 @@ "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1709204054,
-        "narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=",
+        "lastModified": 1712759992,
+        "narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2f3367769a93b226c467551315e9e270c3f78b15",
+        "rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@ }
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1709410583,
-        "narHash": "sha256-esOSUoQ7mblwcsSea0K17McZuwAIjoS6dq/4b83+lvw=",
+        "lastModified": 1712760404,
+        "narHash": "sha256-4zhaEW1nB+nGbCNMjOggWeY5nXs/H0Y71q0+h+jdxoU=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "59e37017b9ed31dee303dbbd4531c594df95cfbc",
+        "rev": "e1c4bac14beb8c409d0534382cf967171706b9d9",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@ }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1709237383,
-        "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
+        "lastModified": 1712608508,
+        "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
+        "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6",
         "type": "github"
       },
       "original": {

@@ -2,9 +2,13 @@ { config
 , pkgs
 , self
 , host
+, lib
 , ...
 }:
 
+let
+  mkTuple = lib.hm.gvariant.mkTuple;
+in
 {
 
   imports = [
@@ -41,27 +45,29 @@ libnotify
     signal-desktop
     calibre
     pinentry
-    kontact
-    korganizer
-    libreoffice-qt
-    akonadi
+    libreoffice
     go
-    evolution
     dconf
     chromium
+    evolution
+
+    gnome3.gnome-tweaks
+    gnome3.gnome-shell-extensions
+    gnomeExtensions.appindicator
+    gnomeExtensions.dash-to-dock
+    gnomeExtensions.unite
+    gnomeExtensions.search-light
 
   ] ++ (import ./bin { inherit pkgs host; });
 
-
-  gtk = {
-    enable = true;
-    iconTheme = {
-      package = pkgs.breeze-icons;
-      name = "Breeze";
+  dconf.settings = {
+    "org/gnome/mutter" = {
+      experimental-features = [ "scale-monitor-framebuffer" ];
     };
-    theme = {
-      package = pkgs.breeze-gtk;
-      name = "Breeze";
+    "org/gnome/desktop/input-sources" = {
+      show-all-sources = true;
+      sources = [ (mkTuple [ "xkb" "us+workman" ]) (mkTuple [ "xkb" "us" ]) ];
+      xkb-options = [ "terminate:ctrl_alt_bksp" ];
     };
   };
 

@@ -13,6 +13,7 @@ loader.efi.canTouchEfiVariables = true;
     kernel.sysctl."net.ipv4.ip_forward" = 1;
     resumeDevice = "/dev/nvme0n1p2";
     kernelPackages = pkgs.linuxPackages;
+    kernelModules = [ "i2c-dev" ];
   };
 
   networking = {
@@ -25,6 +26,9 @@ firewall.checkReversePath = "loose";
   };
 
   i18n.defaultLocale = "en_US.UTF-8";
+  i18n.inputMethod = {
+    enabled = "ibus";
+  };
   time.timeZone = "Europe/Helsinki";
 
   nixpkgs.config = {
@@ -73,7 +77,7 @@ };
     variables = {
       MOZ_USE_XINPUT2 = "1";
       GDK_SCALE = "2";
-      GDK_DPI_SCALE = "2";
+      GDK_DPI_SCALE = "1";
     };
     systemPackages = with pkgs; [
       man-pages
@@ -81,6 +85,15 @@ git
       man-pages-posix
       (lib.hiPrio pkgs.bashInteractive_5)
     ];
+    gnome.excludePackages = (with pkgs; [
+      gnome-photos
+      gnome-tour
+    ]) ++ (with pkgs.gnome; [
+      cheese
+      epiphany
+      geary
+      totem
+    ]);
   };
 
   documentation = {
@@ -136,12 +149,9 @@ pulse.enable = true;
     };
     xserver = {
       enable = true;
-      layout = "us";
-      desktopManager.plasma6.enable = true;
-      displayManager.sddm = {
-        enable = true;
-        enableHidpi = true;
-      };
+      xkb.layout = "us";
+      desktopManager.gnome.enable = true;
+      displayManager.gdm.enable = true;
       dpi = 192;
       videoDrivers = [ "nvidia" ];
       screenSection = ''
@@ -165,6 +175,7 @@ udev = {
       extraRules = ''
         ACTION=="add", SUBSYSTEM=="backlight", KERNEL=="amdgpu_bl1", MODE="0666", RUN+="${pkgs.coreutils}/bin/chmod a+w /sys/class/backlight/%k/brightness"
         ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="2341", ATTRS{idProduct}=="0036", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+        KERNEL=="i2c-[0-9]*", GROUP="i2c", MODE="0660"
       '';
       extraHwdb = ''
         evdev:input:b0003v0B05p19B6*
@@ -177,6 +188,19 @@ };
     logind.extraConfig = ''
       HandlePowerKey=hibernate
     '';
+
+    keyd = {
+      enable = true;
+      keyboards.default.settings = {
+        "meta" = {
+          h = "left";
+          j = "down";
+          k = "up";
+          l = "right";
+        };
+      };
+    };
+    pcscd.enable = true;
   };
 
   virtualisation.docker = {
@@ -202,7 +226,7 @@ };
 
   users.users.icy = {
     isNormalUser = true;
-    extraGroups = [ "wheel" "docker" "audio" "video" "dialout" ];
+    extraGroups = [ "wheel" "docker" "audio" "video" "dialout" "i2c" ];
   };
 
   programs = {
@@ -227,7 +251,8 @@ };
 
   # https://github.com/NixOS/nixpkgs/issues/180175
   systemd.services.systemd-udevd.restartIfChanged = false;
-  systemd.services.NetworkManager-wait-online.enable = lib.mkForce false;
+  systemd.services.NetworkManager-wait-online.enable = lib.mkForce
+    false;
 
 
   # This value determines the NixOS release from which the default

@@ -31,4 +31,5 @@ 
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   hardware.opengl.enable = true;
   hardware.nvidia.modesetting.enable = false;
+  hardware.pulseaudio.enable = false;
 }

@@ -0,0 +1,59 @@ 
+{ config
+, pkgs
+, ...
+}:
+
+{
+  programs.alacritty = {
+    enable = true;
+    settings = {
+      env = {
+        "TERM" = "xterm-256color-italic";
+      };
+
+      window = {
+        padding.x = 10;
+        padding.y = 10;
+        dynamic_padding = true;
+        decorations = "None";
+        startup_mode = "Maximized";
+      };
+
+      font = {
+        size = 12.0;
+
+        normal.family = "Input";
+      };
+
+      cursor.style = "Beam";
+
+      colors = {
+        primary = {
+          background = "0xf4f4f4";
+          foreground = "0x676767";
+        };
+        normal = {
+          black = "0xf4f4f4";
+          red = "0xdb7070";
+          green = "0x7c9f4b";
+          yellow = "0xd69822";
+          blue = "0x6587bf";
+          magenta = "0xb870ce";
+          cyan = "0x509c93";
+          white = "0x676767";
+        };
+        bright = {
+          black = "0xaaaaaa";
+          red = "0xc66666";
+          green = "0x6d8b42";
+          yellow = "0xe7e7e7";
+          blue = "0x8a8a8a";
+          magenta = "0xa262b5";
+          cyan = "0x43827b";
+          white = "0x525252";
+        };
+      };
+
+    };
+  };
+}

@@ -9,10 +9,10 @@ 
   imports = [
     ./firefox.nix
     ./common.nix
+    ./alacritty.nix
   ];
 
   programs = {
-    mbsync.enable = true;
     gpg.enable = true;
   };
 }

@@ -44,6 +44,11 @@ user = "icy";
         hostname = "150.230.131.193";
         identityFile = "~/.ssh/id_rsa";
       };
+      "aniverse" = {
+        user = "icy";
+        hostname = "94.237.18.93";
+        identityFile = "~/.ssh/id_ed25519";
+      };
     };
   };
 }

@@ -10,12 +10,11 @@ gpg-agent = {
       enable = true;
       defaultCacheTtl = 60 * 60 * 24 * 7;
       maxCacheTtl = 60 * 60 * 24 * 7;
-      pinentryFlavor = "qt";
+      pinentryPackage = pkgs.pinentry-gnome3;
     };
     plan9port = {
       fontsrv.enable = true;
       plumber.enable = true;
     };
   };
-
 }