From aae08f400728b45581cd4e0ba76ddd227a5b69b0 Mon Sep 17 00:00:00 2001 From: tomoron Date: Sat, 19 Oct 2024 16:15:49 +0200 Subject: [PATCH] add firefox config in declarative, andd ntfs3g to mount ntfs drives --- configuration.nix | 1 + flake.lock | 57 ++++++++++++++++++++++++++++++++++++++------- flake.nix | 19 ++++++++------- home.nix | 4 ++-- hosts/desktop.nix | 2 -- modules/firefox.nix | 11 +++++++++ 6 files changed, 72 insertions(+), 22 deletions(-) create mode 100644 modules/firefox.nix diff --git a/configuration.nix b/configuration.nix index 2c2d5f3..0b347ed 100644 --- a/configuration.nix +++ b/configuration.nix @@ -43,6 +43,7 @@ gnumake git neofetch + ntfs3g ]; #Open ports in the firewall. diff --git a/flake.lock b/flake.lock index 0420445..9171f03 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,43 @@ { "nodes": { + "firefox-addons": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "dir": "pkgs/firefox-addons", + "lastModified": 1729321532, + "narHash": "sha256-3/d/mbLQhrkE1qK2Ut/mrMElE6fP9t6ITJoRQ6F+D7o=", + "owner": "rycee", + "repo": "nur-expressions", + "rev": "70087c8c6e491dcc0bbff459073b480b1a72ac1c", + "type": "gitlab" + }, + "original": { + "dir": "pkgs/firefox-addons", + "owner": "rycee", + "repo": "nur-expressions", + "type": "gitlab" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1629284811, + "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -7,11 +45,11 @@ ] }, "locked": { - "lastModified": 1729258007, - "narHash": "sha256-48B9JVEhQ4zHxE0ak50QDnkC6C+R74Bm/md397tXhXM=", + "lastModified": 1729321331, + "narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=", "owner": "nix-community", "repo": "home-manager", - "rev": "cb93ab1c990c5719ec199e8c397e688de06cb46d", + "rev": "122f70545b29ccb922e655b08acfe05bfb44ec68", "type": "github" }, "original": { @@ -22,11 +60,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728729581, - "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", + "lastModified": 1729333370, + "narHash": "sha256-NU+tYe3QWzDNpB8RagpqR3hNQXn4BNuBd7ZGosMHLL8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", + "rev": "38279034170b1e2929b2be33bdaedbf14a57bfeb", "type": "github" }, "original": { @@ -38,11 +76,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { @@ -54,6 +92,7 @@ }, "root": { "inputs": { + "firefox-addons": "firefox-addons", "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs" diff --git a/flake.nix b/flake.nix index 72d4240..0353425 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ # By: tomoron +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2024/10/17 18:15:24 by tomoron #+# #+# # -# Updated: 2024/10/18 00:42:34 by tomoron ### ########.fr # +# Updated: 2024/10/19 15:11:51 by tomoron ### ########.fr # # # # **************************************************************************** # @@ -20,6 +20,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + + firefox-addons = { + url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { self, nixpkgs, home-manager, nixos-hardware, ... }@inputs: @@ -62,19 +67,12 @@ #HOME CONFIG homeConfigurations = { - ${username} = home-manager.lib.homeManagerConfiguration { - inherit pkgs; - extraSpecialArgs = { - username = "${username}"; - homeDir = "${homeDir}"; - }; - modules = [ ./home.nix ]; - }; vbox = home-manager.lib.homeManagerConfiguration { inherit pkgs; extraSpecialArgs = { username = "${username}"; homeDir = "${homeDir}"; + inherit inputs; }; modules = [ ./home.nix @@ -86,6 +84,7 @@ extraSpecialArgs = { username = "tomoron"; homeDir = "/nfs/homes/tomoron"; + inherit inputs; }; modules = [ ./home.nix @@ -97,6 +96,7 @@ extraSpecialArgs = { username = "${username}"; homeDir = "${homeDir}"; + inherit inputs; }; modules = [ ./home.nix @@ -108,6 +108,7 @@ extraSpecialArgs = { username = "${username}"; homeDir = "${homeDir}"; + inherit inputs; }; modules = [ ./home.nix diff --git a/home.nix b/home.nix index caea716..7ec32b4 100644 --- a/home.nix +++ b/home.nix @@ -6,7 +6,7 @@ # By: tomoron +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2024/10/17 18:15:38 by tomoron #+# #+# # -# Updated: 2024/10/19 14:16:59 by tomoron ### ########.fr # +# Updated: 2024/10/19 14:49:27 by tomoron ### ########.fr # # # # **************************************************************************** # @@ -18,6 +18,7 @@ modules/picom.nix modules/alacritty.nix modules/vim.nix + modules/firefox.nix ]; home.username = "${username}"; @@ -31,7 +32,6 @@ nitrogen nerdfonts rofi - firefox neovim activate-linux bspwm diff --git a/hosts/desktop.nix b/hosts/desktop.nix index a178c81..03f365f 100644 --- a/hosts/desktop.nix +++ b/hosts/desktop.nix @@ -14,8 +14,6 @@ hardware.cpu.intel.updateMicrocode = true; -# services.xserver.videoDrivers = [ "intel"]; - boot.kernelModules = [ "kvm-intel" "nvidia" ]; hardware.graphics.extraPackages = with pkgs; [libGL linuxPackages.nvidia_x11.out]; diff --git a/modules/firefox.nix b/modules/firefox.nix new file mode 100644 index 0000000..de2ac7e --- /dev/null +++ b/modules/firefox.nix @@ -0,0 +1,11 @@ +{ config, lib, pkgs, inputs, username, homeDir, ... }: + +{ + programs.firefox = { + enable = true; + profiles.default = { + extensions = with inputs.firefox-addons.packages."x86_64-linux"; + [vimium ublock-origin]; + }; + }; +}