Lillian-Violet/NixOS-Config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Lillian-Violet:ef6fd0bafd2b0fdf3646e94d69a69457878cc424
Branches Tags
Lillian-Violet:main
Lillian-Violet:Desktop-changes
Lillian-Violet:bcachefs-update-broken-queen
Lillian-Violet:fcast
Lillian-Violet:2.0
Lillian-Violet:v1.0
..
compare: Lillian-Violet:c3df26037e74f41f951ba71fbdac9a83b94607a8
Branches Tags
Lillian-Violet:main
Lillian-Violet:Desktop-changes
Lillian-Violet:bcachefs-update-broken-queen
Lillian-Violet:fcast
Lillian-Violet:2.0
Lillian-Violet:v1.0

No commits in common. "ef6fd0bafd2b0fdf3646e94d69a69457878cc424" and "c3df26037e74f41f951ba71fbdac9a83b94607a8" have entirely different histories.
ef6fd0bafd ... c3df26037e

10 changed files with 82 additions and 151 deletions
Show stats Expand all files Collapse all files

47
disko/wheatley/default.nix
View file

@ -1,47 +0,0 @@
{
disko = {
devices = {
disk = {
disk1 = {
imageSize = "20G";
type = "disk";
device = "/dev/mmcblk0";
content = {
type = "gpt";
partitions = {
firmware = {
size = "30M";
priority = 1;
type = "0700";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/firmware";
};
};
boot = {
size = "1G";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
};
};
root = {
name = "root";
size = "100%";
content = {
type = "filesystem";
extraArgs = [];
format = "ext4";
mountpoint = "/";
};
};
};
};
};
};
};
};
}

54
flake.lock
View file

@ -103,11 +103,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1732855386, "lastModified": 1730928062,
"narHash": "sha256-IyZzKBcs2NGcbi48NcA/IZG7NUBqnYT4McOWh5uTMnE=", "narHash": "sha256-fXwp5vmq313QEu180EsPr0YT0OqVDlcebNYxxZ7mMLw=",
"owner": "koverstreet", "owner": "koverstreet",
"repo": "bcachefs-tools", "repo": "bcachefs-tools",
"rev": "6829fb201072c495ce9e97850664540a0f8294f1", "rev": "d4932bf0e32375451e7cfd4b776bb5c470e9afb8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -234,11 +234,11 @@
}, },
"catppuccin": { "catppuccin": {
"locked": { "locked": {
"lastModified": 1732838231, "lastModified": 1731232837,
"narHash": "sha256-KJTRqfEcGpONBK/6BkMdWmbGth0r/nYWY3k/rvZl4es=", "narHash": "sha256-0aIwr/RC/oe7rYkfJb47xjdEQDSNcqpFGsEa+EPlDEs=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "becc64812c8d6af24dedc2f75c5c63ebf778a115", "rev": "32359bf226fe874d3b7a0a5753d291a4da9616fe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -503,11 +503,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732894783, "lastModified": 1732540163,
"narHash": "sha256-7hBU7L07hYPNjamlm/v5scUUwsHQJvyb1a4flozHNt0=", "narHash": "sha256-5EYzmoTpem2IB9JWzd41sL98pz3lyyCSTiCjv08i4Uk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "a75ba3b87b7ff230ca8b3a1fbfd4ad907a1a5fa2", "rev": "2ed5e30fc7e34adf455db8b02b9151d3922a54ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1000,11 +1000,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732884235, "lastModified": 1732482255,
"narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=", "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "819f682269f4e002884702b87e445c82840c68f2", "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1041,11 +1041,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1732739177, "lastModified": 1732606634,
"narHash": "sha256-iL32+TA/8geCzcL1r3uthrH/GPvbUak5QE++WJUkaiI=", "narHash": "sha256-msRynwdER2LcFXCxxGNKC3vSIZS+xCcBOn1SaSiVDxE=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "8d7b2149e618696d5100c2683af1ffa893f02a75", "rev": "39395c7e0105d9d24da7b91b8735cd310671197b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1392,11 +1392,11 @@
}, },
"nixpkgs-edge": { "nixpkgs-edge": {
"locked": { "locked": {
"lastModified": 1732896563, "lastModified": 1732632271,
"narHash": "sha256-AxIaGRbQI5x+8dYkCnDItPAiDHqnfa8Dhb/QisJiRPs=", "narHash": "sha256-pNaHDLub5HPtAcOzRdOaGRjvHNHWFmwPFwerLu4lQ94=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e6b629da2735d17d47e32626591f4d6fd3499fe7", "rev": "8fc978774f5337284c9a9d2ec960df47d8b79c84",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1503,11 +1503,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1732521221, "lastModified": 1732014248,
"narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1631,11 +1631,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1732521221, "lastModified": 1732014248,
"narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1686,11 +1686,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732639391, "lastModified": 1732465698,
"narHash": "sha256-kFtXjoCIqx9xe0ZryPXpqS6l/HVg71aNcuL8Y5e8+pI=", "narHash": "sha256-xiue+Kj2Jm8PwyZQcHl4CaYmMIgo5oi37hVHqiw2Unk=",
"owner": "pjones", "owner": "pjones",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "06e3209d11797d9c741e25df06ab61048746bf93", "rev": "16d65cd02b5de665d1bcfec1616c02c71a1014a6",
"type": "github" "type": "github"
}, },
"original": { "original": {

19
flake.nix
View file

@ -108,7 +108,6 @@
# Supported systems for your flake packages, shell, etc. # Supported systems for your flake packages, shell, etc.
systems = [ systems = [
"x86_64-linux" "x86_64-linux"
"aarch64-linux"
]; ];
# This is a function that generates an attribute by calling a function you # This is a function that generates an attribute by calling a function you
# pass to it, with each system as an argument # pass to it, with each system as an argument
@ -235,24 +234,6 @@
]; ];
}; };
wheatley = nixpkgs.lib.nixosSystem {
system = "aarch64-linux";
specialArgs = {inherit inputs outputs;};
modules = [
./nixos/hosts/wheatley/configuration.nix
sops-nix.nixosModules.sops
home-manager.nixosModules.home-manager
nixos-hardware.nixosModules.raspberry-pi-4
catppuccin.nixosModules.catppuccin
stylix.nixosModules.stylix
{
home-manager.sharedModules = [
inputs.catppuccin.homeManagerModules.catppuccin
];
}
];
};
# ISO = nixpkgs.lib.nixosSystem { # ISO = nixpkgs.lib.nixosSystem {
# system = "x86_64-linux"; # system = "x86_64-linux";
# specialArgs = {inherit inputs outputs;}; # specialArgs = {inherit inputs outputs;};

2
home-manager/hosts/shodan/lillian.nix
View file

@ -56,8 +56,6 @@
freetube freetube
obs-studio obs-studio
vlc vlc
fcast-receiver
fcast-client
# System tools: # System tools:
rage rage

3
home-manager/hosts/wheatley/lillian.nix
View file

@ -11,7 +11,8 @@
# You can also split up your configuration and import pieces of it here: # You can also split up your configuration and import pieces of it here:
# ./nvim.nix # ./nvim.nix
../../shared ../../package-configs/zsh.nix
../../package-configs/helix.nix
]; ];
nixpkgs = { nixpkgs = {

12
nixos/desktop/default.nix
View file

@ -170,18 +170,6 @@
dockerCompat = true; dockerCompat = true;
}; };
services.avahi = {
nssmdns4 = true;
enable = true;
ipv4 = true;
ipv6 = true;
publish = {
enable = true;
addresses = true;
workstation = true;
};
};
security.tpm2.enable = true; security.tpm2.enable = true;
security.tpm2.pkcs11.enable = true; # expose /run/current-system/sw/lib/libtpm2_pkcs11.so security.tpm2.pkcs11.enable = true; # expose /run/current-system/sw/lib/libtpm2_pkcs11.so
security.tpm2.tctiEnvironment.enable = true; # TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI env variables security.tpm2.tctiEnvironment.enable = true; # TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI env variables

1
nixos/hosts/GLaDOS/configuration.nix
View file

@ -66,7 +66,6 @@
}; };
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.binfmt.emulatedSystems = ["aarch64-linux"];
# boot.lanzaboote = { # boot.lanzaboote = {
# enable = true; # enable = true;

12
nixos/hosts/shodan/configuration.nix
View file

@ -124,18 +124,6 @@
services.desktopManager.plasma6.enable = true; services.desktopManager.plasma6.enable = true;
programs.kdeconnect.enable = true; programs.kdeconnect.enable = true;
services.avahi = {
nssmdns4 = true;
enable = true;
ipv4 = true;
ipv6 = true;
publish = {
enable = true;
addresses = true;
workstation = true;
};
};
services.displayManager.defaultSession = "plasma"; services.displayManager.defaultSession = "plasma";
services.displayManager.sddm.wayland.enable = lib.mkForce true; services.displayManager.sddm.wayland.enable = lib.mkForce true;
services.displayManager.sddm.settings = { services.displayManager.sddm.settings = {

22
nixos/hosts/wheatley/configuration.nix
View file

@ -12,11 +12,11 @@
imports = [ imports = [
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
./armv7l.nix
./hardware-configuration.nix ./hardware-configuration.nix
# Import shared configurations # Import shared configurations
../../shared ../../shared
# ../../../disko/wheatley
]; ];
boot.loader.generic-extlinux-compatible.enable = true; boot.loader.generic-extlinux-compatible.enable = true;
@ -78,20 +78,20 @@
}; };
networking.wireless.enable = true; networking.wireless.enable = true;
# networking.wireless.environmentFile = config.sops.secrets."wireless.env".path; networking.wireless.environmentFile = config.sops.secrets."wireless.env".path;
# networking.wireless.networks."KPNAA6306" = { networking.wireless.networks."KPNAA6306" = {
# hidden = true; hidden = true;
# auth = '' auth = ''
# key_mgmt=WPA-PSK key_mgmt=WPA-PSK
# password="@PSK_HOME@" password="@PSK_HOME@"
# ''; '';
# }; };
networking.firewall.enable = true; networking.firewall.enable = true;
networking.firewall = { networking.firewall = {
allowedTCPPorts = [22 80 443 5335 8080 46899 46898]; allowedTCPPorts = [22 80 443 5335 8080];
allowedUDPPorts = [5335 46899 46898]; allowedUDPPorts = [5335];
}; };
# Set your time zone. # Set your time zone.
time.timeZone = "Europe/Amsterdam"; time.timeZone = "Europe/Amsterdam";

61
nixos/hosts/wheatley/hardware-configuration.nix
View file

@ -1,26 +1,49 @@
# 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.
{ {
fileSystems."/" = { lib,
device = "none"; modulesPath,
fsType = "tmpfs"; ...
options = ["relatime" "mode=755" "size=75%"]; }: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = ["usbhid"];
boot.initrd.kernelModules = [];
boot.kernelModules = [];
boot.extraModulePackages = [];
fileSystems = {
# Prior to 19.09, the boot partition was hosted on the smaller first partition
# Starting with 19.09, the /boot folder is on the main bigger partition.
# The following is to be used only with older images. Note such old images should not be considered supported anymore whatsoever, but if you installed back then, this might be needed
# "/boot" = {
# device = "/dev/disk/by-label/FIRMWARE";
# fsType = "vfat";
# };
"/" = {
device = "/dev/disk/by-label/NIXOS_SD";
fsType = "ext4";
};
}; };
fileSystems."/boot" = { swapDevices = [{device = "/dev/disk/by-uuid/b299ad0d-37a0-43d6-9647-5f717aca7b3";}];
device = "/dev/disk/by-label/BOOT";
fsType = "vfat";
};
fileSystems."/nix" = { # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
device = "/dev/disk/by-label/NIXOS"; # (the default) this is the recommended approach. When using systemd-networkd it's
fsType = "btrfs"; # still possible to use this option, but it's recommended to use it in conjunction
options = ["compress=zstd"]; # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
}; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enu1u1.useDHCP = lib.mkDefault true;
# networking.interfaces.ip6tnl0.useDHCP = lib.mkDefault true;
# networking.interfaces.sit0.useDHCP = lib.mkDefault true;
# networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
fileSystems."/swap" = { nixpkgs.hostPlatform = lib.mkDefault "armv7l-linux";
device = "/dev/disk/by-label/NIXOS";
fsType = "btrfs";
options = ["noatime" "subvol=swap"];
};
swapDevices = [{device = "/swap/swapfile";}]; powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
} }