diff --git a/flake.nix b/flake.nix index 4cdb83b..e64f7e4 100644 --- a/flake.nix +++ b/flake.nix @@ -126,7 +126,7 @@ inherit (nixpkgs) lib; - meta = {nixpackages ? nixpkgs}: rec { + meta = { nixpackages ? nixpkgs }: rec { system = "x86_64-linux"; pkgs = import nixpackages { inherit system; diff --git a/nixos/homes/palo/default.nix b/nixos/homes/palo/default.nix index 9fcfc12..bc0a50f 100644 --- a/nixos/homes/palo/default.nix +++ b/nixos/homes/palo/default.nix @@ -11,6 +11,7 @@ ./stylix.nix ./vim.nix ./yubikey.nix + ./zellij.nix ]; home.stateVersion = "22.11"; diff --git a/nixos/homes/palo/git.nix b/nixos/homes/palo/git.nix index 7e77c54..bd626c5 100644 --- a/nixos/homes/palo/git.nix +++ b/nixos/homes/palo/git.nix @@ -15,7 +15,8 @@ with pkgs; init.defaultBranch = "main"; pull.ff = "only"; }; - diff-so-fancy.enable = true; + #diff-so-fancy.enable = true; + difftastic.enable = true; }; diff --git a/nixos/homes/palo/i3.nix b/nixos/homes/palo/i3.nix index 250e5b0..b0d78bb 100644 --- a/nixos/homes/palo/i3.nix +++ b/nixos/homes/palo/i3.nix @@ -35,12 +35,12 @@ in in [ fixXhost - pkgs.kitty pkgs.autorandr pkgs.polygon-art.polygon-art ]; + programs.i3status-rust = { enable = true; bars = { @@ -115,6 +115,10 @@ in }; }; + programs.kitty = { + enable = true; + }; + programs.alacritty = { enable = true; settings = { diff --git a/nixos/homes/palo/zellij.nix b/nixos/homes/palo/zellij.nix new file mode 100644 index 0000000..e47cfc4 --- /dev/null +++ b/nixos/homes/palo/zellij.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: +with pkgs; +{ + programs.zellij = { + enable = true; + # zsh will automatically start in zelllij + #enableZshIntegration = true; + settings = { + on_force_close = "quit"; + }; + }; + +}