diff --git a/hosts/nixos/garp/configuration.nix b/hosts/nixos/garp/configuration.nix index 92276d0..cb7be24 100644 --- a/hosts/nixos/garp/configuration.nix +++ b/hosts/nixos/garp/configuration.nix @@ -18,7 +18,6 @@ #boot.kernelPackages = pkgs.linuxPackages_latest; #hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.latest; #hardware.nvidia.modesetting.enable = false; # makes atom behave, but mpv refuses to start - /**/ # PRIME: (lspci) #hardware.nvidia.prime.intelBusId = "PCI:0:02:0"; @@ -39,25 +38,14 @@ ../../../profiles/shell.nix - #../../../profiles/desktop - #../../../profiles/desktop/gnome # configures gdm - ##../../../profiles/desktop/sound/alsa.nix - ##../../../profiles/desktop/sound/pulseaudio.nix - #../../../profiles/desktop/sound/pipewire.nix - ../../../profiles/domeneshop-dyndns.nix ../../../profiles/known-hosts.nix ]; services.domeneshop-updater.targets = [ config.networking.fqdn ]; - #networking.firewall.allowedTCPPorts = [ 57621 ]; # spotify local discovery - # Networking networking.networkmanager.enable = true; # TODO: remove? Move? programs.dconf.enable = true; - - # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; } diff --git a/users/pbsds/home/profiles/desktop/default.nix b/users/pbsds/home/profiles/desktop/default.nix index 794e848..28cf799 100644 --- a/users/pbsds/home/profiles/desktop/default.nix +++ b/users/pbsds/home/profiles/desktop/default.nix @@ -34,7 +34,7 @@ #nheko #fluffychat - libreoffice + (pkgs.onlyoffice-desktopeditors or pkgs.libreoffice) emote normcap # doesn't work on wayland diff --git a/users/pbsds/home/profiles/desktop/gnome/dconf-gnome-bindings.nix b/users/pbsds/home/profiles/desktop/gnome/dconf-gnome-bindings.nix index 960693d..284591f 100644 --- a/users/pbsds/home/profiles/desktop/gnome/dconf-gnome-bindings.nix +++ b/users/pbsds/home/profiles/desktop/gnome/dconf-gnome-bindings.nix @@ -147,7 +147,7 @@ with lib.hm.gvariant; "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom13" = { binding = "Print"; - command = "normcap"; + command = "systemd-run --user normcap"; name = "normcap OCR"; }; diff --git a/users/pbsds/home/profiles/desktop/mime.nix b/users/pbsds/home/profiles/desktop/mime.nix index 4c1cb4f..9291e6f 100644 --- a/users/pbsds/home/profiles/desktop/mime.nix +++ b/users/pbsds/home/profiles/desktop/mime.nix @@ -4,6 +4,7 @@ # TODO: mod-music # TODO: vgmstream # TODO: 3d +# TODO: onlyoffice let mime-map = { diff --git a/users/pbsds/home/profiles/git.nix b/users/pbsds/home/profiles/git.nix index 3532963..c703815 100644 --- a/users/pbsds/home/profiles/git.nix +++ b/users/pbsds/home/profiles/git.nix @@ -3,7 +3,26 @@ home.packages = with pkgs; [ #git gh - hub + #hub + (pkgs.symlinkJoin { + inherit (pkgs.hub) name meta; + paths = [ pkgs.hub ]; + postBuild = '' + rm $out/bin/hub + cat <<"EOF" >$out/bin/hub + #!${pkgs.runtimeShell} + + # https://hub.github.com/hub.1.html#github-oauth-authentication + if [[ ! -d ~/.config/hub ]]; then + export GITHUB_TOKEN=$(${pkgs.gh}/bin/gh auth token 2>/dev/null) + fi + + exec -a "$0" ${pkgs.hub}/bin/hub "$@" + EOF + chmod +x $out/bin/hub + ''; + }) + tea colordiff ]; diff --git a/users/pbsds/home/profiles/shell.nix b/users/pbsds/home/profiles/shell.nix index 57bd7c5..f9bd2ba 100644 --- a/users/pbsds/home/profiles/shell.nix +++ b/users/pbsds/home/profiles/shell.nix @@ -1,4 +1,12 @@ { pkgs, lib, config, ... }: + +let + + _tmp_func_name = "_tmp_func_Oaw5aifeeniezeiquonaipheNahthae9caik4Rai"; # pwgen ftw + mkArgsAlias = alias: ''${_tmp_func_name}() { ${alias}; unset -f ${_tmp_func_name}; }; ${_tmp_func_name}''; + +in + { # TODO: "bind -s 'set completion-ignore-case on'" programs.bash.enable = true; @@ -144,16 +152,29 @@ #home.shellAliases.mv = "mv -i"; #home.shellAliases.cp = "cp -i"; - home.shellAliases.inom-build = "nom-build --system i686-linux -j0"; - home.shellAliases.inix-build = "nix-build --system i686-linux -j0"; - home.shellAliases.rnom-build = "nom-build --system riscv64-linux -j0"; - home.shellAliases.rnix-build = "nix-build --system riscv64-linux -j0"; - home.shellAliases.fnom-build = "nom-build --system x86_64-freebsd -j0"; - home.shellAliases.fnix-build = "nix-build --system x86_64-freebsd -j0"; - home.shellAliases.anom-build = "nom-build --system aarch64-linux -j0"; - home.shellAliases.anix-build = "nix-build --system aarch64-linux -j0"; - home.shellAliases.dnom-build = "nom-build --system x86_64-darwin -j0"; - home.shellAliases.dnix-build = "nix-build --system x86_64-darwin -j0"; + home.shellAliases.inom = mkArgsAlias ''nom "$@" --system i686-linux -j0''; + home.shellAliases.inix = mkArgsAlias ''nix "$@" --system i686-linux -j0''; + home.shellAliases.rnom = mkArgsAlias ''nom "$@" --system riscv64-linux -j0''; + home.shellAliases.rnix = mkArgsAlias ''nix "$@" --system riscv64-linux -j0''; + home.shellAliases.fnom = mkArgsAlias ''nom "$@" --system x86_64-freebsd -j0''; + home.shellAliases.fnix = mkArgsAlias ''nix "$@" --system x86_64-freebsd -j0''; + home.shellAliases.anom = mkArgsAlias ''nom "$@" --system aarch64-linux -j0''; + home.shellAliases.anix = mkArgsAlias ''nix "$@" --system aarch64-linux -j0''; + home.shellAliases.dnom = mkArgsAlias ''nom "$@" --system x86_64-darwin -j0''; + home.shellAliases.dnix = mkArgsAlias ''nix "$@" --system x86_64-darwin -j0''; + home.shellAliases.danom = mkArgsAlias ''nom "$@" --system aarch64-darwin -j0''; + home.shellAliases.danix = mkArgsAlias ''nix "$@" --system aarch64-darwin -j0''; + + home.shellAliases.inom-build = "nom-build --system i686-linux -j0"; + home.shellAliases.inix-build = "nix-build --system i686-linux -j0"; + home.shellAliases.rnom-build = "nom-build --system riscv64-linux -j0"; + home.shellAliases.rnix-build = "nix-build --system riscv64-linux -j0"; + home.shellAliases.fnom-build = "nom-build --system x86_64-freebsd -j0"; + home.shellAliases.fnix-build = "nix-build --system x86_64-freebsd -j0"; + home.shellAliases.anom-build = "nom-build --system aarch64-linux -j0"; + home.shellAliases.anix-build = "nix-build --system aarch64-linux -j0"; + home.shellAliases.dnom-build = "nom-build --system x86_64-darwin -j0"; + home.shellAliases.dnix-build = "nix-build --system x86_64-darwin -j0"; home.shellAliases.danom-build = "nom-build --system aarch64-darwin -j0"; home.shellAliases.danix-build = "nix-build --system aarch64-darwin -j0";