chore: update inputs

sioodmy · Jun 21, 2024 · 45404b0 · 45404b0
1 parent 1399d3b
commit 45404b0
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 14 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/home/default.nix b/home/default.nix
@@ -2,7 +2,6 @@
 # glue all configs together
 {
   config.home.stateVersion = "22.05";
-  config.home.extraOutputsToInstall = ["doc" "devdoc"];
   imports = [
     inputs.nix-index-db.hmModules.nix-index
     # inputs.niri.homeModules.niri
@@ -12,7 +11,6 @@
     ./impermanence.nix
 
     ./scripts
-    ./rice
     ./misc
   ];
 }
diff --git a/home/rice/default.nix b/home/rice/default.nix
@@ -1,10 +1,10 @@
 {...}: {
   imports = [
     # ./foot.nix
-    ./zathura.nix
     # ./dunst.nix
-    ./gtk.nix
+    # ./gtk.nix
     # ./waybar
+    ./zathura
     ./fuzzel
     # ./niri
   ];

diff --git a/home/rice/gtk.nix b/home/rice/gtk.nix
@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   gtk = {
-    enable = true;
+    enable = false;
     theme = {
       name = "Catppuccin-Frappe-Compact-Pink-Dark";
       package = pkgs.catppuccin-gtk.override {

diff --git a/system/wayland/default.nix b/system/wayland/default.nix
@@ -3,7 +3,16 @@
   inputs,
   ...
 }: {
-  imports = [./fonts.nix ./services.nix ./pipewire.nix inputs.niri.nixosModules.niri];
+  imports = [
+    ./fonts.nix
+    ./services.nix
+    ./pipewire.nix
+    inputs.niri.nixosModules.niri
+    inputs.andromeda.nixosModules.default
+  ];
+  programs.andromeda = {
+    enable = true;
+  };
   environment = {
     variables = {
       NIXOS_OZONE_WL = "1";
@@ -34,14 +43,10 @@
       eval $(gnome-keyring-daemon --start --components=ssh,secrets)
       eval $(ssh-agent)
     '';
-    systemPackages = with pkgs;
-    with inputs.andromeda.packages.${pkgs.system}; [
+    systemPackages = with pkgs; [
       pamixer
       brightnessctl
       wl-clipboard
-      andromeda
-      andromeda-niri
-      nucleus
     ];
   };
 

diff --git a/system/wayland/services.nix b/system/wayland/services.nix
@@ -29,7 +29,7 @@
       settings = rec {
         initial_session = {
           # command = "${config.programs.niri.package}/bin/niri-session";
-          command = "${inputs.andromeda.packages.${pkgs.system}.andromeda-niri}/bin/niri";
+          command = "niri";
           user = "sioodmy";
         };
         default_session = initial_session;