Merge branch 'master' of github.com:pniedzwiedzinski/dots

flake.nix

@@ -15,6 +15,9 @@
 		disko.url = "github:nix-community/disko";
   		disko.inputs.nixpkgs.follows = "nixpkgs";
 		impermanence.url = "github:nix-community/impermanence";
+		agenix.url = "github:ryantm/agenix";
+		nix-ld.url = "github:Mic92/nix-ld";
+		nix-ld.inputs.nixpkgs.follows = "nixpkgs";
 	};
 
 	outputs = { self, nixpkgs, ... }@inputs: 
@@ -54,6 +57,8 @@
 					inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t14-amd-gen2
 					inputs.home-manager.nixosModules.default
 					inputs.nix-index-database.nixosModules.nix-index
+					inputs.agenix.nixosModules.default
+					inputs.nix-ld.nixosModules.nix-ld
 					{
 						home-manager.useGlobalPkgs = true;
 						home-manager.useUserPackages = true;

home.nix

@@ -29,10 +29,17 @@ in
   home.username = "pn";
   home.homeDirectory = "/home/pn";
 
-  programs.chromium.enable = true;
-  programs.chromium.extensions = [
-    { id = "fjcldmjmjhkklehbacihaiopjklihlgg"; }
-  ];
+  programs.brave = {
+    enable = false;
+    package = pkgs.brave.overrideAttrs (oldAttrs: {
+      commandLineArgs = [
+        "--profile-directory=${config.home.homeDirectory}/.config/BraveSoftware/Brave-Browser/Default"
+      ];
+    });
+    extensions = [
+      { id = "fjcldmjmjhkklehbacihaiopjklihlgg"; }
+    ];
+  };
 
   xdg.userDirs = {
     enable = true;

machines/base.nix

@@ -14,7 +14,7 @@
   environment.systemPackages = with pkgs; [
     wget vim curl htop file
     stdenv git zip unzip
-    dnsutils ripgrep jq
+    dnsutils ripgrep
     any-nix-shell fd fzf
     translate-shell
   ];

machines/t14/default.nix

@@ -7,6 +7,7 @@
 		../x220-gnome/pass.nix
 		./hardware-configuration.nix
 		../x220-gnome/pn.nix
+		../../modules/appset-dev.nix
 		];
 
 # Enable networking
@@ -53,6 +54,11 @@
 #   enableSSHSupport = true;
 # };
 
+	services.locate = {
+		enable = true;
+		package = pkgs.plocate;
+	};
+
   services.printing.drivers = with pkgs; [ cnijfilter2 ];
   services.printing.logLevel = "debug";
   services.avahi.enable = true;
@@ -62,6 +68,12 @@
   services.udev.packages = [ pkgs.sane-airscan ];
   hardware.sane.disabledDefaultBackends = [ "escl" ];
 
+	programs.nix-ld.dev = {
+		enable = true;
+		libraries = [
+			pkgs.libgcc.lib
+		];
+	};
 
 	programs.appimage = {
 		enable = true;

modules/appset-dev.nix

@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+{
+	environment.systemPackages = with pkgs; [
+		vscode
+		vim
+		jq
+		python3
+		nodejs
+	];
+}

modules/gnome.nix

@@ -115,7 +115,14 @@ in
 		gnome.gnome-boxes
 		gnome.file-roller
 		gnomeExtensions.hibernate-status-button
-		brave
+		#brave #specified in home.nix
+            	(pkgs.brave.overrideAttrs (oldAttrs: {
+		  installPhase = oldAttrs.installPhase + ''
+		  	substituteInPlace $out/share/applications/brave-browser.desktop \
+			--replace %U "--profile-directory=Default %U"
+		  '';
+                }))
+
 		newsflash
 		spotify
 		fragments