Skip to content

Commit d150381

Browse files
committed
attemp to lock veritco
it is building locally, i might as well get it building on CI
1 parent e76cf70 commit d150381

File tree

5 files changed

+25
-9
lines changed

5 files changed

+25
-9
lines changed

bin/home-manager-flake-switch.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
# [[file:../workstation.org::*flake-world equivalent to home-manager 'switch'][flake-world equivalent to home-manager 'switch':1]]
1212
set -u # error in case WORKSTATION_NAME is not set
1313
function home_manager_flake_switch() {
14-
nix build --no-link ~/workstation/#homeConfigurations.${WORKSTATION_NAME}.$(whoami).activationPackage --show-trace
15-
"$(nix path-info ~/workstation/#homeConfigurations.${WORKSTATION_NAME}.$(whoami).activationPackage)"/activate --show-trace
14+
nix build --no-link ~/workstation/#homeConfigurations.${WORKSTATION_NAME}.$(whoami).activationPackage --show-trace && \
15+
"$(nix path-info ~/workstation/#homeConfigurations.${WORKSTATION_NAME}.$(whoami).activationPackage)"/activate --show-trace
1616
}
1717
home_manager_flake_switch
1818
# flake-world equivalent to home-manager 'switch':1 ends here

bootstrap-workstation.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,8 @@ set -u
307307

308308
# [[[[file:~/workstation/workstation.org::home_manager_flake_switch_function][home_manager_flake_switch_function]]][home_manager_flake_switch_function]]
309309
function home_manager_flake_switch() {
310-
nix build --no-link ~/workstation/#homeConfigurations.${WORKSTATION_NAME}.$(whoami).activationPackage --show-trace
311-
"$(nix path-info ~/workstation/#homeConfigurations.${WORKSTATION_NAME}.$(whoami).activationPackage)"/activate --show-trace
310+
nix build --no-link ~/workstation/#homeConfigurations.${WORKSTATION_NAME}.$(whoami).activationPackage --show-trace && \
311+
"$(nix path-info ~/workstation/#homeConfigurations.${WORKSTATION_NAME}.$(whoami).activationPackage)"/activate --show-trace
312312
}
313313
# home_manager_flake_switch_function ends here
314314
home_manager_flake_switch

dotfiles/doom.d/init.el

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@
2626
;; NOTE: I switched from vertico to ivy completion becuase of a
2727
;; bug that seems to be in the search code for vertico.
2828
;; no idea when it may get resolved
29-
ivy ; a search engine for love and life
30-
31-
;; vertico ; the search engine of the future
29+
;; ivy ; a search engine for love and life
30+
vertico ; the search engine of the future
3231

3332
:ui
3433
;;deft ; notational velocity for Emacs

flake.nix

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,23 @@
7171
extraConfig = ''
7272
(add-to-list 'exec-path "~/.nix-profile/bin/")
7373
'';
74+
75+
emacsPackagesOverlay = self: super: {
76+
# https://github.com/doomemacs/doomemacs/blob/07fca786154551f90f36535bfb21f8ca4abd5027/modules/completion/vertico/packages.el#L4C18-L7
77+
vertico = self.trivialBuild {
78+
pname = "vertico";
79+
ename = "vertico";
80+
version = "926234ab3fbe2b89e8c7ddfccecff518d73ac6ba";
81+
packageRequires = [ super.compat super.emacs ];
82+
src = pkgs.fetchFromGitHub {
83+
owner = "minad";
84+
repo = "vertico";
85+
rev = "926234ab3fbe2b89e8c7ddfccecff518d73ac6ba";
86+
sha256 = "sha256-8vsNZKSWY6AcLs/a8/b9tjmkF2LEeRSAOvsdiWq+cAc=";
87+
88+
};
89+
};
90+
};
7491
};
7592

7693
# workaround; see https://github.com/nix-community/home-manager/issues/3342#issuecomment-1283158398

workstation.org

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -579,8 +579,8 @@ home_manager_flake_switch
579579
#+NAME: home_manager_flake_switch_function
580580
#+begin_src shell
581581
function home_manager_flake_switch() {
582-
nix build --no-link ~/workstation/#homeConfigurations.${WORKSTATION_NAME}.$(whoami).activationPackage --show-trace
583-
"$(nix path-info ~/workstation/#homeConfigurations.${WORKSTATION_NAME}.$(whoami).activationPackage)"/activate --show-trace
582+
nix build --no-link ~/workstation/#homeConfigurations.${WORKSTATION_NAME}.$(whoami).activationPackage --show-trace && \
583+
"$(nix path-info ~/workstation/#homeConfigurations.${WORKSTATION_NAME}.$(whoami).activationPackage)"/activate --show-trace
584584
}
585585
#+end_src
586586
** Nix darwin

0 commit comments

Comments
 (0)