bit more ricing

2024-12-27 12:04:38 +01:00 · 2024-12-27 12:04:38 +01:00 · c9fb02840b
commit c9fb02840b
parent a24394ecf6
11 changed files with 662 additions and 395 deletions
--- a/common/default.nix
+++ b/common/default.nix
@ -51,13 +51,13 @@
        "https://nix-community.cachix.org"
        "https://nixpkgs-review-bot.cachix.org"
        "https://cachix.cachix.org"
-        "https://cosmic.cachix.org"
+        "https://hyprland.cachix.org"
      ];
      trusted-public-keys = [
        "cachix.cachix.org-1:eWNHQldwUO7G2VkjpnjDbWwy4KQ/HNxht7H4SSoMckM="
        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
        "nixpkgs-review-bot.cachix.org-1:eppgiDjPk7Hkzzz7XlUesk3rcEHqNDozGOrcLc8IqwE="
-        "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="
+        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
      ];
    };
    optimise = {
--- a/common/desktop/home.nix
+++ b/common/desktop/home.nix
@ -109,7 +109,6 @@ in

  xdg.autoStart = {
    packages = with pkgs; [
-      obsidian
      element-desktop
      firefox
      discord
--- a/common/hm-modules/catppuccin/default.nix
+++ b/common/hm-modules/catppuccin/default.nix
@ -6,20 +6,7 @@
 }:
 with lib;
 let
-  inherit (builtins) fromTOML readFile;
  cfg = config.themes.v.catppuccin;
-  mako = pkgs.fetchFromGitHub {
-    owner = "catppuccin";
-    repo = "mako";
-    rev = "9dd088aa5f4529a3dd4d9760415e340664cb86df";
-    sha256 = "sha256-nUzWkQVsIH4rrCFSP87mXAka6P+Td2ifNbTuP7NM/SQ=";
-  };
-  starship = pkgs.fetchFromGitHub {
-    owner = "catppuccin";
-    repo = "starship";
-    rev = "5629d2356f62a9f2f8efad3ff37476c19969bd4f";
-    sha256 = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0=";
-  };
 in
 {
  options.themes.v.catppuccin = {
@ -27,8 +14,24 @@ in
  };
  config = mkIf cfg.enable {
    catppuccin = {
+      enable = true;
      flavor = "frappe";
      accent = "pink";
+
+      waybar.enable = false;
+
+      mako.enable = true;
+      rofi.enable = true;
+      # gtk = {
+      #   enable = true;
+      #   gnomeShellTheme = true;
+      #   icon.enable = false;
+      # };
+
+      hyprland.enable = true;
+      kitty.enable = true;
+
+      kvantum.enable = true;
    };

    home.pointerCursor = {
@ -38,21 +41,12 @@ in
    };

    programs.kitty = {
-      themeFile = "Catppuccin-Frappe";
+      # themeFile = "Catppuccin-Frappe";
      font.name = "DejaVuSansMono Nerd Font";
    };

    gtk = {
      enable = true;
-      # theme = {
-      #   name = "Catppuccin-Frappe-Standard-Pink-Dark";
-      #   package = pkgs.catppuccin-gtk.override {
-      #     accents = [ "pink" ];
-      #     variant = "frappe";
-      #     size = "standard";
-      #   };
-      # };
-
      iconTheme = {
        name = "Papirus-Dark";
        package = pkgs.papirus-icon-theme.override { color = "violet"; };
@ -62,34 +56,12 @@ in
      };
    };

-    # qt = {
-    #   enable = true;
-    #   # platformTheme = "qtct";
-    #   style.name = "kvantum";
-    #   platformTheme.name = "kvantum";
-    # };
-
-    # xdg.configFile = {
-    #   "Kvantum/kvantum.kvconfig".text = ''
-    #     [General]
-    #     theme=Catppuccin-Frappe-Pink
-    #   '';
-    # };
-
-    home.packages = with pkgs; [
-      # (catppuccin-kvantum.override {
-      #   accent = "Pink";
-      #   variant = "Frappe";
-      # })
-    ];
-
-    services.mako.catppuccin.enable = true;
-    # programs.mako.extraConfig = readFile "${mako}/src/frappe";
-    #
-    # programs.starship.settings = {
-    #   palette = "catppuccin_frappe";
-    # } //fromTOML (readFile "${starship}/palettes/frappe.toml");
-    #
+    qt = {
+      enable = true;
+      # platformTheme = "qtct";
+      style.name = "kvantum";
+      platformTheme.name = "kvantum";
+    };

    programs.vscode = {
      userSettings."workbench.colorTheme" = "Catppuccin Frappé";
--- a/flake.lock
+++ b/flake.lock
--- a/flake.nix
+++ b/flake.nix
@ -5,7 +5,7 @@
  # * https://github.com/Infinidoge/nix-minecraft

  inputs = {
-    nixpkgs.url = "nixpkgs/nixos-unstable-small";
+    nixpkgs.url = "nixpkgs/nixos-unstable";
    flake-utils-plus.url = "github:gytis-ivaskevicius/flake-utils-plus";
    nur.url = "github:nix-community/NUR";
    colmena.url = "github:zhaofengli/colmena";
@ -34,7 +34,6 @@
    vault-unseal.inputs.nixpkgs.follows = "nixpkgs";

    gnome-autounlock-keyring.url = "git+https://git.0x76.dev/v/gnome-autounlock-keyring.git";
-    gnome-autounlock-keyring.inputs.nixpkgs.follows = "nixpkgs";

    t.url = "github:jdonszelmann/t-rs";
    t.inputs.nixpkgs.follows = "nixpkgs";
@ -48,6 +47,8 @@
    essentials.inputs.nixpkgs.follows = "nixpkgs";

    autostart.url = "github:Zocker1999NET/home-manager-xdg-autostart";
+
+    hyprland-qtutils.url = "github:hyprwm/hyprland-qtutils";
  };

  outputs =
--- a/hosts/thalassa/aoife/default.nix
+++ b/hosts/thalassa/aoife/default.nix
@ -29,10 +29,7 @@
  # Bootloader.
  boot = {
    kernelParams = [
-      # "amdgpu.sg_display=0" # did not fix the flickering
-      # "amdgpu.ppfeaturemask=0xffffffff" # did not fix flicker
-      # "amdgpu.graphics_sg=0"
-      "amdgpu.dcdebugmask=0x10"
+      "amdgpu.dcdebugmask=0x10" # Disables partial screen refresh, fixes flicker
    ];
    bootspec.enable = true;
    initrd.kernelModules = [ "amdgpu" ];
@ -59,7 +56,10 @@
    # here, NOT in environment.systemPackages
  ];

-  programs.hyprland.enable = true;
+  programs.hyprland = {
+    enable = true;
+    withUWSM = true;
+  };

  services.gnome.gnome-keyring.enable = true;

--- a/hosts/thalassa/aoife/home/default.nix
+++ b/hosts/thalassa/aoife/home/default.nix
@ -15,13 +15,9 @@
  '';

  home.packages = with pkgs; [
-    jetbrains.rust-rover
-    jetbrains.clion
-    # jetbrains.idea-ultimate
    eduvpn-client
    localsend
    typst
-    zed-editor
  ];


--- a/hosts/thalassa/aoife/home/hyprland.nix
+++ b/hosts/thalassa/aoife/home/hyprland.nix
@ -2,110 +2,63 @@
  pkgs,
  config,
  inputs,
+  lib,
  ...
 }:
 let
  terminal = "${config.programs.kitty.package}/bin/kitty -1";
 in
 {
+  imports = [
+    ./waybar.nix
+  ];

  home.packages = with pkgs; [
-    v.hyprland-workspaces
+    hyprland-workspaces
+    inputs.gnome-autounlock-keyring.packages.${pkgs.system}.default
+    inputs.hyprland-qtutils.packages.${pkgs.system}.default
  ];

  services = {
-    mako.enable = true;
+    mako = {
+      enable = true;
+      defaultTimeout = 5000;
+    };
  };

  programs = {
-    wofi = {
+    rofi = {
      enable = true;
+      package = pkgs.rofi-wayland;
    };

    # eww = {
-      # enable = true;
-      # configDir = ./eww;
+    # enable = true;
+    # configDir = ./eww;
    # };
+  };

+  # Hack to ensure graphical dependent services start _after_ hyprland starts
+  # Needed as these services normally start after graphical-session-pre
+  systemd.user.services.hyprpaper.Unit.After = lib.mkForce "graphical-session.target";
+  systemd.user.services.waybar.Unit.After = lib.mkForce "graphical-session.target";

-    waybar = {
-      enable = true;
-      style = ./waybar.css;
-      settings = {
-        mainBar = {
-          layer = "top";
-          position = "top";
-          height = 30;
-          modules-left = [ "hyprland/workspaces" ];
-          modules-center = [ "clock" ];
-          modules-right = [
-            "wireplumber"
-            "power-profiles-daemon"
-            "network"
-            "battery"
-          ];
+  services = {
+    gnome-keyring.enable = true;
+    hyprpaper =
+      let
+        wallpaper = ../../../../assets/wallpaper-nix-pink.png;
+      in
+      {
+        enable = true;
+        settings = {
+          preload = [ "${wallpaper}" ];
+          wallpaper = [ "eDP-1,${wallpaper}" ];

-          wireplumber = {
-            format = "󰕾 {volume}%";
-            format-muted = "󰖁";
-            on-click = "${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_SINK@ toggle";
-          };
-
-          network =
-            let
-              nmtui = pkgs.writeScriptBin "nmtui.sh" ''
-                #!${pkgs.stdenv.shell}
-                unset COLORTERM
-                TERM=xterm-old ${pkgs.networkmanager}/bin/nmtui
-              '';
-            in
-            {
-              format-wifi = "󰖩 {essid} ({signalStrength}%)";
-              format-ethernet = "󰈀 {ifname}: {ipaddr}/{cidr}";
-              format-disconnected = "󰌙 ";
-              tooltip-format = "{ifname}: {ipaddr}";
-              on-click = "touch ~/a && ${terminal} --execute ${nmtui}/bin/nmtui.sh";
-            };
-
-          power-profiles-daemon = {
-            format = "{icon}";
-            format-icons = {
-              performance = "󰓅";
-              balanced = "󰾅";
-              power-saver = "󰾆";
-            };
-          };
-
-          battery = {
-            states = {
-              warning = 30;
-              critical = 15;
-            };
-
-            format = "󱐋 {capacity}%";
-            format-discharging = "{icon}  {capacity}%";
-
-            format-icons = [
-              "󰂎"
-              "󰁺"
-              "󰁻"
-              "󰁼"
-              "󰁽"
-              "󰁾"
-              "󰁿"
-              "󰂀"
-              "󰂁"
-              "󰂂"
-              "󰁹"
-            ];
-          };
+          splash = false;
+          ipc = "off";
        };
      };
-      systemd = {
-        enable = true;
-        target = "hyprland-session.target";
-      };
-    };
  };

  wayland.windowManager.hyprland =
@ -118,44 +71,31 @@ in
        	hyprctl keyword monitor ",preferred,auto,1,mirror,eDP-1"
        fi
      '';
+      # Autostart now handled by xdg.autoStart
      startup = pkgs.writeScriptBin "startup.sh" ''
        #!${pkgs.stdenv.shell}
-        firefox &
-        discord &
-
-        # start keyring, then unlock it, then start Element
-        gnome-keyring-daemon -r -d && ${
-          inputs.gnome-autounlock-keyring.packages.${pkgs.system}.default
-        }/bin/gnome-autounlock-keyring unlock && element-desktop &
+        echo "Starting up"
      '';
-      hyprpaper-conf =
-        let
-          wallpaper = ../../../../assets/wallpaper-nix-pink.png;
-        in
-        pkgs.writeText "hyprpaper.conf" ''
-          preload = ${wallpaper}
-          wallpaper = eDP-1,${wallpaper}
-
-          splash = false
-          ipc = off
-        '';
    in
    {
      enable = true;
-      systemd.enable = true;
+      systemd.enable = false; # using UWSM
+
+      plugins = with pkgs.hyprlandPlugins; [
+        hyprexpo
+      ];

      settings =
        let
          inherit (builtins) genList concatLists toString;
          wpctl = "${pkgs.wireplumber}/bin/wpctl";
          brightnessctl = "${pkgs.brightnessctl}/bin/brightnessctl";
-          menu = "${config.programs.wofi.package}/bin/wofi --show run,drun";
+          menu = "${config.programs.rofi.package}/bin/rofi -show combi -modes combi -combi-modes \"window,drun,run\"";
          fileManager = "${pkgs.nautilus}/bin/nautilus";
        in
        {
          "$mod" = "SUPER";
          exec-once = [
-            "${pkgs.hyprpaper}/bin/hyprpaper -c ${hyprpaper-conf}"
            "${startup}/bin/startup.sh"
          ];
          monitor = [
@ -169,11 +109,11 @@ in
            gaps_in = 5;
            gaps_out = 10;
            border_size = 2;
-            "col.active_border" = "rgba(8caaeeee) rgba(a6d189ee) 45deg";
+            "col.active_border" = "rgba(babbf1ee) rgba(f4b8e4ee) 45deg";
            "col.inactive_border" = "rgba(303446aa)";
            layout = "dwindle";
            # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
-            allow_tearing = false;
+            allow_tearing = true;
          };
          group = {
            "col.border_active" = "rgba(babbf1ee) rgba(f4b8e4ee) 45deg";
@ -187,6 +127,14 @@ in
              text_color = "rgba(ffffffee)";
            };
          };
+
+          plugin.hyprexpo = {
+            workspace_method = "first 1";
+            enable_gesture = true;
+            gesture_positive = false;
+            gesture_fingers = 3;
+          };
+
          decoration = {
            rounding = 10;

@ -213,8 +161,8 @@ in
              "windowsOut, 1, 7, default, popin 80%"
              "border, 1, 10, default"
              "borderangle, 1, 8, default"
-              "fade, 1, 7, default"
-              "workspaces, 1, 6, default"
+              "fade, 1, 4, default"
+              "workspaces, 1, 4, default"
            ];
          };
          dwindle = {
@ -254,7 +202,7 @@ in
            [
              "$mod, RETURN, exec, ${terminal}"
              "$mod, Q, killactive,"
-              "$mod SHIFT, escape, exit,"
+              "$mod SHIFT, Q, exec, uwsm stop,"
              "$mod, E, exec, ${fileManager}"
              "$mod, V, togglefloating,"
              "$mod, D, exec, ${menu}"
@ -262,6 +210,8 @@ in
              "$mod, J, togglesplit, # dwindle"
              "$mod,m,fullscreen"

+              "$mod, space, hyprexpo:expo, toggle"
+
              # Move focus with arrow keys
              "$mod, left, movefocus, l"
              "$mod, right, movefocus, r"
@ -271,6 +221,7 @@ in
              # Scratch workspace
              "$mod, S, togglespecialworkspace, magic"
              "$mod SHIFT, S, movetoworkspace, special:magic"
+
              # Groups aka Tabs
              "$mod,g,togglegroup"
              "$mod,tab,changegroupactive"
--- a/hosts/thalassa/aoife/home/waybar.nix
+++ b/hosts/thalassa/aoife/home/waybar.nix
@ -0,0 +1,84 @@
+{ pkgs, config, ... }:
+let
+  terminal = "${config.programs.kitty.package}/bin/kitty -1";
+in
+{
+  programs.waybar = {
+    enable = true;
+    systemd = {
+      enable = true;
+      # target = "wayland-session@Hyprland.target";
+    };
+    style = ./waybar.css;
+    settings = {
+      mainBar = {
+        layer = "top";
+        position = "top";
+        height = 30;
+        modules-left = [ "hyprland/workspaces" ];
+        modules-center = [ "clock" ];
+        modules-right = [
+          "wireplumber"
+          "power-profiles-daemon"
+          "network"
+          "battery"
+        ];
+
+        wireplumber = {
+          format = "󰕾 {volume}%";
+          format-muted = "󰖁";
+          on-click = "${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_SINK@ toggle";
+        };
+
+        network =
+          let
+            nmtui = pkgs.writeScriptBin "nmtui.sh" ''
+              #!${pkgs.stdenv.shell}
+              unset COLORTERM
+              TERM=xterm-old ${pkgs.networkmanager}/bin/nmtui
+            '';
+          in
+          {
+            format-wifi = "󰖩 {essid} ({signalStrength}%)";
+            format-ethernet = "󰈀 {ifname}: {ipaddr}/{cidr}";
+            format-disconnected = "󰌙 ";
+            tooltip-format = "{ifname}: {ipaddr}";
+            on-click = "touch ~/a && ${terminal} --execute ${nmtui}/bin/nmtui.sh";
+          };
+
+        power-profiles-daemon = {
+          format = "{icon}";
+          format-icons = {
+            performance = "󰓅";
+            balanced = "󰾅";
+            power-saver = "󰾆";
+          };
+        };
+
+        battery = {
+          states = {
+            warning = 30;
+            critical = 15;
+          };
+
+          format = "󱐋 {capacity}%";
+          format-discharging = "{icon}  {capacity}%";
+
+          format-icons = [
+            "󰂎"
+            "󰁺"
+            "󰁻"
+            "󰁼"
+            "󰁽"
+            "󰁾"
+            "󰁿"
+            "󰂀"
+            "󰂁"
+            "󰂂"
+            "󰁹"
+          ];
+        };
+      };
+    };
+  };
+}
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@ -21,8 +21,6 @@ final: prev: {
      platformio.platformio-ide =
        prev.callPackage ./vscode-extensions/platformio.nix { };
    };
-
-    hyprland-workspaces = prev.callPackage ./hyprland-workspaces { };
  };

  plex-plexpass = prev.callPackage ./plex-pass { };
--- a/pkgs/hyprland-workspaces/default.nix
+++ b/pkgs/hyprland-workspaces/default.nix
@ -1,20 +0,0 @@
-{ rustPlatform, lib, fetchFromGitHub }:
-rustPlatform.buildRustPackage rec {
-  pname = "hyprland-workspaces";
-  version = "2.0.0";
-
-  src = fetchFromGitHub {
-    owner = "FieldofClay";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-4QGLTimIpx74gWUyHCheUZZT1WgVzBoJRY8OlUDdOh4=";
-  };
-
- cargoHash = "sha256-9ndP0nyRBCdOGth4UWA263IvjbgnVW2x9PK8oTaMrxg=";
-
-  meta = with lib; {
-    description = "A multi-monitor aware Hyprland workspace widget";
-    license = licenses.mit;
-    platforms = platforms.linux;
-  };
-}