✨ Nix Flakes Home-manager Builds!

Snuggle · Aug 31, 2024 · 6dff2a7 · 6dff2a7
1 parent b27bc69
commit 6dff2a7
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 188 deletions.
diff --git a/packages/blobmoji-color-font.nix → config/packages/blobmoji-color-font.nix b/packages/blobmoji-color-font.nix → config/packages/blobmoji-color-font.nix
diff --git a/packages/gnome-keyring-yubikey-unlock.nix → ...packages/gnome-keyring-yubikey-unlock.nix b/packages/gnome-keyring-yubikey-unlock.nix → ...packages/gnome-keyring-yubikey-unlock.nix
diff --git a/packages/overlays/vscode.nix → config/packages/overlays/vscode.nix b/packages/overlays/vscode.nix → config/packages/overlays/vscode.nix
diff --git a/home-manager/home.nix b/home-manager/home.nix
@@ -9,6 +9,7 @@
 }: {
   # You can import other home-manager modules here
   imports = [
+    ../config/dconf/dconf.nix
     # If you want to use home-manager modules from other flakes (such as nix-colors):
     # inputs.nix-colors.homeManagerModule
 
@@ -38,14 +39,6 @@
     };
   };
 
-  # This value determines the Home Manager release that your configuration is
-  # compatible with. This helps avoid breakage when a new Home Manager release
-  # introduces backwards incompatible changes.
-  #
-  # You should not change this value, even if you update Home Manager. If you do
-  # want to update the value, then make sure to first check the Home Manager
-  # release notes.
-  home.stateVersion = "24.05"; # Please read the comment before changing.
 
   # The home.packages option allows you to install Nix packages into your
   # environment.
@@ -110,7 +103,6 @@
 			sha256 = "1d16baihs6d95zkj0mvm7drmyxjnxybwbrivjf91a0innjlhdz07"; 
 		};
 	};
-	imports = [ ../config/dconf/dconf.nix ];
 
 	gtk = {
 		enable = true;
@@ -327,10 +319,6 @@
 		};
 	};
 
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
-
-  # TODO: Set your username
   home = {
     username = "snuggle";
     homeDirectory = "/home/snuggle";
@@ -340,9 +328,8 @@
   # programs.neovim.enable = true;
   # home.packages = with pkgs; [ steam ];
 
-  # Enable home-manager and git
+  # Enable home-manager
   programs.home-manager.enable = true;
-  programs.git.enable = true;
 
   # Nicely reload system units when changing configs
   systemd.user.startServices = "sd-switch";

diff --git a/hosts/cherry/configuration.nix b/hosts/cherry/configuration.nix
@@ -19,7 +19,7 @@
 
     # Import your generated (nixos-generate-config) hardware configuration
     ./hardware-configuration.nix
-    #./packages.nix
+    ./packages.nix
   ];
 
   nixpkgs = {

diff --git a/hosts/cherry/hardware-configuration.nix b/hosts/cherry/hardware-configuration.nix
@@ -55,12 +55,6 @@ fileSystems."/boot" = {
 	fsType = "vfat";
 };
 
-fileSystems."/mnt/fruit-salad" = { 
-	device = "/dev/disk/by-uuid/917d6f24-1f40-4019-9efa-c9cd6be4c5f6";
-	fsType = "btrfs";
-	options = [ "nofail" "x-systemd.device-timeout=10s" "defaults" ];
-};
-
 /* fileSystems."/homesweet" = {
     device = "homesweet.server:/mnt/homesweet/users/snuggle";
     fsType = "nfs";	

diff --git a/hosts/cherry/packages.nix b/hosts/cherry/packages.nix
@@ -33,7 +33,7 @@ environment.systemPackages = with pkgs; [
     yubioath-flutter
     #whatsapp-for-linux
 	#xkeysnail
-	zoom-us
+	#zoom-us
 
 	#displaylink
 

diff --git a/setup/build.sh b/setup/build.sh
diff --git a/setup/linux_setup.sh b/setup/linux_setup.sh
diff --git a/setup/macos_setup.sh b/setup/macos_setup.sh
diff --git a/switch b/switch