Compare commits

..

No commits in common. "59f6cd7292cae56a49181f6f9e58523eeb93b8f5" and "dd6c19315cb288eb41fdcddebedd638de1fffe61" have entirely different histories.

7 changed files with 267 additions and 834 deletions

66
flake.lock generated
View file

@ -122,11 +122,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1743483509, "lastModified": 1742773104,
"narHash": "sha256-aHnOrBV4UpVQuv9RHmYaRb0jZRBpmeDWsZWBRoSCc5w=", "narHash": "sha256-dAhrL+gEjNN5U/Sosy7IrX0Y0qPA0U7Gp9TBhqEliNU=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "692aba39210127804151c9436e4b87fe1d0e0f2b", "rev": "d74460da63a8c08a69a1f143b04f2ab1a6b2f5c2",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -295,11 +295,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743482579, "lastModified": 1743097780,
"narHash": "sha256-u81nqA4UuRatKDkzUuIfVYdLMw8birEy+99oXpdyXhY=", "narHash": "sha256-5tUbaMBKYbfTe/4aXACxmiXG22TgwPBNcfZ8Kg3rt+g=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c21383b556609ce1ad901aa08b4c6fbd9e0c7af0", "rev": "b14a70c40f4fd0b73d095ab04a7c6e31fbc18e52",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -430,11 +430,11 @@
"treefmt-nix": "treefmt-nix_3" "treefmt-nix": "treefmt-nix_3"
}, },
"locked": { "locked": {
"lastModified": 1743306087, "lastModified": 1742701397,
"narHash": "sha256-Z/tIz51+M42kqBWYM3xXBXYnBaWfIzirNFRHLMyub4U=", "narHash": "sha256-xkr0Bl6LShu0S0ubG+mS0uokPzmZLvm1pRzDFesgugg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-anywhere", "repo": "nixos-anywhere",
"rev": "846ea21d98e6fa917d878a3695a5037d86fb4f5e", "rev": "d48c8a01968afc8870b5afcba43b7739c943f7f8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -497,11 +497,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1743420942, "lastModified": 1742806253,
"narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=", "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4", "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -522,11 +522,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743037670, "lastModified": 1742432671,
"narHash": "sha256-U5e319PMrbCN4lxjQNOsMHI+Ehyvihz44tTgMdO5Fds=", "narHash": "sha256-6M0lxz78i79n0UUm6GP/r7zMFXWr0V7gZhpnmtLSlJQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-images", "repo": "nixos-images",
"rev": "08a37650022258173c6e11d865c3cba492be0e55", "rev": "55f23642b75d501387691a22a7e86fbc22d06372",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -537,11 +537,11 @@
}, },
"nixos-stable": { "nixos-stable": {
"locked": { "locked": {
"lastModified": 1743231893, "lastModified": 1742512142,
"narHash": "sha256-tpJsHMUPEhEnzySoQxx7+kA+KUtgWqvlcUBqROYNNt0=", "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c570c1f5304493cafe133b8d843c7c1c4a10d3a6", "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -553,11 +553,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1743315132, "lastModified": 1742889210,
"narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "52faf482a3889b7619003c0daec593a1912fddc1", "rev": "698214a32beb4f4c8e3942372c694f40848b360d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -591,11 +591,11 @@
"nuschtosSearch": "nuschtosSearch" "nuschtosSearch": "nuschtosSearch"
}, },
"locked": { "locked": {
"lastModified": 1743362786, "lastModified": 1742991302,
"narHash": "sha256-XbXIRDbb8/vLBX1M096l7lM5wfzBTp1ZXfUl9bUhVGU=", "narHash": "sha256-5S+qnc5ijgFWlAWS9+L7uAgpDnL0RtVEDhVpHWGoavA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "d81f37256d0a8691b837b74979d27bf89be8ecdd", "rev": "1c0dd320d9c4f250ac33382e11d370b7abe97622",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -613,11 +613,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743201766, "lastModified": 1742659553,
"narHash": "sha256-bb/dqoIjtIWtJRzASOe8g4m8W2jUIWtuoGPXdNjM/Tk=", "narHash": "sha256-i/JCrr/jApVorI9GkSV5to+USrRCa0rWuQDH8JSlK2A=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "2651dbfad93d6ef66c440cbbf23238938b187bde", "rev": "508752835128a3977985a4d5225ff241f7756181",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -725,11 +725,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743494586, "lastModified": 1742700801,
"narHash": "sha256-Rx3/NJnsl8k7N7Ggd7fuHvJkgsee/U19VgtzSGF5k0w=", "narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "49cffb88f6362d14aa893a6b8326692cff48b962", "rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -854,11 +854,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743081648, "lastModified": 1742370146,
"narHash": "sha256-WRAylyYptt6OX5eCEBWyTwOEqEtD6zt33rlUkr6u3cE=", "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "29a3d7b768c70addce17af0869f6e2bd8f5be4b7", "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -213,7 +213,7 @@ in
}; };
profiles = { profiles = {
default = { default = {
extensions.packages = with pkgs.firefox-addons; [ extensions = with pkgs.firefox-addons; [
ublock-origin ublock-origin
bitwarden bitwarden
clearurls clearurls

View file

@ -19,27 +19,35 @@ in
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
mod-arpeggiator-lv2 mod-arpeggiator-lv2
rkrlv2
bolliedelayxt-lv2 bolliedelayxt-lv2
airwindows-lv2 airwindows-lv2
aether-lv2 aether-lv2
swh_lv2 swh_lv2
neural-amp-modeler-lv2 neural-amp-modeler-lv2
mda_lv2 mda_lv2
x42-plugins
#tunefish
mod-distortion mod-distortion
infamousPlugins infamousPlugins
drumgizmo drumgizmo
distrho-ports
bshapr bshapr
bchoppr bchoppr
gxplugins-lv2 gxplugins-lv2
talentedhack talentedhack
plujain-ramp plujain-ramp
mooSpace mooSpace
artyFX
boops boops
metersLv2 metersLv2
bs2b-lv2 bs2b-lv2
oxefmsynth
ninjas2 ninjas2
bespokesynth bespokesynth
zam-plugins zam-plugins
surge-XT
surge
lsp-plugins lsp-plugins
ladspaPlugins ladspaPlugins
AMB-plugins AMB-plugins
@ -51,6 +59,7 @@ in
autotalent autotalent
tap-plugins tap-plugins
xsynth_dssi xsynth_dssi
]; ];
environment.sessionVariables = environment.sessionVariables =

View file

@ -15,8 +15,6 @@
self.inputs.srvos.nixosModules.desktop self.inputs.srvos.nixosModules.desktop
]; ];
boot.loader.grub.devices = [ "/dev/sda" ];
#facter.reportPath = ./facter.json; #facter.reportPath = ./facter.json;
jopejoe1 = { jopejoe1 = {

View file

@ -9,6 +9,7 @@
{ {
imports = [ imports = [
./hardware.nix
./disk.nix ./disk.nix
#nixos-hardware.nixosModules.framework-16-7040-amd #nixos-hardware.nixosModules.framework-16-7040-amd
self.inputs.srvos.nixosModules.desktop self.inputs.srvos.nixosModules.desktop
@ -16,17 +17,18 @@
facter.reportPath = ./facter.json; facter.reportPath = ./facter.json;
virtualisation.xen = { programs.nix-ld = {
enable = false; enable = true;
efi.bootBuilderVerbosity = "info"; # Adds a handy report that lets you know which Xen boot entries were created. libraries = with pkgs; [
bootParams = [ libcxx
"vga=ask" # Useful for non-headless systems with screens bigger than 640x480. SDL
"dom0=pvh" # Uses the PVH virtualisation mode for the Domain 0, instead of PV. openal
libcaca
xorg.libXext
xorg.libX11
libpulseaudio
alsa-lib
]; ];
dom0Resources = {
memory = 32768; # Only allocates 1GiB of memory to the Domain 0, with the rest of the system memory being freely available to other domains.
maxVCPUs = 8; # Allows the Domain 0 to use, at most, two CPU cores.
};
}; };
jopejoe1 = { jopejoe1 = {
@ -112,20 +114,15 @@
allowedUDPPorts = [ 8080 ]; allowedUDPPorts = [ 8080 ];
}; };
boot.binfmt.emulatedSystems = [
"riscv64-linux"
"aarch64-linux"
"armv6l-linux"
];
boot.initrd.systemd.enable = true; boot.initrd.systemd.enable = true;
programs.captive-browser = { programs.captive-browser = {
enable = true; enable = true;
interface = "wlp5s0"; interface = "wlp5s0";
}; };
fileSystems."/home/jopejoe1/Public/games" = {
device = "/dev/sda";
fsType = "bcachefs";
options = [
"compression=zstd"
"nofail"
];
};
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
} }

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,22 @@
# 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,
modulesPath,
...
}:
{
fileSystems."/home/jopejoe1/Public/games" = {
device = "/dev/sda";
fsType = "bcachefs";
options = [
"compression=zstd"
"nofail"
];
};
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
}