Compare commits
6 Commits
7455cc5c0f
...
1ffd4c02f4
| Author | SHA1 | Date | |
|---|---|---|---|
| 1ffd4c02f4 | |||
| 12776bf609 | |||
| 0b58bfecfc | |||
| cc1d60ce13 | |||
| 904b387fa7 | |||
| 460c6daf76 |
20
flake.lock
generated
20
flake.lock
generated
@@ -373,11 +373,11 @@
|
|||||||
"wshowkeys": "wshowkeys"
|
"wshowkeys": "wshowkeys"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1783179784,
|
"lastModified": 1783716673,
|
||||||
"narHash": "sha256-9qyKPHXc2fK6oZxCXLV9q0WdyNYdgCpfiAouRf+ELrc=",
|
"narHash": "sha256-n0BipnNxUEeXXXAVCHHp/QUN/geVHg/3az38eyI8ZJY=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "bdd6ec3efa05c1130002808d4c2c4552bb20587a",
|
"rev": "25fcd16d4d4836e063e2198102ddfba38de43100",
|
||||||
"revCount": 37,
|
"revCount": 42,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.voidarc.co.uk/voidarc/hypr"
|
"url": "https://git.voidarc.co.uk/voidarc/hypr"
|
||||||
},
|
},
|
||||||
@@ -815,11 +815,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1783148766,
|
"lastModified": 1783549019,
|
||||||
"narHash": "sha256-uslt2pqShTIXDdAHRHv2QkYLsVdY8Oqwz0EA48/RSM8=",
|
"narHash": "sha256-0XnckG4ZhBmAsYa9mLuEIFowBG0fDGPLHduQGsbMS4A=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "a50de1b7d8a586adc18d2395c19de7d6058e6030",
|
"rev": "74cc63f702f7d60a557e152a57b40fb1fd0f72ac",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1043,11 +1043,11 @@
|
|||||||
"nixpkgs": "nixpkgs_8"
|
"nixpkgs": "nixpkgs_8"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1783322884,
|
"lastModified": 1783704618,
|
||||||
"narHash": "sha256-BmYEQewp9fCTP6KFGnYh2dh6EjMj62FfJQTrksSSN3c=",
|
"narHash": "sha256-/zurHHGZW+E2xF4Pk6BSP4Mib3oPJDMtqrinRF2pYFI=",
|
||||||
"owner": "AceSLS",
|
"owner": "AceSLS",
|
||||||
"repo": "SLSsteam",
|
"repo": "SLSsteam",
|
||||||
"rev": "8ef40a2bdc662331f215775e525e1b010a2ffba3",
|
"rev": "37d5bb313fa186e70b38623bee3ba0f4f17f65b5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -31,7 +31,8 @@
|
|||||||
};
|
};
|
||||||
settings = {
|
settings = {
|
||||||
font_size = 11;
|
font_size = 11;
|
||||||
window_padding_width = 10;
|
scrollbar = "never";
|
||||||
|
window_padding_width = 9;
|
||||||
background_opacity = 0.50;
|
background_opacity = 0.50;
|
||||||
confirm_os_window_close = 0;
|
confirm_os_window_close = 0;
|
||||||
enable_audio_bell = false;
|
enable_audio_bell = false;
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ cheatsheet_viewer = "less -R; clear" # command to show cheatsheet; through pipin
|
|||||||
clear_screen_after_execution = false
|
clear_screen_after_execution = false
|
||||||
loop_mode = false # don't quit after executing a module, useful with scratchpads; stderr is hidden in loop mode
|
loop_mode = false # don't quit after executing a module, useful with scratchpads; stderr is hidden in loop mode
|
||||||
external_editor = "nvim" # if set, press ctrl+x ctrl+ee (or v in vi normal mode) to edit prompt in the specified program
|
external_editor = "nvim" # if set, press ctrl+x ctrl+ee (or v in vi normal mode) to edit prompt in the specified program
|
||||||
delay_startup = 0 # sometimes the otter runs too fast even before the terminal window is ready; this slows it down by milliseconds; useful when chafa image is skewed
|
delay_startup = 1 # sometimes the otter runs too fast even before the terminal window is ready; this slows it down by milliseconds; useful when chafa image is skewed
|
||||||
|
|
||||||
[interface]
|
[interface]
|
||||||
# use three quotes to write longer codes
|
# use three quotes to write longer codes
|
||||||
@@ -21,7 +21,7 @@ header_cmd_trimmed_lines = 0 # remove trailing lines from header_cmd output, in
|
|||||||
place_holder = "execute" # at the input field
|
place_holder = "execute" # at the input field
|
||||||
suggestion_mode = "list" # available options: list, hint
|
suggestion_mode = "list" # available options: list, hint
|
||||||
footer = "" # add a line after suggestion list
|
footer = "" # add a line after suggestion list
|
||||||
suggestion_lines = 8 # 0 to disable suggestions and tab completion
|
suggestion_lines = 7 # 0 to disable suggestions and tab completion
|
||||||
list_prefix = " "
|
list_prefix = " "
|
||||||
selection_prefix = "\u001B[31;1m "
|
selection_prefix = "\u001B[31;1m "
|
||||||
prefix_padding = 3 # format prefixes to have a uniformed width
|
prefix_padding = 3 # format prefixes to have a uniformed width
|
||||||
|
|||||||
@@ -19,14 +19,13 @@
|
|||||||
otter-launcher = let
|
otter-launcher = let
|
||||||
extra-config = ''
|
extra-config = ''
|
||||||
[overlay]
|
[overlay]
|
||||||
overlay_cmd = """
|
overlay_cmd = "${lib.getExe pkgs.chafa} -s 20x ${./cat.png}"
|
||||||
${lib.getExe pkgs.chafa} -s 20x20 ${./cat.png}
|
|
||||||
"""
|
|
||||||
overlay_trimmed_lines = 1
|
overlay_trimmed_lines = 1
|
||||||
'';
|
'';
|
||||||
final-config = pkgs.writeText "config.toml" ''
|
final-config = pkgs.writeText "config.toml" ''
|
||||||
${builtins.readFile ./config.toml}
|
|
||||||
${extra-config}
|
${extra-config}
|
||||||
|
|
||||||
|
${builtins.readFile ./config.toml}
|
||||||
'';
|
'';
|
||||||
in
|
in
|
||||||
inputs.wrappers.lib.wrapPackage ({...}: {
|
inputs.wrappers.lib.wrapPackage ({...}: {
|
||||||
@@ -34,6 +33,7 @@
|
|||||||
package = inputs'.otter-launcher.packages.default;
|
package = inputs'.otter-launcher.packages.default;
|
||||||
runtimePkgs = with pkgs; [
|
runtimePkgs = with pkgs; [
|
||||||
fsel
|
fsel
|
||||||
|
chafa
|
||||||
bluetui
|
bluetui
|
||||||
];
|
];
|
||||||
flags = {
|
flags = {
|
||||||
|
|||||||
@@ -33,10 +33,10 @@
|
|||||||
packages = {
|
packages = {
|
||||||
zsh = inputs.wrappers.wrappers.zsh.wrap {
|
zsh = inputs.wrappers.wrappers.zsh.wrap {
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
runtimePkgs = [pkgs.carapace];
|
runtimePkgs = [pkgs.carapace pkgs.fzf];
|
||||||
zshAliases = {
|
zshAliases = {
|
||||||
ls = "${lib.getExe pkgs.lsd} -l";
|
ls = "${lib.getExe pkgs.lsd} -l";
|
||||||
v = lib.getExe self'.packages.nvim;
|
v = lib.getExe self'.packages.nvim;
|
||||||
cat = lib.getExe pkgs.bat;
|
cat = lib.getExe pkgs.bat;
|
||||||
lg = lib.getExe pkgs.lazygit;
|
lg = lib.getExe pkgs.lazygit;
|
||||||
devenv = lib.getExe pkgs.devenv;
|
devenv = lib.getExe pkgs.devenv;
|
||||||
@@ -45,20 +45,22 @@
|
|||||||
nsh = "nix-shell -p";
|
nsh = "nix-shell -p";
|
||||||
};
|
};
|
||||||
zshrc.content = ''
|
zshrc.content = ''
|
||||||
autoload -U compinit && compinit
|
autoload -U compinit && compinit
|
||||||
export CARAPACE_BRIDGES='zsh,fish,bash,inshellisense' # optional
|
export CARAPACE_BRIDGES='zsh,fish,bash,inshellisense' # optional
|
||||||
zstyle ':completion:*' format $'\e[2;37mCompleting %d\e[m'
|
zstyle ':completion:*' format $'\e[2;37mCompleting %d\e[m'
|
||||||
source <(${lib.getExe pkgs.carapace} _carapace)
|
source <(${lib.getExe pkgs.carapace} _carapace)
|
||||||
zstyle ':completion:*' matcher-list 'm:{[:lower:]}={[:upper:]}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
|
zstyle ':completion:*' matcher-list 'm:{[:lower:]}={[:upper:]}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
|
||||||
|
|
||||||
setopt NO_CASE_GLOB
|
source <(${lib.getExe pkgs.fzf} --zsh)
|
||||||
|
|
||||||
export EDITOR=nvim
|
setopt NO_CASE_GLOB
|
||||||
|
|
||||||
eval "$(${lib.getExe pkgs.devenv} hook zsh)"
|
export EDITOR=nvim
|
||||||
eval "$(${lib.getExe self'.packages.ohMyPosh} init zsh)"
|
|
||||||
|
|
||||||
${lib.getExe pkgs.any-nix-shell} zsh --info-right | source /dev/stdin
|
eval "$(${lib.getExe pkgs.devenv} hook zsh)"
|
||||||
|
eval "$(${lib.getExe self'.packages.ohMyPosh} init zsh)"
|
||||||
|
|
||||||
|
${lib.getExe pkgs.any-nix-shell} zsh --info-right | source /dev/stdin
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
ohMyPosh = inputs.wrappers.wrappers.oh-my-posh.wrap {
|
ohMyPosh = inputs.wrappers.wrappers.oh-my-posh.wrap {
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
flake.nixosConfigurations.HACKSTATION = inputs.nixpkgs.lib.nixosSystem {
|
flake.nixosConfigurations.HACKSTATION = inputs.nixpkgs.lib.nixosSystem {
|
||||||
modules = with self.nixosModules; [
|
modules = with self.nixosModules; [
|
||||||
desktop
|
desktop
|
||||||
|
amdDrivers
|
||||||
youtube
|
youtube
|
||||||
development
|
development
|
||||||
hackstationConfiguration
|
hackstationConfiguration
|
||||||
|
|||||||
Reference in New Issue
Block a user