pederbs/config
pederbs
/
config
2
1
Fork 0
Code Issues Pull Requests Releases Activity

more gnome

This commit is contained in:
Peder Bergebakken Sundt 2023-03-11 15:59:56 +01:00
parent fb9fcd3648
commit a3c26357c5
14 changed files with 51 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.envrc
View File

@ -4,17 +4,21 @@ git config --local core.hooksPath "$PWD"/.githooks
test -d .direnv || mkdir -p .direnv
now="$(date +%Y-%m-%d)"
if ! test -s .direnv/pull-date || test "$now" != "$(cat .direnv/pull-date)"; then
git pull --rebase --autostash
nix flake update
echo "$now" > .direnv/pull-date
git pull --rebase --autostash
nix flake update
echo "$now" > .direnv/pull-date
fi
if command -v nixos-rebuild >/dev/null; then
use flake .#nomos-rebuild
elif ! command -v nixos-rebuild >/dev/null; then
use flake .#non-nixos
fi
if test -s .remote.toml; then
use flake .#remote
echo
echo "Current remote: $(remote-host)"
tomlq <.remote.toml '.hosts | to_entries[] | "remote-set \(.key+1) # -> \(.value.host)"' -r
echo
elif ! command -v nixos-rebuild >/dev/null; then
use flake .#non-nixos
use flake .#remote
echo
echo "Current remote: $(remote-host)"
tomlq <.remote.toml '.hosts | to_entries[] | "remote-set \(.key+1) # -> \(.value.host)"' -r
echo
fi

2
README.md
View File

@ -15,6 +15,8 @@
* [x] Make a flake
* [x] merge hosted docs into a single subdomain
* [x] Setup some remote-development and deploy flow
* [ ] xclip
* [ ] xforwarding over ssh
* [ ] autogenerate ssh keys
* [ ] switch to systemd networkd
* [ ] pre-commit hook with 'nix eval ...outPath'

5
flake.nix
View File

@ -115,14 +115,15 @@
};
non-nixos = nixpkgs.legacyPackages.${system}.mkShell {
packages = with nixpkgs.legacyPackages.${system}; [
(writeScriptBin "nixos-rebuild" ''
exec ${nixos-rebuild}/bin/nixos-rebuild "$@" |& ${nix-output-monitor}/bin/nom
'')
nix-output-monitor
nixos-rebuild
home-manager
];
};
remote = nixpkgs.legacyPackages.${system}.mkShell {
packages = with nixpkgs.legacyPackages.${system}; [
nix-output-monitor
self.packages.${system}.remote-exec
yq
];

4
hosts/nord/default.nix
View File

@ -24,8 +24,8 @@
../../users/pbsds
../../profiles/desktop/gnome # with gdm
../../profiles/desktop/sound/pulseaudio.nix
#../../profiles/desktop/sound/pipewire.nix
#../../profiles/desktop/sound/pulseaudio.nix
../../profiles/desktop/sound/pipewire.nix
#../../profiles/desktop/sound/alsa.nix
../../profiles/desktop/steam.nix

1
profiles/desktop/gnome/default.nix
View File

@ -17,6 +17,7 @@
environment.systemPackages = with pkgs; [
lxterminal
ffmpegthumbnailer
gnomeExtensions.appindicator
];

5
profiles/desktop/sound/pipewire.nix
View File

@ -1,3 +1,4 @@
{ pkgs, ... }:
{
hardware.pulseaudio.enable = false; # gnome defaults it to true
@ -12,5 +13,9 @@
# no need to redefine it in your config for now)
#services.pipewire.media-session.enable = true;
environment.systemPackages = with pkgs; [
easyeffects
];
security.rtkit.enable = true; # optional
}

4
profiles/desktop/sound/pulseaudio.nix
View File

@ -7,5 +7,9 @@
#hardware.pulseaudio.support32Bit = true;
nixpkgs.config.pulseaudio = true;
environment.systemPackages = with pkgs; [
pulseeffects-legacy
];
security.rtkit.enable = true; # optional
}

2
profiles/domeneshop-dyndns/default.nix
View File

@ -7,7 +7,7 @@ in
options = with lib; {
services.domeneshop-updater.target = mkOption {
type = types.string;
type = types.str;
#default = config.networking.fqdn;
};
};

3
profiles/nfs/reidun.nix
View File

@ -1,6 +1,7 @@
{ config, pkgs, lib, ... }:
{
# TODO: wireguard
#boot.kernelParams = [ "nfs.nfs4_disable_idmapping=0" "nfsd.nfs4_disable_idmapping=0" ];
fileSystems = let
mkMount = mountpoint: server: subdir: {

24
profiles/remote-builders/default.nix
View File

@ -9,18 +9,6 @@ let
# find 'publicKey' with `ssh-keyscan`
remotes = [
/** /
{
systems = [ "x86_64-linux" "wasm32-wasi" "wasm64-wasi" "x86_64-windows" "aarch64-linux" "riscv64-linux" ];
hostName = "nord.pbsds.net"; # TODO: port 24
sshUser = "pbsds";
maxJobs = 2; # 4 cores
#maxJobs = 1; # at least for big-parallel
speedFactor = 2;
supportedFeatures = [ "kvm" "big-parallel" "nixos-test" ];
#mandatoryFeatures = [ ];
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIBSdIUtUfAxnVbPDmDDFdP2S3Wd3+CC8IfZAANJ76oh";
}
/**/
{
systems = [ "x86_64-linux" "wasm32-wasi" "wasm64-wasi" "x86_64-windows" "aarch64-linux" "riscv64-linux" ];
@ -65,6 +53,18 @@ let
proxy.publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGurF7rdnrDP/VgIK2Tx38of+bX/QGCGL+alrWnZ1Ca5llGneMulUt1RB9xZzNLHiaWIE+HOP0i4spEaeZhilfU=";
}
/**/
{
systems = [ "x86_64-linux" "wasm32-wasi" "wasm64-wasi" "x86_64-windows" "aarch64-linux" "riscv64-linux" ];
hostName = "nord.pbsds.net"; # TODO: port 24
sshUser = "pbsds";
maxJobs = 2; # 4 cores
#maxJobs = 1; # at least for big-parallel
speedFactor = 2;
supportedFeatures = [ "kvm" "big-parallel" "nixos-test" ];
#mandatoryFeatures = [ ];
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIBSdIUtUfAxnVbPDmDDFdP2S3Wd3+CC8IfZAANJ76oh";
}
/**/
{
systems = ["x86_64-linux"];
hostName = "isvegg.pvv.ntnu.no";

5
users/pbsds/home/gnome.nix
View File

@ -7,9 +7,4 @@
./profiles/mpv.nix
./profiles/desktop.nix
];
home.packages = with pkgs; [
gnome.eog
];
}

3
users/pbsds/home/profiles/desktop.nix
View File

@ -10,7 +10,8 @@
scrcpy
slack
#spotify
transmission-remote-gtk
transgui #transmission-remote-gtk
gnome.eog
];
# flatpak

2
users/pbsds/home/profiles/gnome/default.nix
View File

@ -25,6 +25,7 @@
gnomeExtensions.vertical-overview
gnomeExtensions.appindicator
gnomeExtensions.removable-drive-menu
gnomeExtensions.always-show-titles-in-overview
/* TODO:
gnomeExtensions.night-light-slider
gnomeExtensions.tray-icons-reloaded
@ -50,6 +51,7 @@
"vertical-overview@RensAlthuis.github.com"
"appindicatorsupport@rgcjonas.gmail.com"
"drive-menu@gnome-shell-extensions.gcampax.github.com"
"Always-Show-Titles-In-Overview@gmail.com"
];
};

2
users/pbsds/home/profiles/mpv.nix
View File

@ -6,6 +6,6 @@
programs.mpv.bindings."n" = "sub-seek 1";
programs.mpv.bindings."SHIFT+n" = "sub-seek -1";
programs.mpv.bindings."b" = ''cycle-values audio-channels 2 "auto"'';
#programs.mpv.config
programs.mpv.config.osc = "no"; # likely a thumbnail requirement
programs.mpv.scripts = with pkgs.mpvScripts; [ thumbnail ];
}