switch to wayland

1 files changed, 28 insertions, 7 deletions

diff --git a/nixos.org b/nixos.org
index f0ad6c4..1560b6d 100644
--- a/nixos.org
+++ b/nixos.org
@@ -199,7 +199,7 @@ stuff
    I don't acutally literally live in the terminal. So we have to implement some xorg and other stuff
 *** Basics
     Enable printing, sound and a good keyboard, along with x11 itself
-    #+begin_src nix :noweb_ref no
+    #+begin_src nix :noweb-ref no
       {
         # Enable CUPS to print documents.
         services.printing.enable = true;
@@ -266,6 +266,26 @@ stuff
    #+begin_src nix
      {
        programs.wayfire.enable = true;
+       programs.wayfire.plugins = with pkgs.wayfirePlugins; [
+         wcm
+         wf-shell
+         wayfire-plugins-extra
+       ];
+       sound.enable = true;
+       fonts.packages = with pkgs; [
+         noto-fonts
+         noto-fonts-cjk
+         noto-fonts-emoji
+         liberation_ttf
+         fira-code
+         fira-code-symbols
+         mplus-outline-fonts.githubRelease
+         dina-font
+         proggyfonts
+       ];
+       environment.systemPackages = with pkgs; [
+         wofi waypipe 
+       ];
      }
    #+end_src
 ** Networking
@@ -282,9 +302,9 @@ stuff
     #+begin_src nix
       {
         environment.systemPackages = let
-          myFirefox = with pkgs; wrapFirefox firefox-esr-unwrapped {
+          myFirefox = with pkgs; wrapFirefox librewolf-unwrapped {
             nixExtensions = builtins.filter lib.isDerivation (builtins.attrValues nur.repos.crazazy.firefox-addons);
-
+            libName = "librewolf";
             extraPolicies = {
               CaptivePortal = false;
               DisableFirefoxStudies = true;
@@ -335,11 +355,10 @@ stuff
             # krdc
             mpv
             # nur.repos.crazazy.seamonkey
-            # myFirefox
+            myFirefox
             unzip zip
             vim
             # vieb
-            firefox
             (wine.override { wineBuild = "wineWow"; })
           ];
         # persistent directory for my browser details
@@ -387,12 +406,13 @@ stuff
     #+begin_src nix
       {
         services.emacs = {
-          package = import ./emacs.nix;
+          # package = import ./emacs.nix;
+          package = pkgs.emacs29-pgtk;
           defaultEditor = true;
           enable = true;
         };
         homeBinds = [
-          # ".config/emacs"
+          ".config/emacs"
         ];
       }
     #+end_src
@@ -403,3 +423,4 @@ stuff
         virtualisation.libvirtd.enable = true;
       }
     #+end_src
+