From 451b92c3e9e36cc5c92304a2a0da173f46ae7570 Mon Sep 17 00:00:00 2001
From: Mans Ziesel <mans@mziesel.com>
Date: Tue, 20 Jun 2023 19:10:32 +0200
Subject: [PATCH] common stuff

---
 home-manager/home.nix                    |  4 ++++
 home-manager/zsh.nix                     | 22 ++++++++++++++++++++++
 nixos/machines/pc-mans/configuration.nix | 10 +++++++++-
 nixos/modules/common.nix                 |  2 ++
 nixos/modules/i3.nix                     |  2 --
 nixos/modules/mans.nix                   | 15 +++++++--------
 nixos/modules/nixconfig.nix              |  4 ++++
 nixos/modules/xmonad.nix                 | 13 +++++++++++++
 8 files changed, 61 insertions(+), 11 deletions(-)
 create mode 100644 home-manager/zsh.nix
 create mode 100644 nixos/modules/common.nix
 create mode 100644 nixos/modules/xmonad.nix

diff --git a/home-manager/home.nix b/home-manager/home.nix
index f9ace4a..3a1e5c0 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -10,6 +10,7 @@
     # You can also split up your configuration and import pieces of it here:
     ./nvim.nix
     ./kitty.nix
+    ./zsh.nix
     # ./i3.nix
   ];
 
@@ -70,6 +71,9 @@
   services.owncloud-client = {
     enable = true;
   };
+
+  services.dunst.enable = true;
+  services.flameshot.enable = true;
   	
   services.playerctld.enable = true;
 
diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix
new file mode 100644
index 0000000..e9086db
--- /dev/null
+++ b/home-manager/zsh.nix
@@ -0,0 +1,22 @@
+{ config, lib, pkgs, ... }:
+
+{
+  programs.zsh = {
+    enable = true;
+    # autocd = true;
+    # dotDir = ".config/zsh";
+    # enableAutosuggestions = true;
+    # enableCompletion = true;
+    shellAliases = {
+      l = "exa -l";
+      ssh = "TERM=xterm-256color ssh";
+    };
+    sessionVariables.PROMPT= ''%B%F{green}[%n@%m:%~]%f%b%F{green}$%f '';
+  };
+
+  programs.fzf = {
+    enable = true;
+    enableZshIntegration = true;
+  };
+
+}
diff --git a/nixos/machines/pc-mans/configuration.nix b/nixos/machines/pc-mans/configuration.nix
index c88dc0a..d96eda6 100644
--- a/nixos/machines/pc-mans/configuration.nix
+++ b/nixos/machines/pc-mans/configuration.nix
@@ -21,6 +21,8 @@
     ../../modules/nvidia.nix
     ../../modules/docker.nix
 
+    ../../modules/xmonad.nix
+
     ./hardware-configuration.nix
   ];
 
@@ -41,11 +43,17 @@
     "/crypto_keyfile.bin" = null;
   };
 
+  services.xserver.displayManager.autoLogin.enable = false;
+  services.xserver.displayManager.autoLogin.user = "mans";
+
   environment.systemPackages = with pkgs; [
     wget
     neovim
     openssl
-  ];  
+    tree
+    file
+    inetutils
+  ];
 
   home-manager = {
     extraSpecialArgs = { inherit inputs; };
diff --git a/nixos/modules/common.nix b/nixos/modules/common.nix
new file mode 100644
index 0000000..2c63c08
--- /dev/null
+++ b/nixos/modules/common.nix
@@ -0,0 +1,2 @@
+{
+}
diff --git a/nixos/modules/i3.nix b/nixos/modules/i3.nix
index deb3e54..4b307f8 100644
--- a/nixos/modules/i3.nix
+++ b/nixos/modules/i3.nix
@@ -12,8 +12,6 @@
    
     displayManager.defaultSession = "none+i3";
     displayManager.lightdm.enable = true;
-    displayManager.autoLogin.enable = true;
-    displayManager.autoLogin.user = "mans";
 
     windowManager.i3 = {
       enable = true;
diff --git a/nixos/modules/mans.nix b/nixos/modules/mans.nix
index 4a75de0..b5bd776 100644
--- a/nixos/modules/mans.nix
+++ b/nixos/modules/mans.nix
@@ -1,13 +1,12 @@
 { inputs, config, lib, pkgs, ... }:
 
+
 {
-  users.users = {
-    mans = {
-      isNormalUser = true;
-      openssh.authorizedKeys.keys = [
-        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDub2v/G51kGDqhQ4o7LN5ncq1oS0e14cjlibsPSfuPsGQBSFMojAUN8sYf43PrlzJs1nZsA3teF9SLmuWcyzcNXGKclhbj0AhN470l/G2SoEcIKDTgVJwNeQ7A/qzFSxmXIV7rmiPPADAyq0ykQA9MAD3f/+4KPiv3DgcU+9ZkSD1nbh4TGld44OLr70ozWBEdqlaUETIXKleEq/RbMcNi3YD89opafeeKpt6tMQydxcIFLUMimq3PiYVjJk4bypjB2r/jMAgnrE6nm96L8R8EZFMWsKpaL2s52NX90VIB69VMyQTdKdHEtxRWIwFR68E3YkYfyGZ5gyNIOaG4l0FyBVux21KxpR1kjhgm2JNw2moG0qwkpFI+Lu+3hqvUu0OM8otTpqGMWjTVs0yYsmIqwnEzEqAifdWxcLus6QLmz+61ajyQBlPBkJ6qFr9MhFvQOnuaUB461SkN/Rah3PU2wUSO9VvCcan2+l3M5zP2QJfPGfdS/mUHPuqCVzzXjNc= mzies@DESKTOP-AKMBK3I"
-      ];
-      extraGroups = [ "wheel" "networkmanager" ];
-    };
+  users.users.mans = {
+    isNormalUser = true;
+    openssh.authorizedKeys.keys = [
+      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDub2v/G51kGDqhQ4o7LN5ncq1oS0e14cjlibsPSfuPsGQBSFMojAUN8sYf43PrlzJs1nZsA3teF9SLmuWcyzcNXGKclhbj0AhN470l/G2SoEcIKDTgVJwNeQ7A/qzFSxmXIV7rmiPPADAyq0ykQA9MAD3f/+4KPiv3DgcU+9ZkSD1nbh4TGld44OLr70ozWBEdqlaUETIXKleEq/RbMcNi3YD89opafeeKpt6tMQydxcIFLUMimq3PiYVjJk4bypjB2r/jMAgnrE6nm96L8R8EZFMWsKpaL2s52NX90VIB69VMyQTdKdHEtxRWIwFR68E3YkYfyGZ5gyNIOaG4l0FyBVux21KxpR1kjhgm2JNw2moG0qwkpFI+Lu+3hqvUu0OM8otTpqGMWjTVs0yYsmIqwnEzEqAifdWxcLus6QLmz+61ajyQBlPBkJ6qFr9MhFvQOnuaUB461SkN/Rah3PU2wUSO9VvCcan2+l3M5zP2QJfPGfdS/mUHPuqCVzzXjNc= mzies@DESKTOP-AKMBK3I"
+    ];
+    extraGroups = [ "wheel" "networkmanager" ];
   };
 }
diff --git a/nixos/modules/nixconfig.nix b/nixos/modules/nixconfig.nix
index a1b685a..d681194 100644
--- a/nixos/modules/nixconfig.nix
+++ b/nixos/modules/nixconfig.nix
@@ -37,4 +37,8 @@
       auto-optimise-store = true;
     };
   };
+
+  nix.gc.automatic = true;
+  nix.gc.options = "--delete-older-than 30d";
+
 }
diff --git a/nixos/modules/xmonad.nix b/nixos/modules/xmonad.nix
new file mode 100644
index 0000000..8dd455c
--- /dev/null
+++ b/nixos/modules/xmonad.nix
@@ -0,0 +1,13 @@
+{ config, lib, pkgs, ... }:
+
+{
+  environment.pathsToLink = [ "/libexec" ]; # links /libexec from derivations to /run/current-system/sw 
+  # Define the i3 window manager configuration
+  services.xserver = {
+    windowManager.xmonad = {
+      enable = true;
+      enableContribAndExtras = true;
+    };
+  };
+}
+