diff --git a/common/firefox.nix b/common/firefox.nix index 54bf07d7..33b858bc 100644 --- a/common/firefox.nix +++ b/common/firefox.nix @@ -18,6 +18,7 @@ # ''; extensions = with pkgs.nur.repos.rycee.firefox-addons; [ privacy-badger + violentmonkey tridactyl clearurls onepassword-password-manager diff --git a/common/gui.nix b/common/gui.nix index 256ad34b..b4f15e5c 100644 --- a/common/gui.nix +++ b/common/gui.nix @@ -20,23 +20,29 @@ lib.attrsets.optionalAttrs device.hasGui { WantedBy = ["graphical-session.target"]; }; }; - # home.file = lib.optionalAttrs device.isMac { - # "Applications/1Password.app".source = "${pkgs._1password-gui}/Applications/1Password.app"; - # }; - # Only for checking markdown previews - vscode = { - enable = true; - package = pkgs.vscodium; - extensions = with pkgs.vscode-extensions; [ - shd101wyy.markdown-preview-enhanced - asvetliakov.vscode-neovim - ]; + programs = { + # Only for checking markdown previews + vscode = { + enable = true; + package = pkgs.vscodium; + extensions = with pkgs.vscode-extensions; [ + shd101wyy.markdown-preview-enhanced + asvetliakov.vscode-neovim + ]; + }; + # ghostty = { + # enable = true; + # installBatSyntax = false; + # package = + # if pkgs.stdenv.isLinux + # then pkgs.ghostty + # else pkgs.hello; + # }; }; home.packages = with pkgs; [] ++ lib.optionals pkgs.stdenv.isLinux [ - ghostty (mpv-unwrapped.wrapper {mpv = mpv-unwrapped.override {sixelSupport = true;};}) abaddon catppuccinThemes.gtk diff --git a/flake.lock b/flake.lock index 43908a49..af2784c7 100644 --- a/flake.lock +++ b/flake.lock @@ -1060,11 +1060,11 @@ ] }, "locked": { - "lastModified": 1736508663, - "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", + "lastModified": 1736785676, + "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", "owner": "nix-community", "repo": "home-manager", - "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", + "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", "type": "github" }, "original": { @@ -1904,11 +1904,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1736523798, - "narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=", + "lastModified": 1736798957, + "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "130595eba61081acde9001f43de3248d8888ac4a", + "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", "type": "github" }, "original": { diff --git a/modules/ghostty.nix b/modules/ghostty.nix deleted file mode 100644 index 5b01cced..00000000 --- a/modules/ghostty.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - pkgs, - config, - lib, - ... -}: -with lib; let - cfg = config.programs.ghostty; - # tomlFormat = pkgs.formats.toml {}; - inherit (lib.generatros) toKeyValue mkKeyValueDefault; -in { - options = { - programs.ghostty = { - enable = mkEnableOption "ghostty"; - package = mkPackageOption pkgs "ghostty" {}; - - settings = lib.mkOption { - type = tomlFormat.type; - description = "Options"; - }; - }; - }; - - config = { - xdg.configFile."ghostty/config".source = - tomlFormat.generate "config" cfg.settings; - }; -} diff --git a/overlays.nix b/overlays.nix index caf25abd..bd869a5c 100644 --- a/overlays.nix +++ b/overlays.nix @@ -120,7 +120,7 @@ }; }; ddcbacklight = inputs.ddcbacklight.packages.${prev.system}.ddcbacklight; - ghostty = inputs.ghostty.packages.${prev.system}.default; + # ghostty = inputs.ghostty.packages.${prev.system}.default; }; anyrun-overlay = final: prev: { anyrun =