daniel/dotfiles
1
0
Fork 0
Code Activity Actions

Update deps

Browse source
This commit is contained in:
Daniel Kempkens 2023-09-09 19:54:02 +02:00
parent 3edb03a8f3
commit 0625f69563
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
10 changed files with 116 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
flake.lock
View file

@ -117,11 +117,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1686747123,
"narHash": "sha256-XUQK9kwHpTeilHoad7L4LjMCCyY13Oq383CoFADecRE=",
"lastModified": 1694158470,
"narHash": "sha256-yWx9eBDHt6WR3gr65+J85KreHdMypty/P6yM35tIYYM=",
"owner": "serokell",
"repo": "deploy-rs",
"rev": "724463b5a94daa810abfc64a4f87faef4e00f984",
"rev": "d0cfc042eba92eb206611c9e8784d41a2c053bab",
"type": "github"
},
"original": {
@ -491,11 +491,11 @@
]
},
"locked": {
"lastModified": 1693972774,
"narHash": "sha256-Dt9UZs0/DaIex598quYRYFuGabUbvFdNrHuvGc6HjBc=",
"lastModified": 1694134858,
"narHash": "sha256-fG/ESauOGmiojKlpJG8gB62dJa5Wd+ZIuiDMKK/HD3g=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "b22d7bab30076bbb73744867d6c5bf7d6380570c",
"rev": "19c6a4081b14443420358262f8416149bd79561a",
"type": "github"
},
"original": {
@ -514,11 +514,11 @@
},
"locked": {
"dir": "contrib",
"lastModified": 1694074322,
"narHash": "sha256-5JIwHRW/JCKNR5lD+LXi18dDVaGZ5Y4GABIK9JiDQbI=",
"lastModified": 1694130713,
"narHash": "sha256-jZae7bEHY0a4QTEDY5EA4nfhSOsZ3G5a+9xO9IWFbhM=",
"owner": "neovim",
"repo": "neovim",
"rev": "131a1ee82d15ce9d1356a46117c9a1651947d4b8",
"rev": "6a8b48e24cbe070846dd1d234553b3fdeb19460e",
"type": "github"
},
"original": {
@ -539,11 +539,11 @@
"weewx-proxy-flake": "weewx-proxy-flake"
},
"locked": {
"lastModified": 1694074799,
"narHash": "sha256-fgLoGXgBdN10d/GiHoHrTJTP2kdwP+DzO+p6qthc/QE=",
"lastModified": 1694161158,
"narHash": "sha256-s9C3Q5q+EoKGcXMkQO0mU+TxhbneBeultTKWhrGDWmQ=",
"owner": "nifoc",
"repo": "nix-overlay",
"rev": "c4f91cae530aadf7ca1b6aa58ba7e7f469b12707",
"rev": "fcc3bd9ad4322666c5e279e3a75f29b178d7b73a",
"type": "github"
},
"original": {
@ -590,11 +590,11 @@
},
"nixos-stable": {
"locked": {
"lastModified": 1693953029,
"narHash": "sha256-1+28KQl4YC4IBzKo/epvEyK5KH4MlgoYueJ8YwLGbOc=",
"lastModified": 1694048570,
"narHash": "sha256-PEQptwFCVaJ+jLFJgrZll2shQ9VI/7xVhrCYkJo8iIw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4077a0e4ac3356222bc1f0a070af7939c3098535",
"rev": "4f77ea639305f1de0a14d9d41eef83313360638c",
"type": "github"
},
"original": {
@ -606,11 +606,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1694032533,
"narHash": "sha256-I8cfCV/4JNJJ8KHOTxTU1EphKT8ARSb4s9pq99prYV0=",
"lastModified": 1694062546,
"narHash": "sha256-PiGI4f2BGnZcedP6slLjCLGLRLXPa9+ogGGgVPfGxys=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "efd23a1c9ae8c574e2ca923c2b2dc336797f4cc4",
"rev": "b200e0df08f80c32974a6108ce431d8a8a5e6547",
"type": "github"
},
"original": {

9
home/config/nushell/scripts/nix-utils.nu Normal file
View file

@ -0,0 +1,9 @@
def upn [] {
let os = (uname)
match $os {
"Darwin" => { echo "D1" }
"Linux" => { echo D2 }
_ => { error make {msg: "unsupported operating system"} }
}
}

5
home/config/wezterm/config.fnl
View file

@ -162,7 +162,10 @@
;; Scrollback
:scrollback_lines 5000
;; Launch Menu
:launch_menu [{:label :Btop++ :args [_G.programs.btop]}]
:launch_menu [{:label :Btop++ :args [_G.programs.btop]}
{:label :bash :args [_G.shells.bash]}
{:label :fish :args [_G.shells.fish]}
{:label :nushell :args [_G.shells.nushell]}]
;; Other
:front_end :WebGpu
:check_for_updates false})

9
home/hosts/Styx.nix
View file

@ -5,9 +5,12 @@
../config/fonts.nix
../programs/fish.nix
../programs/nushell.nix
../programs/atuin.nix
../programs/starship.nix
../programs/direnv.nix
../programs/starship.nix
../programs/zoxide.nix
../programs/wezterm.nix
../programs/nvim
@ -73,8 +76,4 @@
xz
];
};
programs = {
zoxide.enable = true;
};
}

8
home/programs/fish.nix
View file

@ -88,11 +88,9 @@ in
ngc = "nix-collect-garbage -d && sudo nix-collect-garbage -d";
nsr = "sudo nix-store --verify --check-contents --repair";
j = "z";
ji = "zi";
la = "${pkgs.exa}/bin/exa --long --all --group --header --group-directories-first --sort=type --icons";
lg = "${pkgs.exa}/bin/exa --long --all --group --header --git";
lt = "${pkgs.exa}/bin/exa --long --all --group --header --tree --level ";
la = "${pkgs.eza}/bin/eza --long --all --group --header --group-directories-first --sort=type --icons";
lg = "${pkgs.eza}/bin/eza --long --all --group --header --git";
lt = "${pkgs.eza}/bin/eza --long --all --group --header --tree --level ";
mysqld-direnv = "mysqld --datadir=$PWD/.direnv/mysql/data --bind-address=127.0.0.1 --socket=$PWD/.direnv/mysql/mysqld.sock --gdb";
postgres-direnv-init = "initdb --username $USER --pgdata $PWD/.direnv/postgres/data --auth trust";

28
home/programs/nushell.nix Normal file
View file

@ -0,0 +1,28 @@
{ pkgs, ... }:
{
programs.nushell = {
enable = true;
shellAliases = {
nrsw = "nixpkgs-switch";
upa = "nix flake update ~/.config/nixpkgs -v and upn";
ngc = "nix-collect-garbage -d and sudo nix-collect-garbage -d";
nsr = "sudo nix-store --verify --check-contents --repair";
la = "${pkgs.eza}/bin/eza --long --all --group --header --group-directories-first --sort=type --icons";
lg = "${pkgs.eza}/bin/eza --long --all --group --header --git";
lt = "${pkgs.eza}/bin/eza --long --all --group --header --tree --level ";
};
configFile = {
text = ''
$env.config = {
show_banner: false
keybindings: []
}
'';
};
};
}

34
home/programs/nvim/plugins.nix
View file

@ -19,12 +19,12 @@ in
};
plenary-nvim = buildVimPluginFrom2Nix {
pname = "plenary.nvim";
version = "2023-08-24";
version = "2023-09-07";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "plenary.nvim";
rev = "0dbe561ae023f02c2fb772b879e905055b939ce3";
sha256 = "0j42b4q25l8yypa92zkdf9jargjszyvw5f83l3qxbh0vy9ly1j2d";
rev = "a56bf0071bf63d35274fdc4738bb1e8821cfd2ea";
sha256 = "1w7j16bqzscqfdyxj9dk863v163sw3q3zra17fz4lnlza2yg5kd8";
fetchSubmodules = false;
};
};
@ -118,12 +118,12 @@ in
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2023-09-07";
version = "2023-09-08";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "80b4fa7970ee159e5c2c715bbcd386143c48dcb1";
sha256 = "0mzip875xxiq6yci7r2iral0d8yjnkw0svifjrqd51vg9vwim4r0";
rev = "dfcfdb0e7bcb362c4de1ed7d0015c21957c91ba7";
sha256 = "0k2nm7v3jlripl6hi64p1rdj3cmsjil3r5h3sqcam4s48ncspzpa";
fetchSubmodules = false;
};
};
@ -162,12 +162,12 @@ in
};
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope.nvim";
version = "2023-09-04";
version = "2023-09-08";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
rev = "20a37e43bb43c74c6091f9fea6551af0964ad45a";
sha256 = "0n8g9m44d250wdncv9cy71irsj10r78g3hdz1x72bpbx6ixlckyz";
rev = "18f10f28007cb8b4d50324217349c3f568684be2";
sha256 = "0v20ssgp2n0b2jnw0hl93fnrkhpy4rd20pswwwciqp3mknsfwcpi";
fetchSubmodules = false;
};
};
@ -301,8 +301,8 @@ in
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-lint";
rev = "de5b36579c572325dc8142b7a8ecfff8e69f4e3a";
sha256 = "1r2aq778nsri65fq67wx91g5i06mi53v34ypn0n5hn4vqqjfzr9v";
rev = "73682da41b74c9c35f33b1b2dbd0cc02cc59452f";
sha256 = "061x7p90p1nmjf2fs4alrgyj0w0v8w6kbg2n86q2khl40w522ihk";
fetchSubmodules = false;
};
};
@ -462,12 +462,12 @@ in
};
nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
version = "2023-09-05";
version = "2023-09-08";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
rev = "35493556b895f54c129918aca43ae9a63af42a1f";
sha256 = "13j8m902cblfddwbhjcqrqgshc39476xgrar57mayw1id7025nn4";
rev = "defad64afbf19381fe31488a7582bbac421d6e38";
sha256 = "05ihrriym44g01rryaah2h2xnl183dpwcsf8q8rxzr29z0jpxxip";
fetchSubmodules = false;
};
};
@ -572,12 +572,12 @@ in
};
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns.nvim";
version = "2023-09-07";
version = "2023-09-08";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
rev = "983f1a216cca1a079399ba050bc4b9ce130de83a";
sha256 = "1hlzabdgcja1nps0iiic38aq4fdvm7lynyd4l7ki63zsxqwqdag3";
rev = "fef5d90953f0a730483b44745fae5938ba8227f8";
sha256 = "1739v2garbf5xinrwl1ac2cf2xmpfkwpjzca2iwj78d7clj9flq5";
fetchSubmodules = false;
};
};

11
home/programs/wezterm.nix
View file

@ -1,7 +1,14 @@
{ pkgs, ... }:
{ pkgs, config, ... }:
let
wezterm-pkg = pkgs.wezterm;
wezterm-nushell = pkgs.writeShellScript "wezterm-nushell.sh" ''
source /etc/static/bashrc
source ${config.home.sessionVariablesPackage}/etc/profile.d/hm-session-vars.sh
exec ${pkgs.nushell.outPath}/bin/nu
'';
in
{
programs.wezterm = {
@ -11,7 +18,9 @@ in
extraConfig = ''
_G.shells = {
bash = '${pkgs.bash.outPath}/bin/bash',
fish = '${pkgs.fish.outPath}/bin/fish',
nushell = '${wezterm-nushell}',
};
_G.programs = {

15
home/programs/zoxide.nix Normal file
View file

@ -0,0 +1,15 @@
{
programs.zoxide = {
enable = true;
};
programs.fish.shellAliases = {
j = "z";
ji = "zi";
};
programs.nushell.shellAliases = {
j = "z";
ji = "zi";
};
}

9
system/darwin/yabai.nix
View file

@ -24,15 +24,18 @@ in
config = {
layout = "bsp";
window_placement = "second_child";
top_padding = 5;
bottom_padding = 5;
left_padding = 5;
right_padding = 5;
window_gap = 5;
window_placement = "second_child";
split_type = "auto";
};
extraConfig = ''
yabai -m rule --add app='^Dato$' manage=off
yabai -m rule --add app='^Mona$' manage=off
yabai -m rule --add app='^System.*einstellungen$' manage=off
@ -63,6 +66,8 @@ in
meh - f : ${yabai-bin} -m window --toggle zoom-fullscreen
meh - t : ${yabai-bin} -m window --toggle float; ${yabai-bin} -m window --grid 6:6:1:1:4:4
meh - g : ${yabai-bin} -m window --resize bottom:0:40
meh - s : ${yabai-bin} -m window --resize bottom:0:-40
@ -70,5 +75,7 @@ in
hyper - j : ${yabai-bin} -m window --warp south
hyper - k : ${yabai-bin} -m window --warp north
hyper - l : ${yabai-bin} -m window --warp east
hyper - f : ${yabai-bin} -m window --toggle native-fullscreen
'';
}