✏️ awesomewm is back from the dead

elythh · Nov 1, 2023 · 00311c3 · 00311c3
1 parent e117639
commit 00311c3
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 19 deletions.
diff --git a/home/gwen/conf/utils/picom/default.nix b/home/gwen/conf/utils/picom/default.nix
@@ -1,8 +1,10 @@
-{ pkgs, nixpkgs-f2k, ... }:
+{ pkgs, inputs, ... }:
+let
+  nixpkgs-f2k = inputs.nixpkgs-f2k;
+in
 {
   services.picom = {
     enable = true;
-    #package = nixpkgs-f2k.packages.${pkgs.system}.picom-pijulius;
     package = nixpkgs-f2k.packages.${pkgs.system}.picom-ft-labs.overrideAttrs (oldAttrs: {
       src = pkgs.fetchFromGitHub {
         owner = "fdev31";

diff --git a/home/gwen/home.nix b/home/gwen/home.nix
@@ -1,9 +1,7 @@
-{ inputs, config, pkgs, lib, ... }:
+{ inputs, config, pkgs, lib, nix-colors, spicetify-nix, nixpkgs-f2k, ... }:
 
 let
-  spicetify-nix = inputs.spicetify-nix;
-  colors = import ../shared/cols/cat.nix { };
-  hyprland = inputs.hyprland;
+  colors = import ../shared/cols/verdant.nix { };
   hyprland-plugins = inputs.hyprland-plugins;
   split-monitor-workspaces = inputs.split-monitor-workspaces;
   zjstatus = inputs.zjstatus;
@@ -13,7 +11,6 @@ let
     {
       config = config.nixpkgs.config;
     };
-  nixpkgs-f2k = inputs.nixpkgs-f2k;
 in
 {
   # some general info
@@ -47,13 +44,15 @@ in
       size = 11;
     };
   };
+  colorScheme = nix-colors.colorSchemes.catppuccin-mocha;
   imports = [
+    nix-colors.homeManagerModules.default
     # Importing Configurations
-    # (import ./conf/ui/eww/default.nix { inherit pkgs inputs config lib colors; })
-    (import ../shared/xresources.nix { inherit colors; })
-    (import ./conf/music/cava/default.nix { inherit colors; })
-    (import ./conf/music/spicetify/default.nix { inherit colors spicetify-nix pkgs; })
-    (import ./conf/shell/zsh/default.nix { inherit config colors pkgs; })
+    (import ./misc/awesome.nix { inherit pkgs colors; })
+    ./conf/utils/picom
+    ./conf/music/cava
+    ./conf/music/spicetify
+    ./conf/shell/zsh
     (import ./conf/term/kitty/default.nix { inherit pkgs colors; })
     (import ./conf/term/wezterm/default.nix { inherit pkgs colors; })
     (import ./conf/term/zellij { inherit pkgs colors; })
@@ -77,6 +76,9 @@ in
   home = {
     activation = {
       installConfig = ''
+        if [ ! -d "${config.home.homeDirectory}/.config/awesome" ]; then
+          ${pkgs.git}/bin/git clone --depth 1 --branch alps https://github.com/chadcat7/crystal ${config.home.homeDirectory}/.config/awesome
+        fi
         if [ ! -d "${config.home.homeDirectory}/.config/nvim" ]; then
           ${pkgs.git}/bin/git clone --depth 1 https://github.com/elythh/nvim ${config.home.homeDirectory}/.config/nvim
         fi

diff --git a/home/gwen/misc/xinit.nix b/home/gwen/misc/xinit.nix
@@ -2,6 +2,6 @@
 {
   home.file.".xinitrc".text = ''
     #!/usr/bin/env bsah
-    exec dbus-run-session hyprland
+    exec dbus-run-session awesome
   '';
 }
diff --git a/home/shared/bin/misc/changeTheme.nix b/home/shared/bin/misc/changeTheme.nix
@@ -5,5 +5,5 @@ _:
   sed -i "5s/.*/  colors = import ..\/shared\/cols\/$THEME.nix { };/g" /etc/nixos/home/gwen/home.nix
   cd /etc/nixos && home-manager switch --flake ".#$USER@thinkpad"
   echo $THEME > /tmp/themeName
-  eww reload
+  awesome-client 'awesome.emit_signal("colors::refresh")'
 ''
diff --git a/hosts/shared/default.nix b/hosts/shared/default.nix
@@ -50,10 +50,11 @@ in
     defaultUserShell = pkgs.zsh;
   };
   fonts.packages = with pkgs; [
+    rubik
     gg-sans
     lexend
     # icon fonts
-    material-symbols
+    material-design-icons
 
     # normal fonts
     lexend

diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix
@@ -16,6 +16,10 @@
     overlays = [
       outputs.overlays.modifications
       outputs.overlays.additions
+      (final: prev:
+        {
+          awesome = inputs.nixpkgs-f2k.packages.${pkgs.system}.awesome-git;
+        })
     ];
   };
   # Bootloader.
@@ -79,10 +83,13 @@
           naturalScrolling = true;
         };
       };
-      displayManager.gdm.enable = true;
-      displayManager.gdm.wayland = true;
-      displayManager.sessionPackages = [ pkgs.hyprland ];
-      desktopManager.gnome.enable = false;
+      displayManager = {
+        defaultSession = "none+awesome";
+        startx.enable = true;
+      };
+      windowManager.awesome = {
+        enable = true;
+      };
     };
   };