Niri, Hypr, Flake Bump, initial setup for niri

Sets up a config for Niri which involved both the host and user config
settings. It's a semi basic set up to be improved on further later.

This also needs to bump flake so that niri can be added to the flake
update. I don't know what the flake bump date was at this point, so I'll
have to bump it again soon.

This needs to break apart the "waylandcompositors" service to allow niri
and hypr to better fit the directory structure. Otherwise Hypr is
unchanged.

hmModules/apps/fish/app.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 let
   functionModule = with lib.types; submodule {
     options = {
@@ -21,9 +21,6 @@ in {
   config = lib.mkIf config.fish.enable {
     programs.fish = {
       enable = true;
-      interactiveShellInit = ''
-        ${pkgs.nix-your-shell}/bin/nix-your-shell fish | source
-      '';
       functions = {
         fish_greeting = "";
         fish_prompt = ''

hmModules/apps/neovim/app.nix

@@ -105,13 +105,7 @@
         ]);
 
         rust-pkg = lopts cfgl.rust.enable (with pkgs.vimPlugins; [
-          {
+          rustaceanvim
-            plugin = rustaceanvim;
-            type = "lua";
-            config = ''
-              vim.g.rust_recommended_style = 0
-            '';
-          }
         ]);
         
         go-pkg = lopts cfgl.go.enable (with pkgs.vimPlugins; [

hmModules/apps/neovim/options.lua

@@ -33,9 +33,6 @@ vim.opt.backup = false
 vim.opt.undofile = true
 vim.opt.undodir = '/home/pan/.config/nvim/undodir'
 
--- Error viewing
-vim.keymap.set('n', '<Leader>d', function() vim.diagnostic.open_float() end)
-
 -- Easy copy and pasting to external programs
 -- map <C-y> "+yy
 -- map <C-p> "+P

hosts/onizuka/host.nix

@@ -15,7 +15,7 @@
   sshd.enable = true;
 
   tuigreet.enable = true;
-  niri.enable = true;
+  hyprland.enable = true;
 
   steam.enable = true;
   steam.gamemode = true;

hosts/onizuka/users/pan/user.nix

@@ -72,7 +72,6 @@
     treesitter.enable = true;
     wiki.enable = true;
   };
-  neovim.themes.catppuccin.enable = true;
 
   lf.enable = true;
   lf.hiddenfiles = [

nixosModules/services/displaymanager/service.nix

@@ -6,19 +6,15 @@
   };
 
   config = lib.mkIf config.tuigreet.enable {
-    services.greetd = let 
+    services.greetd = {
-      wm = 
-        if config.hyprland.enable then "Hyprland"
-        else (if config.niri.enable then "niri" else null);
-    in {
       enable = true;
       package = pkgs.greetd.tuigreet;
       settings = {
         terminal = {
           vt = 2;
         };
-        default_session = lib.mkIf (wm != null) {
+        default_session = lib.mkIf config.hyprland.enable {
-          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd ${wm}";
+          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland";
           user = "greeter";
         };
       };