From b83d57f8fadd3a6f1384823f4e84f2f54e6f9c5f Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 4 Apr 2023 08:26:27 +0100
Subject: [PATCH] Fix i3 startup commands

---
 nixos/home-manager/env/config/i3/startup.nix |  5 ---
 nixos/home-manager/env/i3.nix                | 43 +++++++++++---------
 2 files changed, 23 insertions(+), 25 deletions(-)
 delete mode 100644 nixos/home-manager/env/config/i3/startup.nix

diff --git a/nixos/home-manager/env/config/i3/startup.nix b/nixos/home-manager/env/config/i3/startup.nix
deleted file mode 100644
index fb6362ba..00000000
--- a/nixos/home-manager/env/config/i3/startup.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }:
-[
-  { command = "$HOME/.screenlayout/default.sh";}
-  { command = "nitrogen --restore";}
-]
diff --git a/nixos/home-manager/env/i3.nix b/nixos/home-manager/env/i3.nix
index 79038e0a..ebc951eb 100644
--- a/nixos/home-manager/env/i3.nix
+++ b/nixos/home-manager/env/i3.nix
@@ -14,24 +14,27 @@ in
     nitrogen
     i3blocks
   ];
-  #xsession.windowManager.i3 = {
-  #  enable = true;
-  #  config = {
-  #    modifier = mod;
-  #    floating = {
-  #      modifier = mod;
-  #    };
-  #    fonts = {
-  #      names = ["Noto Sans Regular" "DejaVu Sans Mono"];
-  #      style = "Regular";
-  #      size = 12.0;
-  #    };
-  #    gaps = {
-  #      inner = 6;
-  #      outer = 3;
-  #    };
-  #    keybindings = import ./config/i3/keybindings.nix;
-  #    startup = import ./config/i3/startup.nix;
-  #  };
-  #};
+  xsession.windowManager.i3 = {
+    enable = true;
+    config = {
+      modifier = mod;
+      floating = {
+        modifier = mod;
+      };
+      fonts = {
+        names = [ "Noto Sans Regular" "DejaVu Sans Mono" ];
+        style = "Regular";
+        size = 12.0;
+      };
+      gaps = {
+        inner = 6;
+        outer = 3;
+      };
+      keybindings = import ./config/i3/keybindings.nix;
+      startup = [
+        { command = "$HOME/.screenlayout/default.sh"; }
+        { command = "nitrogen --restore"; }
+      ];
+    };
+  };
 }