updated flake inputs, fixed evaluation warnings

removed the neon configuration from the flake
This commit is contained in:
2025-07-14 12:30:10 -04:00
parent c12ae3a9e9
commit 54d1c15823
19 changed files with 273 additions and 850 deletions

View File

@@ -14,6 +14,7 @@
};
hardwareCfg = {
networkModule.enable = true;
kernelModule.enable = true;
bootLoader.enable = true;
};
softwareCfg = {

View File

@@ -1,35 +1,28 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
{ config, lib, pkgs, modulesPath, ... }:
boot.initrd.availableKernelModules =
[ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
{
imports =
[ (modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sr_mod" "virtio_blk" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" = {
device = "/dev/disk/by-partlabel/disk-main-root";
fsType = "ext4";
};
fileSystems."/" =
{ device = "/dev/disk/by-uuid/5d8dd8ba-6c4c-4227-adc5-f33bf0022fff";
fsType = "ext4";
};
fileSystems."/nix" = {
device = "/dev/disk/by-partlabel/disk-main-nix";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-partlabel/disk-main-ESP";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
fileSystems."/home" = {
device = "/dev/disk/by-partlabel/disk-main-home";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/6A3C-0A12";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
};
swapDevices = [ ];
@@ -38,12 +31,7 @@
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp14s0.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp15s0.useDHCP = lib.mkDefault true;
# networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware = {
keyboard.uhk.enable = true;
cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
};
}

View File

@@ -1,105 +0,0 @@
{ lib, pkgs, modulesPath, inputs, ... }:
let
userConfig = {
isNormalUser = true;
hashedPassword = "$y$j9T$OobgblSbriz8BMgqKXk8Q/$FlTKe918WI3e5m3sj0dDGO.R/rmJOqcscVZMtN5a/DD";
shell = pkgs.zsh;
extraGroups = [ "wheel" ];
};
in
{
imports = [ ./hardware.nix ];
boot.initrd.postDeviceCommands = lib.mkAfter ''
mkdir /btrfs_tmp
mount /dev/root_vg/root /btrfs_tmp
if [[ -e /btrfs_tmp/root ]]; then
mkdir -p /btrfs_tmp/old_roots
timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/root)" "+%Y-%m-%-d_%H:%M:%S")
mv /btrfs_tmp/root "/btrfs_tmp/old_roots/$timestamp"
fi
delete_subvolume_recursively() {
IFS=$'\n'
for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do
delete_subvolume_recursively "/btrfs_tmp/$i"
done
btrfs subvolume delete "$1"
}
for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +30); do
delete_subvolume_recursively "$i"
done
btrfs subvolume create /btrfs_tmp/root
umount /btrfs_tmp
'';
environment.persistence."/home" = {
enable = true;
hideMounts = true;
directories = [
"persistence"
];
};
movOpts = {
sysEnv = {
issue.enable = true;
stylixConfig.enable = true;
nixSettings.enable = true;
};
hardwareCfg = {
networkModule.enable = true;
bootLoader.enable = true;
};
softwareCfg = {
sysProgs.enable = true;
sysServices.enable = true;
};
};
environment.systemPackages = with pkgs;[
alsa-lib
xwayland
wayland
alsa-utils
bc
cliphist
git
hyprpaper
hyprpicker
inetutils
kitty
lsof
neofetch
nh
nix-output-monitor
nix-prefetch-scripts
nixos-option
nix-search-cli
nix-template
nixfmt
nvd
pamixer
pavucontrol
playerctl
usbutils
vim
jq
wl-clipboard
libnotify
file
];
users = {
groups.persist = { };
users = {
impermanence = userConfig;
persistence = userConfig // {
extraGroups = userConfig.extraGroups ++ [ "persist" ];
};
root.hashedPassword = "$y$j9T$tjpyEif7XNctN0twWipqc/$hfVGMaVYVP7.gjqG.2eV34j2AoWp2AFBxox7B5QyQy3";
};
};
}

View File

@@ -1,76 +0,0 @@
{
device ? throw "Set this to your disk device, e.g. /dev/sda",
...
}: {
disko.devices = {
disk.main = {
inherit device;
type = "disk";
content = {
type = "gpt";
partitions = {
boot = {
name = "boot";
size = "1M";
type = "EF02";
};
esp = {
name = "ESP";
size = "750M";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
};
};
swap = {
size = "4G";
content = {
type = "swap";
resumeDevice = true;
};
};
root = {
name = "root";
size = "100%";
content = {
type = "lvm_pv";
vg = "root_vg";
};
};
};
};
};
lvm_vg = {
root_vg = {
type = "lvm_vg";
lvs = {
root = {
size = "100%FREE";
content = {
type = "btrfs";
extraArgs = ["-f"];
subvolumes = {
"/root" = {
mountpoint = "/";
};
"/home/persistence" = {
mountOptions = ["subvol=persist" "noatime"];
mountpoint = "/home/persistence";
};
"/nix" = {
mountOptions = ["subvol=nix" "noatime"];
mountpoint = "/nix";
};
};
};
};
};
};
};
};
}

View File

@@ -1,89 +0,0 @@
{ pkgs, username, ... }:
let
scripts = with pkgs; [
myScripts.icanhazip
myScripts.invoke
myScripts.runbg
myScripts.splash
myScripts.toolbelt
myScripts.viconf
myScripts.vipkg
myScripts.fetchfromgh
myScripts.garbage-collect
myScripts.nsp
myScripts.rebuild
myScripts.chpaper
myScripts.chscheme
myScripts.keyring
myScripts.mkscreenshots
myScripts.moveonscreen
myScripts.s_check
myScripts.switchmon
myScripts.git-compose
myScripts.playshellsound
myScripts.color-commit
];
in
{
home.username = "${username}";
home.homeDirectory = "/home/${username}";
home.stateVersion = "25.05";
programs.home-manager.enable = true;
home.packages = with pkgs; [
nemo
feh
gtk3
sqlite
gimp
imagemagick
lolcat
vesktop
zsh
zsh-syntax-highlighting
zsh-history-substring-search
zsh-autosuggestions
libreoffice
gtrash
ripgrep
toilet-extrafonts
chafa
] ++ scripts;
movOpts = {
homeFiles.enable = true;
envConfig = {
hyprlandConfig = {
enable = true;
monitorNames = [ "eDP-1" ];
workspaceLayout = "singlemonitor";
};
userPkgs.enable = false;
stylixHomeConfig.enable = true;
gtkConfig.enable = true;
starshipConfig.enable = true;
swayncConfig.enable = true;
zshConfig = {
shellAliases.enable = true;
envVariables.enable = true;
shellOptions.enable = true;
extraConfig.enable = true;
};
};
programConfigs = {
autojumpConfig.enable = true;
btopConfig.enable = true;
ezaConfig.enable = true;
firefoxConfig.enable = true;
fuzzelConfig.enable = true;
fzfConfig.enable = true;
gitConfig.enable = true;
kittyConfig.enable = true;
yaziConfig.enable = true;
passConfig.enable = true;
batConfig.enable = true;
};
};
}