diff --git a/docs/TODO.md b/docs/TODO.md index d67d4d5..637cc55 100644 --- a/docs/TODO.md +++ b/docs/TODO.md @@ -8,7 +8,6 @@ - [ ] Windows theme - [ ] MacOS theme - [ ] Global variable for config location -- [ ] Obsidian conditional import - [ ] Make hyprcursor work - [ ] Nixvim - [ ] Telescope shortcut for file content diff --git a/home/programs/nvim/plugins/alpha.nix b/home/programs/nvim/plugins/alpha.nix index a698867..f81deca 100644 --- a/home/programs/nvim/plugins/alpha.nix +++ b/home/programs/nvim/plugins/alpha.nix @@ -70,7 +70,8 @@ { type = "button"; val = " NixOs Config"; - on_press.__raw = "function() vim.cmd[[e ~/.config/nixos]] end"; + on_press.__raw = + "function() vim.cmd[[e ${config.var.configDirectory}]] end"; opts = { shortcut = "nc"; position = "center"; diff --git a/home/scripts/nixy/default.nix b/home/scripts/nixy/default.nix index b152d55..df201f1 100644 --- a/home/scripts/nixy/default.nix +++ b/home/scripts/nixy/default.nix @@ -1,22 +1,20 @@ { pkgs, config, ... }: let - homedir = config.home.homeDirectory; - nixy-rebuild = pkgs.writeShellScriptBin "nixy-rebuild" '' - sudo nixos-rebuild switch --flake ${homedir}/.config/nixos#nixy + sudo nixos-rebuild switch --flake ${config.var.configDirectory}#nixy ''; nixy-upgrade = pkgs.writeShellScriptBin "nixy-upgrade" '' - sudo nixos-rebuild switch --upgrade --flake ${homedir}/.config/nixos#nixy + sudo nixos-rebuild switch --upgrade --flake ${config.var.configDirectory}#nixy ''; nixy-update = pkgs.writeShellScriptBin "nixy-update" '' - cd ${homedir}/.config/nixos && sudo nix flake update + cd ${config.var.configDirectory} && sudo nix flake update ''; nixy-gc = pkgs.writeShellScriptBin "nixy-gc" '' - cd ${homedir}/.config/nixos && sudo nix-collect-garbage -d + cd ${config.var.configDirectory} && sudo nix-collect-garbage -d ''; nixy-cb = pkgs.writeShellScriptBin "nixy-cb" '' diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index 589f5e1..05122f8 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -122,7 +122,7 @@ system.autoUpgrade = if config.var.autoUpgrade then { enable = true; dates = "04:00"; - flake = "${config.users.users.${config.var.username}.home}/.config/nixos"; + flake = "${config.var.configDirectory}"; flags = [ "--update-input" "nixpkgs" "--commit-lock-file" ]; allowReboot = false; } else