Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.age binary
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
**/*.bak
2 changes: 1 addition & 1 deletion external/zsh/profile.zsh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
exec Hyprland
exec niri-session
fi

if [ -z "$KITTY_WINDOW_ID" ]; then
Expand Down
2 changes: 1 addition & 1 deletion external/zsh/prompt.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ function precmd() {

local baseprompt="${reset}${dim}%n${reset}${accent}@${reset}${dim}%m${reset}:${accent}%l${reset} ${dim}->${reset} ${cwd} ${dim}(${reset}%?${dim})${reset}${newline}"

if [[ "$last_command" == 'cat' || "$last_command" == 'head' || "$last_command" == 'tail' || "$last_command" == 'tac' || "$last_command" == 'nc' || "$last_command" == 'ncat' || "$last_command" == 'netcat' || "$last_command" == 'kitget' ]]; then
if [[ "$last_command" == 'car' || "$last_command" == 'cat' || "$last_command" == 'head' || "$last_command" == 'tail' || "$last_command" == 'tac' || "$last_command" == 'nc' || "$last_command" == 'ncat' || "$last_command" == 'netcat' || "$last_command" == 'kitget' ]]; then
baseprompt+='😻'
elif [[ "$last_command" == 'sudo' ]]; then
baseprompt+='🙀'
Expand Down
122 changes: 108 additions & 14 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@
inputs.nixpkgs.follows = "nixpkgs";
};

niri = {
url = "github:sodiboo/niri-flake";
inputs.nixpkgs.follows = "nixpkgs-unstable";
inputs.nixpkgs-stable.follows = "nixpkgs";
};

iamb = {
url = "github:ulyssa/iamb/v0.0.11-alpha.1";
inputs.nixpkgs.follows = "nixpkgs";
Expand All @@ -40,6 +46,7 @@
self,
nixpkgs,
home-manager,
niri,
...
}@inputs:
let
Expand All @@ -55,6 +62,7 @@
./modules/base.nix
./systems/${name}
home-manager.nixosModules.home-manager
niri.nixosModules.niri
./modules/home.nix
];
};
Expand Down
4 changes: 4 additions & 0 deletions home/adam.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
{ config, ... }:

{
home = {
username = "adam";
homeDirectory = "/home/adam";
stateVersion = "25.05";
};

age.identityPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ];

imports = [
./modules/scripts.nix
./modules/xdg.nix
Expand Down
3 changes: 1 addition & 2 deletions home/modules/packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@

nerd-fonts.fira-code
wl-clipboard
hyprpaper
hyprcursor
grim
slurp

cloudflared
unstable.kitget
];
}
13 changes: 4 additions & 9 deletions home/modules/programs/chromium.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,10 @@
];
};

age = {
identityPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ];
secrets = {
chromium = {
file = ../../../secrets/chromium.sh.age;
mode = "0500";
path = "${config.home.homeDirectory}/.local/bin/chromium";
};
};
age.secrets.chromium = {
file = ../../../secrets/chromium.sh.age;
mode = "0500";
path = "${config.home.homeDirectory}/.local/bin/chromium";
};

home.sessionVariables.DEFAULT_BROWSER = "chromium";
Expand Down
3 changes: 3 additions & 0 deletions home/modules/programs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
./zoxide.nix
./neovim.nix

./niri.nix

./swww.nix
./rofi.nix
./kitty.nix
./dunst.nix
Expand Down
3 changes: 2 additions & 1 deletion home/modules/programs/iamb.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
package = iamb.packages.${pkgs.stdenv.system}.default;

settings = {
profiles.user.user_id = "@xx0a_q:matrix.org";
profiles.user.user_id = "@adam:matrix.system72.dev";
dirs.downloads = "/tmp/downloads";
settings = {
username_display = "displayname";
notifications.enabled = true;
Expand Down
1 change: 1 addition & 0 deletions home/modules/programs/kitty.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
cursor_trail = 1;
cursor_trail_decay = "0.05 0.2";
cursor_trail_start_threshold = 2;
enable_audio_bell = false;
};
};
}
13 changes: 12 additions & 1 deletion home/modules/programs/neovim.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
{ pkgs, anvim, ... }:
{
pkgs,
config,
anvim,
...
}:

{
imports = [ anvim.homeManagerModules.default ];
Expand All @@ -12,4 +17,10 @@
bash-language-server
nixd
];

age.secrets.wakatime = {
file = ../../../secrets/wakatime.cfg.age;
mode = "0500";
path = "${config.home.homeDirectory}/.wakatime.cfg";
};
}
Loading