Compare commits

..

No commits in common. "a0a6acf2808e5a48b7ae0a59fb760de254cb2488" and "3a6d18e50752c115909db17739c083e72252ea5d" have entirely different histories.

14 changed files with 63 additions and 30 deletions

View File

@ -1,6 +1,7 @@
{ {
config, config,
pkgs, pkgs,
lib,
... ...
}: { }: {
imports = [ imports = [

View File

@ -4,6 +4,7 @@
{ {
config, config,
lib, lib,
pkgs,
modulesPath, modulesPath,
... ...
}: { }: {

View File

@ -1,4 +1,5 @@
{ {
config,
pkgs, pkgs,
nix-xilinx, nix-xilinx,
system, system,

View File

@ -1,12 +1,16 @@
{ {
pkgs, pkgs,
config, config,
lib,
inputs,
... ...
}: let }:
let
qutebrowser_firejail = pkgs.writeShellScriptBin "qutebrowser" '' qutebrowser_firejail = pkgs.writeShellScriptBin "qutebrowser" ''
firejail -- ${pkgs.qutebrowser}/bin/qutebrowser "$@" firejail -- ${pkgs.qutebrowser}/bin/qutebrowser "$@"
''; '';
in { in
with lib; {
imports = [./zsh.nix ./i3status-rust.nix ./sway.nix ./i3.nix ./home_packages.nix ./whatsapp-for-linux.nix]; imports = [./zsh.nix ./i3status-rust.nix ./sway.nix ./i3.nix ./home_packages.nix ./whatsapp-for-linux.nix];
home.stateVersion = "22.11"; home.stateVersion = "22.11";
@ -58,7 +62,7 @@ in {
clock24 = true; clock24 = true;
keyMode = "vi"; keyMode = "vi";
terminal = "screen-256color"; terminal = "screen-256color";
plugins = with pkgs.tmuxPlugins; [sysstat net-speed gruvbox]; plugins = with pkgs.tmuxPlugins; [ sysstat net-speed gruvbox ];
}; };
mpv = { mpv = {

View File

@ -1,4 +1,5 @@
{ {
config,
pkgs, pkgs,
inputs, inputs,
system, system,

View File

@ -1,4 +1,9 @@
{...}: { {
config,
lib,
pkgs,
...
}: {
programs.i3status-rust = { programs.i3status-rust = {
bars.top = { bars.top = {
icons = "awesome5"; icons = "awesome5";

View File

@ -1,5 +1,6 @@
{ {
config, config,
lib,
pkgs, pkgs,
inputs, inputs,
system, system,

View File

@ -1,4 +1,9 @@
{lib, ...}: {
config,
pkgs,
lib,
...
}:
with lib; { with lib; {
xdg.configFile."whatsapp-for-linux/settings.conf".source = builtins.toFile "settings.conf" ( xdg.configFile."whatsapp-for-linux/settings.conf".source = builtins.toFile "settings.conf" (
generators.toINI {} { generators.toINI {} {

View File

@ -1,4 +1,9 @@
{pkgs, ...}: { {
config,
lib,
pkgs,
...
}: {
programs.z-lua = { programs.z-lua = {
enableAliases = true; enableAliases = true;
enableZshIntegration = true; enableZshIntegration = true;
@ -72,36 +77,36 @@
envExtra = ''''; envExtra = '''';
initExtra = '' initExtra = ''
# binds # binds
bindkey '^K' fzf-file-widget bindkey '^K' fzf-file-widget
# options # options
setopt nobeep setopt nobeep
setopt nopromptcr setopt nopromptcr
setopt c_bases setopt c_bases
setopt completeinword setopt completeinword
setopt completealiases setopt completealiases
setopt notify setopt notify
# #
RPS1="" RPS1=""
# #
function chpwd() { function chpwd() {
ls; ls;
} }
eval "$(direnv hook zsh)" eval "$(direnv hook zsh)"
zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}' zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
if [[ -n "$PS1" ]] && [[ -z "$TMUX" ]] && [[ -n "$SSH_CONNECTION" ]]; then if [[ -n "$PS1" ]] && [[ -z "$TMUX" ]] && [[ -n "$SSH_CONNECTION" ]]; then
TMUX_EXE="${pkgs.tmux}/bin/tmux" TMUX_EXE="${pkgs.tmux}/bin/tmux"
systemd-run --scope --user $TMUX_EXE attach-session -t $USER || systemd-run --scope --user $TMUX_EXE new-session -s $USER systemd-run --scope --user $TMUX_EXE attach-session -t $USER || systemd-run --scope --user $TMUX_EXE new-session -s $USER
fi fi
if [[ -n "$BUBBLEWRAP_DIR" ]]; then if [[ -n "$BUBBLEWRAP_DIR" ]]; then
RPS1="{{$BUBBLEWRAP_DIR}}" RPS1="{{$BUBBLEWRAP_DIR}}"
fi fi
''; '';
}; };
} }

View File

@ -2,7 +2,9 @@
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ {
config,
lib, lib,
pkgs,
modulesPath, modulesPath,
... ...
}: { }: {

View File

@ -4,6 +4,8 @@
{ {
config, config,
pkgs, pkgs,
lib,
sops-nix,
zremap, zremap,
system, system,
nvim, nvim,

View File

@ -2,7 +2,9 @@
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ {
config,
lib, lib,
pkgs,
modulesPath, modulesPath,
... ...
}: { }: {

View File

@ -1,7 +1,9 @@
{ {
config, config,
pkgs, pkgs,
lib,
nix-xilinx, nix-xilinx,
sops-nix,
system, system,
nvim, nvim,
zremap, zremap,

View File

@ -4,6 +4,7 @@
{ {
config, config,
lib, lib,
pkgs,
modulesPath, modulesPath,
... ...
}: { }: {