use upstream hyprland and greetd

system/work/config/hypr.conf

@@ -1,125 +0,0 @@
-
-exec-once= ~/.local/scripts/autostart
-monitor=,preferred,auto,1.2
-
-input {
-	kb_file=
-	kb_layout=gb
-	kb_variant=dvorak
-	kb_model=
-	kb_options=caps:escape
-	kb_rules=
-
-	follow_mouse=1
-
-	touchpad {
-		natural_scroll=yes
-	}
-
-	sensitivity=0
-	accel_profile=flat
-}
-
-general {
-
-	gaps_in=5
-	gaps_out=20
-	border_size=2
-	col.active_border=0x66ee1111
-	col.inactive_border=0x66333333
-
-	apply_sens_to_raw=0
-
-	layout = master
-}
-
-decoration {
-	rounding=5
-	blur=0
-	blur_size=3 # minimum 1
-	blur_passes=1 # minimum 1
-	blur_new_optimizations=1
-}
-
-bezier=overshot, 0.05, 0.9, 0.1, 1.1
-animations {
-	enabled=1
-	animation=windows,1,5,default
-	animation=border,1,5,default
-	animation=fade,1,10,default
-	animation=workspaces,1,3,overshot
-}
-
-dwindle {
-	pseudotile=0 # enable pseudotiling on dwindle
-}
-
-gestures {
-	workspace_swipe=yes
-}
-
-bindm=SUPER,mouse:272,movewindow
-bindm=SUPER,mouse:273,resizewindow
-
-bind=SUPER,RETURN,exec,foot
-bind=SUPER_SHIFT,Q,killactive,
-bind=SUPER,M,exec,foot -e ncmpcpp
-bind=SUPER,E,exec,foot -e neomutt
-bind=SUPER,O,exec,pcmanfm
-bind=SUPER,y,exec,foot -e ytui
-bind=SUPER,Z,exec,swaylock -f
-bind=SUPER,T,exec,notify-send "$(date)"
-bind=SUPER_SHIFT,S,exec,~/.local/scripts/screenshot
-bind=SUPERCTRL_SHIFT,S,exec,qrcode.sh
-bind=SUPER,p,exec,hyprpicker | wl-copy; wl-paste | xargs notify-send Copied
-bind=SUPER,slash,exec,brave
-bind=SUPER,V,togglefloating,
-bind=SUPER,F,fullscreen,
-bind=SUPER,d,exec,wofi --show drun
-bind=SUPER_SHIFT,P,exec,~/.local/scripts/bwmenu
-bind=SUPER,apostrophe,exec,notify-send -i mpv "$(playerctl metadata --format '{{title}}')" "$(playerctl metadata --format '{{album}}')" -t 3000
-bind=SUPER_SHIFT,E,exit,
-bind=,XF86AudioRaiseVolume,exec,amixer sset Master 5%+ && amixer sset Master unmute
-bind=,XF86AudioLowerVolume,exec,amixer sset Master 5%-
-bind=,XF86AudioPlay,exec,~/.local/scripts/play-pause
-bind=,XF86AudioNext,exec,playerctl next
-bind=,XF86AudioPrev,exec,playerctl previous
-bind=,XF86MonBrightnessUp,exec,~/.local/scripts/brightness-up
-bind=,XF86MonBrightnessDown,exec,~/.local/scripts/brightness-down
-
-bind=SUPER,h,movefocus,l
-bind=SUPER,l,movefocus,r
-
-bind=SUPER,j,layoutmsg,cyclenext
-bind=SUPER,k,layoutmsg,cycleprev
-bind=SUPER,space,layoutmsg,swapwithmaster
-
-master {
-	new_is_master= true
-	new_on_top= true
-}
-
-bind=SUPER,1,workspace,1
-bind=SUPER,2,workspace,2
-bind=SUPER,3,workspace,3
-bind=SUPER,4,workspace,4
-bind=SUPER,5,workspace,5
-bind=SUPER,6,workspace,6
-bind=SUPER,7,workspace,7
-bind=SUPER,8,workspace,8
-bind=SUPER,9,workspace,9
-bind=SUPER,0,workspace,10
-
-bind=SUPER_SHIFT,1,movetoworkspace,1
-bind=SUPER_SHIFT,2,movetoworkspace,2
-bind=SUPER_SHIFT,3,movetoworkspace,3
-bind=SUPER_SHIFT,4,movetoworkspace,4
-bind=SUPER_SHIFT,5,movetoworkspace,5
-bind=SUPER_SHIFT,6,movetoworkspace,6
-bind=SUPER_SHIFT,7,movetoworkspace,7
-bind=SUPER_SHIFT,8,movetoworkspace,8
-bind=SUPER_SHIFT,9,movetoworkspace,9
-bind=SUPER_SHIFT,0,movetoworkspace,10
-
-bind=SUPER,mouse_down,workspace,e+1
-bind=SUPER,mouse_up,workspace,e-1

system/work/hardware.nix

@@ -45,4 +45,15 @@
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+
+  hardware.opengl = {
+    enable = true;
+    extraPackages = with pkgs; [
+      intel-media-driver # LIBVA_DRIVER_NAME=iHD
+      vaapiIntel         # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
+      vaapiVdpau
+      libvdpau-va-gl
+    ];
+  };
+
 }

system/work/home.nix

@@ -13,48 +13,40 @@
 
   programs.git = {
     enable = true;
-    userName = "tristan";
-    userEmail = "tristan@tristans.cloud";
+    userName = "Tristan Beedell";
+    userEmail = "tristan.beedell@cryoserver.com";
     aliases = {
       graph = "log --oneline --all --graph";
       amend = "commit --amend --no-edit";
     };
   };
   
-  accounts.email.accounts."tristan@tristans.cloud" = {
-    notmuch.enable = true;
-    neomutt.enable = true;
-    mbsync.enable = true;
-    mbsync.create = "maildir";
-    userName = "tristan@tristans.cloud";
-    realName = "Tristan";
-    address = "tristan@tristans.cloud";
+  accounts.email.accounts."tristan.beedell@cryoserver.com" = {
+    userName = "tristan.beedell@cryoserver.com";
+    realName = "Tristan Beedell";
+    address = "tristan.beedell@cryoserver.com";
     primary = true;
-    passwordCommand = "rbw get privateemail";
-    smtp = {
-      host = "mail.privateemail.com";
-      port = 465;
-      tls.enable = true;
-    };
-    imap = {
-      host = "mail.privateemail.com";
-      port = 993;
-      tls.enable = true;
+  };
+
+  programs.waybar.settings.mainBar = {
+    modules-right = ["battery"];
+    battery = {
+      format = "{icon} {capacity}%";
+      format-icons = ["🤏" "🪫" "🔋"];
+      states = {
+          warning = 30;
+          critical = 15;
+      };
     };
   };
 
-  programs.notmuch.enable = true;
-  programs.neomutt = {
-    enable = true;
-    vimKeys = true;
-    sort = "reverse-date";
-    sidebar.enable = true;
-  };
-  programs.mbsync.enable = true;
-  services.mbsync.enable = true;
-
-  home.file.".config/hypr/hyprland.conf" = {
-    source = ./config/hypr.conf;
+  wayland.windowManager.hyprland = {
+    extraConfig = ''
+      monitor = ,preferred,auto, 1.2
+      input {
+        kb_variant = dvorak
+      }
+    '';
   };
 
 }