diff --git a/common/home-manager/spacemacs.nix b/common/home-manager/spacemacs.nix index b1a2098..7f6e593 100644 --- a/common/home-manager/spacemacs.nix +++ b/common/home-manager/spacemacs.nix @@ -1,4 +1,4 @@ -{ config, pkgs, spacemacs, spacemacs-config, ... }: +{ config, pkgs, spacemacs, ... }: { # Set up spacemacs using local emacs config @@ -6,11 +6,5 @@ recursive = true; source = spacemacs; }; - - # Spacemacs config - - home.file.".spacemacs.d" = { - recursive = true; - source = spacemacs-config; - }; } + diff --git a/flake.lock b/flake.lock index f2ac34a..b4cbf82 100644 --- a/flake.lock +++ b/flake.lock @@ -72,8 +72,7 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nur": "nur", - "spacemacs": "spacemacs", - "spacemacs-config": "spacemacs-config" + "spacemacs": "spacemacs" } }, "spacemacs": { @@ -92,22 +91,6 @@ "repo": "spacemacs", "type": "github" } - }, - "spacemacs-config": { - "flake": false, - "locked": { - "lastModified": 1649949666, - "narHash": "sha256-+k/sDxrYfCrdqz4xrLktEfxVySv3s5NH/UM8eRXxsp0=", - "owner": "kiana-S", - "repo": "spacemacs-config", - "rev": "24caf5a28432885fd3872b1e8ae6a6e73408da3a", - "type": "github" - }, - "original": { - "owner": "kiana-S", - "repo": "spacemacs-config", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 987000a..8cd7e42 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,5 @@ { description = "System conf"; - inputs = rec { nixpkgs.url = "nixpkgs/nixos-unstable"; @@ -13,10 +12,7 @@ inputs = rec { spacemacs.url = "github:syl20bnr/spacemacs/develop"; spacemacs.flake = false; - spacemacs-config.url = "github:kiana-S/spacemacs-config"; - spacemacs-config.flake = false; }; - outputs = { self, nixpkgs, home-manager,