Compare commits

...

7 Commits

Author SHA1 Message Date
Daniel Olsen
3e2c2864d2 install zed again 2025-03-27 01:03:27 +01:00
Daniel Olsen
51626254b3 beep bloop 2025-03-27 00:39:22 +01:00
Daniel Olsen
d6a224a466 beep boop 2025-03-25 05:00:07 +01:00
Daniel Olsen
180ecd08a7 init new soryu 2025-03-24 18:30:27 +01:00
Daniel Olsen
18ad8f5a83 move soryu to soryu-old 2025-03-24 17:25:54 +01:00
Daniel Olsen
8525ee16e8 flake.lock update 2025-03-24 01:37:35 +01:00
Daniel Olsen
b96652db97 soryu: more ram 2025-03-23 23:30:53 +01:00
16 changed files with 449 additions and 43 deletions

76
flake.lock generated
View File

@ -9,13 +9,14 @@
"locked": {
"lastModified": 1656687988,
"narHash": "sha256-2ywoy3wUvFAyxDTw7VPlz5TGh9mk/um2AWOjhJqJxNQ=",
"ref": "refs/heads/master",
"ref": "master",
"rev": "7e85f62e40cd585ce81fa1f3debd5385bb0cad03",
"revCount": 160,
"type": "git",
"url": "https://git.dodsorf.as/Dandellion/NUR.git"
},
"original": {
"ref": "master",
"type": "git",
"url": "https://git.dodsorf.as/Dandellion/NUR.git"
}
@ -205,11 +206,11 @@
"rev": "fde738910de1fd8293535a6382c2f0c2749dd7c1",
"revCount": 79,
"type": "git",
"url": "https://git.pvv.ntnu.no/Projects/grzegorz-clients"
"url": "https://git.pvv.ntnu.no/grzegorz/grzegorz-clients"
},
"original": {
"type": "git",
"url": "https://git.pvv.ntnu.no/Projects/grzegorz-clients"
"url": "https://git.pvv.ntnu.no/grzegorz/grzegorz-clients"
}
},
"greg-clients_2": {
@ -241,11 +242,11 @@
]
},
"locked": {
"lastModified": 1739757849,
"narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
"lastModified": 1742655702,
"narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
"rev": "0948aeedc296f964140d9429223c7e4a0702a1ff",
"type": "github"
},
"original": {
@ -420,11 +421,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1739798439,
"narHash": "sha256-GyipmjbbQEaosel/+wq1xihCKbv0/e1LU00x/8b/fP4=",
"lastModified": 1742806253,
"narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "3e2ea8a49d4d76276b0f4e2041df8ca5c0771371",
"rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726",
"type": "github"
},
"original": {
@ -452,11 +453,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1739923778,
"narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=",
"lastModified": 1742751704,
"narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1",
"rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092",
"type": "github"
},
"original": {
@ -530,11 +531,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1739866667,
"narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
"lastModified": 1742889210,
"narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
"rev": "698214a32beb4f4c8e3942372c694f40848b360d",
"type": "github"
},
"original": {
@ -544,6 +545,18 @@
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 0,
"narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=",
"path": "/nix/store/qjmsdak7fhqc7pi922i2mgm45f7af9h8-source",
"type": "path"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nur": {
"inputs": {
"flake-parts": "flake-parts",
@ -551,11 +564,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1740048753,
"narHash": "sha256-2t/4U/39d8kvon9g+qqHd2Mjo5uu2T4r+CMHWX1oU+M=",
"lastModified": 1743025561,
"narHash": "sha256-wbszHA2bJaA9TSLkiU1Gqby4noRNhhWi9CNoFqxSPj0=",
"owner": "nix-community",
"repo": "NUR",
"rev": "37f8ad3ed97ec483592c40a1d816f0e3b80cbdcf",
"rev": "dcc6f70a7f8c69b50a266de40ca6228f01a50c88",
"type": "github"
},
"original": {
@ -605,7 +618,8 @@
"nur": "nur",
"unstable": "unstable",
"wack-ctf": "wack-ctf",
"wack-server-conf": "wack-server-conf"
"wack-server-conf": "wack-server-conf",
"warez": "warez"
}
},
"sops-nix": {
@ -677,11 +691,11 @@
},
"unstable": {
"locked": {
"lastModified": 1739863612,
"narHash": "sha256-UbtgxplOhFcyjBcNbTVO8+HUHAl/WXFDOb6LvqShiZo=",
"lastModified": 1742923925,
"narHash": "sha256-biPjLws6FiBVUUDHEMFq5pUQL84Wf7PntPYdo3oKkFw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "632f04521e847173c54fa72973ec6c39a371211c",
"rev": "25d1b84f5c90632a623c48d83a2faf156451e6b1",
"type": "github"
},
"original": {
@ -848,6 +862,24 @@
"repo": "wack-server-conf",
"type": "github"
}
},
"warez": {
"inputs": {
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1738103614,
"narHash": "sha256-EvaKn0vfvvX/rtRGFXim+JOQLLAr/1Y4igQrmnLI1CE=",
"ref": "refs/heads/master",
"rev": "c3bb59ee5cc6d700f6edf98c65a853efa09993ef",
"revCount": 6,
"type": "git",
"url": "https://git.pvv.ntnu.no/tnug/nix-warez"
},
"original": {
"type": "git",
"url": "https://git.pvv.ntnu.no/tnug/nix-warez"
}
}
},
"root": "root",

View File

@ -1,12 +1,9 @@
{
description = "dandellion's home-manager profiles";
# nixConfig.extra-substituters = ["https://cache.dodsorf.as"];
# nixConfig.exta-trusted-public-keys = "cache.dodsorf.as:FYKGadXTyI2ax8mirBTOjEqS/8PZKAWxiJVOBjESQXc=";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
home-manager.url = "github:nix-community/home-manager/release-24.11";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
@ -16,7 +13,7 @@
nur.url = "github:nix-community/NUR";
dan.url = "git+https://git.dodsorf.as/Dandellion/NUR.git"; #"git+https://git.dodsorf.as/Dandellion/NUR";
dan.url = "git+https://git.dodsorf.as/Dandellion/NUR.git?ref=master"; #"git+https://git.dodsorf.as/Dandellion/NUR";
dan.inputs.nixpkgs.follows = "unstable";
wack-server-conf.url = "github:WackAttackCTF/wack-server-conf";
@ -25,11 +22,10 @@
wack-ctf.url = "github:WackAttackCTF/wack-ctf-flake";
wack-ctf.inputs.nixpkgs.follows = "nixpkgs";
greg-clients.url = "git+https://git.pvv.ntnu.no/Projects/grzegorz-clients";
greg-clients.url = "git+https://git.pvv.ntnu.no/grzegorz/grzegorz-clients";
greg-clients.inputs.nixpkgs.follows = "unstable";
# helix.url = "github:helix-editor/helix";
# helix.inputs.nixpkgs.follows = "unstable";
warez.url = "git+https://git.pvv.ntnu.no/tnug/nix-warez";
nixgl.url = "github:guibou/nixGL";
nixgl.inputs.nixpkgs.follows = "nixpkgs";
@ -50,8 +46,9 @@
# helix = inputs.helix.packages.${prev.system}.helix;
wack = inputs.wack-ctf.packages.${prev.system}.wack;
})
nur.overlay
nixgl.overlay
nur.overlays.default
nixgl.overlays.default
inputs.warez.overlays.default
];
mkHome =
@ -77,11 +74,11 @@
};
mkHomes = machines: extraArgs: nixlib.genAttrs machines (machine: mkHome ({inherit machine; } // extraArgs));
allMachines = [ "laptop" "desktop" "headless" "pvv-terminal" "ikari" ];
in
{
homeConfigurations = mkHomes [ "laptop" "headless" "ikari" ] { }
// mkHomes [ "desktop" ] { username = "dan"; }
// mkHomes [ "pvv-terminal" ] { username = "danio"; homeDirectory = "/home/pvv/d/danio"; };
@ -98,15 +95,43 @@
];
};
soryu-old = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
inherit inputs;
};
modules = [
./hosts/asuka/soryu-old/configuration.nix
];
};
soryu = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
inherit inputs;
};
modules = [
./hosts/soryu/configuration.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = false;
home-manager.useUserPackages = true;
home-manager.users.daniel = import ./home/machines/soryu.nix;
home-manager.extraSpecialArgs = {
overlays = defaultOverlays;
};
}
./hosts/asuka/soryu/configuration.nix
];
};
# langley = nixpkgs.lib.nixosSystem {
# system = "x86_64-linux";
# specialArgs = {
# inherit inputs;
# };
# modules = [
# ./hosts/asuka/langley/configuration.nix
# ];
# };
ikari = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
@ -131,7 +156,7 @@
});
inherit defaultOverlays;
# hydraJobs = {
# laptop.x86_64-linux = self.homeActivations.laptop;
# desktop.x86_64-linux = self.homeActivations.desktop;

31
home/machines/soryu.nix Normal file
View File

@ -0,0 +1,31 @@
{ config, lib, pkgs, overlays, ... }:
{
nixpkgs.overlays = overlays;
nixpkgs.config.allowUnfreePredicate = (pkg: true);
nixpkgs.config.allowUnfree = true;
imports = [ ../profiles ];
machine = {
name = "Soryu";
eth = "enp9s0";
wlan = null;
secondary-fs = null;
};
profiles.base.enable = true;
profiles.base.plus = true;
profiles.xsession.enable = true;
profiles.audio.fancy = true;
profiles.zsh.enable = true;
profiles.games.enable = true;
profiles.timetracking.enable = true;
home.packages = [
pkgs.unstable.osu-lazer-bin
];
home.stateVersion = "24.11";
}

View File

@ -82,7 +82,7 @@ in
ripgrep
gregctl
wack
# wack
] ++ lib.optionals cfg.plus [
ffmpeg-full
] ++ lib.optionals config.profiles.gui.enable [

View File

@ -16,6 +16,7 @@ in {
steam
prismlauncher
fjordlauncher
# minetest
# dwarf-fortress-packages.dwarf-fortress-full
# superTuxKart

View File

@ -26,10 +26,10 @@
SYSTEMD_NSPAWN_TMPFS_TMP = "0";
};
serviceConfig = {
CPUQuota = "300%";
MemoryHigh = "29G";
MemoryMax = "30G";
MemorySwapMax = "50G";
CPUQuota = "1400%";
MemoryHigh = "90G";
MemoryMax = "94G";
MemorySwapMax = "40G";
ExecStart = "systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth -U --settings=override --machine=%i -D /mnt/human/machines/ubuntu-ai";
};
# overrideStrategy = "asDropin";

View File

@ -31,7 +31,7 @@
zramSwap = {
enable = true;
memoryMax = 32 * 1024 * 1024 * 1024; # 16 GB ZRAM
memoryMax = 96 * 1024 * 1024 * 1024; # 96 GB ZRAM
};
disabledModules = [

View File

@ -0,0 +1,71 @@
{ config, lib, pkgs, inputs, ... }:
{
networking.firewall.allowedTCPPorts = [ 1337 ];
networking.nat.forwardPorts = [
{
destination = "${config.containers.ireul.hostAddress}:1337";
proto = "tcp";
sourcePort = 1337;
}
];
containers.ireul = {
bindMounts."/wordlists" = {
hostPath = "/mnt/human/wordlists";
isReadOnly = false;
};
privateNetwork = true;
hostAddress = "192.168.10.1";
localAddress = "192.168.10.2";
forwardPorts = [
{ containerPort = 1337;
hostPort = 1337;
protocol = "tcp";
}
];
bindMounts."/dev/dri" = {
hostPath = "/dev/dri";
isReadOnly = false;
};
bindMounts."/dev/kfd" = {
hostPath = "/dev/kfd";
isReadOnly = false;
};
bindMounts."/run/opengl-driver" = {
hostPath = "/run/opengl-driver";
isReadOnly = false;
};
allowedDevices = [
{ node = "/dev/dri/card0"; modifier = "rw"; }
{ node = "/dev/dri/renderD128"; modifier = "rw"; }
{ node = "/dev/kfd"; modifier = "rw"; }
];
config = { config, pkgs, ... }: {
services.openssh.enable = true;
services.openssh.ports = [ 1337 ];
environment.systemPackages = with pkgs; [
hashcat
hashcat-utils
john
kitty.terminfo
];
users.groups.video.members = builtins.attrNames config.users.users;
programs.zsh.enable = true;
imports = [ (inputs.wack-server-conf + /users/default.nix) ];
system.stateVersion = "24.11";
};
};
}

View File

@ -0,0 +1,190 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ config, lib, pkgs, ... }:
{
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
# ./wack.nix
];
# Use the systemd-boot EFI boot loader.
boot.loader.efi.canTouchEfiVariables = true;
boot.loader.systemd-boot = {
enable = true;
netbootxyz = { enable = true; sortKey = "y_netbootxyz"; };
edk2-uefi-shell = { enable = true; sortKey = "z_edk2-uefi-shell"; };
extraEntries = {
"old-soryuu.conf" = ''
title Old Soryuu;
efi /efi/edk2-uefi-shell/shell.efi
options -nointerrupt -nomap -noversion HD1b65535a:\EFI\systemd\systemd-bootx64.efi
sort-key o_soryuu-old
'';
};
};
boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
boot.kernelPackages = pkgs.linuxPackages_latest;
# programs.adb.enable = true;
systemd.enableEmergencyMode = false;
networking.hostName = "soryu";
networking.extraHosts = ''
127.0.0.1 modules-cdn.eac-prod.on.epicgames.com #Star Citizen EAC workaround
'';
# Star Citizen resource limits
boot.kernel.sysctl = {
"vm.max_map_count" = 16777216;
"fs.file-max" = 524288;
};
zramSwap = {
enable = true;
memoryMax = 96 * 1024 * 1024 * 1024; # 96 GB ZRAM
};
services.resolved.enable = true;
services.resolved.dnssec = "false";
services.gnome.gnome-keyring.enable = true;
services.murmur = {
enable = true;
# registerName = "DODSORFAS";
welcometext = "Dans PC at singsaker smh backup mumble server";
};
programs.steam = {
enable = true;
remotePlay.openFirewall = false; # Open ports in the firewall for Steam Remote Play
dedicatedServer.openFirewall = false; # Open ports in the firewall for Source Dedicated Server
};
nixpkgs.config = {
allowUnfree = true;
};
services.tailscale.enable = true;
networking.firewall.interfaces."tailscale0" = let
all = { from = 0; to = 65535; };
in {
allowedUDPPortRanges = [ all ];
allowedTCPPortRanges = [ all ];
};
# Select internationalisation properties.
console.keyMap = "no-latin1";
time.timeZone = "Europe/Oslo";
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
wget vim git
];
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
# programs.mtr.enable = true;
# programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
# List services that you want to enable:
# Enable the OpenSSH daemon.
services.openssh.enable = true;
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
networking.firewall.enable = true;
networking.firewall.allowedTCPPorts = [ config.services.murmur.port ];
networking.firewall.allowedUDPPorts = [ config.services.murmur.port ];
# Enable CUPS to print documents.
# services.printing.enable = true;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
jack.enable = true;
};
hardware.graphics.enable = true;
hardware.graphics.enable32Bit = true;
hardware.graphics.extraPackages = with pkgs; [
libva
];
hardware.amdgpu.opencl.enable = true;
# Enable the X11 windowing system.
services.xserver.enable = true;
services.xserver.displayManager = {
defaultSession = "xsession";
session = [
{ manage = "desktop";
name = "xsession";
start = "exec $HOME/.xsession";
}
];
};
services.xserver.xkb.layout = "no";
# services.xserver.xkbOptions = "eurosign:e";
services.xserver.displayManager.lightdm.enable = true;
services.xserver.videoDrivers = ["amdgpu"];
programs.zsh.enable = true;
virtualisation.docker.enable = true;
virtualisation.libvirtd.enable = true;
virtualisation.spiceUSBRedirection.enable = true;
# networking.nameservers = lib.mkForce [ "192.168.0.25" ];
# services.ipfs.enable = true;
# services.ipfs.gatewayAddress = "/ip4/127.0.0.1/tcp/5002";
nix.trustedUsers = [ "daniel" ];
nix.extraOptions = ''
experimental-features = nix-command flakes
'';
users.users.daniel = {
isNormalUser = true;
uid = 1000;
shell = pkgs.zsh;
extraGroups = [ "wheel" "networkmanager" "docker" "video" "libvirtd" ];
initialPassword = "Abc123";
};
programs.dconf.enable = true;
services.dbus.packages = with pkgs; [ dconf ];
# This value determines the NixOS release with which your system is to be
# compatible, in order to avoid breaking some software such as database
# servers. You should change this only after NixOS release notes say you
# should.
system.stateVersion = "24.11"; # Did you read the comment?
}

View File

@ -0,0 +1,56 @@
# 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")
];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "thunderbolt" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
boot.initrd.luks.devices."crypted-main".device = "/dev/disk/by-uuid/2f59c91a-6765-439a-bc8d-6a84d662ba0c";
fileSystems."/" =
{ device = "/dev/disk/by-uuid/a1aec49d-4455-44e6-b69a-2576598b8749";
fsType = "btrfs";
options = [ "subvol=root" ];
};
fileSystems."/home" =
{ device = "/dev/disk/by-uuid/a1aec49d-4455-44e6-b69a-2576598b8749";
fsType = "btrfs";
options = [ "subvol=home" ];
};
fileSystems."/nix" =
{ device = "/dev/disk/by-uuid/a1aec49d-4455-44e6-b69a-2576598b8749";
fsType = "btrfs";
options = [ "subvol=nix" ];
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/2285-60E9";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
};
swapDevices = [ { device = "/dev/disk/by-partlabel/swap"; randomEncryption.enable = true; } ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# 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.docker0.useDHCP = lib.mkDefault true;
# networking.interfaces.enp9s0.useDHCP = lib.mkDefault true;
# networking.interfaces.tailscale0.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp10s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}