flake.lock

@@ -9,11 +9,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1725418254,
+        "lastModified": 1718588737,
-        "narHash": "sha256-2zPzPP9Eu5NxgJxTVcuCCX5xh7CWy7rYaLHfaAZS6H8=",
+        "narHash": "sha256-06acqoMEYtc+/w5gWiIIuUFfdtdOBKlp1qrC/InRiBY=",
         "owner": "tpwrules",
         "repo": "nixos-apple-silicon",
-        "rev": "c5f944f49a052232015bb3c03524b69e3fdd2aa4",
+        "rev": "b0a2376f6c164a0af963d47386c064cc6fdcd5ea",
         "type": "github"
       },
       "original": {
@@ -34,6 +34,23 @@
         "url": "https://marq42.xyz/displaylink-580.zip"
       }
     },
+    "emacs-config": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1718499201,
+        "narHash": "sha256-XvN+25zS9JKIKPgvV/wEIPH+Kf4cx9PU2W75xs8guPw=",
+        "ref": "main",
+        "rev": "818621bbb9945053e4ffcb03ddba90defd9922dc",
+        "revCount": 535,
+        "type": "git",
+        "url": "https://git.marq42.xyz/mir/emacs"
+      },
+      "original": {
+        "ref": "main",
+        "type": "git",
+        "url": "https://git.marq42.xyz/mir/emacs"
+      }
+    },
     "flake-compat": {
       "locked": {
         "lastModified": 1688025799,
@@ -49,6 +66,22 @@
         "type": "github"
       }
     },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -67,6 +100,24 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "flakey-profile": {
       "locked": {
         "lastModified": 1712898590,
@@ -89,11 +140,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726989464,
+        "lastModified": 1719827385,
-        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
+        "narHash": "sha256-qs+nU20Sm8czHg3bhGCqiH+8e13BJyRrKONW34g3i50=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
+        "rev": "391ca6e950c2525b4f853cbe29922452c14eda82",
         "type": "github"
       },
       "original": {
@@ -110,11 +161,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730633670,
+        "lastModified": 1719827439,
-        "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=",
+        "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661",
+        "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d",
         "type": "github"
       },
       "original": {
@@ -177,16 +228,18 @@
     },
     "nix-ld": {
       "inputs": {
+        "flake-compat": "flake-compat_2",
+        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1728031945,
+        "lastModified": 1721411691,
-        "narHash": "sha256-NRkLjdMtVfC6dD1gEbYZWFEtbmC2xfD6ft1IP7l76Vw=",
+        "narHash": "sha256-fN0NjkYcQrdVSvWlSnvdu8XD34q8tl84SEz5BOJYROA=",
         "owner": "Mic92",
         "repo": "nix-ld",
-        "rev": "4524c512e8729ccb5a1b9239d01e1474cbf074a2",
+        "rev": "7a990656e51465a18ba70f49c2cf9c8d0947b4c9",
         "type": "github"
       },
       "original": {
@@ -213,11 +266,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1730531603,
+        "lastModified": 1719690277,
-        "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
+        "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
+        "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e",
         "type": "github"
       },
       "original": {
@@ -229,11 +282,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1730747049,
+        "lastModified": 1719892551,
-        "narHash": "sha256-K42BMyiu9dh4kajhqk8Rw2PsU57T+QA4myKtM/Kd96g=",
+        "narHash": "sha256-E4q0X+z1zNgAJvQEcdbQ+xuQE2pr3QwCMGZE/aq3RDU=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "9047a1ea2401169b09e5b8914ab267f93f6df4a7",
+        "rev": "46158ae602a77357f80f659277990e0ce3e6149f",
         "type": "github"
       },
       "original": {
@@ -246,6 +299,7 @@
       "inputs": {
         "apple-silicon": "apple-silicon",
         "displaylink": "displaylink",
+        "emacs-config": "emacs-config",
         "home-manager": "home-manager",
         "home-manager-unstable": "home-manager-unstable",
         "lix": "lix",
@@ -286,6 +340,21 @@
         "repo": "default",
         "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"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -43,30 +43,7 @@
       home-manager,
       nur,
       ... }: {
- homeManagerConfigurations.soundblaster = 
-        # import ./home.nix {
-        #   inherit nixpkgs lix-module nix-ld home-manager nur;
-        # }
-	home-manager.lib.homeManagerConfiguration {
-          pkgs = nixpkgs.legacyPackages.x86_64-linux;
-	  # configuration = { pkgs, lib, ... }: {
-	  #   imports = [ ./home.nix ];
-	  #   nixpkgs = {
-          #     config = { allowUnfree = true; };
-	  #   };
-          # };
-	  modules = [
-	    ./home.nix {
-	      home = {
-	        username = "mir";
-		homeDirectory = "/home/mir";
-	      };
-	    }
-	  ];
-	};
-
         nixosConfigurations = {
-
           kremzeek = # {{{
             let 
               system = "x86_64-linux";

home.nix

@@ -3,8 +3,8 @@
 with lib.hm.gvariant;
 {
   imports = [
-    # ./modules/dconf.nix
+    ./modules/dconf.nix
-    # ./modules/shell.nix
+    ./modules/shell.nix
     ./modules/firefox.nix
     # ./modules/sway.nix
     ./modules/emacs.nix
@@ -108,40 +108,4 @@ with lib.hm.gvariant;
     enableSshSupport = true;
   };
 
-# programs.bash.enable = true;
-# programs.bash.profileExtra = lib.mkAfter ''
-#   rm -rf ${config.home.homeDirectory}/.local/share/applications/home-manager
-#   rm -rf ${config.home.homeDirectory}/.icons/nix-icons
-#   ls ${config.home.homeDirectory}/.nix-profile/share/applications/*.desktop > ${config.home.homeDirectory}/.cache/current_desktop_files.txt
-# '';
-# home.activation = {
-#   linkDesktopApplications = {
-#     after = ["writeBoundary" "createXdgUserDirectories"];
-#     before = [];
-#     data = ''
-#       rm -rf ${config.home.homeDirectory}/.local/share/applications/home-manager
-#       rm -rf ${config.home.homeDirectory}/.icons/nix-icons
-#       mkdir -p ${config.home.homeDirectory}/.local/share/applications/home-manager
-#       mkdir -p ${config.home.homeDirectory}/.icons
-#       ln -sf ${config.home.homeDirectory}/.nix-profile/share/icons ${config.home.homeDirectory}/.icons/nix-icons
-# 
-#       # Check if the cached desktop files list exists
-#       if [ -f ${config.home.homeDirectory}/.cache/current_desktop_files.txt ]; then
-#         current_files=$(cat ${config.home.homeDirectory}/.cache/current_desktop_files.txt)
-#       else
-#         current_files=""
-#       fi
-# 
-#       # Symlink new desktop entries
-#       for desktop_file in ${config.home.homeDirectory}/.nix-profile/share/applications/*.desktop; do
-#         if ! echo "$current_files" | grep -q "$(basename $desktop_file)"; then
-#           ln -sf "$desktop_file" ${config.home.homeDirectory}/.local/share/applications/home-manager/$(basename $desktop_file)
-#         fi
-#       done
-# 
-#       # Update desktop database
-#       ${pkgs.desktop-file-utils}/bin/update-desktop-database ${config.home.homeDirectory}/.local/share/applications
-#     '';
-#   };
-# };
 }

mix.sh

@@ -13,19 +13,6 @@ rebuild () {
 }
 
 case $1 in
-	home)
-		# nix --extra-experimental-features nix-command\ flakes \
-		#	run "github:NixOS/nix/2.18.4" -- \
-		#	--extra-experimental-features nix-command\ flakes \
-		#	build ./\#homeManagerConfigurations.soundblaster.activationPackage &&
-		#	./result/activate
-		nix --extra-experimental-features nix-command\ flakes \
-			run "github:NixOS/nix/2.18.4" -- \
-			--extra-experimental-features nix-command\ flakes \
-		        run "github:nix-community/home-manager/release-24.11" -- \
-                	--extra-experimental-features nix-command\ flakes\
-			switch --flake ./\#soundblaster
-		;;
 	fetch)
 		fetch_dl_driver 
 		;;

modules/shell.nix

@@ -1,43 +1,37 @@
 { config, lib, pkgs, ... }:
 {
-  programs.bash = {
+  # programs.bash = {
-    enable = true;
-    shellAliases = {
-      ls = "eza";
-      tree = "eza -T";
-    };
-    initExtraFirst = ''
-      export HISTFILE=$XDG_CACHE_HOME/.bash_history
-      GUIX_PROFILE=/home/mir/.guix-profile
-      . $GUIX_PROFILE/etc/profile
-
-    '';
-  };
-  # programs.zsh = {
   #   enable = true;
   #   shellAliases = {
   #     ls = "eza";
   #     tree = "eza -T";
-  #     ping = "ping -c 4";
-  #     ip = "ip -c";
-  #   };
-  #   initExtraFirst = ''
-  #     [ -n "$EAT_SHELL_INTEGRATION_DIR" ] && \
-  #     source "$EAT_SHELL_INTEGRATION_DIR/zsh"
-  #     source ~/.p10k.zsh
-  #   '';
-  #   enableCompletion = true;
-  #   # autosuggestions.enable = true;
-  #   zplug = {
-  #     enable = true;
-  #     plugins = [
-  #       { name = "zsh-users/zsh-autosuggestions"; }
-  #       { name = "zdharma-continuum/fast-syntax-highlighting"; }
-  #       { name = "romkatv/powerlevel10k"; tags = [ as:theme depth:1 ]; }
-  #       { name = "zsh-users/zsh-completions"; }
-  #       ];
   #   };
   # };
+  programs.zsh = {
+    enable = true;
+    shellAliases = {
+      ls = "eza";
+      tree = "eza -T";
+      ping = "ping -c 4";
+      ip = "ip -c";
+    };
+    initExtraFirst = ''
+      [ -n "$EAT_SHELL_INTEGRATION_DIR" ] && \
+      source "$EAT_SHELL_INTEGRATION_DIR/zsh"
+      source ~/.p10k.zsh
+    '';
+    enableCompletion = true;
+    # autosuggestions.enable = true;
+    zplug = {
+      enable = true;
+      plugins = [
+        { name = "zsh-users/zsh-autosuggestions"; }
+	{ name = "zdharma-continuum/fast-syntax-highlighting"; }
+	{ name = "romkatv/powerlevel10k"; tags = [ as:theme depth:1 ]; }
+	{ name = "zsh-users/zsh-completions"; }
+	];
+    };
+  };
   programs.zoxide = {
     enable = true;
     options = [ "--cmd cd" ];