From 4eaf76cf1e0af9ec7a630320bb7d4956041dd03e Mon Sep 17 00:00:00 2001 From: sils Date: Thu, 4 May 2023 18:17:38 +0200 Subject: Structure(treewide): Use new structure with home-manager home-manager enables great possibilities and is part of simplifying the structure of my config. --- sys/services/flatpak/default.nix | 11 ++++++++++ sys/services/zsh/default.nix | 44 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 sys/services/flatpak/default.nix create mode 100644 sys/services/zsh/default.nix (limited to 'sys/services') diff --git a/sys/services/flatpak/default.nix b/sys/services/flatpak/default.nix new file mode 100644 index 0000000..d1f4586 --- /dev/null +++ b/sys/services/flatpak/default.nix @@ -0,0 +1,11 @@ +{...}: { + services.flatpak.enable = true; + fileSystems."/var/lib/flatpak" = { + device = "/srv/flatpak"; + options = ["bind"]; + }; + # xdg.portal = { + # enable = true; + # extraPortals = [pkgs.xdg-desktop-portal-gtk]; + # }; +} diff --git a/sys/services/zsh/default.nix b/sys/services/zsh/default.nix new file mode 100644 index 0000000..b8349f9 --- /dev/null +++ b/sys/services/zsh/default.nix @@ -0,0 +1,44 @@ +{pkgs, ...}: { + programs.zsh = { + enable = true; + syntaxHighlighting.enable = true; + autosuggestions.enable = true; + interactiveShellInit = '' + export ZSH=${pkgs.oh-my-zsh}/share/oh-my-zsh/ + export fpath=("$XDG_DATA_HOME/zsh/site-functions" $fpath) + HISTFILE="$XDG_STATE_HOME/zsh/history" + + plugins=(git) + + alias vim="nvim" + alias ls='lsd' + alias l='ls -l' + alias la='ls -a' + alias lla='ls -la' + alias lt='ls --tree' + alias rebackup='restic -r /mnt/storage/backups --password-file ~/srv/restic_pswd backup' + alias repreconf='restic -r /mnt/storage/backups --password-file ~/srv/restic_pswd' + alias b-del="sudo btrfs subv delet /srv/snapshots/home" + alias b-shot="sudo btrfs subvolume snapshot -r /home /srv/snapshots/home" + alias b-home='[ -d /srv/snapshots/home ] && sudo btrfs subvolume delete /srv/snapshots/home; sudo btrfs subvolume snapshot -r /home /srv/snapshots/home; sudo restic -r /mnt/storage/backups --password-file ~/srv/restic_pswd --cache-dir /srv/.restic-cache backup /srv/snapshots/home;' + alias r-clean="sudo restic -r /mnt/storage/backups --password-file ~/srv/restic_pswd --cache-dir /srv/.restic-cache forget \ + --keep-weekly 7 \ + --keep-daily 7 \ + --keep-monthly 6 \ + --keep-yearly 10 \ + --keep-hourly 5 \ + --keep-tag prs" + alias r-prune="sudo restic -r /mnt/storage/backups --password-file ~/srv/restic_pswd --cache-dir /srv/.restic-cache prune" + alias r-check="sudo restic -r /mnt/storage/backups --cache-dir /srv/.restic-cache --password-file ~/srv/.restic_pswd check" + alias zconf="vim ~/.config/zsh/.zshrc" + alias zenv="vim ~/.config/zsh/.zshenv" + alias o="xdg-open" + alias wget=wget --hsts-file="$XDG_DATA_HOME/wget-hsts" + + + source $ZSH/oh-my-zsh.sh + ''; + + promptInit = "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; + }; +} -- cgit 1.4.1