Merge remote-tracking branch 'refs/remotes/origin/main'
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
...
|
||||
}:
|
||||
let
|
||||
dotfiles = "${config.home.homeDirectory}/nixos-config/modules/home-manager/hyprland/hypr";
|
||||
dotfiles = "${config.home.homeDirectory}/ndots/modules/home-manager/hyprland/hypr";
|
||||
in
|
||||
{
|
||||
options.custom.hyprland.enable = lib.mkEnableOption "Hyprland user config";
|
||||
|
||||
@@ -36,7 +36,7 @@ in
|
||||
monitor = "${monitor}";
|
||||
color = "${bg}";
|
||||
# Prefer a wallpaper? drop `color` above and use:
|
||||
# path = ~/nixos-config/wallpapers/lock.png
|
||||
# path = ~/ndots/wallpapers/lock.png
|
||||
# blur_passes = 3
|
||||
# blur_size = 6
|
||||
};
|
||||
|
||||
@@ -11,6 +11,6 @@
|
||||
fzf
|
||||
];
|
||||
|
||||
xdg.configFile."nvim".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nixos-config/modules/home-manager/nvim/nvim";
|
||||
xdg.configFile."nvim".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/ndots/modules/home-manager/nvim/nvim";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -11,6 +11,6 @@
|
||||
tmux
|
||||
];
|
||||
|
||||
xdg.configFile."tmux/tmux.conf".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nixos-config/modules/home-manager/tmux/tmux.conf";
|
||||
xdg.configFile."tmux/tmux.conf".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/ndots/modules/home-manager/tmux/tmux.conf";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -44,11 +44,11 @@
|
||||
enc = "openssl enc -aes-256-cbc -md sha512 -pbkdf2 -iter 1000000 -salt";
|
||||
backup = "packup && rm ~/Documents/packup* && mv ~/packup* ~/Documents/ && rsync --archive --update --copy-links ~/Documents 192.168.3.200:/home/jpporta/ --info=progress2";
|
||||
gn = "git commit -m \"$(date)\"";
|
||||
nixs = "cd ~/nixos-config && git add . && sudo nixos-rebuild switch --flake ~/nixos-config#jpporta-nixos";
|
||||
nixs = "cd ~/ndots && git add . && sudo nixos-rebuild switch --flake ~/ndots#jpporta-nixos";
|
||||
nix-search = "nix --extra-experimental-features \"nix-command flakes\" search nixpkgs";
|
||||
nix-garbage = "sudo nix-collect-garbage -d && sudo nixos-rebuild switch";
|
||||
nix-update = "sudo nix-channel --update && sudo nixos-rebuild switch";
|
||||
hms = "cd ~/nixos-config && git add . && home-manager switch --flake . ";
|
||||
hms = "cd ~/ndots && git add . && home-manager switch --flake .#jpporta-deck";
|
||||
s = "sesh connect $(sesh list | fzf)";
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user