Merge branch 'main' into unity2

home/arrakis/default.nix

@@ -12,6 +12,7 @@
     inputs.nixvim.homeManagerModules.nixvim
     ../common/programs/default.nix
     ../common/programs/desktop
+    ../common/programs/zen-browser.nix
     ../common/programs/hyprland
     ../common/programs/ghostty.nix
     ../common/programs/syncthing.nix
@@ -45,7 +46,7 @@
     ];
   };
 
-  programs.hyprpanel.layout = {
+  programs.hyprpanel.settings.layout = {
     "bar.layouts" = {
       "0" = {
         "left" = [

home/arrakis/monitors.nix

@@ -14,7 +14,10 @@ in
   wayland.windowManager.hyprland.settings = {
     monitor = [
       "eDP-1, preferred, 0x0, 1, bitdepth, 8"
-      "DP-3, preferred, 0x-2160, 1.2"
+      "DP-1, preferred, auto-up, 1"
+      "DP-2, preferred, auto-up, 1"
+      "DP-3, preferred, auto-up, 1"
+      "DP-4, preferred, auto-up, 1"
       # "DP-3, 1920x1200, 0x0, 1, mirror, eDP-1"
     ];
   };

home/common/programs/cpp.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    esphome
+    clang-tools
+  ];
+}

home/common/programs/default.nix

@@ -10,6 +10,7 @@
     ./solidity.nix
     ./dev.nix
     ./aider.nix
+    ./cpp.nix
   ];
 
   programs = {

home/common/programs/desktop/darkman.nix

@@ -10,13 +10,21 @@
       gtk-theme = ''
         ${pkgs.dconf}/bin/dconf write\
         /org/gnome/desktop/interface/color-scheme "'prefer-dark'"
+        ${pkgs.dconf}/bin/dconf write\
+        /org/gnome/desktop/interface/gtk-theme "'Orchis-Dark-Compact'"
       '';
     };
     lightModeScripts = {
       gtk-theme = ''
         ${pkgs.dconf}/bin/dconf write\
         /org/gnome/desktop/interface/color-scheme "'prefer-light'"
+        ${pkgs.dconf}/bin/dconf write\
+        /org/gnome/desktop/interface/gtk-theme "'Orchis-Compact'"
       '';
     };
   };
+
+  xdg.configFile."darkman/config.yaml".text = ''
+    usegeoclue: true
+  '';
 }

home/common/programs/dev.nix

@@ -19,5 +19,7 @@
     aider-chat
     inotify-tools
     devenv
+    # bruno
+    zed-editor
   ];
 }

home/common/programs/gpg.nix

@@ -14,20 +14,8 @@
 
   services.gpg-agent = {
     enable = true;
-    pinentryPackage = pkgs.pinentry-gnome3;
+    pinentry.package = pkgs.pinentry-gnome3;
   };
-  # pinentry = {
-  #   enable = true;
-  #   pinentryFlavor = "gnome3";
-  # };
-  # settings = {
-  #   keyserver = "hkps://keys.openpgp.org";
-  #   use-agent = true;
-  #   use-agent-extra = true;
-  #   no-greeting = true;
-  #   verbose = true;
-  # };
-  # };
 
   programs.password-store = {
     enable = true;

home/common/programs/hyprland/default.nix

@@ -8,6 +8,7 @@ in
     ./dunst.nix
     ./cursor.nix
     ./hyprpanel.nix
+    ./quickshell.nix
   ];
 
   home.packages = with pkgs; [

home/common/programs/hyprland/quickshell.nix

@@ -0,0 +1,13 @@
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}:
+{
+  home.packages = with pkgs; [
+    inputs.quickshell.packages.x86_64-linux.quickshell
+  ];
+
+  xdg.configFile."quickshell".source = ./quickshell;
+}

home/common/programs/hyprland/quickshell/Bar.qml

@@ -0,0 +1,28 @@
+import Quickshell
+import Quickshell.Io
+import QtQuick
+
+Scope {
+  Variants {
+    model: Quickshell.screens;
+
+    delegate: Component {
+      PanelWindow {
+        property var modelData
+        screen: modelData
+
+        anchors {
+          top: true
+          left: true
+          right: true
+        }
+
+        implicitHeight: 30
+
+        ClockWidget {
+          anchors.centerIn: parent
+        }
+      }
+    }
+  }
+}

home/common/programs/hyprland/quickshell/ClockWidget.qml

@@ -0,0 +1,5 @@
+import QtQuick
+
+Text {
+  text: Time.time
+}

home/common/programs/hyprland/quickshell/Time.qml

@@ -0,0 +1,26 @@
+pragma Singleton
+
+import Quickshell
+import Quickshell.Io
+import QtQuick
+
+Singleton {
+  id: root
+  property string time
+
+  Process {
+    id: dateProc
+    command: ["date"]
+    running: true
+    stdout: StdioCollector {
+      onStreamFinished: root.time = this.text
+    }
+  }
+
+  Timer {
+    interval: 1000
+    running: true
+    repeat: true
+    onTriggered: dateProc.running = true
+  }
+}

home/common/programs/hyprland/quickshell/shell.qml

@@ -0,0 +1,6 @@
+import Quickshell
+
+Scope {
+  Bar {}
+}
+

home/common/programs/zsh.nix

@@ -70,6 +70,7 @@
       [[ -f ~/.secrets.zsh ]] && source ~/.secrets.zsh
 
       export PATH="$HOME/.bin:$PATH"
+      export FOUNDRY_DISABLE_NIGHTLY_WARNING=true
       # export PKG_CONFIG_PATH=$(nix eval --raw nixpkgs.openssl.dev)/lib/pkgconfig:$PKG_CONFIG_PATH
       # export LIBRARY_PATH=$(nix eval --raw nixpkgs.openssl.dev)/lib:$LIBRARY_PATH
       # export LD_LIBRARY_PATH=$(nix eval --raw nixpkgs.openssl.dev)/lib:$LD_LIBRARY_PATH

home/desktop/default.nix

@@ -66,7 +66,7 @@
     };
   };
 
-  programs.hyprpanel.layout = {
+  programs.hyprpanel.settings.layout = {
     "bar.layouts" = {
       "0" = {
         "left" = [

home/desktop/monitors.nix

@@ -29,10 +29,11 @@ in
       "DP-2,     3840x2160, 2880x180,   1.333333,   transform, 1"
     ];
     workspace = [
-      "1, monitor=DP-3"
-      "2, monitor=DP-2"
-      "3, monitor=HDMI-A-1"
-      "4, monitor=DP-3"
+      "1, monitor=DP-2"
+      "2, monitor=DP-3"
+      "3, monitor=DP-2"
+      "4, monitor=HDMI-A-1"
+      "5, monitor=HDMI-A-1"
     ];
   };