Compare commits
40 changed files with 338 additions and 863 deletions
|
|
@ -1,8 +1,56 @@
|
||||||
{
|
{
|
||||||
|
inputs,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
|
nixpkgs.overlays = [
|
||||||
|
(final: prev: {
|
||||||
|
gnome = prev.gnome // {
|
||||||
|
nixos-gsettings-overrides = prev.gnome.nixos-gsettings-overrides.override {
|
||||||
|
glib = final.buildPackages.glib;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# Meson looks for gio and gdbus-codegen for the build machine
|
||||||
|
gnome-session = prev.gnome-session.overrideAttrs (old: {
|
||||||
|
depsBuildBuild = (old.depsBuildBuild or [ ]) ++ [
|
||||||
|
final.pkgsBuildBuild.pkg-config
|
||||||
|
final.pkgsBuildBuild.glib
|
||||||
|
];
|
||||||
|
});
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
# TODO: flutter apps don't cross compile, and the flake's package isn't cached
|
# TODO: flutter apps don't cross compile, and the flake's package isn't cached
|
||||||
programs.nexus.enable = lib.mkForce false;
|
programs.nexus.enable = lib.mkForce false;
|
||||||
|
|
||||||
|
# The cache builder doesn't find gtk-query-immodules-3.0 when cross compiling,
|
||||||
|
# and GNOME Shell connects apps to IBus itself, so the GTK module isn't used anyway.
|
||||||
|
i18n.inputMethod.enableGtk3 = false;
|
||||||
|
|
||||||
|
# Needs python gi on the build machine, and only connects desktop browsers to
|
||||||
|
# extensions.gnome.org anyway.
|
||||||
|
services.gnome.gnome-browser-connector.enable = false;
|
||||||
|
|
||||||
|
# nix-maid runs the host mustache-go at build time, swap in a copy of its core
|
||||||
|
# module that uses the build platform's one for that step.
|
||||||
|
# TODO: upstream (use pkgs.buildPackages.mustache-go in core.nix)
|
||||||
|
maid.sharedModules =
|
||||||
|
let
|
||||||
|
core = "${inputs.nix-maid}/src/maid/modules/core.nix";
|
||||||
|
in
|
||||||
|
[
|
||||||
|
{
|
||||||
|
disabledModules = [ core ];
|
||||||
|
imports = [
|
||||||
|
(builtins.toFile "nix-maid-core.nix" (
|
||||||
|
builtins.replaceStrings
|
||||||
|
[ "import ../vars.nix" "lib.getExe pkgs.mustache-go" ]
|
||||||
|
[ "import ${inputs.nix-maid}/src/maid/vars.nix" "lib.getExe pkgs.buildPackages.mustache-go" ]
|
||||||
|
(builtins.readFile core)
|
||||||
|
))
|
||||||
|
];
|
||||||
|
}
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
|
cfg = config.quadphone;
|
||||||
host = config.nixpkgs.hostPlatform;
|
host = config.nixpkgs.hostPlatform;
|
||||||
|
|
||||||
otherOverlays = lib.init config.nixpkgs.overlays;
|
otherOverlays = lib.init config.nixpkgs.overlays;
|
||||||
|
|
@ -40,7 +41,8 @@ let
|
||||||
let
|
let
|
||||||
name = lib.concatStringsSep "." path;
|
name = lib.concatStringsSep "." path;
|
||||||
in
|
in
|
||||||
builtins.match toolchainRegex name == null
|
!(builtins.elem name cfg.crossPackages)
|
||||||
|
&& builtins.match toolchainRegex name == null
|
||||||
&& lib.isDerivation native
|
&& lib.isDerivation native
|
||||||
&& lib.meta.availableOn host native
|
&& lib.meta.availableOn host native
|
||||||
&& (native.meta.license.free or true)
|
&& (native.meta.license.free or true)
|
||||||
|
|
@ -94,6 +96,15 @@ let
|
||||||
v;
|
v;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
options.quadphone.crossPackages = lib.mkOption {
|
||||||
|
type = with lib.types; listOf str;
|
||||||
|
default = [ ];
|
||||||
|
description = ''
|
||||||
|
Top-level attribute names that should always be cross-compiled instead of
|
||||||
|
substituted from the binary cache (i.e. ones that turn out not to be cached).
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
nixpkgs.buildPlatform = "x86_64-linux";
|
nixpkgs.buildPlatform = "x86_64-linux";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
{
|
|
||||||
# The image is built with an empty LUKS passphrase (systemd-repart can't take a
|
|
||||||
# key file through the NixOS image builder). After flashing, set a real passphrase
|
|
||||||
# and rotate the volume key, since the image's key is sitting in the nix store:
|
|
||||||
# run0 systemd-cryptenroll --password --wipe-slot=empty /dev/disk/by-partlabel/nixos
|
|
||||||
# run0 cryptsetup reencrypt /dev/disk/by-partlabel/nixos
|
|
||||||
image.repart.partitions."30-root".repartConfig.Encrypt = "key-file";
|
|
||||||
|
|
||||||
boot.initrd = {
|
|
||||||
luks.forceLuksSupportInInitrd = true;
|
|
||||||
unl0kr = {
|
|
||||||
enable = true;
|
|
||||||
settings = {
|
|
||||||
general.backend = "drm";
|
|
||||||
theme = {
|
|
||||||
default = "nord-dark";
|
|
||||||
alternate = "nord-light";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
systemd.settings.Manager.DefaultDeviceTimeoutSec = "infinity";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,58 +0,0 @@
|
||||||
{ pkgs, ... }:
|
|
||||||
let
|
|
||||||
# Sets VCP 0xD6 (power mode) on every display: 01 = on, 05 = off (even monitors that say they don't support it are usually lying)
|
|
||||||
monitor-power = pkgs.writeShellApplication {
|
|
||||||
name = "monitor-power";
|
|
||||||
runtimeInputs = with pkgs; [
|
|
||||||
ddcutil
|
|
||||||
gnugrep
|
|
||||||
coreutils
|
|
||||||
];
|
|
||||||
text = ''
|
|
||||||
for bus in $(ddcutil detect --terse | grep -oP '/dev/i2c-\K\d+'); do
|
|
||||||
(for _ in 1 2 3 4 5; do ddcutil --bus "$bus" setvcp D6 "$1" && break; sleep 1; done) &
|
|
||||||
done
|
|
||||||
wait
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
in
|
|
||||||
{
|
|
||||||
hardware.i2c.enable = true;
|
|
||||||
environment.systemPackages = [
|
|
||||||
pkgs.ddcutil
|
|
||||||
monitor-power
|
|
||||||
];
|
|
||||||
|
|
||||||
systemd.services =
|
|
||||||
let
|
|
||||||
# ddcutil refuses to start without a cache dir, and services have no HOME
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "oneshot";
|
|
||||||
RemainAfterExit = true;
|
|
||||||
CacheDirectory = "ddcutil";
|
|
||||||
Environment = "XDG_CACHE_HOME=/var/cache";
|
|
||||||
};
|
|
||||||
in
|
|
||||||
{
|
|
||||||
monitor-power = {
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
after = [ "systemd-modules-load.service" ];
|
|
||||||
# Otherwise every rebuild that touches this unit blinks the monitors
|
|
||||||
restartIfChanged = false;
|
|
||||||
serviceConfig = serviceConfig // {
|
|
||||||
ExecStart = "${monitor-power}/bin/monitor-power 01";
|
|
||||||
ExecStop = "${monitor-power}/bin/monitor-power 05";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
monitor-power-sleep = {
|
|
||||||
wantedBy = [ "sleep.target" ];
|
|
||||||
before = [ "sleep.target" ];
|
|
||||||
unitConfig.StopWhenUnneeded = true;
|
|
||||||
serviceConfig = serviceConfig // {
|
|
||||||
ExecStart = "${monitor-power}/bin/monitor-power 05";
|
|
||||||
ExecStop = "${monitor-power}/bin/monitor-power 01";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -74,14 +74,10 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.services = {
|
systemd.services = {
|
||||||
caddy = {
|
caddy.serviceConfig.SupplementaryGroups = [
|
||||||
wants = [ "degoog.service" ];
|
|
||||||
after = [ "degoog.service" ];
|
|
||||||
serviceConfig.SupplementaryGroups = [
|
|
||||||
"degoog"
|
"degoog"
|
||||||
"oauth2-proxy"
|
"oauth2-proxy"
|
||||||
];
|
];
|
||||||
};
|
|
||||||
|
|
||||||
oauth2-proxy = {
|
oauth2-proxy = {
|
||||||
requires = [ "kanidm.service" ];
|
requires = [ "kanidm.service" ];
|
||||||
|
|
|
||||||
|
|
@ -339,8 +339,6 @@ in
|
||||||
serviceConfig = hardening // {
|
serviceConfig = hardening // {
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
RemainAfterExit = true;
|
RemainAfterExit = true;
|
||||||
Restart = "on-failure";
|
|
||||||
RestartSec = 5;
|
|
||||||
User = "kanidm";
|
User = "kanidm";
|
||||||
Group = "kanidm";
|
Group = "kanidm";
|
||||||
StateDirectory = "kanidm-bootstrap";
|
StateDirectory = "kanidm-bootstrap";
|
||||||
|
|
@ -399,10 +397,8 @@ in
|
||||||
kanidm-mail-sender = {
|
kanidm-mail-sender = {
|
||||||
description = "Kanidm mail sender";
|
description = "Kanidm mail sender";
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
wants = [
|
wants = [ "network-online.target" ];
|
||||||
"network-online.target"
|
requires = [ "kanidm-bootstrap.service" ];
|
||||||
"kanidm-bootstrap.service"
|
|
||||||
];
|
|
||||||
after = [
|
after = [
|
||||||
"network-online.target"
|
"network-online.target"
|
||||||
"kanidm-bootstrap.service"
|
"kanidm-bootstrap.service"
|
||||||
|
|
|
||||||
|
|
@ -76,6 +76,8 @@ in
|
||||||
"@nex:starstruck.systems"
|
"@nex:starstruck.systems"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
log = ''info,[transaction{origin="matrix.org"}]=debug,[transaction{origin="zirco.dev"}]=debug,[transaction{origin="starstruck.systems"}]=debug'';
|
||||||
|
|
||||||
well_known = {
|
well_known = {
|
||||||
support_email = "henry@henryhiles.com";
|
support_email = "henry@henryhiles.com";
|
||||||
support_mxid = "@quadradical:${domain}";
|
support_mxid = "@quadradical:${domain}";
|
||||||
|
|
|
||||||
|
|
@ -1,36 +0,0 @@
|
||||||
{ inputs, ... }:
|
|
||||||
{
|
|
||||||
imports = [ inputs.disko.nixosModules.disko ];
|
|
||||||
disko.devices.disk.main = {
|
|
||||||
type = "disk";
|
|
||||||
device = "/dev/nvme0n1";
|
|
||||||
content = {
|
|
||||||
type = "gpt";
|
|
||||||
partitions = {
|
|
||||||
ESP = {
|
|
||||||
size = "1G";
|
|
||||||
type = "EF00";
|
|
||||||
content = {
|
|
||||||
type = "filesystem";
|
|
||||||
format = "vfat";
|
|
||||||
mountpoint = "/boot";
|
|
||||||
mountOptions = [ "umask=0077" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
luks = {
|
|
||||||
size = "100%";
|
|
||||||
content = {
|
|
||||||
type = "luks";
|
|
||||||
name = "cryptroot";
|
|
||||||
settings.allowDiscards = true;
|
|
||||||
content = {
|
|
||||||
type = "filesystem";
|
|
||||||
format = "ext4";
|
|
||||||
mountpoint = "/";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
{
|
|
||||||
# Enroll after install with `fprintd-enroll`.
|
|
||||||
services.fprintd.enable = true;
|
|
||||||
}
|
|
||||||
|
|
@ -3,6 +3,6 @@
|
||||||
"--force-grab-cursor"
|
"--force-grab-cursor"
|
||||||
"-W 1920"
|
"-W 1920"
|
||||||
"-H 1080"
|
"-H 1080"
|
||||||
"-r 60"
|
"-r 120"
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,30 @@
|
||||||
{
|
{
|
||||||
boot = {
|
boot = {
|
||||||
initrd.availableKernelModules = [
|
initrd = {
|
||||||
"nvme"
|
availableKernelModules = [
|
||||||
"xhci_pci"
|
"xhci_pci"
|
||||||
|
"ahci"
|
||||||
|
"nvme"
|
||||||
|
"usb_storage"
|
||||||
|
"sd_mod"
|
||||||
];
|
];
|
||||||
kernelModules = [ "kvm-amd" ];
|
kernelModules = [ ];
|
||||||
|
};
|
||||||
|
kernelModules = [ "kvm-intel" ];
|
||||||
|
extraModulePackages = [ ];
|
||||||
};
|
};
|
||||||
|
|
||||||
hardware = {
|
fileSystems = {
|
||||||
amdgpu.initrd.enable = true;
|
"/" = {
|
||||||
cpu.amd.updateMicrocode = true;
|
device = "/dev/disk/by-uuid/15598217-e3e1-4922-b336-8e9f62fad939";
|
||||||
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
"/boot" = {
|
||||||
|
device = "/dev/disk/by-uuid/C6EC-B430";
|
||||||
|
fsType = "vfat";
|
||||||
|
options = [ "fmask=0022" "dmask=0022" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
hardware.cpu.intel.updateMicrocode = true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
19
clients/quadtop/nvidia.nix
Normal file
19
clients/quadtop/nvidia.nix
Normal file
|
|
@ -0,0 +1,19 @@
|
||||||
|
{
|
||||||
|
services.xserver.videoDrivers = [ "nvidia" ];
|
||||||
|
hardware.nvidia = {
|
||||||
|
prime = {
|
||||||
|
offload = {
|
||||||
|
enable = true;
|
||||||
|
enableOffloadCmd = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
intelBusId = "PCI:00:02:0";
|
||||||
|
nvidiaBusId = "PCI:01:00:0";
|
||||||
|
};
|
||||||
|
open = true;
|
||||||
|
nvidiaSettings = false;
|
||||||
|
nvidiaPersistenced = false;
|
||||||
|
dynamicBoost.enable = true;
|
||||||
|
powerManagement.finegrained = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
200
flake.lock
generated
200
flake.lock
generated
|
|
@ -74,26 +74,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"app-grid": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1794892850,
|
|
||||||
"narHash": "sha256-7kOT7EWzzNnKvuuPkTx9HciJ7Kd1ZrUbZJcwKgqq+w0=",
|
|
||||||
"ref": "refs/heads/main",
|
|
||||||
"rev": "ab0704e682c8b394edbec55c2b7b83d1601f7da8",
|
|
||||||
"revCount": 4,
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.federated.nexus/Henry-Hiles/app-grid"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.federated.nexus/Henry-Hiles/app-grid"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"base16": {
|
"base16": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"fromYaml": "fromYaml"
|
"fromYaml": "fromYaml"
|
||||||
|
|
@ -301,11 +281,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1795004531,
|
"lastModified": 1793997955,
|
||||||
"narHash": "sha256-3fvQO3U9rhUkBNxe56X6Ta5huTShZ2mtavi49o7tMvY=",
|
"narHash": "sha256-Smi0gGdpBHiowEIU1oNBkeUx+27VcYJpz2Z7X7hFC1I=",
|
||||||
"owner": "degoog-org",
|
"owner": "degoog-org",
|
||||||
"repo": "degoog",
|
"repo": "degoog",
|
||||||
"rev": "5490ca46096167cbf9b6f9480e7ac83726c0ce7e",
|
"rev": "cf012d9b639b9d5d874560ab69b31e02d29a6bb4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -799,11 +779,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1794948232,
|
"lastModified": 1794806514,
|
||||||
"narHash": "sha256-ngHNaADvk405ZLGgGK4j1AqbXTEVSQFN94Dw0KqSJI8=",
|
"narHash": "sha256-hRJv/aBOgTE5HnUFWi7yD1vTckeZ+WNIrrJ/hLhLQiM=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "51021d3af207c519ab5d9824af940d48ca9eabc1",
|
"rev": "c3d58126ff1351d85bc03a1139139324898559cb",
|
||||||
"revCount": 393,
|
"revCount": 383,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://codeberg.org/pastthepixels/gaypanel"
|
"url": "https://codeberg.org/pastthepixels/gaypanel"
|
||||||
},
|
},
|
||||||
|
|
@ -834,6 +814,25 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"gnome-mobile": {
|
||||||
|
"inputs": {
|
||||||
|
"gnome-shell-mobile": "gnome-shell-mobile",
|
||||||
|
"mutter-mobile": "mutter-mobile",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 0,
|
||||||
|
"narHash": "sha256-nO7cqicSHCjn96qMIV1JKwDei3n56Ra4G6rtaePbu3k=",
|
||||||
|
"type": "git",
|
||||||
|
"url": "file:///home/quadradical/Documents/Code/nixos-gnome-mobile"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "file:///home/quadradical/Documents/Code/nixos-gnome-mobile"
|
||||||
|
}
|
||||||
|
},
|
||||||
"gnome-shell": {
|
"gnome-shell": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
|
@ -853,6 +852,21 @@
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"gnome-shell-mobile": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"dirtyRev": "c602286053f9e06b3493decb4a9dabe8ba20ad9c-dirty",
|
||||||
|
"dirtyShortRev": "c60228605-dirty",
|
||||||
|
"lastModified": 1793323139,
|
||||||
|
"narHash": "sha256-DTqRtdXSwmb8ovlEmzVf7CcwtjRgpXinuWCb+1CgTc0=",
|
||||||
|
"type": "git",
|
||||||
|
"url": "file:///home/quadradical/Documents/Code/gnome-shell-mobile"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "file:///home/quadradical/Documents/Code/gnome-shell-mobile"
|
||||||
|
}
|
||||||
|
},
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
|
@ -860,11 +874,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1794963576,
|
"lastModified": 1794715309,
|
||||||
"narHash": "sha256-+CPrP74GDJ63f7bgEFC9Av4hbxc7K9WUNv1ZVRifRe8=",
|
"narHash": "sha256-awkBBs5ctFKgEYjpNGpi3t/VqF589n5EWfdinRb2gNI=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "2b13c9cb3aa20653e6f8ee0b7f8331a53ea9b0a9",
|
"rev": "a1293da7dd8e497e08d26173f97e2976b36a31ea",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -907,6 +921,21 @@
|
||||||
"url": "https://git.federated.nexus/Henry-Hiles/matrixoidc"
|
"url": "https://git.federated.nexus/Henry-Hiles/matrixoidc"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"mutter-mobile": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"dirtyRev": "7e7b25f68c7719ebf3b651808824e0c8bd33020d-dirty",
|
||||||
|
"dirtyShortRev": "7e7b25f68-dirty",
|
||||||
|
"lastModified": 1793323139,
|
||||||
|
"narHash": "sha256-mvdRwZfbnlzBrwr0bT4ZItYcM15smb7gkpppwIEp64k=",
|
||||||
|
"type": "git",
|
||||||
|
"url": "file:///home/quadradical/Documents/Code/mutter-mobile"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "file:///home/quadradical/Documents/Code/mutter-mobile"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nexus": {
|
"nexus": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"continuwuity": "continuwuity_2",
|
"continuwuity": "continuwuity_2",
|
||||||
|
|
@ -917,11 +946,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1795013460,
|
"lastModified": 1794839305,
|
||||||
"narHash": "sha256-GSeulyglamkjHjdD2fCIddwZ2Phy6CZ4GyauzHPi6iE=",
|
"narHash": "sha256-LoJibO1DD1is9P2DtjjqHKBFxmupVlbFb3QavT2wnR0=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "01938119931f92be47ca0c5b44ece2989b0d482e",
|
"rev": "3112871ceb0f1e94513ebb70c01e84c7f3443100",
|
||||||
"revCount": 1267,
|
"revCount": 1255,
|
||||||
"submodules": true,
|
"submodules": true,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.federated.nexus/Nexus/nexus"
|
"url": "https://git.federated.nexus/Nexus/nexus"
|
||||||
|
|
@ -952,27 +981,6 @@
|
||||||
"url": "https://git.federated.nexus/federated-nexus/nexusbot"
|
"url": "https://git.federated.nexus/federated-nexus/nexusbot"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"niri-mobile": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1795016524,
|
|
||||||
"narHash": "sha256-gpq5p9sIORvbvR5S095ixBprS2/oXIrdXyg+Y8EQtDs=",
|
|
||||||
"owner": "Henry-Hiles",
|
|
||||||
"repo": "niri",
|
|
||||||
"rev": "cd9fabb98e9c3f5048d6f8fd2de5f9460a3efeb8",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "Henry-Hiles",
|
|
||||||
"ref": "quad/mobile",
|
|
||||||
"repo": "niri",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nix-github-actions": {
|
"nix-github-actions": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
|
@ -996,18 +1004,17 @@
|
||||||
},
|
},
|
||||||
"nix-maid": {
|
"nix-maid": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1795021775,
|
"lastModified": 1794213517,
|
||||||
"narHash": "sha256-KwipEAmXRwCpFccoUXkE7bw4Rg3Fqlm0GpSVNLlvCTU=",
|
"narHash": "sha256-bryY6i495uT5OEz0eSeTPeJ35E6JLpI0PjPGNa5EdRk=",
|
||||||
"ref": "quad/fix/cross-mustache",
|
"ref": "refs/heads/master",
|
||||||
"rev": "f1fc27b1a9f4c2707a229683843edd97738b248b",
|
"rev": "d4f00026e380858e683a022abe313a0ae52ad2c0",
|
||||||
"revCount": 138,
|
"revCount": 136,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://codeberg.org/Henry-Hiles/nix-maid"
|
"url": "https://codeberg.org/viperML/nix-maid"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"ref": "quad/fix/cross-mustache",
|
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://codeberg.org/Henry-Hiles/nix-maid"
|
"url": "https://codeberg.org/viperML/nix-maid"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nix2flatpak": {
|
"nix2flatpak": {
|
||||||
|
|
@ -1039,27 +1046,26 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1795105247,
|
"lastModified": 1794327622,
|
||||||
"narHash": "sha256-S0pWLHzB0u7y/t9OUk+xhxWNqIFY8DuJA2S2ONNQmww=",
|
"narHash": "sha256-mJlrDqLL7Xqz1avdukOJyaA52EauQMoJ6/DBO7rptQg=",
|
||||||
"ref": "quad/fix/sdm845-initrd",
|
"ref": "refs/heads/master",
|
||||||
"rev": "fbcf8cf2e49c21af5cb1bdcf9f661af74d2dc8b3",
|
"rev": "5dc82c9de380dba9df746ad516363d08b1fe4c93",
|
||||||
"revCount": 54,
|
"revCount": 53,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://codeberg.org/nixphone/nixphone"
|
"url": "https://codeberg.org/nixphone/nixphone"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"ref": "quad/fix/sdm845-initrd",
|
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://codeberg.org/nixphone/nixphone"
|
"url": "https://codeberg.org/nixphone/nixphone"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1794890597,
|
"lastModified": 1794537146,
|
||||||
"narHash": "sha256-lME2lHoDHAaSHP3/okgiVoJ0icVEvsQH8LeU3We7tcc=",
|
"narHash": "sha256-Wpz/7x/YWnDIBu7yj6ixe8j6fIMsidd9Y+o1PqPF3iM=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "04906337b6d53e8bb0eaf0470ae9f070a4d4eb55",
|
"rev": "d5cc6833999746cffdfe0598f7bc801a57b887a9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1229,31 +1235,10 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"quadshell": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1795014593,
|
|
||||||
"narHash": "sha256-BPxE0o1cicSrKejw1Zy0yNV2c6eEFpYxQLxaJnDwA+A=",
|
|
||||||
"ref": "refs/heads/main",
|
|
||||||
"rev": "66bdba9a05985399d99a8d34278dd59fdf0669e5",
|
|
||||||
"revCount": 10,
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.federated.nexus/Henry-Hiles/quadshell"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.federated.nexus/Henry-Hiles/quadshell"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"agenix": "agenix",
|
"agenix": "agenix",
|
||||||
"agenix-cli": "agenix-cli",
|
"agenix-cli": "agenix-cli",
|
||||||
"app-grid": "app-grid",
|
|
||||||
"continuwuity": "continuwuity",
|
"continuwuity": "continuwuity",
|
||||||
"cozybot": "cozybot",
|
"cozybot": "cozybot",
|
||||||
"degoog": "degoog",
|
"degoog": "degoog",
|
||||||
|
|
@ -1263,20 +1248,18 @@
|
||||||
"flake-parts": "flake-parts_5",
|
"flake-parts": "flake-parts_5",
|
||||||
"gadgetfs": "gadgetfs",
|
"gadgetfs": "gadgetfs",
|
||||||
"gaypanel": "gaypanel",
|
"gaypanel": "gaypanel",
|
||||||
|
"gnome-mobile": "gnome-mobile",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"lk-jwt-service-module": "lk-jwt-service-module",
|
"lk-jwt-service-module": "lk-jwt-service-module",
|
||||||
"matrixoidc": "matrixoidc",
|
"matrixoidc": "matrixoidc",
|
||||||
"nexus": "nexus",
|
"nexus": "nexus",
|
||||||
"nexusbot": "nexusbot",
|
"nexusbot": "nexusbot",
|
||||||
"niri-mobile": "niri-mobile",
|
|
||||||
"nix-maid": "nix-maid",
|
"nix-maid": "nix-maid",
|
||||||
"nixphone": "nixphone",
|
"nixphone": "nixphone",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"quadshell": "quadshell",
|
|
||||||
"run0-sudo-shim": "run0-sudo-shim",
|
"run0-sudo-shim": "run0-sudo-shim",
|
||||||
"sable": "sable",
|
"sable": "sable",
|
||||||
"sable-next": "sable-next",
|
"sable-next": "sable-next",
|
||||||
"stevia-mobile": "stevia-mobile",
|
|
||||||
"stylix": "stylix",
|
"stylix": "stylix",
|
||||||
"wrapper-manager": "wrapper-manager"
|
"wrapper-manager": "wrapper-manager"
|
||||||
}
|
}
|
||||||
|
|
@ -1385,11 +1368,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1795015701,
|
"lastModified": 1794833435,
|
||||||
"narHash": "sha256-S6oHH5S2sziGcqTUBiyzmkABUtsY/JT9eHtozN/N2fg=",
|
"narHash": "sha256-KrUwt40VEm7MaUULGXRRflSlmyRQEam+0CED+ewOLHE=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "4c8b5133de1804a6a759169bcb9fe93124d0ee3e",
|
"rev": "ba9340cee718a8aae962a2171f44d3a25c793589",
|
||||||
"revCount": 8426,
|
"revCount": 8292,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.sable.moe/SableClient/sable-next"
|
"url": "https://git.sable.moe/SableClient/sable-next"
|
||||||
},
|
},
|
||||||
|
|
@ -1398,23 +1381,6 @@
|
||||||
"url": "https://git.sable.moe/SableClient/sable-next"
|
"url": "https://git.sable.moe/SableClient/sable-next"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"stevia-mobile": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1794931711,
|
|
||||||
"narHash": "sha256-o77hyGwV3ipquHABWk0zAP3QniiORpi3WmdQ26Dp1pg=",
|
|
||||||
"ref": "quad/mobile",
|
|
||||||
"rev": "40ed1ab05b5b81cdabb76a959c4fc681fd216d3b",
|
|
||||||
"revCount": 1348,
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://gitlab.gnome.org/Henry-Hiles/stevia"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"ref": "quad/mobile",
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://gitlab.gnome.org/Henry-Hiles/stevia"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"stylix": {
|
"stylix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"base16": "base16",
|
"base16": "base16",
|
||||||
|
|
|
||||||
20
flake.nix
20
flake.nix
|
|
@ -3,29 +3,17 @@
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
wrapper-manager.url = "git+https://codeberg.org/viperML/wrapper-manager";
|
wrapper-manager.url = "git+https://codeberg.org/viperML/wrapper-manager";
|
||||||
flake-parts.url = "github:hercules-ci/flake-parts";
|
flake-parts.url = "github:hercules-ci/flake-parts";
|
||||||
nix-maid.url = "git+https://codeberg.org/Henry-Hiles/nix-maid?ref=quad/fix/cross-mustache";
|
nix-maid.url = "git+https://codeberg.org/viperML/nix-maid";
|
||||||
gadgetfs = {
|
gadgetfs = {
|
||||||
url = "github:sorki/nixos-gadgetfs-proto";
|
url = "github:sorki/nixos-gadgetfs-proto";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
app-grid = {
|
gnome-mobile = {
|
||||||
url = "git+https://git.federated.nexus/Henry-Hiles/app-grid";
|
url = "git+file:///home/quadradical/Documents/Code/nixos-gnome-mobile";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
quadshell = {
|
|
||||||
url = "git+https://git.federated.nexus/Henry-Hiles/quadshell";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
niri-mobile = {
|
|
||||||
url = "github:Henry-Hiles/niri/quad/mobile";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
stevia-mobile = {
|
|
||||||
url = "git+https://gitlab.gnome.org/Henry-Hiles/stevia?ref=quad/mobile";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
nixphone = {
|
nixphone = {
|
||||||
url = "git+https://codeberg.org/nixphone/nixphone?ref=quad/fix/sdm845-initrd";
|
url = "git+https://codeberg.org/nixphone/nixphone";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
continuwuity = {
|
continuwuity = {
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,4 @@
|
||||||
{
|
{ pkgs, lib, ... }:
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
let
|
||||||
aliases = {
|
aliases = {
|
||||||
upgrade = "nh os switch --update";
|
upgrade = "nh os switch --update";
|
||||||
|
|
@ -28,15 +23,8 @@ in
|
||||||
(
|
(
|
||||||
command: host:
|
command: host:
|
||||||
pkgs.writeShellScriptBin command ''
|
pkgs.writeShellScriptBin command ''
|
||||||
# Stop other systems from getting GC'd
|
|
||||||
keep() {
|
|
||||||
path=$(nix build --no-link --print-out-paths \
|
|
||||||
"${config.programs.nh.flake}#nixosConfigurations.${host}.config.system.build.toplevel")
|
|
||||||
sudo nix-env --profile /nix/var/nix/profiles/${host} --set "$path"
|
|
||||||
}
|
|
||||||
|
|
||||||
${lib.concatMapAttrsStringSep "\n" (
|
${lib.concatMapAttrsStringSep "\n" (
|
||||||
name: cmd: ''${name}() { ${cmd} -H ${host} --target-host ${command} --diff never "$@" && keep; }''
|
name: cmd: ''${name}() { ${cmd} -H ${host} --target-host ${command} --diff never "$@"; }''
|
||||||
) aliases}
|
) aliases}
|
||||||
|
|
||||||
"$@"
|
"$@"
|
||||||
|
|
|
||||||
|
|
@ -2,15 +2,11 @@
|
||||||
{
|
{
|
||||||
users = {
|
users = {
|
||||||
mutableUsers = false;
|
mutableUsers = false;
|
||||||
users =
|
users = {
|
||||||
let
|
root.hashedPasswordFile = config.age.secrets."password.age".path;
|
||||||
password = config.age.secrets."password-${config.networking.hostName}.age".path;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
root.hashedPasswordFile = password;
|
|
||||||
quadradical = {
|
quadradical = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
hashedPasswordFile = password;
|
hashedPasswordFile = config.age.secrets."password.age".path;
|
||||||
description = "QuadRadical";
|
description = "QuadRadical";
|
||||||
extraGroups = [
|
extraGroups = [
|
||||||
"wheel"
|
"wheel"
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,10 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
services.adw-bluetooth.enable = true;
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
nmgui
|
|
||||||
heroic
|
heroic
|
||||||
inkscape
|
inkscape
|
||||||
libreoffice
|
libreoffice
|
||||||
|
authenticator
|
||||||
prismlauncher
|
prismlauncher
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -37,18 +37,6 @@
|
||||||
version = "0.2.1";
|
version = "0.2.1";
|
||||||
sha256 = "sha256-uHdQeW9ZXYg6+VnD6cb5CU10/xV5hCtxt5K+j0qb7as=";
|
sha256 = "sha256-uHdQeW9ZXYg6+VnD6cb5CU10/xV5hCtxt5K+j0qb7as=";
|
||||||
}
|
}
|
||||||
{
|
|
||||||
publisher = "theqtcompany";
|
|
||||||
name = "qt-core";
|
|
||||||
version = "1.16.0";
|
|
||||||
hash = "sha256-6NBWsK7ljx7Ie3xvOrjBClyvwQP1UltCna1jQHJST5U=";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
publisher = "theqtcompany";
|
|
||||||
name = "qt-qml";
|
|
||||||
version = "1.16.0";
|
|
||||||
hash = "sha256-QWjUSbBtHIdxYZyRBDn64HXhvSwhgzm7DjDaed6lNds=";
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
@ -116,11 +104,9 @@
|
||||||
"indentRainbow.ignoreErrorLanguages" = [ "*" ];
|
"indentRainbow.ignoreErrorLanguages" = [ "*" ];
|
||||||
"dart.runPubGetOnPubspecChanges" = "never";
|
"dart.runPubGetOnPubspecChanges" = "never";
|
||||||
"workbench.colorTheme" = "Nord";
|
"workbench.colorTheme" = "Nord";
|
||||||
"qt-qml.qmlls.customExePath" = "${pkgs.qt6.qtdeclarative}/bin/qmlls";
|
|
||||||
"qt-qml.doNotAskForQmllsDownload" = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
"VSCodium/User/keybindings.json".text = builtins.toJSON [
|
"/home/quadradical/.config/VSCodium/User/keybindings.json".source = builtins.toJSON [
|
||||||
{
|
{
|
||||||
key = "ctrl+s";
|
key = "ctrl+s";
|
||||||
command = "workbench.action.files.saveAll";
|
command = "workbench.action.files.saveAll";
|
||||||
|
|
|
||||||
6
modules/desktop/wm/clipboard.nix
Normal file
6
modules/desktop/wm/clipboard.nix
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
{ pkgs, lib, ... }:
|
||||||
|
{
|
||||||
|
# Keeps clipboard contents available after the app they were copied from exits
|
||||||
|
programs.fht-compositor.sessionPrograms.wl-clip-persist =
|
||||||
|
"${lib.getExe pkgs.wl-clip-persist} --clipboard regular";
|
||||||
|
}
|
||||||
|
|
@ -63,8 +63,6 @@ in
|
||||||
"org.freedesktop.impl.portal.ScreenCast" = [ "fht-compositor" ];
|
"org.freedesktop.impl.portal.ScreenCast" = [ "fht-compositor" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
quad.session = lib.getExe' cfg.package "fht-compositor-session";
|
|
||||||
|
|
||||||
environment = {
|
environment = {
|
||||||
# Called by name (rather than by store path), so Super+Ctrl+R after a rebuild runs the new version
|
# Called by name (rather than by store path), so Super+Ctrl+R after a rebuild runs the new version
|
||||||
systemPackages = [ session-programs ];
|
systemPackages = [ session-programs ];
|
||||||
|
|
@ -79,7 +77,6 @@ in
|
||||||
patches = (old.patches or [ ]) ++ [
|
patches = (old.patches or [ ]) ++ [
|
||||||
./resize-tiled-windows.patch
|
./resize-tiled-windows.patch
|
||||||
./lone-modifier.patch
|
./lone-modifier.patch
|
||||||
./session-lock-fail-closed.patch
|
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.makeWrapper ];
|
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.makeWrapper ];
|
||||||
|
|
@ -113,10 +110,6 @@ in
|
||||||
Super-q = "close-focused-window";
|
Super-q = "close-focused-window";
|
||||||
Super-f = "fullscreen-focused-window";
|
Super-f = "fullscreen-focused-window";
|
||||||
Super-Ctrl-q = "quit";
|
Super-Ctrl-q = "quit";
|
||||||
Super-l = {
|
|
||||||
action = "run-command";
|
|
||||||
arg = "${config.quad.lock}";
|
|
||||||
};
|
|
||||||
Super-Ctrl-r = {
|
Super-Ctrl-r = {
|
||||||
action = "run-command";
|
action = "run-command";
|
||||||
arg = "fht-compositor ipc action reload-config; session-programs";
|
arg = "fht-compositor ipc action reload-config; session-programs";
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue