liam/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup and updates

Browse Source
This commit is contained in:
Liam Malone
2024-03-31 22:00:34 +01:00
parent 7bcc81f20d
commit 36317ca5e5
2 changed files with 153 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hosts/default/home.nix
+86 -101
View File
@@ -4,6 +4,10 @@
home.username = "liamm";
home.homeDirectory = "/home/liamm";
imports = [
../../modules/home-manager/dunst.nix
../../modules/home-manager/terminals/alacritty.nix
];
# You should not change this value, even if you update Home Manager. If you do
# want to update the value, then make sure to first check the Home Manager
# release notes.
@@ -109,10 +113,6 @@
xdg.enable = true;
xdg.configFile = {
"alacritty" = {
recursive = true;
source = ../../modules/old_configs/alacritty;
};
"contour" = {
recursive = true;
source = ../../modules/old_configs/contour;
@@ -167,109 +167,94 @@
# BEGIN PROGRAMS
programs.bash = {
enable = true;
enableCompletion = true;
enableVteIntegration = true;
initExtra =''
if [[ -z $ORIG_SHLVL ]]; then
export ORIG_SHLVL=$SHLVL
fi;
if [[ $SHLVL -gt $ORIG_SHLVL ]]; then
export PS1='\[\e[1;m\e[1;33m\e[1;m\] ($(($SHLVL - $ORIG_SHLVL))) \W\[\e[m\e[m\] 🐧 \[\e[1;32m\]~> \[\e[m\e[m\]'
else
export PS1='\[\e[1;m\e[1;33m\e[1;m\] \W\[\e[m\e[m\] 🐧 \[\e[1;32m\]~> \[\e[m\e[m\]'
fi;
set -o vi
'';
shellAliases = {
ls = "ls --color=auto";
ll = "ls -l";
la = "ls -lA";
ping = "ping -c 5";
kpx = "keepassxc-cli open";
nixbuild = "sudo nixos-rebuild switch --flake";
nixtest = "sudo nixos-rebuild test --flake";
vi = "\vim";
emacsd = "emacs --daemon";
emacsc = "emacsclient -c -a 'emacs'";
new = "source $HOME/.bashrc";
newbar = "pkill waybar; waybar &disown";
".." = "cd ..";
set-github-var = "export GITHUB=$(sed -n 2p ~/documents/.git_keys)";
set-gitlab-var = "export GITLAB=$(sed -n 4p ~/documents/.git_keys)";
};
};
programs.emacs = {
enable = true;
extraPackages = epkgs: [
# epkgs.nix-mode
# epkgs.magit
epkgs.pdf-tools
epkgs.org-pdftools
];
};
programs.feh.enable = true;
programs.git = {
enable = true;
diff-so-fancy.enable = true;
userEmail = "maloneliam@proton.me";
userName = "Liam Malone";
};
programs.neovim = {
enable = true;
package = pkgs.neovim-unwrapped;
vimAlias = true;
vimdiffAlias = true;
};
programs.obs-studio = {
programs = {
bash = {
enable = true;
enableCompletion = true;
enableVteIntegration = true;
initExtra =''
if [[ -z $ORIG_SHLVL ]]; then
export ORIG_SHLVL=$SHLVL
fi;
if [[ $SHLVL -gt $ORIG_SHLVL ]]; then
export PS1='\[\e[1;m\e[1;33m\e[1;m\] ($(($SHLVL - $ORIG_SHLVL))) \W\[\e[m\e[m\] 🐧 \[\e[1;32m\]~> \[\e[m\e[m\]'
else
export PS1='\[\e[1;m\e[1;33m\e[1;m\] \W\[\e[m\e[m\] 🐧 \[\e[1;32m\]~> \[\e[m\e[m\]'
fi;
set -o vi
'';
shellAliases = {
ls = "ls --color=auto";
ll = "ls -l";
la = "ls -lA";
ping = "ping -c 5";
kpx = "keepassxc-cli open";
nixbuild = "sudo nixos-rebuild switch --flake";
nixtest = "sudo nixos-rebuild test --flake";
vi = "\vim";
emacsd = "emacs --daemon";
emacsc = "emacsclient -c -a 'emacs'";
new = "source $HOME/.bashrc";
newbar = "pkill waybar; waybar &disown";
".." = "cd ..";
set-github-var = "export GITHUB=$(sed -n 2p ~/documents/.git_keys)";
set-gitlab-var = "export GITLAB=$(sed -n 4p ~/documents/.git_keys)";
};
};
emacs = {
enable = true;
extraPackages = epkgs: [
epkgs.pdf-tools
epkgs.org-pdftools
];
};
feh.enable = true;
git = {
enable = true;
diff-so-fancy.enable = true;
userEmail = "maloneliam@proton.me";
userName = "Liam Malone";
};
neovim = {
enable = true;
package = pkgs.neovim-unwrapped;
vimAlias = true;
vimdiffAlias = true;
};
obs-studio = {
enable = true;
};
swaylock.enable = true;
waybar = {
enable = true;
systemd.enable = true;
systemd.target = "hyprland-session.target";
};
wofi.enable = true;
};
programs.swaylock.enable = true;
programs.waybar = {
enable = true;
systemd.enable = true;
systemd.target = "hyprland-session.target";
};
programs.wofi.enable = true;
# BEGIN SERVICES
services.blueman-applet.enable = true;
services.dunst = {
enable = true;
# waylandDisplay = true;
};
services.emacs = {
enable = true;
client = {
services = {
blueman-applet.enable = true;
emacs = {
enable = true;
arguments = [
"-c"
"-a emacs"
];
client = {
enable = true;
arguments = [
"-c"
"-a emacs"
];
};
startWithUserSession = true;
};
startWithUserSession = true;
gnome-keyring.enable = true;
gpg-agent = {
enable = true;
defaultCacheTtl = 1800;
enableSshSupport = true;
};
nextcloud-client.enable = true;
swayidle.enable = true;
};
# services.flameshot = {
# enable = true;
# settings = {
# General = {
# disabledTrayIcon = true;
# showStartupLaunchMessage = false;
# };
# };
# };
services.gnome-keyring.enable = true;
services.gpg-agent = {
enable = true;
defaultCacheTtl = 1800;
enableSshSupport = true;
};
services.nextcloud-client.enable = true;
services.swayidle.enable = true;
}