diff --git a/doom.d/packages.el b/doom.d/packages.el index 38a2a23..98e2ddc 100644 --- a/doom.d/packages.el +++ b/doom.d/packages.el @@ -53,3 +53,4 @@ (package! dirvish) (package! git-auto-commit-mode) (package! polymode) +(package! atomic-chrome) diff --git a/flake.lock b/flake.lock index eb9680e..e4b8931 100644 --- a/flake.lock +++ b/flake.lock @@ -590,6 +590,21 @@ "type": "github" } }, + "nur": { + "locked": { + "lastModified": 1672393622, + "narHash": "sha256-sa12NfBKaXs4o65/p9S/PB4GygzrBVIpWib+VYKfpTw=", + "owner": "nix-community", + "repo": "NUR", + "rev": "1b7d2861b3939da8ef61ea4cd57b12456d32bfd1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "ob-racket": { "flake": false, "locked": { @@ -737,6 +752,7 @@ "nixosHardware": "nixosHardware", "nixpkgsStable": "nixpkgsStable", "nixpkgsUnstable": "nixpkgsUnstable", + "nur": "nur", "preCommitHooks": "preCommitHooks", "rock5b": "rock5b" } diff --git a/flake.nix b/flake.nix index 42a89fa..75b2a37 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,7 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgsUnstable"; }; + nur.url = "github:nix-community/NUR"; preCommitHooks.url = "github:cachix/pre-commit-hooks.nix"; agenix.url = "github:ryantm/agenix"; doomEmacs.url = "github:nix-community/nix-doom-emacs"; diff --git a/hmModules/firefox/default.nix b/hmModules/firefox/default.nix index e652c5d..c8a7da4 100644 --- a/hmModules/firefox/default.nix +++ b/hmModules/firefox/default.nix @@ -1,11 +1,32 @@ {pkgs, ...}: { programs.firefox = { enable = true; - package = pkgs.wrapFirefox pkgs.firefox-unwrapped { - extraPolicies = { - ExtensionSettings = {}; + package = + (pkgs.wrapFirefox pkgs.firefox-unwrapped { + extraPolicies = { + ExtensionSettings = {}; + }; + }) + .override { + cfg = { + enableTridactylNative = true; + enableBrowserpass = true; + enableFXCastBridge = true; + }; }; - }; + extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + https-everywhere + privacy-badger + ublock-origin + tridactyl + octotree + octolinker + org-capture + browserpass + bypass-paywalls-clean + ghosttext # or edit-with-emacs? + # fx_cast # TODO make PR to rycee NUR repo + ]; profiles.ccr = { settings = { "browser.startup.homepage" = "https://google.it"; diff --git a/hmModules/sway/default.nix b/hmModules/sway/default.nix index 47e485d..22d0291 100644 --- a/hmModules/sway/default.nix +++ b/hmModules/sway/default.nix @@ -41,7 +41,7 @@ modifier = modifier; menu = "${pkgs.fuzzel}/bin/fuzzel --background-color=253559cc --border-radius=5 --border-width=0"; output = let - bg = "${./wallpaper.png} fill"; + bg = "${./wallpaper.svg} fill"; in { DP-1 = { pos = "0 0"; diff --git a/hmModules/sway/wallpaper.png b/hmModules/sway/wallpaper.png deleted file mode 100644 index 464e50e..0000000 Binary files a/hmModules/sway/wallpaper.png and /dev/null differ diff --git a/hmModules/sway/wallpaper.svg b/hmModules/sway/wallpaper.svg new file mode 100644 index 0000000..642563e --- /dev/null +++ b/hmModules/sway/wallpaper.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/hmModules/xdg/default.nix b/hmModules/xdg/default.nix index 2d5d8b6..16c3c60 100644 --- a/hmModules/xdg/default.nix +++ b/hmModules/xdg/default.nix @@ -1,4 +1,15 @@ { - xdg.enable = true; - xdg.mimeApps.enable = true; + xdg = { + enable = true; + mimeApps.enable = true; + desktopEntries = { + org-protocol = { + name = "org-protocol"; + genericName = "Org protocol"; + exec = "emacsclient -- %u"; + terminal = false; + mimeType = ["x-scheme-handler/org-protocol"]; + }; + }; + }; } diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix index 6eac254..e514132 100644 --- a/hosts/thinkpad/default.nix +++ b/hosts/thinkpad/default.nix @@ -157,8 +157,8 @@ # services.openssh.enable = true; # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; + # networking.firewall.allowedTCPPorts = [ 5000]; + # networking.firewall.allowedUDPPorts = [ 5000 ]; # Or disable the firewall altogether. # networking.firewall.enable = false; diff --git a/modules/docker/default.nix b/modules/docker/default.nix index 342f14a..ff20993 100644 --- a/modules/docker/default.nix +++ b/modules/docker/default.nix @@ -6,4 +6,7 @@ }: { virtualisation.docker.enable = true; users.users.ccr.extraGroups = ["docker"]; + environment.systemPackages = with pkgs; [ + docker-compose + ]; } diff --git a/utils/default.nix b/utils/default.nix index 577a87c..dcbdbdd 100644 --- a/utils/default.nix +++ b/utils/default.nix @@ -5,6 +5,7 @@ homeManager, nixosHardware, nixpkgsUnstable, + nur, preCommitHooks, rock5b, self, @@ -42,7 +43,7 @@ value.file = ./.. + "/${name}"; }) (import ../secrets); }; - nixpkgs.overlays = [agenix.overlay comma.overlays.default]; + nixpkgs.overlays = [agenix.overlay comma.overlays.default nur.overlay]; } (../hosts + "/${name}") homeManager.nixosModule