1 files changed, 38 insertions, 27 deletions

diff --git a/flake.nix b/flake.nix
index 55ed146..aab11c1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,12 +2,12 @@
   description = "nerdypepper's nixos config";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    nixpkgs.url = github:NixOS/nixpkgs/nixpkgs-unstable;
 
     nixos-hardware.url = "github:nixos/nixos-hardware";
 
     home-manager = {
-      url = "github:nix-community/home-manager";
+      url = github:nix-community/home-manager;
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -22,15 +22,24 @@
     };
 
     vim-colors-plain = {
-      url = "git+https://git.peppe.rs/vim/vim-colors-plain";
+      url = "github:oppiliappan/vim-colors-plain";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    flaresolverr = {
-      url = "git+https://git.peppe.rs/flakes/flaresolverr";
+    # flaresolverr = {
+    #   url = "git+https://git.peppe.rs/flakes/flaresolverr";
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    # };
+
+    niri = {
+      url = "github:sodiboo/niri-flake";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    readit = {
+      url = "git+https://git.peppe.rs/web/readit";
+    };
+
   };
 
   outputs =
@@ -41,7 +50,9 @@
     , prompt
     , better-text-objs
     , vim-colors-plain
-    , flaresolverr
+      # , flaresolverr
+    , niri
+    , readit
     , ...
     } @ inputs: {
 
@@ -50,18 +61,20 @@
         prompt = prompt.overlay;
         better-text-objs = better-text-objs.overlay;
         vim-colors-plain = vim-colors-plain.overlay;
-        flaresolverr = flaresolverr.overlays.default;
+        # flaresolverr = flaresolverr.overlays.default;
+        niri = niri.overlays.niri;
       };
 
       formatter."x86_64-linux" = nixpkgs.legacyPackages."x86_64-linux".nixpkgs-fmt;
 
       nixosConfigurations = {
-        olive = nixpkgs.lib.nixosSystem {
+
+        myrtle = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           modules = [
             ({ config = { nix.registry.nixpkgs.flake = nixpkgs; }; })
             {
-              imports = [ ./hosts/olive/configuration.nix ];
+              imports = [ ./hosts/myrtle/configuration.nix ];
               _module.args.self = self;
             }
             home-manager.nixosModules.home-manager
@@ -69,48 +82,45 @@
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
               home-manager.users.np = {
-                imports = [ ./home.nix ];
+                imports = [ ./hosts/myrtle/home.nix ];
                 _module.args.self = self;
                 _module.args.inputs = inputs;
                 _module.args.theme = import ./theme;
+                _module.args.font = import ./font.nix;
               };
             }
+            nixos-hardware.nixosModules.asus-battery
           ];
         };
 
-        myrtle = nixpkgs.lib.nixosSystem {
+        mantis = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           modules = [
             ({ config = { nix.registry.nixpkgs.flake = nixpkgs; }; })
             {
-              imports = [ ./hosts/myrtle/configuration.nix ];
+              imports = [ ./hosts/mantis/configuration.nix ];
               _module.args.self = self;
             }
             home-manager.nixosModules.home-manager
             {
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
-              home-manager.users.np = {
-                imports = [ ./home.nix ];
+              home-manager.users.op = {
+                imports = [ ./hosts/mantis/home.nix ];
                 _module.args.self = self;
                 _module.args.inputs = inputs;
                 _module.args.theme = import ./theme;
                 _module.args.font = import ./font.nix;
               };
             }
-            nixos-hardware.nixosModules.asus-battery
-          ];
-        };
 
-        mantis = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules = [
-            ({ config = { nix.registry.nixpkgs.flake = nixpkgs; }; })
-            {
-              imports = [ ./hosts/mantis/configuration.nix ];
-              _module.args.self = self;
-            }
-            flaresolverr.nixosModules.default
+            # {
+            #   imports = [niri.nixosModules.niri];
+            #   nixpkgs.overlays = [niri.overlays.niri];
+            #   programs.niri.enable = true;
+            #   programs.niri.config = builtins.readFile ./hosts/mantis/niri-config.kdl;
+            # }
+
           ];
         };
 
@@ -122,7 +132,8 @@
               imports = [ ./hosts/laurel/configuration.nix ];
               _module.args.self = self;
             }
-            flaresolverr.nixosModules.default
+            # flaresolverr.nixosModules.default
+            readit.nixosModules.default
           ];
         };