From e43ac000c8682cb642f686f18a9eed26bd48fdd7 Mon Sep 17 00:00:00 2001 From: "Reid \"reidlab" Date: Wed, 5 Jun 2024 18:27:57 -0700 Subject: [PATCH 1/9] move eza to system category --- hosts/goopnet-interface/default.nix | 2 +- modules/software/{tools => system}/eza.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename modules/software/{tools => system}/eza.nix (72%) diff --git a/hosts/goopnet-interface/default.nix b/hosts/goopnet-interface/default.nix index 3d259f5..159309e 100755 --- a/hosts/goopnet-interface/default.nix +++ b/hosts/goopnet-interface/default.nix @@ -63,6 +63,7 @@ }; software = { # system + system.eza.enable = true; system.wezterm.enable = true; system.fish.enable = true; # editors @@ -75,7 +76,6 @@ distractions.discord.vesktop = true; distractions.steam.enable = true; # tools - tools.eza.enable = true; tools.gpg.enable = true; tools.mpv.enable = true; }; diff --git a/modules/software/tools/eza.nix b/modules/software/system/eza.nix similarity index 72% rename from modules/software/tools/eza.nix rename to modules/software/system/eza.nix index d510bd6..db4a389 100644 --- a/modules/software/tools/eza.nix +++ b/modules/software/system/eza.nix @@ -2,9 +2,9 @@ with lib; let - cfg = config.modules.software.tools.eza; + cfg = config.modules.software.system.eza; in { - options.modules.software.tools.eza = { + options.modules.software.system.eza = { enable = mkEnableOption "Enable eza, a modern replacement for ls"; }; From 290b00620953d5d9cc53c917d9246cc67eded574 Mon Sep 17 00:00:00 2001 From: "Reid \"reidlab" Date: Sat, 8 Jun 2024 18:17:48 -0700 Subject: [PATCH 2/9] better screenshotting --- modules/desktop/hyprland.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index 6f1002f..3d34cf6 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -75,9 +75,13 @@ in { bindr = [ # "bind released" "SUPER, Super_L, exec, ${lib.getExe pkgs.nwg-drawer}" ]; - bind = [ + bind = let + screenshotScript = pkgs.writeScript "screenshot" '' + ${lib.getExe pkgs.grimblast} --freeze --notify copy area + ''; + in [ "$mod, R, exec, ${lib.getExe pkgs.rofi-wayland} -show run" - ", print, exec, ${lib.getExe pkgs.grimblast} --freeze copy area" + ", print, exec, ${screenshotScript}" "$mod, T, exec, ${lib.getExe pkgs.wezterm}" "$mod, Q, killactive, " @@ -97,6 +101,8 @@ 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} From e52bd4c9b7de3acbf4fdf97d7c0aa16d766c7090 Mon Sep 17 00:00:00 2001 From: "Reid \"reidlab" Date: Sun, 9 Jun 2024 03:10:25 -0700 Subject: [PATCH 3/9] even BETTER screenshotting --- modules/desktop/hyprland.nix | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index 3d34cf6..69088f0 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -76,8 +76,29 @@ in { "SUPER, Super_L, exec, ${lib.getExe pkgs.nwg-drawer}" ]; bind = let + # screenshotScript = pkgs.writeScript "screenshot" '' + # ${lib.getExe pkgs.grimblast} --freeze --notify copy area + # ''; screenshotScript = pkgs.writeScript "screenshot" '' - ${lib.getExe pkgs.grimblast} --freeze --notify copy area + 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 open in Swappy") + + case "$action" in + default) + ${lib.getExe pkgs.swappy} -f "$temp_file" + ;; + esac ''; in [ "$mod, R, exec, ${lib.getExe pkgs.rofi-wayland} -show run" From 330644f130d0a0db58e879b21dc2e5c99fe7d18a Mon Sep 17 00:00:00 2001 From: "Reid \"reidlab" Date: Sun, 9 Jun 2024 12:41:16 -0700 Subject: [PATCH 4/9] swap to satty for annotating images --- modules/desktop/hyprland.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index 69088f0..34d84dc 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -92,11 +92,11 @@ in { --urgency=normal \ --action="default=Edit Image" \ --icon "$temp_file" \ - "Click to open in Swappy") + "Click to annotate image") case "$action" in default) - ${lib.getExe pkgs.swappy} -f "$temp_file" + ${lib.getExe pkgs.satty} --filename "$temp_file" ;; esac ''; @@ -180,6 +180,8 @@ 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$" From 722e3e6baca74c42ec6a0ecbc728386952288c4e Mon Sep 17 00:00:00 2001 From: "Reid \"reidlab" Date: Sun, 9 Jun 2024 23:00:28 -0700 Subject: [PATCH 5/9] opt out inital workspace tracking --- modules/desktop/hyprland.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index 34d84dc..7c6ff43 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -268,6 +268,8 @@ in { force_default_wallpaper = 0; disable_splash_rendering = true; disable_hyprland_logo = true; + + initial_workspace_tracking = 0; }; }; From 82348b778fdd25f16f0b10715994cee383b3d125 Mon Sep 17 00:00:00 2001 From: "Reid \"reidlab" Date: Mon, 10 Jun 2024 15:32:22 -0700 Subject: [PATCH 6/9] update hardware --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 549cb30..90e2c84 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ }, "hardware": { "locked": { - "lastModified": 1717574423, - "narHash": "sha256-cz3P5MZffAHwL2IQaNzsqUBsJS+u0J/AAwArHMAcCa0=", + "lastModified": 1717995329, + "narHash": "sha256-lQJXEFHHVsFdFLx0bvoRbZH3IXUBsle6EWj9JroTJ/s=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "d6c6cf6f5fead4057d8fb2d5f30aa8ac1727f177", + "rev": "58b52b0dd191af70f538c707c66c682331cfdffc", "type": "github" }, "original": { From d442f9da9393b653798272d5f5536c711ba4df87 Mon Sep 17 00:00:00 2001 From: "Reid \"reidlab" Date: Mon, 10 Jun 2024 15:37:03 -0700 Subject: [PATCH 7/9] re-add catppuccin vscode (broken from kernel regression??) --- flake.nix | 5 +---- modules/desktop/themes/catppuccin/default.nix | 19 +++++++++---------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/flake.nix b/flake.nix index 485bae5..ed965f2 100644 --- a/flake.nix +++ b/flake.nix @@ -37,10 +37,7 @@ 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 { diff --git a/modules/desktop/themes/catppuccin/default.nix b/modules/desktop/themes/catppuccin/default.nix index d7258de..519c31b 100644 --- a/modules/desktop/themes/catppuccin/default.nix +++ b/modules/desktop/themes/catppuccin/default.nix @@ -46,16 +46,15 @@ in { vscode = { colorTheme = { name = "Catppuccin Mocha"; - extension = pkgs.vscode-extensions.catppuccin.catppuccin-vsc; - #extension = (pkgs.vscode-extensions.catppuccin.catppuccin-vsc.override { - # accent = accent; - # boldKeywords = false; - # italicComments = false; - # italicKeywords = false; - # extraBordersEnabled = false; - # workbenchMode = "flat"; - # bracketMode = "rainbow"; - #}); + extension = (pkgs.vscode-extensions.catppuccin.catppuccin-vsc.override { + accent = accent; + boldKeywords = false; + italicComments = false; + italicKeywords = false; + extraBordersEnabled = false; + workbenchMode = "flat"; + bracketMode = "rainbow"; + }); }; iconTheme = { name = "material-icon-theme"; From 1d75e8761b9bcbb5fa17fb28ee2915cec57e2702 Mon Sep 17 00:00:00 2001 From: "Reid \"reidlab" Date: Mon, 10 Jun 2024 15:54:23 -0700 Subject: [PATCH 8/9] fix rofi font size --- modules/desktop/rofi.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/desktop/rofi.nix b/modules/desktop/rofi.nix index d687c37..5724685 100644 --- a/modules/desktop/rofi.nix +++ b/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}"; + font = with config.modules.desktop.fonts.fonts.monospace; "${family} ${toString size}px"; extraConfig = { show-icons = true; }; From b74ed84bf0f239831fd6a1b750c758e28664d4ae Mon Sep 17 00:00:00 2001 From: "Reid \"reidlab" Date: Mon, 10 Jun 2024 22:29:10 -0700 Subject: [PATCH 9/9] s2idle isnt worth it, Actually --- hosts/goopnet-interface/apple-macbook-air-9-1.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/hosts/goopnet-interface/apple-macbook-air-9-1.nix b/hosts/goopnet-interface/apple-macbook-air-9-1.nix index a4d6b71..3390a07 100644 --- a/hosts/goopnet-interface/apple-macbook-air-9-1.nix +++ b/hosts/goopnet-interface/apple-macbook-air-9-1.nix @@ -60,7 +60,5 @@ "i915.i915_enable_fbc=1" "i915.fastboot=1" "i915.enable_gvt=1" - # makes waking up from suspend much more bareable - "mem_sleep_default=s2idle" ]; } \ No newline at end of file