From 3aa47ea58890aa173042d78e512b40bc7c40f9c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Wed, 21 May 2025 11:54:19 +0200 Subject: [PATCH] feat: add rio as a terminal emulator --- modules/moritz/profiles/desktop.nix | 6 ++++++ modules/moritz/programs/ghostty.nix | 2 +- modules/moritz/programs/kitty.nix | 2 +- modules/moritz/programs/niri.nix | 1 - modules/moritz/programs/rio.nix | 22 ++++++++++++++++++++++ 5 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 modules/moritz/programs/rio.nix diff --git a/modules/moritz/profiles/desktop.nix b/modules/moritz/profiles/desktop.nix index 88a837d..6399c1c 100644 --- a/modules/moritz/profiles/desktop.nix +++ b/modules/moritz/profiles/desktop.nix @@ -20,6 +20,7 @@ in { firefox.enable = mkDefault true; gpg.enable = mkDefault true; niri.enable = mkDefault true; + kitty.enable = mkDefault true; nvim.enable = mkDefault true; python.versions."311".enable = mkDefault true; spotify-player = { @@ -83,6 +84,11 @@ in { home-manager.users.moritz = { programs.ghostty.settings.window-decoration = false; + programs.rio.settings = { + confirm-before-quit = false; + renderer.backend = "Vulkan"; + window.decorations = "Disabled"; + }; services.nextcloud-client = { enable = true; startInBackground = true; diff --git a/modules/moritz/programs/ghostty.nix b/modules/moritz/programs/ghostty.nix index 01426a2..87d9563 100644 --- a/modules/moritz/programs/ghostty.nix +++ b/modules/moritz/programs/ghostty.nix @@ -13,7 +13,7 @@ in { }; config = mkIf cfg.enable { - my.terminal.package = cfg.package; + my.terminal.package = lib.mkDefault cfg.package; home-manager.users.moritz.programs.ghostty = { inherit (cfg) enable package; }; diff --git a/modules/moritz/programs/kitty.nix b/modules/moritz/programs/kitty.nix index eac63b9..e7d1254 100644 --- a/modules/moritz/programs/kitty.nix +++ b/modules/moritz/programs/kitty.nix @@ -9,7 +9,7 @@ in { options.my.programs.kitty.enable = mkEnableOption "kitty"; config = mkIf cfg.enable { - my.terminal.package = config.home-manager.users.moritz.programs.kitty.package; + my.terminal.package = lib.mkDefault config.home-manager.users.moritz.programs.kitty.package; my.shell.aliases.ssh = "TERM=xterm-256color command ssh"; home-manager.users.moritz = { programs.kitty = { diff --git a/modules/moritz/programs/niri.nix b/modules/moritz/programs/niri.nix index d84daf0..4f4da92 100644 --- a/modules/moritz/programs/niri.nix +++ b/modules/moritz/programs/niri.nix @@ -39,7 +39,6 @@ in { my = { programs = { wallpaper.enable = true; - kitty.enable = true; tofi.enable = true; }; wallpapers.enable = true; diff --git a/modules/moritz/programs/rio.nix b/modules/moritz/programs/rio.nix new file mode 100644 index 0000000..3b11023 --- /dev/null +++ b/modules/moritz/programs/rio.nix @@ -0,0 +1,22 @@ +{ + config, + lib, + pkgs, + ... +}: +with lib; let + cfg = config.my.programs.rio; +in { + options.my.programs.rio = { + enable = mkEnableOption "rio"; + package = mkPackageOption pkgs "rio" {}; + }; + + config = mkIf cfg.enable { + my.terminal.package = lib.mkDefault cfg.package; + home-manager.users.moritz.programs.rio = { + inherit (cfg) enable; + package = lib.mkDefault cfg.package; + }; + }; +}