toaster: back to niri

1 files changed, 43 insertions, 65 deletions

diff --git a/modules/niri.nix b/modules/niri.nix
index e769189..4af69ca 100644
--- a/modules/niri.nix
+++ b/modules/niri.nix
@@ -1,74 +1,52 @@
-# General Desktop-related config
-{ pkgs, inputs, ... }:
+{ pkgs, ... }:
 {
-  nixpkgs.overlays = [ inputs.niri.overlays.niri ];
-
   programs.niri.enable = true;
 
   imports = [
     ./desktop-software.nix
     ./fonts.nix
   ];
-  environment.systemPackages =
-    let
-      xwayland-satellite-git = pkgs.xwayland-satellite.overrideAttrs (
-        final: _prev: {
-          version = "git";
-          cargoHash = "sha256-MaF2FyR3HvQAKkZKa8OO/5jbO64/Ncv7+JqHda4jN50=";
-          src = pkgs.fetchFromGitHub {
-            owner = "Supreeeme";
-            repo = "xwayland-satellite";
-            rev = "cca74a5f6b23742d77dc5db4312dfc40fd4a0fcc";
-            sha256 = "sha256-YZ+axsuNsgIKWfnRkt6Qa9UoKfUOIWf42vNUonXxmxM=";
-          };
-          cargoDeps = pkgs.rustPlatform.fetchCargoTarball {
-            inherit (final) pname src version;
-            hash = final.cargoHash;
-          };
-        }
-      );
-    in
-    with pkgs;
-    [
-      screen-message
-      qbittorrent
-      gajim
-      imv
-      mpv
-      evince
-      brightnessctl
-      pulsemixer
-      cmus
-      termusic
-      gsettings-desktop-schemas
-      xdg-utils
-      qt5.qtwayland
-      bashmount
-      audacity
-      spotify-player
-      zathura
-      ncdu
-      adwaita-icon-theme
-      bluetui
-      gammastep
-      graphicsmagick
-      i3status-rust
-      impala
-      kanshi
-      pamixer
-      swayidle
-      swaylock
-      wl-clipboard
-      xfce.thunar
-      banana-cursor
-      fuzzel
-      alacritty
-      i3bar-river
-      mako
-      swww
-      oculante
-      xwayland-satellite-git
-    ];
+  environment.systemPackages = with pkgs; [
+    screen-message
+    qbittorrent
+    gajim
+    imv
+    mpv
+    evince
+    brightnessctl
+    pulsemixer
+    cmus
+    termusic
+    gsettings-desktop-schemas
+    xdg-utils
+    qt5.qtwayland
+    bashmount
+    audacity
+    spotify-player
+    zathura
+    ncdu
+    adwaita-icon-theme
+    bluetui
+    gammastep
+    graphicsmagick
+    i3status-rust
+    impala
+    kanshi
+    pamixer
+    swayidle
+    swaylock
+    wl-clipboard
+    xfce.thunar
+    banana-cursor
+    fuzzel
+    alacritty
+    i3bar-river
+    mako
+    swww
+    oculante
+    xwayland-satellite
+    foot
+  ];
 
   # Enable sound.
   security.rtkit.enable = true;
@@ -127,7 +105,7 @@
     enable = true;
     settings = {
       default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --greeting \"$(${pkgs.fortune}/bin/fortune -s)\" --cmd ${pkgs.niri-stable}/bin/niri-session";
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --greeting \"$(${pkgs.fortune}/bin/fortune -s)\" --cmd ${pkgs.niri}/bin/niri-session";
       };
     };
   };