Compare commits
No commits in common. "f7dead6bd4d332478ab4ee44f876f3bf6ce655da" and "d158ef134f7c4957756a9235feb206762ba248f1" have entirely different histories.
f7dead6bd4
...
d158ef134f
6 changed files with 58 additions and 123 deletions
36
flake.lock
36
flake.lock
|
|
@ -54,11 +54,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1712750567,
|
||||
"narHash": "sha256-VHP7ESpUHb5STZfbZyMDGz9g+xsgGdJGa8iX4rkFYz8=",
|
||||
"lastModified": 1712668887,
|
||||
"narHash": "sha256-tcGPDWrfUuo3d5OpXyg9veJeYIatzFLRjcZSp+0SFxI=",
|
||||
"owner": "atuinsh",
|
||||
"repo": "atuin",
|
||||
"rev": "0da8d34425ef83395759db79377025c062a69911",
|
||||
"rev": "0ab9f4d9ff545d83dc664b494ecf450750c0f184",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -192,11 +192,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1712798444,
|
||||
"narHash": "sha256-aAksVB7zMfBQTz0q2Lw3o78HM3Bg2FRziX2D6qnh+sk=",
|
||||
"lastModified": 1712612224,
|
||||
"narHash": "sha256-Tv4C8OSPVmm4LbpJGLFSODyvJy6DqrisEGPCQdNVOeY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "a297cb1cb0337ee10a7a0f9517954501d8f6f74d",
|
||||
"rev": "79eab0e82cb126bf4ac170f44af82479f0895ab5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -216,11 +216,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1712800011,
|
||||
"narHash": "sha256-mEL4y1N/aQrI+OeYHm6Sol8lpDVsceCc2TJF8+uMv6Y=",
|
||||
"lastModified": 1712713563,
|
||||
"narHash": "sha256-y703Dcj6RS51iO5xFDorkyIGZD8/hQDkwaHJsB6uI80=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "9b79fd139ff55062e46191bd5dd42fcb79696328",
|
||||
"rev": "d08457d425b0a1f15f44f6d9faa17240f2bd29a6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -560,11 +560,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1712759992,
|
||||
"narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=",
|
||||
"lastModified": 1712688495,
|
||||
"narHash": "sha256-NrVLXkpT9ZigiI8md6NIzHS+3lE4QTj30IgXG57O9iM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9",
|
||||
"rev": "b00d0e4fe9cba0047f54e77418ddda5f17e6ef2c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -667,11 +667,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1712760404,
|
||||
"narHash": "sha256-4zhaEW1nB+nGbCNMjOggWeY5nXs/H0Y71q0+h+jdxoU=",
|
||||
"lastModified": 1712695607,
|
||||
"narHash": "sha256-rXb3onsPMiv00FrGSpIJyYa8x53W0dlbJ5Ka3xvje/c=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "e1c4bac14beb8c409d0534382cf967171706b9d9",
|
||||
"rev": "05aa46a1f3b5ac92bfe84807868ba9670d48b031",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -911,11 +911,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1712801594,
|
||||
"narHash": "sha256-KZJnVw3TdfDyUhvClzgy3IEoC9tRhvG0yM+lHfqAm34=",
|
||||
"lastModified": 1712715149,
|
||||
"narHash": "sha256-uOx7GaLV+5hekAYtm/CBr627Pi7+d1Yh70hwKmVjYYo=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "35ebec41fcdeeae8e012e7d62ba153a13645227f",
|
||||
"rev": "9ef1eca23bee5fb8080863909af3802130b2ee57",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -7,13 +7,6 @@
|
|||
with lib;
|
||||
let
|
||||
cfg = config.eboskma.programs.fish;
|
||||
|
||||
catppuccin = pkgs.fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "fish";
|
||||
rev = "0ce27b518e8ead555dec34dd8be3df5bd75cff8e";
|
||||
hash = "sha256-Dc/zdxfzAUM5NX8PxzfljRbYvO9f9syuLO8yBr+R3qg=";
|
||||
};
|
||||
in
|
||||
{
|
||||
options.eboskma.programs.fish = {
|
||||
|
|
@ -24,7 +17,7 @@ in
|
|||
programs = {
|
||||
fish = {
|
||||
enable = true;
|
||||
functions = import ./functions.nix { inherit pkgs; };
|
||||
functions = import ./functions.nix { inherit (pkgs) git coreutils; };
|
||||
|
||||
plugins = [
|
||||
{
|
||||
|
|
@ -39,7 +32,8 @@ in
|
|||
];
|
||||
|
||||
shellAliases = {
|
||||
ls = "${pkgs.eza}/bin/eza --long --git --git-repos --header --classify --binary";
|
||||
# code = "${pkgs.vscode}/bin/code --enable-features=UseOzonePlatform --ozone-platform=wayland";
|
||||
ls = "${pkgs.eza}/bin/eza -Fb --git";
|
||||
|
||||
vimdiff = mkIf config.eboskma.programs.neovim.enable "nvim -d";
|
||||
vim = mkIf config.eboskma.programs.neovim.enable "nvim";
|
||||
|
|
@ -74,7 +68,5 @@ in
|
|||
enableFishIntegration = true;
|
||||
};
|
||||
};
|
||||
|
||||
xdg.configFile."fish/themes/Catppuccin Mocha.theme".source = "${catppuccin}/themes/Catppuccin Mocha.theme";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,24 +1,9 @@
|
|||
{ pkgs, ... }:
|
||||
{ git, coreutils }:
|
||||
{
|
||||
# Mark each prompt so you can jump between prompts with C-S-z and C-S-x
|
||||
mark_prompt_start = {
|
||||
onEvent = "fish_prompt";
|
||||
body = ''
|
||||
${pkgs.coreutils}/bin/echo -en "\e]133;A\e\\"
|
||||
'';
|
||||
};
|
||||
# Mark the start and end of the output of a command
|
||||
# This
|
||||
foot_cmd_start = {
|
||||
onEvent = "fish_preexec";
|
||||
body = ''
|
||||
${pkgs.coreutils}/bin/echo -en "\e]133;C\e\\"
|
||||
'';
|
||||
};
|
||||
foot_cmd_end = {
|
||||
onEvent = "fish_postexec";
|
||||
body = ''
|
||||
${pkgs.coreutils}/bin/echo -en "\e]133;D\e\\"
|
||||
${coreutils}/bin/echo -en "\e]133;A\e\\"
|
||||
'';
|
||||
};
|
||||
reload = {
|
||||
|
|
@ -41,45 +26,28 @@
|
|||
clangfmt = {
|
||||
body = ''
|
||||
set source_exts "h" "hpp" "c" "cpp" "cc" "cp" "c++" "cxx" "cu" "proto"
|
||||
set files (${pkgs.git}/bin/git diff --diff-filter=ACMR --name-only $argv[1])
|
||||
set repo_path (${pkgs.coreutils}/bin/realpath --relative-to=$PWD (${pkgs.git}/bin/git rev-parse --show-toplevel))
|
||||
set clangformat (${pkgs.git}/bin/git config --get clangFormat.binary)
|
||||
${pkgs.coreutils}/bin/echo "Formatting files in $repo_path with $clangformat"
|
||||
set files (${git}/bin/git diff --diff-filter=ACMR --name-only $argv[1])
|
||||
set repo_path (realpath --relative-to=$PWD (${git}/bin/git rev-parse --show-toplevel))
|
||||
set clangformat (${git}/bin/git config --get clangFormat.binary)
|
||||
${coreutils}/bin/echo "Formatting files in $repo_path with $clangformat"
|
||||
|
||||
for f in $files
|
||||
set file (${pkgs.coreutils}/bin/realpath $repo_path/$f)
|
||||
${pkgs.coreutils}/bin/echo "Processing $file"
|
||||
set file (realpath $repo_path/$f)
|
||||
${coreutils}/bin/echo "Processing $file"
|
||||
|
||||
set ext (string match -r ".*\.([^\.]+)\$" $file)[2]
|
||||
|
||||
if contains $ext $source_exts
|
||||
${pkgs.coreutils}/bin/echo "Formatting $file"
|
||||
${coreutils}/bin/echo "Formatting $file"
|
||||
$clangformat -i -style=file $file
|
||||
else
|
||||
${pkgs.coreutils}/bin/echo "Extension $ext not found in $source_exts"
|
||||
${coreutils}/bin/echo "Extension $ext not found in $source_exts"
|
||||
end
|
||||
end
|
||||
'';
|
||||
description = "Use clang-format to format all changed and added files";
|
||||
};
|
||||
|
||||
kink = {
|
||||
body = ''
|
||||
set -f pls_url = "https://playerservices.streamtheworld.com/pls/KINKAAC.pls"
|
||||
if [ "$channel" = "dna" ]
|
||||
set pls_url "https://playerservices.streamtheworld.com/pls/KINK_DNAAAC.pls"
|
||||
else if [ "$channel" = "distortion" ]
|
||||
set pls_url "https://playerservices.streamtheworld.com/pls/KINK_DISTORTIONAAC.pls"
|
||||
end
|
||||
set -f stream_url (${pkgs.curl}/bin/curl -sSL $pls_url | grep File | shuf | head -n 1 | awk -F '=' 'BEGIN { RS="\r\n" } { print $2 }')
|
||||
mpc clear
|
||||
mpc add "$stream_url"
|
||||
mpc play
|
||||
'';
|
||||
argumentNames = "channel";
|
||||
description = "Play a KINK channel with mpc";
|
||||
};
|
||||
|
||||
linklib = {
|
||||
body = ''
|
||||
function linklib --argument lib
|
||||
|
|
@ -88,17 +56,17 @@
|
|||
set libmajor $libname.$libcomponents[3]
|
||||
|
||||
if test -f $libname -o -L $libname
|
||||
${pkgs.coreutils}/bin/echo "$libname already exists"
|
||||
${coreutils}/bin/echo "$libname already exists"
|
||||
return 1
|
||||
end
|
||||
|
||||
if test -f $libmajor -o -L $libmajor
|
||||
${pkgs.coreutils}/bin/echo "$libmajor already exists"
|
||||
${coreutils}/bin/echo "$libmajor already exists"
|
||||
return 2
|
||||
end
|
||||
|
||||
${pkgs.coreutils}/bin/ln -s $lib $libmajor
|
||||
${pkgs.coreutils}/bin/ln -s $libmajor $libname
|
||||
${coreutils}/bin/ln -s $lib $libmajor
|
||||
${coreutils}/bin/ln -s $libmajor $libname
|
||||
end
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -39,46 +39,24 @@ in
|
|||
|
||||
colors = {
|
||||
alpha = 0.9;
|
||||
|
||||
# Dracula
|
||||
# foreground = "f8f8f2";
|
||||
# background = "282a36";
|
||||
# regular0 = "000000"; # black
|
||||
# regular1 = "ff5555"; # red
|
||||
# regular2 = "50fa7b"; # green
|
||||
# regular3 = "f1fa8c"; # yellow
|
||||
# regular4 = "bd93f9"; # blue
|
||||
# regular5 = "ff79c6"; # magenta
|
||||
# regular6 = "8be9fd"; # cyan
|
||||
# regular7 = "bfbfbf"; # white
|
||||
# bright0 = "4d4d4d"; # bright black
|
||||
# bright1 = "ff6e67"; # bright red
|
||||
# bright2 = "5af78e"; # bright green
|
||||
# bright3 = "f4f99d"; # bright yellow
|
||||
# bright4 = "caa9fa"; # bright blue
|
||||
# bright5 = "ff92d0"; # bright magenta
|
||||
# bright6 = "9aedfe"; # bright cyan
|
||||
# bright7 = "e6e6e6"; # bright white
|
||||
|
||||
# Catppuccin Mocha
|
||||
foreground = "cdd6f4"; # Text
|
||||
background = "1e1e2e"; # Base
|
||||
regular0 = "45475a"; # Surface 1
|
||||
regular1 = "f38ba8"; # red
|
||||
regular2 = "a6e3a1"; # green
|
||||
regular3 = "f9e2af"; # yellow
|
||||
regular4 = "89b4fa"; # blue
|
||||
regular5 = "f5c2e7"; # pink
|
||||
regular6 = "94e2d5"; # teal
|
||||
regular7 = "bac2de"; # Subtext 1
|
||||
bright0 = "585b70"; # Surface 2
|
||||
bright1 = "f38ba8"; # red
|
||||
bright2 = "a6e3a1"; # green
|
||||
bright3 = "f9e2af"; # yellow
|
||||
bright4 = "89b4fa"; # blue
|
||||
bright5 = "f5c2e7"; # pink
|
||||
bright6 = "94e2d5"; # teal
|
||||
bright7 = "a6adc8"; # Subtext 0
|
||||
foreground = "f8f8f2";
|
||||
background = "282a36";
|
||||
regular0 = "000000"; # black
|
||||
regular1 = "ff5555"; # red
|
||||
regular2 = "50fa7b"; # green
|
||||
regular3 = "f1fa8c"; # yellow
|
||||
regular4 = "bd93f9"; # blue
|
||||
regular5 = "ff79c6"; # magenta
|
||||
regular6 = "8be9fd"; # cyan
|
||||
regular7 = "bfbfbf"; # white
|
||||
bright0 = "4d4d4d"; # bright black
|
||||
bright1 = "ff6e67"; # bright red
|
||||
bright2 = "5af78e"; # bright green
|
||||
bright3 = "f4f99d"; # bright yellow
|
||||
bright4 = "caa9fa"; # bright blue
|
||||
bright5 = "ff92d0"; # bright magenta
|
||||
bright6 = "9aedfe"; # bright cyan
|
||||
bright7 = "e6e6e6"; # bright white
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ in
|
|||
"dialout"
|
||||
"input"
|
||||
] ++ (optional config.hardware.i2c.enable config.hardware.i2c.group);
|
||||
shell = config.home-manager.users.erwin.programs.fish.package;
|
||||
shell = config.home-manager.users.erwin.programs.nushell.package;
|
||||
openssh.authorizedKeys.keyFiles = [
|
||||
(pkgs.fetchurl {
|
||||
url = "https://github.com/eboskma.keys";
|
||||
|
|
@ -50,8 +50,6 @@ in
|
|||
];
|
||||
};
|
||||
|
||||
programs.fish.enable = true;
|
||||
|
||||
nix.settings.allowed-users = [ "erwin" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -147,15 +147,15 @@ in
|
|||
enable = true;
|
||||
package = pkgs.swayfx;
|
||||
wayvnc = true;
|
||||
lock-wallpaper = "${homeCfg.home.homeDirectory}/.wallpapers/river-3840.png";
|
||||
lock-wallpaper = ../../wallpapers/river-3840.png;
|
||||
output = {
|
||||
"DP-1" = {
|
||||
bg = "${homeCfg.home.homeDirectory}/.wallpapers/river-3840.png fill";
|
||||
bg = "${../../wallpapers/river-3840.png} fill";
|
||||
mode = "3840x2160@60Hz";
|
||||
position = "0 0";
|
||||
};
|
||||
"DP-3" = {
|
||||
bg = "${homeCfg.home.homeDirectory}/.wallpapers/river-3840.png fill";
|
||||
bg = "${../../wallpapers/space_shuttle_endeavour_3840.jpg} fill";
|
||||
mode = "3840x2160@60Hz";
|
||||
position = "3840 0";
|
||||
};
|
||||
|
|
@ -237,8 +237,7 @@ in
|
|||
[
|
||||
atool
|
||||
attic-client
|
||||
# bitwarden
|
||||
bitwarden-cli
|
||||
bitwarden
|
||||
blink1-tool
|
||||
bottom
|
||||
chromium
|
||||
|
|
|
|||
Loading…
Reference in a new issue