flake.lock

@@ -52,11 +52,11 @@
     },
     "hardware": {
       "locked": {
-        "lastModified": 1717995329,
+        "lastModified": 1717574423,
-        "narHash": "sha256-lQJXEFHHVsFdFLx0bvoRbZH3IXUBsle6EWj9JroTJ/s=",
+        "narHash": "sha256-cz3P5MZffAHwL2IQaNzsqUBsJS+u0J/AAwArHMAcCa0=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "58b52b0dd191af70f538c707c66c682331cfdffc",
+        "rev": "d6c6cf6f5fead4057d8fb2d5f30aa8ac1727f177",
         "type": "github"
       },
       "original": {

flake.nix

@@ -37,7 +37,10 @@
           config.allowAliases = false;
           overlays = extraOverlays ++ (lib.attrValues self.overlays);
         };
-      pkgs = mkPkgs nixpkgs [ self.overlays.default inputs.catppuccin-vsc.overlays.default ];
+      pkgs = mkPkgs nixpkgs [ 
+        self.overlays.default 
+        #inputs.catppuccin-vsc.overlays.default
+      ];
 
       lib = nixpkgs.lib.extend (final: prev: {
         my = import ./lib {

hosts/goopnet-interface/apple-macbook-air-9-1.nix

@@ -60,5 +60,7 @@
     "i915.i915_enable_fbc=1"
     "i915.fastboot=1"
     "i915.enable_gvt=1"
+    # makes waking up from suspend much more bareable
+    "mem_sleep_default=s2idle"
   ];
 }

hosts/goopnet-interface/default.nix

@@ -63,7 +63,6 @@
     };
     software = {
       # system
-      system.eza.enable = true;
       system.wezterm.enable = true;
       system.fish.enable = true;
       # editors
@@ -76,6 +75,7 @@
       distractions.discord.vesktop = true;
       distractions.steam.enable = true;
       # tools
+      tools.eza.enable = true;
       tools.gpg.enable = true;
       tools.mpv.enable = true;
     };

modules/desktop/hyprland.nix

@@ -75,34 +75,9 @@ in {
         bindr = [ # "bind released"
           "SUPER, Super_L, exec, ${lib.getExe pkgs.nwg-drawer}"
         ];
-        bind = let 
+        bind = [
-          # screenshotScript = pkgs.writeScript "screenshot" ''
-          #   ${lib.getExe pkgs.grimblast} --freeze --notify copy area
-          # '';
-          screenshotScript = pkgs.writeScript "screenshot" ''
-            temp_file=$(mktemp)
-            trap 'rm -f "$temp_file"' EXIT
-
-            ${lib.getExe pkgs.grimblast} --freeze save area - > "$temp_file" || exit 1
-
-            cat "$temp_file" | ${lib.getExe pkgs.wl-clipboard-x11} -selection clipboard -t image/png
-
-            action=$(${pkgs.libnotify}/bin/notify-send "Screenshot Captured" \
-              --app-name="Screenshot" \
-              --urgency=normal \
-              --action="default=Edit Image" \
-              --icon "$temp_file" \
-              "Click to annotate image")
-
-            case "$action" in
-              default)
-                ${lib.getExe pkgs.satty} --filename "$temp_file"
-                ;;
-            esac
-          '';
-        in [
           "$mod, R, exec, ${lib.getExe pkgs.rofi-wayland} -show run"
-          ", print, exec, ${screenshotScript}"
+          ", print, exec, ${lib.getExe pkgs.grimblast} --freeze copy area"
           "$mod, T, exec, ${lib.getExe pkgs.wezterm}"
 
           "$mod, Q, killactive, "
@@ -122,8 +97,6 @@ in {
           # alternatively, scroll through workspaces with mod + brackets
           "$mod, bracketleft, workspace, e-1"
           "$mod, bracketright, workspace, e+1"
-
-          ", XF86LaunchA, exec, ${screenshotScript}"
         ] ++ (
           # workspaces
           # binds $mod + [shift +] {1..10} to [move to] workspace {1..10}
@@ -180,8 +153,6 @@ in {
           "size 1100 650, class:org.gnome.FileRoller"
           "float, class:org.gnome.Loupe"
           "size 1100 650, class:org.gnome.Loupe"
-          "float, class:com.gabm.satty"
-          "size 1100 650, class:com.gabm.satty"
           "float, initialTitle:^Open Folder$"
           "size 1100 650, initialTitle:^Open Folder$"
           "float, initialTitle:^Open File$"
@@ -268,8 +239,6 @@ in {
           force_default_wallpaper = 0;
           disable_splash_rendering = true;
           disable_hyprland_logo = true;
-
-          initial_workspace_tracking = 0;
         };
       };
       

modules/desktop/rofi.nix

@@ -12,7 +12,7 @@ in {
     hm.programs.rofi = {
       enable = true;
       package = pkgs.rofi-wayland;
-      font = with config.modules.desktop.fonts.fonts.monospace; "${family} ${toString size}px";
+      font = with config.modules.desktop.fonts.fonts.monospace; "${family} ${toString size}";
       extraConfig = {
         show-icons = true;
       };

modules/desktop/themes/catppuccin/default.nix

@@ -46,15 +46,16 @@ in {
         vscode = {
           colorTheme = {
             name = "Catppuccin Mocha";
-            extension = (pkgs.vscode-extensions.catppuccin.catppuccin-vsc.override {
+            extension = pkgs.vscode-extensions.catppuccin.catppuccin-vsc;
-              accent = accent;
+            #extension = (pkgs.vscode-extensions.catppuccin.catppuccin-vsc.override {
-              boldKeywords = false;
+            #  accent = accent;
-              italicComments = false;
+            #  boldKeywords = false;
-              italicKeywords = false;
+            #  italicComments = false;
-              extraBordersEnabled = false;
+            #  italicKeywords = false;
-              workbenchMode = "flat";
+            #  extraBordersEnabled = false;
-              bracketMode = "rainbow";
+            #  workbenchMode = "flat";
-            });
+            #  bracketMode = "rainbow";
+            #});
           };
           iconTheme = {
             name = "material-icon-theme";

modules/software/tools/eza.nix

@@ -2,9 +2,9 @@
 
 with lib;
 let
-  cfg = config.modules.software.system.eza;
+  cfg = config.modules.software.tools.eza;
 in {
-  options.modules.software.system.eza = {
+  options.modules.software.tools.eza = {
     enable = mkEnableOption "Enable eza, a modern replacement for ls";
   };