home/natto: added tofi config, changed hyprland config + webcord

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>

flake.lock

@@ -410,7 +410,8 @@
         "nix-gaming": "nix-gaming",
         "nixpkgs": "nixpkgs_3",
         "nvim-overlay": "nvim-overlay",
-        "rust-overlay": "rust-overlay"
+        "rust-overlay": "rust-overlay",
+        "webcord": "webcord"
       }
     },
     "rust-overlay": {
@@ -479,6 +480,22 @@
         "type": "github"
       }
     },
+    "webcord": {
+      "locked": {
+        "lastModified": 1672958964,
+        "narHash": "sha256-3SB6mTMTiek1B1zie7oD3DWJWVqKDaB5znQ+Nz6jz/Y=",
+        "owner": "huantianad",
+        "repo": "nixpkgs",
+        "rev": "1d1ed8fbb244fe3d242ebd3d2ad4e647235719eb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "huantianad",
+        "ref": "webcord",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "wlroots": {
       "flake": false,
       "locked": {

flake.nix

@@ -30,6 +30,7 @@
       inputs.nixpkgs.url = github:nixos/nixpkgs?rev=fad51abd42ca17a60fc1d4cb9382e2d79ae31836;
     };
     hyprland.url = github:hyprwm/Hyprland;
+    webcord.url = github:huantianad/nixpkgs/webcord;
   };
 
   outputs = inputs@{ self, ... }:
@@ -49,6 +50,7 @@
           config = {
             allowUnfree = true;
             allowBroken = true;
+            allowInsecure = true;
           };
           overlays = [
             inputs.nvim-overlay.overlay

home/natto/config/hypr/hyprland.conf

@@ -1,4 +1,3 @@
-exec-once=/nix/store/x6xkqqa5caslrmbz36m2hxg5b3pzzydy-dbus-1.14.4/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP && systemctl --user start hyprland-session.target
 monitor=,preferred,auto,1
 input {
     kb_layout = us
@@ -68,7 +67,8 @@ gestures {
 $mainMod = SUPER
 
 binde=$mainMod, RETURN, exec, foot
-bindr=SUPER, D, exec, pkill wofi || wofi
+bindr=SUPER, D, exec, pkill tofi || tofi-drun | xargs hyprctl dispatch exec --
+bindr=SUPER SHIFT, D, exec, pkill tofi || tofi-run --require-match=false | xargs hyprctl dispatch exec
 
 bind=$mainMod, P, exec, mpc toggle
 bind=, XF86AudioNext, exec, mpc seek +00:00:05
@@ -76,7 +76,7 @@ bind=, XF86AudioPrev, exec, mpc seek -00:00:05
 bind=$mainMod, XF86AudioNext, exec, mpc next
 bind=$mainMod, XF86AudioPrev, exec, mpc prev
 binde=, XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
-bindl=, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
+binde=, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
 bind=,XF86AudioMute,exec,wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
 
 binde=, XF86MonBrightnessUp, exec, light -A 5
@@ -89,7 +89,7 @@ bind=$mainMod SHIFT, F4, exec, setxkbmap in guru
 bind=$mainMod SHIFT, F5, exec, setxkbmap colemak dhz
 
 binde=$mainMod SHIFT, Q, killactive,
-bind=$mainMod ALT, e, exit,
+bind=$mainMod ALT, f, exit,
 bind=$mainMod SHIFT, t, pseudo,
 bind=$mainMod, f, fullscreen,
 bind=$mainMod, t, togglefloating,
@@ -135,13 +135,13 @@ bind=$mainMod, 8, workspace, 8
 bind=$mainMod, 9, workspace, 9
 bind=$mainMod, 0, workspace, 10
 
-bind=$mainMod SHIFT, 1, movetoworkspace, 1
-bind=$mainMod SHIFT, 2, movetoworkspace, 2
-bind=$mainMod SHIFT, 3, movetoworkspace, 3
-bind=$mainMod SHIFT, 4, movetoworkspace, 4
-bind=$mainMod SHIFT, 5, movetoworkspace, 5
-bind=$mainMod SHIFT, 6, movetoworkspace, 6
-bind=$mainMod SHIFT, 7, movetoworkspace, 7
-bind=$mainMod SHIFT, 8, movetoworkspace, 8
-bind=$mainMod SHIFT, 9, movetoworkspace, 9
-bind=$mainMod SHIFT, 0, movetoworkspace, 10
+bind=$mainMod SHIFT, 1, movetoworkspacesilent, 1
+bind=$mainMod SHIFT, 2, movetoworkspacesilent, 2
+bind=$mainMod SHIFT, 3, movetoworkspacesilent, 3
+bind=$mainMod SHIFT, 4, movetoworkspacesilent, 4
+bind=$mainMod SHIFT, 5, movetoworkspacesilent, 5
+bind=$mainMod SHIFT, 6, movetoworkspacesilent, 6
+bind=$mainMod SHIFT, 7, movetoworkspacesilent, 7
+bind=$mainMod SHIFT, 8, movetoworkspacesilent, 8
+bind=$mainMod SHIFT, 9, movetoworkspacesilent, 9
+bind=$mainMod SHIFT, 0, movetoworkspacesilent, 10

home/natto/default.nix

@@ -9,7 +9,7 @@
   imports = [
     ./email.nix
     ./programs.nix
-    ./xsession.nix
+   # ./xsession.nix :(
     ./wayland.nix
     ./pkgs.nix
     ./stuff.nix

home/natto/dunst.nix

@@ -23,7 +23,7 @@
 
         urgency_normal = {
           inherit background foreground;
-          frame_color = green;
+          frame_color = mauve;
           timeout = 5;
         };
 

home/natto/pkgs.nix

@@ -5,7 +5,6 @@
     # A/V, codec and media stuff
     ffmpeg-full
     wireplumber
-    mpv
     pulseaudio
     pavucontrol
     spotify
@@ -31,6 +30,7 @@
     (discord.override {
       nss = nss_latest;
     })
+    inputs.webcord.legacyPackages.${pkgs.system}.webcord
     qbittorrent
     hexchat
     luajit

home/natto/programs.nix

@@ -53,5 +53,13 @@
         };
       };
     };
+    mpv = {
+      enable = true;
+      config = {
+        force-window = true;
+        keep-open = true;
+        save-position-on-quit = true;
+      };
+    };
   };
 }

home/natto/stuff.nix

@@ -7,6 +7,17 @@
   age.sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ];
 
   home = {
+    pointerCursor = {
+      package = pkgs.catppuccin-cursors.mochaFlamingo;
+      name = "Catppuccin-Mocha-Flamingo-Cursors";
+      size = 32;
+      x11 = {
+        enable = true;
+        defaultCursor = "crosshair";
+      };
+      gtk.enable = true;
+    };
+
     sessionVariables = {
       LV2_PATH = lib.makeSearchPath "lib/lv2" (with pkgs; [ calf ]);
       QT_X11_NO_MITSHM = "1";
@@ -19,17 +30,6 @@
       ecc = ec + " -c";
       ecnw = ec + " -nw";
     };
-
-    file = with config; {
-      stalonetray = {
-        source = ./config/stalonetrayrc;
-        target = "${home.homeDirectory}/.stalonetrayrc";
-      };
-      mpv = {
-        source = ./config/mpv/mpv.conf;
-        target = "${xdg.configHome}/mpv/mpv.conf";
-      };
-    };
   };
   i18n = {
     inputMethod = {

home/natto/wayland.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ pkgs, config, colors, ... }:
 {
   wayland = {
     windowManager = {
@@ -12,9 +12,42 @@
           hidpi = true;
         };
         nvidiaPatches = true;
-        extraConfig = builtins.readFile ./config/hypr/hyprland.conf;
+        extraConfig = (builtins.readFile ./config/hypr/hyprland.conf)
+          + (with config.home.pointerCursor; ''
+          exec-once=hyprctl setcursor ${name} ${toString size}
+        '')
+          + (with colors.argb { a = "ee"; };''
+          general {
+            col.active_border = 0x${mauve} 0x${flamingo} 135deg
+            col.inactive_border = 0x${surface0}
+          }
+        '');
       };
     };
   };
 
+  home.file.tofi = {
+    source = pkgs.writeText "tofi-config" (pkgs.lib.generators.toKeyValue { } (with colors.default; {
+      # https://github.com/philj56/tofi/blob/master/themes/fullscreen
+      width = "100%";
+      height = "100%";
+      border-width = 0;
+      outline-width = 0;
+      padding-left = "35%";
+      padding-top = "35%";
+      result-spacing = 25;
+      num-results = 5;
+      font = "Fira Mono";
+      font-size = 15;
+      text-color = foreground;
+      selection-color = rosewater;
+      selection-match-color = red;
+      background-color = "#000A";
+    }));
+    target = "${config.xdg.configHome}/tofi/config";
+  };
+
+  home.packages = with pkgs; [
+    tofi
+  ];
 }

home/natto/xsession.nix

@@ -1,15 +1,5 @@
 { pkgs, config, flake, ... }:
 {
-  home.pointerCursor = {
-    package = flake.packages.${pkgs.system}.simp1e-cursors;
-    name = "Simp1e-Solarized-Light";
-    x11 = {
-      enable = true;
-      defaultCursor = "crosshair";
-    };
-    gtk.enable = true;
-  };
-
   xsession = {
     enable = true;
     windowManager = {
@@ -51,4 +41,9 @@
     xmobar
     stalonetray
   ];
+
+  home.file.stalonetray = {
+    source = ./config/stalonetrayrc;
+    target = "${config.home.homeDirectory}/.stalonetrayrc";
+  };
 }