From 45b5dfb2922fd13c1624e3a45bb14b07feb3deeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= <dev@theaninova.de>
Date: Wed, 1 Nov 2023 10:52:13 +0100
Subject: [PATCH] update config

---
 desktops/hyprland/hyprland.nix | 14 ++++++++-----
 flake.lock                     | 37 +++++++++++++++++++++++++++++++++-
 flake.nix                      |  7 ++++++-
 home.nix                       |  5 +++++
 packages.nix                   |  4 ++++
 5 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/desktops/hyprland/hyprland.nix b/desktops/hyprland/hyprland.nix
index 7d113b7..9a89b70 100644
--- a/desktops/hyprland/hyprland.nix
+++ b/desktops/hyprland/hyprland.nix
@@ -14,7 +14,7 @@
         # Fixes black screen on Jellyfin
         # https://github.com/jellyfin/jellyfin-media-player/issues/165#issuecomment-1569842393
         "QT_QPA_PLATFORM,xcb"
-        # Fixes dialogs randomly closing again in IntelliJ
+        # Potentially (?) fixes dialogs randomly closing again in IntelliJ
         # https://github.com/hyprwm/Hyprland/issues/1947
         "_JAVA_AWT_WM_NOREPARENTING=1"
       ];
@@ -22,6 +22,9 @@
         "ags"
         "swww init"
         "swww img ~/Pictures/Wallpapers/wallpaper.jpg"
+        "gnome-keyring-daemon --start --components=secrets"
+        "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"
+
       ];
       general = {
         gaps_in = 4;
@@ -37,6 +40,9 @@
       dwindle.pseudotile = true;
       input = {
         accel_profile = "flat";
+        kb_layout = "us";
+        kb_variant = "altgr-intl";
+        numlock_by_default = true;
       };
       bind = import ./keybinds.nix;
       bindm = import ./mousebinds.nix;
@@ -66,6 +72,7 @@
         # IntelliJ focus fixes
         "windowdance,class:^(jetbrains-.*)$"
         "dimaround,class:^(jetbrains-.*)$,floating:1,title:^(?!win)"
+        "center,class:^(jetbrains-.*)$,floating:1,title:^(?!win)"
         "noanim,class:^(jetbrains-.*)$,title:^(win.*)$"
         "noinitialfocus,class:^(jetbrains-.*)$,title:^(win.*)$"
         "rounding 0,class:^(jetbrains-.*)$,title:^(win.*)$"
@@ -75,8 +82,6 @@
     };
   };
 
-  # services.dunst = import ./dunst.nix;
-  
   programs.ags = {
     enable = true;
     configDir = ./ags;
@@ -85,7 +90,6 @@
   # programs.alacritty.enable = true;
   programs.fish.enable = true;
   programs.foot = import ./foot.nix;
-  # programs.waybar = import ./waybar.nix;
   programs.wofi = import ./wofi.nix;
   programs.swaylock = import ./swaylock.nix;
 
@@ -99,6 +103,7 @@
     grim
     slurp
     wl-clipboard
+    polkit_gnome
     /* TODO: (flameshot.overrideAttrs(prev: {
       nativeBuildInputs = prev.nativeBuildInputs ++ [ git grim ];
       cmakeFlags = [
@@ -106,7 +111,6 @@
         "-DUSE_WAYLAND_GRIM=true"
       ];
     }))*/
-    # wttrbar
     swww
     # ags
     glib
diff --git a/flake.lock b/flake.lock
index 4e22e77..813c7e2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,23 @@
 {
   "nodes": {
+    "ags": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1698528149,
+        "narHash": "sha256-qxvk+zKQGCrpRjBmMBwm+5+UiciW6qerSGGoZThiai0=",
+        "owner": "Aylur",
+        "repo": "ags",
+        "rev": "96f1dc8f126cd4785fd49bcac5b257d407beb2ca",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Aylur",
+        "repo": "ags",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -21,6 +39,22 @@
       }
     },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1693471703,
+        "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1698318101,
         "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=",
@@ -38,8 +72,9 @@
     },
     "root": {
       "inputs": {
+        "ags": "ags",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs_2"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index e691a04..008be2f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,9 +6,13 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    ags = {
+      url = "github:Aylur/ags";
+    };
   };
 
-  outputs = {nixpkgs, home-manager, ...}:
+  outputs = {nixpkgs, home-manager, ags, ...}:
     let
       username = "theaninova";
       system = "x86_64-linux";
@@ -30,6 +34,7 @@
         inherit pkgs;
 
         modules = [
+          ags.homeManagerModules.default
           home
         ];
       };
diff --git a/home.nix b/home.nix
index 24d6060..290ecde 100644
--- a/home.nix
+++ b/home.nix
@@ -10,6 +10,11 @@ in {
     shellAliases = {
       reload-home-manager-config = "home-manager switch --flake ${homeDirectory}/.config/home-manager";
     };
+
+    keyboard = {
+      layout = "us";
+      variant = "altgr-intl";
+    };
   };
 
   nixpkgs = {
diff --git a/packages.nix b/packages.nix
index 0716ba1..674d993 100644
--- a/packages.nix
+++ b/packages.nix
@@ -15,6 +15,7 @@
   makemkv
   handbrake
   metadata-cleaner
+  bitwarden
 
   # chat apps
   (import ./packages/threema-desktop.nix { inherit pkgs; })
@@ -49,4 +50,7 @@
   bottles
   protontricks
   mangohud
+
+  # utils
+  neofetch
 ]