resuscitate thinky

nixos/boxes/foryog/default.nix

@@ -10,8 +10,9 @@
     ../../gui
     ../../libvirt.nix
     ../../mercurial
-    ../../vim
     ../../sdr.nix
+    ../../vim
+    ../../zsh
   ];
 
   fileSystems."/" = { options = [ "compress=zstd" ]; };

nixos/boxes/thinky/default.nix

@@ -1,20 +1,17 @@
-{
+{ config, pkgs, ... }: {
-  config,
-  pkgs,
-  ...
-}: {
   networking.hostName = "thinky";
 
   imports = [
     ./hardware-configuration.nix
     ../../backups.nix
     ../../boot.nix
-    ../../distributed-builds.nix
     ../../gfx-intel.nix
     ../../git
     ../../gui
     ../../i3
     ../../mercurial
+    ../../vim
+    ../../zsh
   ];
 
   time.timeZone = "Europe/Warsaw";
@@ -27,7 +24,7 @@
     algorithm = "zstd";
     memoryPercent = 50;
   };
-  home-manager.users.cyryl = {...}: {
+  home-manager.users.cyryl = { ... }: {
-    imports = [../../home-manager/programs/termite.nix];
+    imports = [ ../../home-manager/programs/termite.nix ];
   };
 }

nixos/home-manager/default.nix

@@ -13,7 +13,7 @@ in {
 
   home.username = username;
   home.homeDirectory = lib.mkDefault "/home/${username}";
-  home.stateVersion = "22.11";
+  home.stateVersion = "23.05";
   programs.home-manager.enable = true;
 
   imports = [
@@ -26,6 +26,5 @@ in {
     ./programs/newsboat.nix
     ./programs/ssh.nix
     ./programs/tmux.nix
-    ./programs/zsh.nix
   ];
 }

nixos/zsh/default.nix

@@ -0,0 +1,4 @@
+{ config, pkgs, lib, ... }: {
+  programs.zsh.enable = true;
+  home-manager.users.cyryl = { ... }: { imports = [ ./home.nix ]; };
+}