more gnome
This commit is contained in:
parent
fb9fcd3648
commit
a3c26357c5
8
.envrc
8
.envrc
|
@ -9,12 +9,16 @@ if ! test -s .direnv/pull-date || test "$now" != "$(cat .direnv/pull-date)"; the
|
||||||
echo "$now" > .direnv/pull-date
|
echo "$now" > .direnv/pull-date
|
||||||
fi
|
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
|
if test -s .remote.toml; then
|
||||||
use flake .#remote
|
use flake .#remote
|
||||||
echo
|
echo
|
||||||
echo "Current remote: $(remote-host)"
|
echo "Current remote: $(remote-host)"
|
||||||
tomlq <.remote.toml '.hosts | to_entries[] | "remote-set \(.key+1) # -> \(.value.host)"' -r
|
tomlq <.remote.toml '.hosts | to_entries[] | "remote-set \(.key+1) # -> \(.value.host)"' -r
|
||||||
echo
|
echo
|
||||||
elif ! command -v nixos-rebuild >/dev/null; then
|
|
||||||
use flake .#non-nixos
|
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -15,6 +15,8 @@
|
||||||
* [x] Make a flake
|
* [x] Make a flake
|
||||||
* [x] merge hosted docs into a single subdomain
|
* [x] merge hosted docs into a single subdomain
|
||||||
* [x] Setup some remote-development and deploy flow
|
* [x] Setup some remote-development and deploy flow
|
||||||
|
* [ ] xclip
|
||||||
|
* [ ] xforwarding over ssh
|
||||||
* [ ] autogenerate ssh keys
|
* [ ] autogenerate ssh keys
|
||||||
* [ ] switch to systemd networkd
|
* [ ] switch to systemd networkd
|
||||||
* [ ] pre-commit hook with 'nix eval ...outPath'
|
* [ ] pre-commit hook with 'nix eval ...outPath'
|
||||||
|
|
|
@ -115,14 +115,15 @@
|
||||||
};
|
};
|
||||||
non-nixos = nixpkgs.legacyPackages.${system}.mkShell {
|
non-nixos = nixpkgs.legacyPackages.${system}.mkShell {
|
||||||
packages = with nixpkgs.legacyPackages.${system}; [
|
packages = with nixpkgs.legacyPackages.${system}; [
|
||||||
|
(writeScriptBin "nixos-rebuild" ''
|
||||||
|
exec ${nixos-rebuild}/bin/nixos-rebuild "$@" |& ${nix-output-monitor}/bin/nom
|
||||||
|
'')
|
||||||
nix-output-monitor
|
nix-output-monitor
|
||||||
nixos-rebuild
|
|
||||||
home-manager
|
home-manager
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
remote = nixpkgs.legacyPackages.${system}.mkShell {
|
remote = nixpkgs.legacyPackages.${system}.mkShell {
|
||||||
packages = with nixpkgs.legacyPackages.${system}; [
|
packages = with nixpkgs.legacyPackages.${system}; [
|
||||||
nix-output-monitor
|
|
||||||
self.packages.${system}.remote-exec
|
self.packages.${system}.remote-exec
|
||||||
yq
|
yq
|
||||||
];
|
];
|
||||||
|
|
|
@ -24,8 +24,8 @@
|
||||||
../../users/pbsds
|
../../users/pbsds
|
||||||
|
|
||||||
../../profiles/desktop/gnome # with gdm
|
../../profiles/desktop/gnome # with gdm
|
||||||
../../profiles/desktop/sound/pulseaudio.nix
|
#../../profiles/desktop/sound/pulseaudio.nix
|
||||||
#../../profiles/desktop/sound/pipewire.nix
|
../../profiles/desktop/sound/pipewire.nix
|
||||||
#../../profiles/desktop/sound/alsa.nix
|
#../../profiles/desktop/sound/alsa.nix
|
||||||
|
|
||||||
../../profiles/desktop/steam.nix
|
../../profiles/desktop/steam.nix
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
lxterminal
|
lxterminal
|
||||||
|
ffmpegthumbnailer
|
||||||
gnomeExtensions.appindicator
|
gnomeExtensions.appindicator
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
hardware.pulseaudio.enable = false; # gnome defaults it to true
|
hardware.pulseaudio.enable = false; # gnome defaults it to true
|
||||||
|
|
||||||
|
@ -12,5 +13,9 @@
|
||||||
# no need to redefine it in your config for now)
|
# no need to redefine it in your config for now)
|
||||||
#services.pipewire.media-session.enable = true;
|
#services.pipewire.media-session.enable = true;
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
easyeffects
|
||||||
|
];
|
||||||
|
|
||||||
security.rtkit.enable = true; # optional
|
security.rtkit.enable = true; # optional
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,5 +7,9 @@
|
||||||
#hardware.pulseaudio.support32Bit = true;
|
#hardware.pulseaudio.support32Bit = true;
|
||||||
nixpkgs.config.pulseaudio = true;
|
nixpkgs.config.pulseaudio = true;
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
pulseeffects-legacy
|
||||||
|
];
|
||||||
|
|
||||||
security.rtkit.enable = true; # optional
|
security.rtkit.enable = true; # optional
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,7 @@ in
|
||||||
|
|
||||||
options = with lib; {
|
options = with lib; {
|
||||||
services.domeneshop-updater.target = mkOption {
|
services.domeneshop-updater.target = mkOption {
|
||||||
type = types.string;
|
type = types.str;
|
||||||
#default = config.networking.fqdn;
|
#default = config.networking.fqdn;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{ config, pkgs, lib, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
# TODO: wireguard
|
||||||
|
#boot.kernelParams = [ "nfs.nfs4_disable_idmapping=0" "nfsd.nfs4_disable_idmapping=0" ];
|
||||||
|
|
||||||
fileSystems = let
|
fileSystems = let
|
||||||
mkMount = mountpoint: server: subdir: {
|
mkMount = mountpoint: server: subdir: {
|
||||||
|
|
|
@ -9,18 +9,6 @@ let
|
||||||
# find 'publicKey' with `ssh-keyscan`
|
# find 'publicKey' with `ssh-keyscan`
|
||||||
|
|
||||||
remotes = [
|
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" ];
|
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=";
|
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"];
|
systems = ["x86_64-linux"];
|
||||||
hostName = "isvegg.pvv.ntnu.no";
|
hostName = "isvegg.pvv.ntnu.no";
|
||||||
|
|
|
@ -7,9 +7,4 @@
|
||||||
./profiles/mpv.nix
|
./profiles/mpv.nix
|
||||||
./profiles/desktop.nix
|
./profiles/desktop.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
|
||||||
gnome.eog
|
|
||||||
];
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,7 +10,8 @@
|
||||||
scrcpy
|
scrcpy
|
||||||
slack
|
slack
|
||||||
#spotify
|
#spotify
|
||||||
transmission-remote-gtk
|
transgui #transmission-remote-gtk
|
||||||
|
gnome.eog
|
||||||
];
|
];
|
||||||
|
|
||||||
# flatpak
|
# flatpak
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
gnomeExtensions.vertical-overview
|
gnomeExtensions.vertical-overview
|
||||||
gnomeExtensions.appindicator
|
gnomeExtensions.appindicator
|
||||||
gnomeExtensions.removable-drive-menu
|
gnomeExtensions.removable-drive-menu
|
||||||
|
gnomeExtensions.always-show-titles-in-overview
|
||||||
/* TODO:
|
/* TODO:
|
||||||
gnomeExtensions.night-light-slider
|
gnomeExtensions.night-light-slider
|
||||||
gnomeExtensions.tray-icons-reloaded
|
gnomeExtensions.tray-icons-reloaded
|
||||||
|
@ -50,6 +51,7 @@
|
||||||
"vertical-overview@RensAlthuis.github.com"
|
"vertical-overview@RensAlthuis.github.com"
|
||||||
"appindicatorsupport@rgcjonas.gmail.com"
|
"appindicatorsupport@rgcjonas.gmail.com"
|
||||||
"drive-menu@gnome-shell-extensions.gcampax.github.com"
|
"drive-menu@gnome-shell-extensions.gcampax.github.com"
|
||||||
|
"Always-Show-Titles-In-Overview@gmail.com"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -6,6 +6,6 @@
|
||||||
programs.mpv.bindings."n" = "sub-seek 1";
|
programs.mpv.bindings."n" = "sub-seek 1";
|
||||||
programs.mpv.bindings."SHIFT+n" = "sub-seek -1";
|
programs.mpv.bindings."SHIFT+n" = "sub-seek -1";
|
||||||
programs.mpv.bindings."b" = ''cycle-values audio-channels 2 "auto"'';
|
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 ];
|
programs.mpv.scripts = with pkgs.mpvScripts; [ thumbnail ];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue