tmp

2025-02-10 20:33:33 -05:00
parent 508a3ccc9b
commit 2b66f1a774
17 changed files with 191 additions and 114 deletions
--- a/home-manager/flake.lock
+++ b/home-manager/flake.lock
@@ -54,11 +54,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1738878603,
-        "narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=",
+        "lastModified": 1739226747,
+        "narHash": "sha256-uO80xwFP2sjL8qWhwplxD6GcadHbbLs5ph2CFPNh8pI=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "433799271274c9f2ab520a49527ebfe2992dcfbd",
+        "rev": "a3c9e88177f0dc4a2662b5324572425f59129f11",
        "type": "github"
      },
      "original": {
@@ -79,11 +79,11 @@
        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
      },
      "locked": {
-        "lastModified": 1738958180,
-        "narHash": "sha256-I1BUQ6qbXg0vZMffrdD/dV/1R+YMBVySgSk3fA9snf8=",
+        "lastModified": 1739206396,
+        "narHash": "sha256-dfU3l47sxFQbqLe5R9um//V5hplv/MhSwsZJR7JzBrg=",
        "owner": "sodiboo",
        "repo": "niri-flake",
-        "rev": "eaf57f2dbdd448d541bda6049ce99aab070f0db1",
+        "rev": "9f15e7ace2dea798ce3490d2f723095ad4cce0d4",
        "type": "github"
      },
      "original": {
@@ -112,11 +112,11 @@
    "niri-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1738911818,
-        "narHash": "sha256-7bhr9ldHrNP71qOmKI1Hu80uclx+Tco0RNmO+GKtC1Y=",
+        "lastModified": 1739201373,
+        "narHash": "sha256-6upEicgdJH3JaS1oXS+wsgLToU14XL8/aOyL2KcS3KY=",
        "owner": "YaLTeR",
        "repo": "niri",
-        "rev": "397e704d644d1bfe7736f2fdacbfe5742c7b2f9f",
+        "rev": "20769b4c2f843566880f020f117e7bde36edc332",
        "type": "github"
      },
      "original": {
@@ -127,11 +127,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1738824222,
-        "narHash": "sha256-U3SNq+waitGIotmgg/Et3J7o4NvUtP2gb2VhME5QXiw=",
+        "lastModified": 1739020877,
+        "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "550e11f27ba790351d390d9eca3b80ad0f0254e7",
+        "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
        "type": "github"
      },
      "original": {
@@ -143,11 +143,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1738843498,
-        "narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=",
+        "lastModified": 1739055578,
+        "narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f",
+        "rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e",
        "type": "github"
      },
      "original": {
@@ -174,11 +174,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1738981474,
-        "narHash": "sha256-YIELTXxfATG0g1wXjyaOWA4qrlubds3MG4FvMPCxSGg=",
+        "lastModified": 1739154531,
+        "narHash": "sha256-QGeN6e0nMJlNLzm3Y2A7P6riXhQXMeCXLZ7yajZYFQM=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "5c571e5ff246d8fc5f76ba6e38dc8edb6e4002fe",
+        "rev": "035dac86ab7ce5c1e8a4d59dfe85e6911a3526ea",
        "type": "github"
      },
      "original": {
@@ -242,11 +242,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1738951757,
-        "narHash": "sha256-I0Bmxpjid9m7Gg+z2HVASlpQpKzR7QJq5X8b9wCZFVY=",
+        "lastModified": 1739161281,
+        "narHash": "sha256-cMM5E5EzEnfQFdBurCVqCi9mhsmRCeaEJB4iskPsQ1o=",
        "owner": "0xc000022070",
        "repo": "zen-browser-flake",
-        "rev": "e2f657fb55f62fb57e614a1e22e9e667996f5234",
+        "rev": "0e962f036e6e2a9dde28f37d80104c7ea477a801",
        "type": "github"
      },
      "original": {
--- a/home-manager/flake.nix
+++ b/home-manager/flake.nix
@@ -61,18 +61,7 @@
          }
        );

-      pkgs = (
-        import ((import nixpkgs { }).applyPatches {
-          name = "gpt4all 3.9.0 (PR #372723)";
-          src = inputs.nixpkgs;
-          patches = [
-            (builtins.fetchurl {
-              url = "https://github.com/NixOS/nixpkgs/pull/372723.diff";
-              sha256 = "0kfx5vzsssv40iffr7cfdik9mxa7fcg1489i578vqsgcz230fhaf";
-            })
-          ];
-        }) { }
-      );
+      pkgs = (import nixpkgs { });
    in
    {
      homeConfigurations."${username}" = home-manager.lib.homeManagerConfiguration {
--- a/home-manager/gui.nix
+++ b/home-manager/gui.nix
@@ -92,8 +92,6 @@
      # freecad-wayland
      puddletag

-      epiphany
-
      mcaselector

      wireshark
--- a/home-manager/no-gui.nix
+++ b/home-manager/no-gui.nix
@@ -152,13 +152,18 @@
    lsof

    tcpdump
+
+    cargo-flamegraph
+
+    borgbackup
  ];

-  # home.file.".cargo/config.toml".text = ''
-  #   [target.${lib.strings.removeSuffix "-linux" pkgs.system}-unknown-linux-gnu]
-  #   linker = "${pkgs.clang}/bin/clang"
-  #   rustflags = ["-C", "link-arg=-fuse-ld=${pkgs.mold}/bin/mold"]
-  # '';
+  # https://github.com/flamegraph-rs/flamegraph
+  home.file.".cargo/config.toml".text = ''
+    [target.${lib.strings.removeSuffix "-linux" pkgs.system}-unknown-linux-gnu]
+    linker = "${pkgs.clang}/bin/clang"
+    rustflags = ["-Clink-arg=-Wl,--no-rosegment"]
+  '';

  # default applications
  home.sessionVariables = {
--- a/home-manager/progs/eww/config/scripts/currentWindow.fish
+++ b/home-manager/progs/eww/config/scripts/currentWindow.fish
@@ -1,2 +1,10 @@
 #!/usr/bin/env fish
-niri msg focused-window | rg Title | sed -E "s/[[:space:]]+Title\: //g" | sed "s/\"//g" | head -c 55
+name=$(niri msg focused-window | rg Title | sed -E "s/[[:space:]]+Title\: //g" | sed "s/\"//g")
+proc_name=$(echo "$name" | head -c 55)
+
+# TODO! fix this logic, add a '...' at the end
+if ["$name" != "$proc_name"]
+    proc_name="$proc_name..."
+end
+
+echo "$proc_name"
--- a/home-manager/progs/eww/config/scripts/sound/getVolume.sh
+++ b/home-manager/progs/eww/config/scripts/sound/getVolume.sh
@@ -1,8 +1,27 @@
 #!/usr/bin/env bash
-count=$(wpctl get-volume @DEFAULT_SINK@ | cut -d' ' -f2- | sed -E 's/\.//g' | sed 's/^0*//g')
+output=$(wpctl get-volume @DEFAULT_SINK@ | cut -d' ' -f2- | sed -E 's/\.//g' | sed 's/^0*//g')
+count=$(echo "$output" | cut -d' ' -f1)
+muted=$(echo "$output" | cut -d'[' -f2 | cut -d ']' -f1)
+
+# if not muted, set to empty string
+if [ "$muted" == "$count" ]; then
+  muted=""
+fi
+
+# fix removal of zero padding if volume is zero
+if [ "$count" == "" ]; then
+  count="0"
+fi
+
 color="green"
 if ((count > 75)); then color="yellow"; fi
 if ((count > 90)); then color="peach"; fi
 if ((count > 100)); then color="maroon"; fi
 if ((count > 110)); then color="red"; fi
-echo "{\"count\":\"${count}\", \"color\":\"${color}\"}"
+
+output="${count}%"
+if [ "$muted" != "" ]; then
+  output="${output} [${muted}]"
+fi
+
+echo "{\"count\":\"${output}\", \"color\":\"${color}\"}"
--- a/home-manager/progs/niri.nix
+++ b/home-manager/progs/niri.nix
@@ -9,6 +9,12 @@
    settings = {
      prefer-no-csd = true;

+      input = {
+        touchpad = {
+          scroll-factor = 0.4;
+        };
+      };
+
      environment = {
        DISPLAY = ":0";
      };
@@ -39,8 +45,6 @@
      };

      spawn-at-startup = [
-        # waybar (status bar)
-        # { command = [ "${pkgs.waybar}/bin/waybar" ]; }
        {
          command = [
            "${config.programs.eww.package}/bin/eww"