home-manager/home.nix

@@ -9,7 +9,6 @@
 
     # You can also split up your configuration and import pieces of it here:
     # ./nvim.nix
-    # ./i3.nix
   ];
 
   nixpkgs = {
@@ -42,10 +41,7 @@
 
   # Add stuff for your user as you see fit:
   programs.neovim.enable = true;
-  home.packages = with pkgs; [ 
-    steam
-    librewolf
-  ];
+  # home.packages = with pkgs; [ steam ];
 
   # Enable home-manager and git
   programs.home-manager.enable = true;

home-manager/i3.nix

@@ -3,44 +3,41 @@
 let 
   mod = "Mod1";
 in {
-  xsession = {
+  xsession.windowManager.i3 = {
     enable = true;
-    windowManager.i3 = {
-      enable = true;
-      config = {
-        modifier = mod;
+    config = {
+      modifier = mod;
 
-        # fonts = ["DejaVu Sans Mono, FontAwesome 6"];
+      fonts = ["DejaVu Sans Mono, FontAwesome 6"];
 
-        # keybindings = lib.mkOptionDefault {
-        #   "${mod}+p" = "exec ${pkgs.dmenu}/bin/dmenu_run";
-        #   "${mod}+x" = "exec sh -c '${pkgs.maim}/bin/maim -s | xclip -selection clipboard -t image/png'";
-        #   "${mod}+Shift+x" = "exec sh -c '${pkgs.i3lock}/bin/i3lock -c 222222 & sleep 5 && xset dpms force of'";
+      keybindings = lib.mkOptionDefault {
+        "${mod}+p" = "exec ${pkgs.dmenu}/bin/dmenu_run";
+        "${mod}+x" = "exec sh -c '${pkgs.maim}/bin/maim -s | xclip -selection clipboard -t image/png'";
+        "${mod}+Shift+x" = "exec sh -c '${pkgs.i3lock}/bin/i3lock -c 222222 & sleep 5 && xset dpms force of'";
 
-        #   # Focus
-        #   "${mod}+j" = "focus left";
-        #   "${mod}+k" = "focus down";
-        #   "${mod}+l" = "focus up";
-        #   "${mod}+semicolon" = "focus right";
+        # Focus
+        "${mod}+j" = "focus left";
+        "${mod}+k" = "focus down";
+        "${mod}+l" = "focus up";
+        "${mod}+semicolon" = "focus right";
 
-        #   # Move
-        #   "${mod}+Shift+j" = "move left";
-        #   "${mod}+Shift+k" = "move down";
-        #   "${mod}+Shift+l" = "move up";
-        #   "${mod}+Shift+semicolon" = "move right";
+        # Move
+        "${mod}+Shift+j" = "move left";
+        "${mod}+Shift+k" = "move down";
+        "${mod}+Shift+l" = "move up";
+        "${mod}+Shift+semicolon" = "move right";
 
-        #   # My multi monitor setup
-        #   # "${mod}+m" = "move workspace to output DP-2";
-        #   # "${mod}+Shift+m" = "move workspace to output DP-5";
-        # };
-
-        # bars = [
-        #   {
-        #     position = "bottom";
-        #     statusCommand =  "${pkgs.i3status-rust}/bin/i3status-rs ${./i3status-rust.toml}";
-        #   }
-        # ];
+        # My multi monitor setup
+        "${mod}+m" = "move workspace to output DP-2";
+        "${mod}+Shift+m" = "move workspace to output DP-5";
       };
+
+      bars = [
+        {
+          position = "bottom";
+          statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ${./i3status-rust.toml}";
+        }
+      ];
     };
   };
 }

home-manager/i3status-rust.toml

@@ -1,2 +0,0 @@
-theme = "gruvgox-dark"
-icons = "awesome"

nixos/configuration.nix

@@ -6,13 +6,13 @@
   # You can import other NixOS modules here
   imports = [
     # If you want to use modules from other flakes (such as nixos-hardware):
-    # inputs.hardware.nixosModules.common-cpu-amd
-    # inputs.hardware.nixosModules.common-gpu-nvidia
+    inputs.hardware.nixosModules.common-cpu-amd
+    inputs.hardware.nixosModules.common-gpu-nvidia
 
     # You can also split up your configuration and import pieces of it here:
     # ./users.nix
     ./network.nix
-    ./i3.nix
+    # ./i3.nix
 
     # Import home-manager's NixOS module
     inputs.home-manager.nixosModules.home-manager
@@ -131,19 +131,17 @@
   # Feel free to remove if you don't need it.
   services.openssh = {
     enable = true;
-    settings = {
-      # Forbid root login through SSH.
-      PermitRootLogin = "yes";
-      # Use keys only. Remove if you want to SSH using password (not recommended)
-      PasswordAuthentication = false;
-    };
+    # Forbid root login through SSH.
+    permitRootLogin = "yes";
+    # Use keys only. Remove if you want to SSH using password (not recommended)
+    passwordAuthentication = false;
   };
 
   home-manager = {
     extraSpecialArgs = { inherit inputs; };
     users = {
       # Import your home-manager configuration
-      mans = import ../home-manager/home.nix;
+      mans = import ../home-manager;
     };
   };
 

nixos/i3.nix

@@ -23,6 +23,7 @@
      ];
     };
 
+    displayManager.session = "none";
     # windowManager.default = "i3";
     layout = "us";
     xkbVariant = "";