Compare commits

..

No commits in common. "70e5b25e38f653c5f59c16096f00fdac6b55fc57" and "7377d68831b32da139e752fc77af992bf8cfb017" have entirely different histories.

20 changed files with 300 additions and 367 deletions

145
flake.lock generated
View file

@ -70,11 +70,11 @@
},
"crane": {
"locked": {
"lastModified": 1774313767,
"narHash": "sha256-hy0XTQND6avzGEUFrJtYBBpFa/POiiaGBr2vpU6Y9tY=",
"lastModified": 1766774972,
"narHash": "sha256-8qxEFpj4dVmIuPn9j9z6NTbU+hrcGjBOvaxTzre5HmM=",
"owner": "ipetkov",
"repo": "crane",
"rev": "3d9df76e29656c679c744968b17fbaf28f0e923d",
"rev": "01bc1d404a51a0a07e9d8759cd50a7903e218c82",
"type": "github"
},
"original": {
@ -106,11 +106,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1774423251,
"narHash": "sha256-g/PP8G9WcP4vtZVOBNYwfGxLnwLQoTERHnef8irAMeQ=",
"lastModified": 1767163745,
"narHash": "sha256-sJXyT3AeB3rHPuK93VjnVI16hoLJazieFq7LP62cTHw=",
"owner": "nix-community",
"repo": "fenix",
"rev": "b70d7535088cd8a9e4322c372a475f66ffa18adf",
"rev": "33e17a88166bba14f4017b3ee6cafe5b3376aef0",
"type": "github"
},
"original": {
@ -144,11 +144,11 @@
"firefox-gnome-theme": {
"flake": false,
"locked": {
"lastModified": 1764873433,
"narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
"lastModified": 1764724327,
"narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=",
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
"rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
"rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047",
"type": "github"
},
"original": {
@ -176,11 +176,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1772408722,
"narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
"lastModified": 1765835352,
"narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
"rev": "a34fae9c08a15ad73f295041fec82323541400a9",
"type": "github"
},
"original": {
@ -197,11 +197,11 @@
]
},
"locked": {
"lastModified": 1767609335,
"narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
"lastModified": 1763759067,
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "250481aafeb741edfe23d29195671c19b36b6dca",
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
"type": "github"
},
"original": {
@ -248,11 +248,11 @@
"flake": false,
"locked": {
"host": "gitlab.gnome.org",
"lastModified": 1767737596,
"narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
"lastModified": 1764524476,
"narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=",
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "ef02db02bf0ff342734d525b5767814770d85b49",
"rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22",
"type": "gitlab"
},
"original": {
@ -270,11 +270,11 @@
]
},
"locked": {
"lastModified": 1774379316,
"narHash": "sha256-0nGNxWDUH2Hzlj/R3Zf4FEK6fsFNB/dvewuboSRZqiI=",
"lastModified": 1767104570,
"narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "1eb0549a1ab3fe3f5acf86668249be15fa0e64f7",
"rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf",
"type": "github"
},
"original": {
@ -287,15 +287,14 @@
"inputs": {
"flake-compat": "flake-compat",
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs",
"nixpkgs-nixcord": "nixpkgs-nixcord"
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1774376318,
"narHash": "sha256-4qPK1/nTax4RJ4VClNBdDpz9o3uh5KTQwz+2e3XFOn4=",
"lastModified": 1767190262,
"narHash": "sha256-C1BMnQasK43IQz3/dC0a/uNbf2bQhvk8rVw47x9h0q0=",
"owner": "kaylorben",
"repo": "nixcord",
"rev": "1e20d00ccb0fd2ed9ae7a9cce953ea74c430f318",
"rev": "38592e01087877116adc2af0876aebb61083b531",
"type": "github"
},
"original": {
@ -306,11 +305,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1774422943,
"narHash": "sha256-o1xgNumjljdBBfOrcQX95hhKGFOJQYNZqpF3EfaScMk=",
"lastModified": 1767185284,
"narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "632e4bfc21c01e5be900d0d8255a5368a5d6082f",
"rev": "40b1a28dce561bea34858287fbb23052c3ee63fe",
"type": "github"
},
"original": {
@ -320,11 +319,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1773222311,
"narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=",
"lastModified": 1766885793,
"narHash": "sha256-P6RVkrM9JLCW6xBjSwHfgTOQ1JwBUma5xe5LI8xAPC0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0590cd39f728e129122770c029970378a79d076a",
"rev": "9ef261221d1e72399f2036786498d78c38185c46",
"type": "github"
},
"original": {
@ -336,11 +335,11 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1772328832,
"narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
"lastModified": 1765674936,
"narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
"rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
"type": "github"
},
"original": {
@ -361,29 +360,13 @@
"url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
}
},
"nixpkgs-nixcord": {
"locked": {
"lastModified": 1773222311,
"narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0590cd39f728e129122770c029970378a79d076a",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1774244481,
"narHash": "sha256-4XfMXU0DjN83o6HWZoKG9PegCvKvIhNUnRUI19vzTcQ=",
"lastModified": 1767047869,
"narHash": "sha256-tzYsEzXEVa7op1LTnrLSiPGrcCY6948iD0EcNLWcmzo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4590696c8693fea477850fe379a01544293ca4e2",
"rev": "89dbf01df72eb5ebe3b24a86334b12c27d68016a",
"type": "github"
},
"original": {
@ -394,11 +377,11 @@
},
"nixpkgs-unstable-small": {
"locked": {
"lastModified": 1774422283,
"narHash": "sha256-Hli+qOgWID+eatqY5KBaoj80hNyIbeTwiAr/SGrPHpg=",
"lastModified": 1767116409,
"narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2b772c21c564364cfb5ea92c930178f0400a645c",
"rev": "cad22e7d996aea55ecab064e84834289143e44a0",
"type": "github"
},
"original": {
@ -409,11 +392,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1774106199,
"narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
"lastModified": 1766902085,
"narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
"rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
"type": "github"
},
"original": {
@ -424,11 +407,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1767767207,
"narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=",
"lastModified": 1764517877,
"narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5912c1772a44e31bf1c63c0390b90501e5026886",
"rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
"type": "github"
},
"original": {
@ -466,11 +449,11 @@
]
},
"locked": {
"lastModified": 1767810917,
"narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=",
"lastModified": 1764773531,
"narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=",
"owner": "nix-community",
"repo": "NUR",
"rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4",
"rev": "1d9616689e98beded059ad0384b9951e967a17fa",
"type": "github"
},
"original": {
@ -496,11 +479,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1774376228,
"narHash": "sha256-7oA0u4aghFjjIcIDKZ26NUpXH7hVXGPC0sI1OfK7NUk=",
"lastModified": 1767092832,
"narHash": "sha256-cZFPNglcpjQuA9MXejYELyrIvPm67jR5CZ8Sq2o5P0w=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "eabb84b771420b8396ab4bb4747694302d9be277",
"rev": "2b4263b042d9bdee370e027e4b0ea0f6101709d0",
"type": "github"
},
"original": {
@ -558,11 +541,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1774124764,
"narHash": "sha256-Poz9WTjiRlqZIf197CrMMJfTifZhrZpbHFv0eU1Nhtg=",
"lastModified": 1766603026,
"narHash": "sha256-J2DDdRqSU4w9NNgkMfmMeaLIof5PXtS9RG7y6ckDvQE=",
"owner": "danth",
"repo": "stylix",
"rev": "e31c79f571c5595a155f84b9d77ce53a84745494",
"rev": "551df12ee3ebac52c5712058bd97fd9faa4c3430",
"type": "github"
},
"original": {
@ -637,11 +620,11 @@
"tinted-schemes": {
"flake": false,
"locked": {
"lastModified": 1767710407,
"narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=",
"lastModified": 1763914658,
"narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=",
"owner": "tinted-theming",
"repo": "schemes",
"rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2",
"rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c",
"type": "github"
},
"original": {
@ -653,11 +636,11 @@
"tinted-tmux": {
"flake": false,
"locked": {
"lastModified": 1767489635,
"narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
"lastModified": 1764465359,
"narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=",
"owner": "tinted-theming",
"repo": "tinted-tmux",
"rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
"rev": "edf89a780e239263cc691a987721f786ddc4f6aa",
"type": "github"
},
"original": {
@ -669,11 +652,11 @@
"tinted-zed": {
"flake": false,
"locked": {
"lastModified": 1767488740,
"narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
"lastModified": 1764464512,
"narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=",
"owner": "tinted-theming",
"repo": "base16-zed",
"rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
"rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a",
"type": "github"
},
"original": {

View file

@ -62,6 +62,7 @@
pkgs.mobile-broadband-provider-info
pkgs.modem-manager-gui
pkgs.wireshark
pkgs.jetbrains.idea-ultimate
];
# Bootloader.

View file

@ -17,7 +17,9 @@ with lib;
{ pkgs, ... }:
{
home.packages = with pkgs; [
lutris
prismlauncher
wineWowPackages.stable
dxvk_2
vkd3d-proton
];

View file

@ -59,6 +59,7 @@ with lib;
mumble
element-desktop
pkgs.evolution-data-server-gtk4
iamb
deltachat-desktop
];
};

View file

@ -14,6 +14,6 @@
environment.systemPackages = with pkgs; [
playerctl
pulsemixer
crosspipe
helvum
];
}

View file

@ -17,23 +17,29 @@
};
policies = {
DefaultDownloadDirectory = "\${home}/Downloads";
Extensions.Install = map (name: "https://addons.mozilla.org/firefox/downloads/latest/${name}") [
"bitwarden-password-manager"
"darkreader"
"indie-wiki-buddy"
"kagi-search-for-firefox"
"multi-account-containers"
"privacy-badger17"
"return-youtube-dislikes"
"sponsorblock"
"styl-us"
"tabby-cat-friend"
"torproject-snowflake"
"tridactyl-vim"
"ublock-origin"
"web-clipper-obsidian"
"web-scrobbler"
];
Extensions.Install =
builtins.map (name: "https://addons.mozilla.org/firefox/downloads/latest/${name}")
[
"bitwarden-password-manager"
"darkreader"
"gruvbox-dark-theme"
"indie-wiki-buddy"
"kagi-search-for-firefox"
"multi-account-containers"
"privacy-badger17"
"return-youtube-dislikes"
"shinigami-eyes"
"sponsorblock"
"styl-us"
"tabby-cat-friend"
"terms-of-service-didnt-read"
"torproject-snowflake"
"tridactyl-vim"
"ublock-origin"
"view-page-archive"
"web-clipper-obsidian"
"web-scrobbler"
];
Extensions.Uninstall = [
"ddg@search.mozilla.org"
"google@search.mozilla.org"
@ -174,21 +180,6 @@
icon = "https://lib.rs/favicon.png";
definedAliases = [ "libs" ];
};
"gleam packages" = {
urls = [
{
template = "https://packages.gleam.run/";
params = [
{
name = "search";
value = "{searchTerms}";
}
];
}
];
icon = "https://packages.gleam.run/static/packages-icon.svg";
definedAliases = [ "libs" ];
};
"rust docs" = {
urls = [
{
@ -204,16 +195,6 @@
icon = "https://docs.rs/-/static/favicon.ico";
definedAliases = [ "docs" ];
};
"gleam docs direct open" = {
urls = [
{
template = "https://hexdocs.pm/{searchTerms}";
}
];
definedAliases = [
"gd"
];
};
"rust docs direct open" = {
urls = [
{
@ -221,7 +202,8 @@
}
];
definedAliases = [
"rd"
"doc"
"docd"
];
};
"rust std docs" = {

View file

@ -1,6 +1,4 @@
#define PI 3.14159
#define TAU 6.28319
#define WIDTH 3.

View file

@ -4,6 +4,7 @@
enable = true;
font.size = 12;
font.name = "Departure Mono Nerd Font";
shellIntegration.enableFishIntegration = false;
keybindings = {
"ctrl+shift+n" = "new_os_window_with_cwd";
};

View file

@ -105,13 +105,6 @@
};
};
language = [
{
name = "gleam";
language-servers = [
"gleam"
"discord-presence-lsp"
];
}
{
name = "nu";
language-servers = [

View file

@ -1,31 +1,26 @@
{ lib, ... }:
let
domains = [
"tiktok.com"
"twitter.com"
"instagram.com"
"facebook.com"
"snapchat.com"
# "youtube.com"
"google-analytics.com"
"stats.g.doubleclick.net"
"googleadservices.com"
"googletagmanager.com"
"googletagservices.com"
"googlesyndication.com"
];
prefixes = [
"www."
""
];
in
{ ... }:
{
networking.hosts =
let
withPrefixes = prefixes |> map (prefix: map (domain: prefix + domain) domains) |> lib.flatten;
in
{
"127.0.0.1" = withPrefixes;
};
networking.hosts = {
"127.0.0.1" = [
"www.tiktok.com"
"www.twitter.com"
"www.instagram.com"
"www.facebook.com"
"www.snapchat.com"
"tiktok.com"
"twitter.com"
"instagram.com"
"facebook.com"
"snapchat.com"
"lovense.com"
"google-analytics.com"
"stats.g.doubleclick.net"
"googleadservices.com"
"googletagmanager.com"
"googletagservices.com"
"googlesyndication.com"
];
};
}

View file

@ -1,18 +1,22 @@
{ pkgs, ... }:
{ ... }:
{
programs.btop = {
enable = true;
package = pkgs.btop-rocm;
settings = {
shown_boxes = "cpu mem net proc gpu0";
color_theme = "gruvbox_dark";
vim_keys = true;
proc_per_core = true;
proc_filter_kernel = true;
proc_aggregate = true;
cpu_graph_upper = "total";
cpu_graph_lower = "user";
update_ms = 500;
home-manager.users.jade =
{ pkgs, ... }:
{
programs.btop = {
enable = true;
package = pkgs.btop-rocm;
settings = {
shown_boxes = "cpu mem net proc gpu0";
color_theme = "gruvbox_dark";
vim_keys = true;
proc_per_core = true;
proc_filter_kernel = true;
proc_aggregate = true;
cpu_graph_upper = "total";
cpu_graph_lower = "user";
update_ms = 500;
};
};
};
};
}

View file

@ -1,23 +1,19 @@
{ pkgs, ... }:
{
imports = [
./nu.nix
./starship.nix
./tty.nix
./git.nix
./mprocs.nix
./btop.nix
./sudo.nix
];
programs.mosh.enable = true;
programs.bat.enable = true;
environment.systemPackages = [ pkgs.nushell ];
home-manager.users.jade =
{ ... }:
{
imports = [
./btop.nix
./mprocs.nix
./git.nix
./starship.nix
./nu.nix
./elvish.nix
];
programs.broot = {
enable = true;
settings = {
@ -37,6 +33,5 @@
};
};
# TODO: Proper switch
users.defaultUserShell = pkgs.elvish;
users.defaultUserShell = pkgs.nushell;
}

View file

@ -1,8 +0,0 @@
{ ... }:
{
xdg.configFile."elvish" = {
recursive = true;
executable = true;
source = ./elvish;
};
}

View file

@ -1,18 +0,0 @@
## hook for direnv
set @edit:before-readline = $@edit:before-readline {
try {
var m = [("/nix/store/kv03kmfwkinhv4ar2hvh79jfkm1n5id5-direnv-2.37.1/bin/direnv" export elvish | from-json)]
if (> (count $m) 0) {
set m = (all $m)
keys $m | each { |k|
if $m[$k] {
set-env $k $m[$k]
} else {
unset-env $k
}
}
}
} catch e {
echo $e
}
}

View file

@ -1,28 +0,0 @@
# <aliases>
fn gnix {|@a| cd ~/nix-configs $@a }
fn grepo {|@a| cd ~/Documents/repos $@a }
fn wh {|@a| wormhole-rs $@a }
fn gc {|@a| git commit $@a }
fn gca {|@a| git commit --all $@a }
fn gp {|@a| git push $@a }
fn gl {|@a| git pull $@a }
fn gs {|@a| git status $@a }
fn cr {|@a| cargo run $@a }
fn cl {|@a| cargo clippy $@a }
fn cb {|@a| cargo build $@a }
fn cch {|@a| cargo check $@a }
fn jb {|@a| just build $@a }
fn px {|@a| pulsemixer $@a }
fn guni {|@a| cd ~/Docs/uni $@a }
fn juts {|@a| just $@a }
# </aliases>
use direnv

View file

@ -5,43 +5,51 @@
...
}:
{
programs.git = {
enable = true;
settings = {
user = {
name = "Schrottkatze";
email = "git@schrottkatze.de";
home-manager.users.jade =
{
pkgs,
config,
...
}:
{
programs.git = {
enable = true;
settings = {
user = {
name = "Schrottkatze";
email = "git@schrottkatze.de";
};
};
signing = {
format = "ssh";
key = lib.mkDefault "${pkgs.writeText "blue_nk3.pub" "SHA256:h7d9+w4uACtz63L/MI7B1oB3fYxh8u+q6bs+SsSTKzY ssh:"}";
signByDefault = true;
};
};
programs.jujutsu = {
enable = true;
settings = {
user = {
name = config.programs.git.userName;
email = config.programs.git.userEmail;
};
};
};
programs.gitui = {
enable = true;
keyConfig = ''
(
move_left: Some(( code: Char('h'), modifiers: "")),
move_right: Some(( code: Char('l'), modifiers: "")),
move_up: Some(( code: Char('k'), modifiers: "")),
move_down: Some(( code: Char('j'), modifiers: "")),
stash_open: Some(( code: Char('l'), modifiers: "")),
open_help: Some(( code: F(1), modifiers: "")),
status_reset_item: Some(( code: Char('U'), modifiers: "SHIFT")),
)
'';
};
};
signing = {
format = "ssh";
key = lib.mkDefault "${pkgs.writeText "blue_nk3.pub" "SHA256:h7d9+w4uACtz63L/MI7B1oB3fYxh8u+q6bs+SsSTKzY ssh:"}";
signByDefault = true;
};
};
programs.jujutsu = {
enable = true;
settings = {
user = {
name = config.programs.git.userName;
email = config.programs.git.userEmail;
};
};
};
programs.gitui = {
enable = true;
keyConfig = ''
(
move_left: Some(( code: Char('h'), modifiers: "")),
move_right: Some(( code: Char('l'), modifiers: "")),
move_up: Some(( code: Char('k'), modifiers: "")),
move_down: Some(( code: Char('j'), modifiers: "")),
stash_open: Some(( code: Char('l'), modifiers: "")),
open_help: Some(( code: F(1), modifiers: "")),
status_reset_item: Some(( code: Char('U'), modifiers: "SHIFT")),
)
'';
};
}

View file

@ -1,23 +1,31 @@
{ pkgs, ... }:
{ ... }:
{
home = {
packages = [ pkgs.mprocs ];
};
xdg.configFile."mprocs/mprocs.yaml" = {
text = builtins.toJSON {
proc_list_width = 15;
keymap_procs = {
"<l>" = {
c = "toggle-focus";
};
home-manager.users.jade =
{
pkgs,
lib,
...
}:
{
home = {
packages = [ pkgs.mprocs ];
};
keymap_term = {
"<C-a>" = null;
# Ctrl-m so it doesnt overlap with zellij or helix
"<C-M>" = {
c = "toggle-focus";
xdg.configFile."mprocs/mprocs.yaml" = {
text = builtins.toJSON {
proc_list_width = 15;
keymap_procs = {
"<l>" = {
c = "toggle-focus";
};
};
keymap_term = {
"<C-a>" = null;
# Ctrl-m so it doesnt overlap with zellij or helix
"<C-M>" = {
c = "toggle-focus";
};
};
};
};
};
};
}

View file

@ -1,42 +1,46 @@
{ pkgs, ... }:
{ config, ... }:
{
# Needed for nu_scripts background_task
services.pueue = {
enable = true;
settings = {
shared = {
use_unix_socket = true;
home-manager.users.jade =
{ pkgs, ... }:
{
# Needed for nu_scripts background_task
services.pueue = {
enable = true;
settings = {
shared = {
use_unix_socket = true;
};
};
};
home.packages = [
pkgs.pueue
];
home.file."shell-startup" = {
source = ./nu/shell-startup.nu;
target = ".config/nushell/shell-startup.nu";
};
programs.nushell = {
enable = true;
package = config.users.defaultUserShell;
configFile.source = ./nu/config.nu;
envFile.source = ./nu/env.nu;
extraConfig = ''
plugin add ${pkgs.nushellPlugins.query}/bin/nu_plugin_query;
plugin add ${pkgs.nushellPlugins.polars}/bin/nu_plugin_polars;
plugin add ${pkgs.nushellPlugins.formats}/bin/nu_plugin_formats;
plugin use query;
plugin use polars;
plugin use formats;
source ${./nu/custom_commands.nu};
source ${./nu/aliases.nu};
nu ${./nu/shell-startup.nu};
'';
extraEnv = '''';
};
# programs.starship.enableNushellIntegration = true;
programs.carapace.enableNushellIntegration = true;
programs.direnv.enableNushellIntegration = true;
};
};
home.packages = [
pkgs.pueue
];
home.file."shell-startup" = {
source = ./nu/shell-startup.nu;
target = ".config/nushell/shell-startup.nu";
};
programs.nushell = {
enable = false;
# package = config.users.defaultUserShell;
configFile.source = ./nu/config.nu;
envFile.source = ./nu/env.nu;
extraConfig = ''
plugin add ${pkgs.nushellPlugins.query}/bin/nu_plugin_query;
plugin add ${pkgs.nushellPlugins.polars}/bin/nu_plugin_polars;
plugin add ${pkgs.nushellPlugins.formats}/bin/nu_plugin_formats;
plugin use query;
plugin use polars;
plugin use formats;
source ${./nu/custom_commands.nu};
source ${./nu/aliases.nu};
nu ${./nu/shell-startup.nu};
'';
extraEnv = "";
};
# programs.starship.enableNushellIntegration = true;
programs.carapace.enableNushellIntegration = true;
programs.direnv.enableNushellIntegration = true;
}

View file

@ -1,8 +1,16 @@
alias gnix = cd ~/nix-configs;
alias grepo = cd ~/Documents/repos;
alias wh = wormhole-rs;
alias b = broot;
alias gg = gitui;
alias ga = git add;
alias gc = git commit;
alias gca = git commit --all;
alias gp = git push;
alias gl = git pull;
alias gs = git status;
alias clip = xclip -selection c;
alias cr = cargo run;

View file

@ -1,40 +1,44 @@
{ ... }:
{
programs.starship = {
enable = true;
enableNushellIntegration = false;
settings = {
format = "$all$directory$character";
character = {
success_symbol = "[\\$](green)";
error_symbol = "[X](red)";
};
git_branch = {
format = "\\[[$symbol$branch]($style)\\]";
symbol = " ";
};
git_status = {
format = "([\\[$all_status$ahead_behind\\]]($style))";
};
haskell = {
format = "\\[[$symbol($version)]($style)\\]";
symbol = " ";
};
cmd_duration = {
format = "\\[[ $duration]($style)\\]";
};
nix_shell = {
format = "\\[[$symbol$state( \\($name\\))]($style)\\]";
symbol = " ";
};
rust = {
format = "\\[[$symbol($version)]($style)\\]";
symbol = " ";
};
package = {
format = "\\[[$symbol$version]($style)\\]";
symbol = " ";
home-manager.users.jade =
{ pkgs, ... }:
{
programs.starship = {
enable = true;
enableNushellIntegration = false;
settings = {
format = "$all$directory$character";
character = {
success_symbol = "[\\$](green)";
error_symbol = "[X](red)";
};
git_branch = {
format = "\\[[$symbol$branch]($style)\\]";
symbol = " ";
};
git_status = {
format = "([\\[$all_status$ahead_behind\\]]($style))";
};
haskell = {
format = "\\[[$symbol($version)]($style)\\]";
symbol = " ";
};
cmd_duration = {
format = "\\[[ $duration]($style)\\]";
};
nix_shell = {
format = "\\[[$symbol$state( \\($name\\))]($style)\\]";
symbol = " ";
};
rust = {
format = "\\[[$symbol($version)]($style)\\]";
symbol = " ";
};
package = {
format = "\\[[$symbol$version]($style)\\]";
symbol = " ";
};
};
};
};
};
}