Compare commits

...

4 commits

6 changed files with 58 additions and 6 deletions

View file

@ -443,11 +443,11 @@
"plugins-nvim-emmet": "plugins-nvim-emmet" "plugins-nvim-emmet": "plugins-nvim-emmet"
}, },
"locked": { "locked": {
"lastModified": 1740867397, "lastModified": 1740873051,
"narHash": "sha256-MCH5ZAXeGqgF4sDBlv5L32WV7oP6ZC5GtwTVyZNKWjk=", "narHash": "sha256-5yrGhxYiWiipWEYnsCAbRNkyeYzArax529KCI39/wtc=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "a5794fb1205e6bafdac4927170bd41763b841da1", "rev": "8a48c56206649cef772ab1e2bbceaa137b02bb59",
"revCount": 149, "revCount": 150,
"type": "git", "type": "git",
"url": "https://codewith.babesonthe.net/punkfairie/marleyvim" "url": "https://codewith.babesonthe.net/punkfairie/marleyvim"
}, },

View file

@ -79,6 +79,12 @@ in {
description = "The browser to use."; description = "The browser to use.";
}; };
email = lib.mkOption {
type = lib.types.package;
default = config.programs.thunderbird.package;
description = "The email client to use.";
};
launcher = lib.mkOption { launcher = lib.mkOption {
type = lib.types.submodule { type = lib.types.submodule {
options = { options = {

View file

@ -277,12 +277,16 @@ in {
# Floorp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Floorp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
"floorp.lepton.interface" = 3; "floorp.lepton.interface" = 3;
"userChrome.tab.lepton_like_padding" = false; "userChrome.tab.lepton_like_padding" = false;
"userChrome.autohide.back_button" = true;
"userChrome.autohide.forward_button" = true;
"userChrome.autohide.navbar" = false;
"userChrome.autohide.page_action" = true;
"floorp.browser.sidebar.enable" = false; "floorp.browser.sidebar.enable" = false;
"floorp.browser.sidebar2.data" = '' "floorp.browser.sidebar2.data" = ''
{"data":{"floorp__history":{"url":"floorp//history","width":415},"floorp__downloads":{"url":"floorp//downloads","width":415},"floorp__notes":{"url":"floorp//notes","width":550}},"index":["floorp__history","floorp__downloads","floorp__notes"]} {"data":{"floorp__history":{"url":"floorp//history","width":415},"floorp__downloads":{"url":"floorp//downloads","width":415},"floorp__notes":{"url":"floorp//notes","width":550}},"index":["floorp__history","floorp__downloads","floorp__notes"]}
''; '';
"floorp.tabbar.style" = 2; "floorp.tabbar.style" = 2;
"floorp.verticaltab.hover.enabled" = true; "floorp.verticaltab.hover.enabled" = false;
"floorp.verticaltab.show.newtab.button" = true; "floorp.verticaltab.show.newtab.button" = true;
# marleyOS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # marleyOS - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

View file

@ -0,0 +1,15 @@
{
lib,
config,
...
}: let
cfg = config.marleyos.services.gnome-keyring;
in {
options.marleyos.services.gnome-keyring.enable = lib.mkEnableOption "gnome-keyring";
config = lib.mkIf cfg.enable {
services.gnome-keyring = {
enable = true;
};
};
}

View file

@ -48,6 +48,7 @@ in {
in [ in [
{command = ["sh" "-c" "${lib.getExe apps.terminal} -e tmux new -s main -A"];} {command = ["sh" "-c" "${lib.getExe apps.terminal} -e tmux new -s main -A"];}
(cmd (lib.getExe apps.browser)) (cmd (lib.getExe apps.browser))
(cmd (lib.getExe apps.email))
]; ];
layout = let layout = let
@ -104,6 +105,21 @@ in {
screenshot-path = "~/pictures/screenshots/%Y-%m-%d %H-%M-%S.png"; screenshot-path = "~/pictures/screenshots/%Y-%m-%d %H-%M-%S.png";
workspaces = {
"01-main" = {
open-on-output = builtins.elemAt cfg.monitors 0;
name = "main";
};
"02-web" = {
open-on-output = builtins.elemAt cfg.monitors 1;
name = "web";
};
"03-email" = {
open-on-output = builtins.elemAt cfg.monitors 1;
name = "email";
};
};
window-rules = window-rules =
[ [
{ {
@ -131,6 +147,18 @@ in {
} }
]; ];
open-on-output = builtins.elemAt cfg.monitors 1; open-on-output = builtins.elemAt cfg.monitors 1;
open-on-workspace = "web";
default-column-width.proportion = 1.0;
}
{
matches = [
{
app-id = "^thunderbird$";
at-startup = true;
}
];
open-on-output = builtins.elemAt cfg.monitors 1;
open-on-workspace = "email";
default-column-width.proportion = 1.0; default-column-width.proportion = 1.0;
} }
]); ]);

View file

@ -13,7 +13,6 @@ in {
services.protonmail-bridge = { services.protonmail-bridge = {
enable = true; enable = true;
package = pkgs.protonmail-bridge-gui;
path = with pkgs; [gnome-keyring]; path = with pkgs; [gnome-keyring];
}; };