a bunch of qol improvments

README.org

@@ -36,7 +36,7 @@ Both include the home-manager module. Primarily I chose that route so that I cou
       inputs.nixpkgs.follows = "nixpkgs";
     };
     hyprland = {
-      url = "github:vaxerski/Hyprland";
+      url = "github:hyprwm/Hyprland";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     emacs = {
@@ -106,7 +106,6 @@ Both include the home-manager module. Primarily I chose that route so that I cou
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
               home-manager.users.chris = import ./user/home.nix;
-              programs.hyprland.enable = true;
             }
           ];
         };
@@ -121,7 +120,6 @@ Both include the home-manager module. Primarily I chose that route so that I cou
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
               home-manager.users.chris = import ./user/home.nix;
-              programs.hyprland.enable = true;
             }
           ];
         };
@@ -183,6 +181,16 @@ services.xserver = {
     sddm = {
       enable = true;
     };
+    session = [
+      {
+        manage = "desktop";
+        name = "Hyprland";
+        start = ''
+          /home/chris/bin/hyprland &
+          waitPID=$!
+        '';
+      }
+    ];
   };
   desktopManager.plasma5 = {
     enable = true;
@@ -191,6 +199,25 @@ services.xserver = {
   # desktopManager.gnome.enable = true;
 };
 
+services.greetd = {
+  enable = true;
+  settings = rec {
+    initial_session = {
+      command = "startplasma-wayland";
+      user = "chris";
+    };
+    default_session = initial_session;
+    hyprland_session = {
+      command = "/home/chris/bin/hyprland";
+      user = "chris";
+    };
+  };
+};
+
+programs.hyprland = {
+  enable = true;
+};
+
 services.avahi = {
   enable = true;
   nssmdns = true;
@@ -497,7 +524,7 @@ fennel
 Let's create our own custom LightlyShaders package. This is in it's own file for now.
 #+NAME: lightlyshaders
 #+begin_src nix
-(libsForQt5.callPackage ../../LightlyShaders {})
+(libsForQt5.callPackage /home/chris/dev/LightlyShaders {})
 #+end_src
 
 Let's also add our own package from my WIP presenter
@@ -554,15 +581,12 @@ Emacs service
 #+begin_src nix
 services.emacs = {
   enable = true;
-  package = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages 
+  package = with pkgs; ((emacsPackagesFor emacsPgtk).emacsWithPackages 
     (epkgs: with epkgs; [
       vterm
       magit
       pdf-tools
-      eglot
       consult-eglot
-      tree-sitter
-      tree-sitter-langs
       org
       org-roam
       command-log-mode
@@ -663,7 +687,6 @@ services.emacs = {
       use-package
       esh-autosuggest
       pkgs.mu
-      pkgs.tree-sitter-grammars.tree-sitter-cpp
     ]));
 };
 #+end_src

flake.nix

@@ -9,7 +9,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     hyprland = {
-      url = "github:vaxerski/Hyprland";
+      url = "github:hyprwm/Hyprland";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     emacs = {
@@ -79,7 +79,6 @@
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
               home-manager.users.chris = import ./user/home.nix;
-              programs.hyprland.enable = true;
             }
           ];
         };
@@ -94,7 +93,6 @@
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
               home-manager.users.chris = import ./user/home.nix;
-              programs.hyprland.enable = true;
             }
           ];
         };

hypr/hyprland.conf

@@ -106,7 +106,7 @@ bind=SUPERSHIFT,Q,exit,
 bind=SUPERSHIFT,D,exec,dolphin
 bind=SUPERSHIFT,F,togglefloating,
 bindr=SUPER,Super_L,exec,/home/chris/bin/launcher.sh
-bindr=ALT,Alt_L,exec,/home/chris/bin/windows.sh
+bindr=SUPERALT,Alt_L,exec,/home/chris/bin/windows.sh
 bind=SUPER,E,exec,/home/chris/bin/emacslof
 bind=SUPER,B,exec,/home/chris/bin/fflof
 bind=SUPER,A,exec,alacritty --class pulsemixer -e pulsemixer
@@ -156,8 +156,8 @@ bind=SUPER,y,togglespecialworkspace
 bind=SUPER,i,pin
 bind=SUPER,n,movetoworkspace,special
 
-binde=, XF86AudioRaiseVolume, exec, volup
+binde=, XF86AudioRaiseVolume, exec, /home/chris/bin/volup
-binde=, XF86AudioLowerVolume, exec, voldown
+binde=, XF86AudioLowerVolume, exec, /home/chris/bin/voldown
 binde=, XF86AudioMute, exec, pamixer -t
 
 binde=, XF86MonBrightnessUp, exec, brightnessctl s +10%

scripts/muunread

@@ -1,2 +1,2 @@
 #!/bin/sh
-mu find flag:unread AND NOT flag:trashed AND NOT maildir:\"/outlook/Junk\" AND NOT maildir:\"/office/Junk Email\" AND NOT maildir:\"/outlook/Deleted\" AND NOT maildir:\"/office/Deleted Items\" | wc -l
+mu find flag:unread AND NOT flag:trashed AND NOT maildir:\"/outlook/Junk\" AND NOT maildir:\"/office/Junk Email\" AND NOT maildir:\"/outlook/Deleted\" AND NOT maildir:\"/office/Deleted Items\" AND NOT maildir:\"/office/Archive\" AND NOT maildir:\"/outlook/Archive\" AND NOT maildir:\"/cochrun/Archive\" | wc -l

scripts/muunread-plasma.2s.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
-muunread="$(mu find flag:unread AND NOT flag:trashed AND NOT maildir:\"/outlook/Junk\" AND NOT maildir:\"/office/Junk Email\" AND NOT maildir:\"/outlook/Deleted\" AND NOT maildir:\"/office/Deleted Items\" | wc -l)"
+muunread="$(mu find flag:unread AND NOT flag:trashed AND NOT maildir:\"/outlook/Junk\" AND NOT maildir:\"/office/Junk Email\" AND NOT maildir:\"/outlook/Deleted\" AND NOT maildir:\"/office/Deleted Items\" AND NOT maildir:\"/office/Archive\" AND NOT maildir:\"/outlook/Archive\" AND NOT maildir:\"/cochrun/Archive\" | wc -l)"
 
 echo "  $muunread "
 # echo "  $muunread | color=#f3f99d font='VictorMono Nerd Font' size=11"

system/kaladin/configuration.nix

@@ -97,6 +97,16 @@
       sddm = {
         enable = true;
       };
+      session = [
+        {
+          manage = "desktop";
+          name = "Hyprland";
+          start = ''
+            /home/chris/bin/hyprland &
+            waitPID=$!
+          '';
+        }
+      ];
     };
     desktopManager.plasma5 = {
       enable = true;
@@ -105,6 +115,25 @@
     # desktopManager.gnome.enable = true;
   };
   
+  services.greetd = {
+    enable = true;
+    settings = rec {
+      initial_session = {
+        command = "startplasma-wayland";
+        user = "chris";
+      };
+      default_session = initial_session;
+      hyprland_session = {
+        command = "/home/chris/bin/hyprland";
+        user = "chris";
+      };
+    };
+  };
+  
+  programs.hyprland = {
+    enable = true;
+  };
+  
   services.avahi = {
     enable = true;
     nssmdns = true;
@@ -373,7 +402,7 @@
     # plasma5Packages.kirigami2
     sqlite
     fennel
-    (libsForQt5.callPackage ../../LightlyShaders {})
+    (libsForQt5.callPackage /home/chris/dev/LightlyShaders {})
   ];
 
   # nixpkgs.overlays = [
@@ -412,15 +441,12 @@
 
   services.emacs = {
     enable = true;
-    package = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages 
+    package = with pkgs; ((emacsPackagesFor emacsPgtk).emacsWithPackages 
       (epkgs: with epkgs; [
         vterm
         magit
         pdf-tools
-        eglot
         consult-eglot
-        tree-sitter
-        tree-sitter-langs
         org
         org-roam
         command-log-mode
@@ -521,7 +547,6 @@
         use-package
         esh-autosuggest
         pkgs.mu
-        pkgs.tree-sitter-grammars.tree-sitter-cpp
       ]));
   };
   services.samba-wsdd.enable = true;

system/syl/configuration.nix

@@ -90,6 +90,16 @@
       sddm = {
         enable = true;
       };
+      session = [
+        {
+          manage = "desktop";
+          name = "Hyprland";
+          start = ''
+            /home/chris/bin/hyprland &
+            waitPID=$!
+          '';
+        }
+      ];
     };
     desktopManager.plasma5 = {
       enable = true;
@@ -98,6 +108,25 @@
     # desktopManager.gnome.enable = true;
   };
   
+  services.greetd = {
+    enable = true;
+    settings = rec {
+      initial_session = {
+        command = "startplasma-wayland";
+        user = "chris";
+      };
+      default_session = initial_session;
+      hyprland_session = {
+        command = "/home/chris/bin/hyprland";
+        user = "chris";
+      };
+    };
+  };
+  
+  programs.hyprland = {
+    enable = true;
+  };
+  
   services.avahi = {
     enable = true;
     nssmdns = true;
@@ -393,21 +422,18 @@
     # plasma5Packages.kirigami2
     sqlite
     fennel
-    (libsForQt5.callPackage ../../LightlyShaders {})
+    (libsForQt5.callPackage /home/chris/dev/LightlyShaders {})
     (libsForQt5.callPackage /home/chris/dev/church-presenter {})
   ];
 
   services.emacs = {
     enable = true;
-    package = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages 
+    package = with pkgs; ((emacsPackagesFor emacsPgtk).emacsWithPackages 
       (epkgs: with epkgs; [
         vterm
         magit
         pdf-tools
-        eglot
         consult-eglot
-        tree-sitter
-        tree-sitter-langs
         org
         org-roam
         command-log-mode
@@ -508,7 +534,6 @@
         use-package
         esh-autosuggest
         pkgs.mu
-        pkgs.tree-sitter-grammars.tree-sitter-cpp
       ]));
   };
   services.samba-wsdd.enable = true;

waybar/config

@@ -7,10 +7,10 @@
     "modules-left": ["wlr/workspaces", "hyprland/window"],
     "modules-center": ["clock"],
     "modules-right": ["pulseaudio", "backlight", "network", "memory", "cpu", "battery", "battery#bat2", "tray"],
-    "margin-top": 0,
+    "margin-top": -5,
-    "margin-bottom": 10,
+    "margin-bottom": 8,
-    "margin-left": 17,
+    "margin-left": 6,
-    "margin-right": 17,
+    "margin-right": 6,
     // Modules configuration
     "sway/workspaces": {
         "disable-scroll": true,
@@ -51,11 +51,10 @@
         // "timezone": "America/New_York",
         "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
         "format-alt": "{:%Y-%m-%d}",
-        "format": "{:%a %b %e, %I:%M %p}"
+        "format": "{:%a %b%e, %I:%M %p}"
     },
     "cpu": {
         "format": " {usage}%",
-        "tooltip": false
     },
     "memory": {
         "format": " {}%"
@@ -75,7 +74,7 @@
     },
     "battery": {
         "states": {
-            // "good": 95,
+            "good": 95,
             "warning": 30,
             "critical": 15
         },
@@ -83,9 +82,10 @@
         "format-charging": " {capacity}%",
         "format-plugged": " {capacity}%",
         "format-alt": "{time} {icon}",
-        // "format-good": "", // An empty format will hide the module
+        "format-good": "", // An empty format will hide the module
-        // "format-full": "",
+        "format-full": "",
-        "format-icons": [" ", " ", " ", " ", " "]
+        "format-icons": [" ", " ", " ", " ", " "],
+        "format-charging-icons": [" ", " ", " ", " ", " "]
     },
     "battery#bat2": {
         "bat": "BAT2",

waybar/style.css

@@ -31,12 +31,16 @@
 
 
 window {
-    color:      @base05;
+    background: transparent;
-    background: @base00;
     /* border-radius: 20px; */
 }
 
-window#waybar.solo {
+window#waybar > box {
+    padding-top: 3px;
+    padding-bottom: 3px;
+    color:      @base05;
+    box-shadow: 2px 2px 5px 5px #101010;
+    margin: 12px 14px 14px 14px;
     background: @base00;
 }