File tree Expand file tree Collapse file tree 5 files changed +25
-9
lines changed Expand file tree Collapse file tree 5 files changed +25
-9
lines changed Original file line number Diff line number Diff line change 11
11
# [[file:../workstation.org::*flake-world equivalent to home-manager 'switch'][flake-world equivalent to home-manager 'switch':1]]
12
12
set -u # error in case WORKSTATION_NAME is not set
13
13
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
16
16
}
17
17
home_manager_flake_switch
18
18
# flake-world equivalent to home-manager 'switch':1 ends here
Original file line number Diff line number Diff line change @@ -307,8 +307,8 @@ set -u
307
307
308
308
# [[[[file:~/workstation/workstation.org::home_manager_flake_switch_function][home_manager_flake_switch_function]]][home_manager_flake_switch_function]]
309
309
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
312
312
}
313
313
# home_manager_flake_switch_function ends here
314
314
home_manager_flake_switch
Original file line number Diff line number Diff line change 26
26
; ; NOTE: I switched from vertico to ivy completion becuase of a
27
27
; ; bug that seems to be in the search code for vertico.
28
28
; ; 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
32
31
33
32
:ui
34
33
; ;deft ; notational velocity for Emacs
Original file line number Diff line number Diff line change 71
71
extraConfig = ''
72
72
(add-to-list 'exec-path "~/.nix-profile/bin/")
73
73
'' ;
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
+ } ;
74
91
} ;
75
92
76
93
# workaround; see https://github.com/nix-community/home-manager/issues/3342#issuecomment-1283158398
Original file line number Diff line number Diff line change @@ -579,8 +579,8 @@ home_manager_flake_switch
579
579
#+NAME: home_manager_flake_switch_function
580
580
#+begin_src shell
581
581
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
584
584
}
585
585
#+end_src
586
586
** Nix darwin
You can’t perform that action at this time.
0 commit comments