t14: 28 current 2024-09-29 19:32:36 24.05.20240928.fbca5e7 6.6.52 *

5 files changed, 29 insertions, 54 deletions

diff --git a/flake.nix b/flake.nix
index 3618e4a..bbabfb3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,21 +13,23 @@
 
 	outputs = { self, nixpkgs, ... }@inputs: 
 
-let
+		let
 		nixosSystem = system: name: nixosModules: nixpkgs.lib.nixosSystem {
-			inherit system;
-			specialArgs = {inherit inputs;};
-			modules = nixosModules ++ [
-				({ config, ... }:
-				 {
-				 	networking.hostName = name;
-				 	nix = {
-				 		extraOptions = "extra-experimental-features = nix-command flakes";
-				 	};
-				 })
-				./machines/${name}
-			];
-		};
+		inherit system;
+		specialArgs = {inherit inputs;};
+		modules = nixosModules ++ [
+			({ config, pkgs, ... }:
+		let rebuild = pkgs.writeShellScriptBin "rebuild" (builtins.readFile ./rebuild.sh); in
+			 {
+			 networking.hostName = name;
+			environment.systemPackages = [ rebuild ];
+			 nix = {
+			 extraOptions = "extra-experimental-features = nix-command flakes";
+			 };
+			 })
+		./machines/${name}
+		];
+	};
 	in {
 		nixosConfigurations = {
 			x220-gnome = nixosSystem "x86_64-linux" "x220-gnome" [
@@ -40,13 +42,13 @@ let
 			];
 			t14 = nixosSystem "x86_64-linux" "t14" [
 				./modules/gnome.nix
-				inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t14-amd-gen2
-				inputs.home-manager.nixosModules.default
-				{
-					home-manager.useGlobalPkgs = true;
-					home-manager.useUserPackages = true;
-					home-manager.users.pn = import ./home.nix;
-				}
+					inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t14-amd-gen2
+					inputs.home-manager.nixosModules.default
+					{
+						home-manager.useGlobalPkgs = true;
+						home-manager.useUserPackages = true;
+						home-manager.users.pn = import ./home.nix;
+					}
 			];
 		};
 	};
diff --git a/machines/base.nix b/machines/base.nix
index 8b4a55d..58d91f0 100755
--- a/machines/base.nix
+++ b/machines/base.nix
@@ -5,7 +5,6 @@
 
   imports = [
      ../modules/nur.nix
-  #  ../users/pn.nix
     ../modules/doas.nix
   #  ../modules/internet.nix
   ];
diff --git a/machines/t14/default.nix b/machines/t14/default.nix
index 506b05f..f258a4c 100644
--- a/machines/t14/default.nix
+++ b/machines/t14/default.nix
@@ -1,7 +1,5 @@
 { config, pkgs, ... }:
-let
-	rebuild = pkgs.writeShellScriptBin "rebuild" (builtins.readFile ../../rebuild.sh);
-in {
+{
 	imports =
 		[ # Include the results of the hardware scan.
 		../base.nix
@@ -37,21 +35,10 @@ in {
 	programs.nano.enable = false;
 	programs.git.enable = true;
 
-	boot.plymouth.enable = true;
-
 # Allow unfree packages
 	nixpkgs.config.allowUnfree = true;
-	nix.settings.experimental-features = [ "flakes" "nix-command" ];
 	nix.optimise.automatic = true;
 
-# List packages installed in system profile. To search, run:
-# $ nix search wget
-	environment.systemPackages = with pkgs; [
-#  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-#  wget
-		rebuild
-	];
-
 # Some programs need SUID wrappers, can be configured further or are
 # started in user sessions.
 # programs.mtr.enable = true;
diff --git a/modules/gnome.nix b/modules/gnome.nix
index e667cea..6d8bb29 100644
--- a/modules/gnome.nix
+++ b/modules/gnome.nix
@@ -51,22 +51,6 @@
 		];
 	};
 
-	##services.xserver.desktopManager.gnome.extraGSettingsOverrides = ''
-		##[org.gnome.shell]
-		##favorite-apps = [ "brave-browser.desktop", "org.gnome.Geary.desktop", "org.gnome.Nautilus.desktop" ]
-##
-		##[org.gnome.desktop.wm.keybindings]
-		##close = ["<Super>q"]
-##
-		##[org.gnome.settings-daemon.plugins.media-keys]
-		##custom-keybindings = ["org/gnome/settings-daemon/plugins/media-keys/custom0/"]
-##
-		##[org.gnome.settings-daemon.plugins.media-keys.custom0]
-		##binding = ["<Super><Enter>"]
-		##command = ["kgx"]
-		##name = ["GNOME Console"]
-	##'';
-
 # Configure keymap in X11
 	services.xserver = {
 		xkb.layout = "pl";
@@ -90,11 +74,14 @@
 # If you want to use JACK applications, uncomment this
 #jack.enable = true;
 
+
 # use the example session manager (no others are packaged yet so this is enabled by default,
 # no need to redefine it in your config for now)
 #media-session.enable = true;
 	};
 
+	boot.plymouth.enable = true;
+
 	environment.systemPackages = with pkgs; [
 		libnotify
 		gnome.gnome-boxes
diff --git a/programs/nvim.nix b/programs/nvim.nix
index 9dbf07d..3e01306 100644
--- a/programs/nvim.nix
+++ b/programs/nvim.nix
@@ -1,8 +1,7 @@
 ## Usage
-## pneovim = import ./programs/nvim.nix pkgs;
 
 
-pkgs:
+{ pkgs, ... }: 
 pkgs.neovim.override {
   configure = {
     customRC = ''
@@ -166,3 +165,4 @@ pkgs.neovim.override {
   vimAlias = true;
   viAlias = true;
  }
+