From bd593e329ecb3be23d56119073977c728cce72d7 Mon Sep 17 00:00:00 2001
From: Christian Ott <mail@christianott.ch>
Date: Sun, 23 Jun 2024 10:21:35 +0200
Subject: [PATCH] use wayabar config and add alternative network manager

---
 configuration.nix |  3 ++-
 flake.lock        | 41 +++++++++++++++++++++++++++++++----------
 flake.nix         |  8 ++++++--
 home.nix          |  2 ++
 4 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 0a9427a..763a95b 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -2,7 +2,7 @@
 # your system. Help is available in the configuration.nix(5) man page, on
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, ronema, ... }:
 
 {
   imports =
@@ -139,6 +139,7 @@
     vscodium
     pciutils
     usbutils
+    ronema.packages.x86_64-linux.default
   ];
 
   # Some programs need SUID wrappers, can be configured further or are
diff --git a/flake.lock b/flake.lock
index d2580d5..c7ab63a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717097707,
-        "narHash": "sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs=",
+        "lastModified": 1718243258,
+        "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0eb314b4f0ba337e88123e0b1e57ef58346aafd9",
+        "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3",
         "type": "github"
       },
       "original": {
@@ -57,11 +57,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1714465198,
-        "narHash": "sha256-ySkEJvS0gPz2UhXm0H3P181T8fUxvDVcoUyGn0Kc5AI=",
+        "lastModified": 1718459188,
+        "narHash": "sha256-umwY+ivE98n/6EwEtobOlqf1t9VddhPIIZ6rVmFXlHg=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "68d680c1b7c0e67a9b2144d6776583ee83664ef4",
+        "rev": "0cd562157274df3783840bdcb0ce6d9c4cf4aa29",
         "type": "github"
       },
       "original": {
@@ -73,11 +73,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1716948383,
-        "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
+        "lastModified": 1718318537,
+        "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
+        "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420",
         "type": "github"
       },
       "original": {
@@ -102,12 +102,33 @@
         "type": "github"
       }
     },
+    "ronema": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1718446613,
+        "narHash": "sha256-4Y9htPtd4CTWO5zGElwfDA5ktzlIhcfKG/aT2BVrN34=",
+        "ref": "refs/heads/master",
+        "rev": "328bd77536cec39d17b5e5027c5778efeb650fed",
+        "revCount": 77,
+        "type": "git",
+        "url": "file:///home/chrigi/private-dev/rofi-network-manager"
+      },
+      "original": {
+        "type": "git",
+        "url": "file:///home/chrigi/private-dev/rofi-network-manager"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
         "nix-colors": "nix-colors",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "ronema": "ronema"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 6a15ab5..b92e2a5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,9 +9,13 @@
       url = github:nix-community/home-manager;
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    ronema = {
+      url = "/home/chrigi/private-dev/rofi-network-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { self, nixpkgs, nixos-hardware, home-manager, nix-colors, ... }@inputs: 
+  outputs = { self, nixpkgs, nixos-hardware, home-manager, nix-colors, ronema, ... }@inputs: 
     let
       username = "chrigi";
       lib = nixpkgs.lib;
@@ -24,7 +28,7 @@
     in {
       nixosConfigurations.nix-fw16 = lib.nixosSystem {
         specialArgs = {
-          inherit pkgs;
+          inherit pkgs ronema;
         };
         modules = [
           ./configuration.nix
diff --git a/home.nix b/home.nix
index cb9291e..4392e76 100644
--- a/home.nix
+++ b/home.nix
@@ -4,6 +4,8 @@
   imports = [ 
     nix-colors.homeManagerModules.default
     ./modules/dunst.nix
+    ./modules/waybar.nix
+    ./modules/ranger.nix
     ./hyperland
   ];
   colorScheme = nix-colors.colorSchemes.gruvbox-material-dark-hard;