From f6135653d957550d1732227b99cfe29cacf31c8a Mon Sep 17 00:00:00 2001
From: tristan <tristan@tristans.cloud>
Date: Thu, 11 Jan 2024 17:38:37 +0000
Subject: [PATCH] display position, disable hycov, stable brave

---
 flake.lock                 | 16 ++++++++++++++++
 flake.nix                  |  7 +++----
 hardware/displays.nix      |  2 +-
 home/programs/hyprland.nix |  1 -
 lib/mkconf.nix             |  2 +-
 nixos/modules/display.nix  |  1 +
 6 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/flake.lock b/flake.lock
index dc78884..917b8a1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -358,9 +358,25 @@
         "hycov": "hycov",
         "hyprland": "hyprland",
         "nixpkgs": "nixpkgs_3",
+        "stable-nixpkgs": "stable-nixpkgs",
         "stylix": "stylix"
       }
     },
+    "stable-nixpkgs": {
+      "locked": {
+        "lastModified": 1704874635,
+        "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-23.11",
+        "type": "indirect"
+      }
+    },
     "stylix": {
       "inputs": {
         "base16": "base16",
diff --git a/flake.nix b/flake.nix
index f5d5f45..861ab8c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,7 @@
 
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-unstable";
+    stable-nixpkgs.url = "nixpkgs/nixos-23.11";
     home-manager = {
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -47,10 +48,8 @@
 
       vm-sway =
         builtins.trace ''
-          I haven't finished configuring sway yet.
-
-          use alt+enter to start a terminal.
-          use alt+d to launch applications
+          use super+enter to start a terminal.
+          use super+d to launch applications
 
           start the vm with '-vga qxl'
         ''
diff --git a/hardware/displays.nix b/hardware/displays.nix
index 0007e5e..16e0547 100644
--- a/hardware/displays.nix
+++ b/hardware/displays.nix
@@ -10,7 +10,7 @@
           freq = 144;
         };
         position.x = 0;
-        position.y = 0;
+        position.y = 360;
       };
       "asus" = {
         resolution = {
diff --git a/home/programs/hyprland.nix b/home/programs/hyprland.nix
index 7a756b0..919cb55 100644
--- a/home/programs/hyprland.nix
+++ b/home/programs/hyprland.nix
@@ -10,7 +10,6 @@ in {
     (import ./swaylock.nix)
     (import ./swayidle.nix)
     (import ./waybar.nix)
-    # (import ./hycov.nix)
   ];
   xdg.portal = {
     enable = true;
diff --git a/lib/mkconf.nix b/lib/mkconf.nix
index 2659afd..7202ae8 100644
--- a/lib/mkconf.nix
+++ b/lib/mkconf.nix
@@ -32,8 +32,8 @@ with inputs;
           };
           nixpkgs.config.packageOverrides = pkgs: {
             hycov = hycov.packages.${system}.hycov;
+            brave = (import stable-nixpkgs {inherit system;}).brave;
           };
-
           imports = [
             {
               options.user = nixpkgs.lib.mkOption {default = user;};
diff --git a/nixos/modules/display.nix b/nixos/modules/display.nix
index 104ba26..9074996 100644
--- a/nixos/modules/display.nix
+++ b/nixos/modules/display.nix
@@ -161,6 +161,7 @@ with lib; let
     monitors);
 
   renderWorkspacesForHyprland = displays: (map hyprWorkspaceSetting displays);
+
   hyprWorkspaceSetting = display:
     specificDisplay display
     + ", "