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

7 files changed, 178 insertions, 20 deletions

diff --git a/flake.lock b/flake.lock
index 0fedf22..0a4b8e4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,48 @@
 {
   "nodes": {
+    "agenix": {
+      "inputs": {
+        "darwin": "darwin",
+        "home-manager": "home-manager",
+        "nixpkgs": "nixpkgs",
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1723293904,
+        "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
+        "owner": "ryantm",
+        "repo": "agenix",
+        "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ryantm",
+        "repo": "agenix",
+        "type": "github"
+      }
+    },
+    "darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "agenix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1700795494,
+        "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
+        "owner": "lnl7",
+        "repo": "nix-darwin",
+        "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lnl7",
+        "ref": "master",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
     "devshell": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -115,7 +158,7 @@
     },
     "flake-utils": {
       "inputs": {
-        "systems": "systems"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1701680307,
@@ -186,6 +229,27 @@
     "home-manager": {
       "inputs": {
         "nixpkgs": [
+          "agenix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1703113217,
+        "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "home-manager_2": {
+      "inputs": {
+        "nixpkgs": [
           "nixpkgs"
         ]
       },
@@ -204,7 +268,7 @@
         "type": "github"
       }
     },
-    "home-manager_2": {
+    "home-manager_3": {
       "inputs": {
         "nixpkgs": [
           "ronvim",
@@ -283,6 +347,26 @@
         "type": "github"
       }
     },
+    "nix-ld": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1728031945,
+        "narHash": "sha256-NRkLjdMtVfC6dD1gEbYZWFEtbmC2xfD6ft1IP7l76Vw=",
+        "owner": "Mic92",
+        "repo": "nix-ld",
+        "rev": "4524c512e8729ccb5a1b9239d01e1474cbf074a2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mic92",
+        "repo": "nix-ld",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1728056216,
@@ -301,16 +385,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1728067476,
-        "narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=",
-        "owner": "nixos",
+        "lastModified": 1703013332,
+        "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030",
+        "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
-        "ref": "nixos-24.05",
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -329,6 +413,22 @@
     },
     "nixpkgs_2": {
       "locked": {
+        "lastModified": 1728067476,
+        "narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
         "lastModified": 1717786204,
         "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
         "owner": "nixos",
@@ -343,7 +443,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1717786204,
         "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
@@ -365,9 +465,9 @@
         "flake-compat": "flake-compat",
         "flake-parts": "flake-parts_2",
         "git-hooks": "git-hooks",
-        "home-manager": "home-manager_2",
+        "home-manager": "home-manager_3",
         "nix-darwin": "nix-darwin",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
@@ -387,7 +487,7 @@
     "ronvim": {
       "inputs": {
         "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "nixvim": "nixvim"
       },
       "locked": {
@@ -407,12 +507,14 @@
     },
     "root": {
       "inputs": {
+        "agenix": "agenix",
         "disko": "disko",
-        "home-manager": "home-manager",
+        "home-manager": "home-manager_2",
         "impermanence": "impermanence",
         "nix-index-database": "nix-index-database",
+        "nix-ld": "nix-ld",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "ronvim": "ronvim"
       }
     },
@@ -431,6 +533,21 @@
         "type": "github"
       }
     },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index 30a179c..55f72f1 100644
--- a/flake.nix
+++ b/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;
diff --git a/home.nix b/home.nix
index 10e5c0c..66466b8 100644
--- a/home.nix
+++ b/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;
diff --git a/machines/base.nix b/machines/base.nix
index a00f178..306fcaf 100755
--- a/machines/base.nix
+++ b/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
   ];
diff --git a/machines/t14/default.nix b/machines/t14/default.nix
index acb9b2c..d2a41a8 100644
--- a/machines/t14/default.nix
+++ b/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;
diff --git a/modules/appset-dev.nix b/modules/appset-dev.nix
new file mode 100644
index 0000000..1682e45
--- /dev/null
+++ b/modules/appset-dev.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+{
+	environment.systemPackages = with pkgs; [
+		vscode
+		vim
+		jq
+		python3
+		nodejs
+	];
+}
diff --git a/modules/gnome.nix b/modules/gnome.nix
index f625534..ba4014c 100644
--- a/modules/gnome.nix
+++ b/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