diff --git a/flake.nix b/flake.nix index 7fed30e..a76ba61 100644 --- a/flake.nix +++ b/flake.nix @@ -28,6 +28,10 @@ url = "github:orhun/base16-kermit"; flake = false; }; + base16-foot = { + url = "github:tinted-theming/base16-foot"; + flake = false; + }; base16-vscode = { url = "github:golf1052/base16-vscode"; flake = false; diff --git a/home-manager/modules/colors.nix b/home-manager/modules/colors.nix index 28574a6..04c2854 100644 --- a/home-manager/modules/colors.nix +++ b/home-manager/modules/colors.nix @@ -320,6 +320,9 @@ in { # Kermit programs.kermit.extraConfig = builtins.readFile (genTheme inputs.base16-kermit); + # Foot + programs.foot.settings.main.include = "${genTheme inputs.base16-foot}"; + # neovim xdg.configFile."nvim/colors/base16.vim".source = "${genTheme inputs.base16-vim}"; programs.neovim.extraConfig = '' diff --git a/home-manager/modules/ezpcusr.nix b/home-manager/modules/ezpcusr.nix index 1e86595..8085bb1 100644 --- a/home-manager/modules/ezpcusr.nix +++ b/home-manager/modules/ezpcusr.nix @@ -187,7 +187,7 @@ in { ''; config = { - terminal = lib.mkDefault "${pkgs.kermit-terminal}/bin/kermit"; + terminal = lib.mkDefault "${pkgs.foot}/bin/foot"; modifier = lib.mkDefault "Mod4"; @@ -539,13 +539,14 @@ in { platformTheme = lib.mkDefault "gtk"; }; - programs.kermit = { - enable = lib.mkDefault true; - settings = { - opacity = lib.mkDefault "0.90"; - key = lib.mkDefault "shift"; - }; - }; + # programs.kermit = { + # enable = lib.mkDefault true; + # settings = { + # opacity = lib.mkDefault "0.90"; + # key = lib.mkDefault "shift"; + # }; + # }; + programs.foot.enable = true; xdg.enable = true; xdg.userDirs.enable = true; @@ -596,7 +597,7 @@ in { programs.rofi = { enable = lib.mkDefault true; package = pkgs.rofi-wayland; - terminal = lib.mkDefault "${pkgs.kermit-terminal}/bin/kermit"; + terminal = lib.mkDefault "${pkgs.foot}/bin/foot"; }; services.flameshot = { diff --git a/home-manager/modules/fonts.nix b/home-manager/modules/fonts.nix index 75aa925..d33f8a9 100644 --- a/home-manager/modules/fonts.nix +++ b/home-manager/modules/fonts.nix @@ -60,6 +60,8 @@ in { font = "${cfg.font.name}, normal ${toString cfg.font.size}"; }; + programs.foot.settings.main.font = "${cfg.font.name}:size=${toString cfg.font.size}"; + programs.rofi.font = "${cfg.font.name} ${toString cfg.font.size}"; services.mako.font = "${cfg.font.name} ${toString cfg.font.size}"; diff --git a/home-manager/users/notgne2.nix b/home-manager/users/notgne2.nix index 5c36c0e..8f4b636 100644 --- a/home-manager/users/notgne2.nix +++ b/home-manager/users/notgne2.nix @@ -71,7 +71,6 @@ in { ]; "nix.formatterPath" = "${pkgs.alejandra}/bin/alejandra"; - "nix.serverPath" = "${pkgs.rnix-lsp}/bin/rnix-lsp"; "nix.enableLanguageServer" = true; "editor.formatOnSave" = true;