floturcocantsee/frank-nix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

major refactor: begin work to switch to GNOME and preservation
ci / check-flake (push) Failing after 53s
Details

Browse Source
This commit is contained in:
floturcocantsee
2026-10-30 22:38:22 -04:00
parent 4657eddf5f
commit 591e6ae996
27 changed files with 135 additions and 1260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hosts/franks-macbook-pro/configuration.nix
-1
View File
@@ -1,4 +1,3 @@
{ _, ... }:
{
imports = [
../shared/darwin.nix
hosts/nero/configuration.nix
-51
View File
@@ -8,50 +8,12 @@
imports = [
../shared/nixos-pc.nix
../../features/gnome.nix
../../features/flatpak.nix
../../features/keyd.nix
];
nixpkgs.overlays = [
inputs.cheatengine.overlays.default
];
networking.hostName = "nero";
services = {
xserver = {
videoDrivers = [ "nvidia" ];
};
flatpak = {
packages = [
{
appId = "com.discordapp.Discord";
origin = "flathub";
}
{
appId = "com.github.Matoking.protontricks";
origin = "flathub";
}
{
appId = "com.steamgriddb.SGDBoop";
origin = "flathub";
}
{
appId = "com.vysp3r.ProtonPlus";
origin = "flathub";
}
{
appId = "io.github.ryubing.Ryujinx";
origin = "flathub";
}
{
appId = "io.github.Amethyst.ModManager";
origin = "amethyst-mod-manager";
}
];
};
wivrn = {
enable = true;
openFirewall = true;
@@ -60,8 +22,6 @@
};
programs = {
gamemode.enable = true;
steam = {
enable = true;
remotePlay.openFirewall = true;
@@ -98,19 +58,8 @@
environment = {
systemPackages = with pkgs; [
mangohud
gamescope
gamescope-wsi
cheatengine
lsfg-vk
lsfg-vk-ui
qbittorrent
aseprite
inputs.scopebuddy.packages.${pkgs.stdenv.hostPlatform.system}.default
inputs.xivlauncher-rb.packages.${pkgs.stdenv.hostPlatform.system}.default
(callPackage ../../packages/aseprite-thumbnailer-kde/package.nix { })
];
};
}
hosts/nero/disko.nix
+69
View File
@@ -0,0 +1,69 @@
{
fileSystems."/nix".neededForBoot = true;
disko.devices = {
nodev = {
"/" = {
fsType = "tmpfs";
mountOptions = [
"size=25%"
"mode=755"
];
};
};
disk.main = {
device = "/dev/nvme0n1";
type = "disk";
content = {
type = "gpt";
partitions = {
esp = {
name = "ESP";
size = "5G";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
};
};
root = {
name = "NIXOS";
size = "100%";
content = {
type = "btrfs";
extraArgs = [ "-f" ];
subvolumes = {
"/persist" = {
mountOptions = [
"subvol=persist"
"noatime"
];
mountpoint = "/persist";
};
"/nix" = {
mountOptions = [
"subvol=nix"
"noatime"
];
mountpoint = "/nix";
};
};
};
};
};
};
};
};
}
hosts/nero/hardware.nix
-3
View File
@@ -9,7 +9,6 @@
{
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
../shared/fs-layouts/single-disk-btrfs.nix
];
boot = {
@@ -49,10 +48,8 @@
hardware = {
bluetooth.enable = true;
cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
nvidia-container-toolkit.enable = true;
nvidia = {
package = config.boot.kernelPackages.nvidiaPackages.latest;
open = true;
modesetting.enable = true;
};
hosts/nero/preservation.nix
+23
View File
@@ -0,0 +1,23 @@
{
boot.tmp.cleanOnBoot = true;
preservation = {
enable = true;
preserveAt."/persist" = {
files = [
{
file = "/etc/machine-id";
inInitrd = true;
}
];
directories = [
"/var/lib/systemd/timers"
"/var/lib/nixos"
"/var/log"
"/var/lib/bluetooth"
"/tmp"
];
};
};
}
hosts/pdw-frankiel/configuration.nix
-25
View File
@@ -1,11 +1,7 @@
{
...
}:
{
imports = [
../shared/nixos-pc.nix
../../features/kde.nix
../../features/flatpak.nix
../../features/keyd.nix
];
@@ -22,27 +18,6 @@
services = {
printing.enable = true;
flatpak = {
packages = [
{
appId = "com.dropbox.Client";
origin = "flathub";
}
{
appId = "org.gnome.gitlab.YaLTeR.VideoTrimmer";
origin = "flathub";
}
{
appId = "org.kde.kdenlive";
origin = "flathub";
}
{
appId = "org.remmina.Remmina";
origin = "flathub";
}
];
};
};
environment = {
hosts/pdw-frankiel/hardware.nix
-1
View File
@@ -9,7 +9,6 @@
{
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
../shared/fs-layouts/single-disk-btrfs.nix
];
boot = {
hosts/shared/fs-layouts/single-disk-btrfs.nix
-36
View File
@@ -1,36 +0,0 @@
{ _, ... }:
{
# RECOMMENDED BTRFS SUBVOLUME LAYOUT
# /home
# /home/.snapshots (needed if snapper on home dir to be enabled)
# /srv
# /var/lib/portables
# /var/lib/machines
# /tmp
# /var/tmp
#
# REQUIRED PARTLABELS (can be set in parted or other tools NOT!!! FILESYSTEM LABEL!)
# / - NIXOS
# /boot - ESP
# swap - SWAP
fileSystems = {
"/" = {
device = "/dev/disk/by-partlabel/NIXOS";
fsType = "btrfs";
};
"/boot" = {
device = "/dev/disk/by-partlabel/ESP";
fsType = "vfat";
options = [
"fmask=0077"
"dmask=0077"
];
};
};
swapDevices = [
{ device = "/dev/disk/by-partlabel/SWAP"; }
];
}
hosts/shared/fs-layouts/single-disk-xfs.nix
-27
View File
@@ -1,27 +0,0 @@
{ _, ... }:
{
# REQUIRED PARTLABELS (can be set in parted or other tools NOT!!! FILESYSTEM LABEL!)
# / - NIXOS
# /boot - ESP
# swap - SWAP
fileSystems = {
"/" = {
device = "/dev/disk/by-partlabel/NIXOS";
fsType = "xfs";
};
"/boot" = {
device = "/dev/disk/by-partlabel/ESP";
fsType = "vfat";
options = [
"fmask=0077"
"dmask=0077"
];
};
};
swapDevices = [
{ device = "/dev/disk/by-partlabel/SWAP"; }
];
}
hosts/shared/nixos-pc.nix
-102
View File
@@ -1,6 +1,5 @@
{
pkgs,
lib,
inputs,
...
}:
@@ -20,7 +19,6 @@
];
boot = {
kernelPackages = pkgs.linuxPackages_latest;
consoleLogLevel = 3;
kernelParams = [
@@ -39,79 +37,12 @@
};
};
fonts = {
fontconfig = {
enable = true;
subpixel.rgba = "none";
hinting.style = "slight";
};
};
services = {
flatpak = {
packages = [
{
appId = "io.github.HakanSeven12.OpenCadStudio";
origin = "flatpark";
}
{
appId = "io.github.ungoogled_software.ungoogled_chromium";
origin = "flathub";
}
{
appId = "org.gtk.Gtk3theme.Breeze";
origin = "flathub";
}
];
};
snapper = {
snapshotInterval = "hourly";
cleanupInterval = "1d";
configs = {
home = {
SUBVOLUME = "/home";
TIMELINE_CREATE = true;
TIMELINE_CLEANUP = true;
TIMELINE_LIMIT_HOURLY = "10";
TIMELINE_LIMIT_DAILY = "7";
TIMELINE_LIMIT_WEEKLY = "2";
TIMELINE_LIMIT_MONTHLY = "0";
TIMELINE_LIMIT_YEARLY = "0";
BACKGROUND_COMPARISON = "yes";
NUMBER_CLEANUP = "no";
NUMBER_MIN_AGE = "1800";
NUMBER_LIMIT = "50";
NUMBER_LIMIT_IMPORTANT = "10";
EMPTY_PRE_POST_CLEANUP = "yes";
EMPTY_PRE_POST_MIN_AGE = "1800";
};
};
};
kmscon = {
enable = true;
config = {
hwAccel = true;
term = "xterm-256color";
font-name = "Hack Nerd Font Mono";
};
};
pipewire = {
enable = true;
pulse.enable = true;
alsa.enable = true;
};
openssh = {
enable = true;
settings = {
PasswordAuthentication = false;
KbdInteractiveAuthentication = false;
};
};
affinity-thumbnailer.enable = true;
};
networking = {
@@ -142,55 +73,22 @@
programs = {
bash.enable = true;
firefox.enable = true;
gnupg.agent = {
enable = true;
pinentryPackage = pkgs.pinentry-qt;
};
appimage = {
enable = true;
binfmt = true;
};
};
nixpkgs = {
# Fix msitools compiling and failing it's test-suite.
overlays = [
(final: prev: {
msitools = prev.msitools.overrideAttrs (old: {
doCheck = false;
});
})
inputs.affinity-nix.overlays.default
];
};
environment = {
systemPackages =
import ../../features/common-pkgs.nix { inherit pkgs; }
++ (with pkgs; [
btrfs-assistant
desktop-file-utils
zathura
hunspell
hunspellDicts.en_US
hyphenDicts.en_US
affinity-v3
libreoffice-qt
qimgv
mpv
vorta
distrobox
rtk
inputs.appimage-manager.packages.${pkgs.stdenv.hostPlatform.system}.default
inputs.pi.packages.${pkgs.stdenv.hostPlatform.system}.default
(callPackage ../../packages/heidisql/package.nix { })
]);
shellAliases = import ../../features/aliases.nix { inherit pkgs; };
hosts/vergil/hardware.nix
-1
View File
@@ -8,7 +8,6 @@
{
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
../shared/fs-layouts/single-disk-xfs.nix
];
boot = {