So much shit I cba to make commits

This commit is contained in:
blahai 2024-11-17 00:07:01 +02:00
parent b5983eb5f1
commit 8527a1396c
Signed by: blahai
SSH key fingerprint: SHA256:ZfCryi+V64yG+vC1ZIIsqgvBCmA31tTi7RJ6M8CvpRc
7 changed files with 117 additions and 118 deletions

4
.gitattributes vendored
View file

@ -1,3 +1,3 @@
flake.lock -diff flake.lock -diff
*.css linguist-detectable=false
modules/home-manager/browser/floorp/chrome/* linguist-vendored *.css linguist-generated=true

View file

@ -42,11 +42,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730968822, "lastModified": 1731496216,
"narHash": "sha256-NocDjINsh6ismkhb0Xr6xPRksmhuB2WGf8ZmXMhxu7Y=", "narHash": "sha256-nlQrNN+tmJ+iP6Ck/czwZI0Hxz3oNvUyGkVruxJwgwA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "a49bc3583ff223f426cb3526fdaa4bcaa247ec14", "rev": "3b00e96f90cb0040de6d88ad99bf5f4d443f0c59",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -78,11 +78,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1731286286, "lastModified": 1731678403,
"narHash": "sha256-7jpkIFzw+dHqtn6/iPHQLnxk6X4RdTwaE03ivRulmaY=", "narHash": "sha256-kcsXMNjQQK3hgUBaH9JoyHyESRvDhFV7L0GqVha3C40=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "363a6f38bc9a634e7431a5623194757b3f8c68a1", "rev": "d9d59a2819215227199b5eeab06a7e5fb56681f7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -121,11 +121,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731274291, "lastModified": 1731746438,
"narHash": "sha256-cZ0QMpv5p2a6WEE+o9uu0a4ma6RzQDOQTbm7PbixWz8=", "narHash": "sha256-f3SSp1axoOk0NAI7oFdRzbxG2XPBSIXC+/DaAXnvS1A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "486250f404f4a4f4f33f8f669d83ca5f6e6b7dfc", "rev": "cb64993826fa7a477490be6ccb38ba1fa1e18fa8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -312,11 +312,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731235328, "lastModified": 1731535640,
"narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", "narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "60bb110917844d354f3c18e05450606a435d2d10", "rev": "35b055009afd0107b69c286fca34d2ad98940d57",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -332,11 +332,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731235328, "lastModified": 1731786860,
"narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", "narHash": "sha256-130gQ5k8kZlxjBEeLpE+SvWFgSOFgQFeZlqIik7KgtQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "60bb110917844d354f3c18e05450606a435d2d10", "rev": "1bd5616e33c0c54d7a5b37db94160635a9b27aeb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -388,11 +388,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1731340175, "lastModified": 1731775198,
"narHash": "sha256-qhkP+XRa1AuKkVrxKDLdK4gby363vH6wEie5tb6rz2E=", "narHash": "sha256-WyPBmw5YMukhzZSZYFOzLi8Tmje8dj/mX+4TeUGthrY=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "f5fa84554ffe55e29a397014964238be89ffa54d", "rev": "83be2480c45bdead9110fdf137a1cd2f5a203378",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -467,11 +467,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731163338, "lastModified": 1731518387,
"narHash": "sha256-Qflei0JBeqQ0c8jxA8e982xAxJvfMwfx4Aci2eJi84s=", "narHash": "sha256-aZZw1ZvTMLkcA6udlvkA3hrCkuipoWLy8s/JNnIclxY=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "60d3dece30f98e8ad85131829c8529950630d6bc", "rev": "315fba5d21d87ddb756d4bebdb49f99d86b0ffe8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -585,11 +585,11 @@
"systems": "systems_5" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1731152446, "lastModified": 1731508795,
"narHash": "sha256-RVqH/LZYFdjtM5z6n+FzEYhubd2zzXg5pzyEpC8xiyg=", "narHash": "sha256-+UibbVz5CTisKMms/5VXGe39FYr56qzaEtX4TWQPkjk=",
"owner": "InioX", "owner": "InioX",
"repo": "matugen", "repo": "matugen",
"rev": "bc520c597cfc26a683c1e7330958e35b01e6130e", "rev": "cb9f81eb0150f6253895ea0adb1daa8534c15fc7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -623,11 +623,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1731139594, "lastModified": 1731319897,
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "rev": "dc460ec76cbff0e66e269457d7b728432263166c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -671,11 +671,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1730785428, "lastModified": 1731139594,
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -703,11 +703,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1731139594, "lastModified": 1731319897,
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "rev": "dc460ec76cbff0e66e269457d7b728432263166c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -735,11 +735,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1730200266, "lastModified": 1731319897,
"narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", "rev": "dc460ec76cbff0e66e269457d7b728432263166c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -751,11 +751,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1731354313, "lastModified": 1731789015,
"narHash": "sha256-AEzoXzAJx09S7ADEaV9dFlPGgYedzua9DjANAC8qAxk=", "narHash": "sha256-WPdauhhD4ZdQ35p3WU8p95P6tN73K6s3w/MkBVW8+tI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "9ed42d53fa81cc19986de870927e2760b37dfc8c", "rev": "5b1a95e38d7c29f980061561cdbd793aa9596b08",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -775,11 +775,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1730814269, "lastModified": 1731363552,
"narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "d70155fdc00df4628446352fc58adc640cd705c2", "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -836,11 +836,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1731213149, "lastModified": 1731748189,
"narHash": "sha256-jR8i6nFLmSmm0cIoeRQ8Q4EBARa3oGaAtEER/OMMxus=", "narHash": "sha256-Zd/Uukvpcu26M6YGhpbsgqm6LUSLz+Q8mDZ5LOEGdiE=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "f1675e3b0e1e663a4af49be67ecbc9e749f85eb7", "rev": "d2bd7f433b28db6bc7ae03d5eca43564da0af054",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -857,11 +857,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731298576, "lastModified": 1731759572,
"narHash": "sha256-l2m0LcSohbU7FXhdlJC/jbxt9PEvFfIcdEXQdSzbvL4=", "narHash": "sha256-wJfvdHRAQNIiWxvgFemX0ZsTCskq3QnD7HCG5Na7NLc=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "c503d1e7521af93013b6253a5f4899ea62a3c5a3", "rev": "068214cd7f099b8ed9388986c6792b387f3b4276",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -990,11 +990,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1730734444, "lastModified": 1731625276,
"narHash": "sha256-lNgCAphrq3/bYGjgDxEl2rVcer6GnmfWXDhxc+kdYOk=", "narHash": "sha256-NbgX4nfGJYFflQauJZMTJrpgTD5oY3hgs+KNE3JJgSc=",
"owner": "wez", "owner": "wez",
"repo": "wezterm", "repo": "wezterm",
"rev": "51c794ac500a2033b9dc570c71810518bfa667a9", "rev": "979df7826965348345a3305ed889a4b9aef838e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1050,11 +1050,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1731281366, "lastModified": 1731689537,
"narHash": "sha256-GALaKG3LyiYw4EdFxSwJidgLHgaDsTuic5uiJlkpdrc=", "narHash": "sha256-0wN39XFD5bVcNANh9uLoQYyKbp9r6xX+oON1qI+L9iI=",
"owner": "ch4og", "owner": "ch4og",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "d7c020d6b192bfa040a58efaf62be74f9155d1a0", "rev": "064be844324965da1d596a541fdd831efe4a3a32",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,12 +1,11 @@
{ config, pkgs, inputs, system, lib, ... }: { config, pkgs, inputs, system, lib, ... }:
{ {
imports = imports = [
[ ./hardware-configuration.nix
./hardware-configuration.nix ../../modules/nixos/default.nix
../../modules/nixos/default.nix inputs.home-manager.nixosModules.default
inputs.home-manager.nixosModules.default ];
];
documentation.nixos.enable = false; documentation.nixos.enable = false;
@ -25,11 +24,7 @@
# package = pkgs.zfs_unstable; # package = pkgs.zfs_unstable;
# }; # };
kernelPackages = pkgs.linuxPackages_zen; kernelPackages = pkgs.linuxPackages_zen;
kernel = { kernel = { sysctl = { "vm.max_map_count" = 2147483642; }; };
sysctl ={
"vm.max_map_count" = 2147483642;
};
};
}; };
zramSwap = { zramSwap = {
@ -40,20 +35,14 @@
networking = { networking = {
hostName = "nyx"; hostName = "nyx";
hostId = builtins.substring 0 8 (builtins.hashString "md5" config.networking.hostName); hostId = builtins.substring 0 8
(builtins.hashString "md5" config.networking.hostName);
networkmanager.enable = true; networkmanager.enable = true;
stevenblack = { stevenblack = {
enable = true; enable = true;
block = [ block = [ "fakenews" "gambling" ];
"fakenews"
"gambling"
];
}; };
nameservers = [ nameservers = [ "1.1.1.1" "1.0.0.1" "9.9.9.9" ];
"1.1.1.1"
"1.0.0.1"
"9.9.9.9"
];
}; };
time.timeZone = "Europe/Helsinki"; time.timeZone = "Europe/Helsinki";
@ -88,7 +77,7 @@
gnome.gnome-keyring.enable = true; gnome.gnome-keyring.enable = true;
}; };
hardware.pulseaudio.enable = false; hardware.pulseaudio.enable = false;
security.rtkit.enable = true; security.rtkit.enable = true;
@ -114,25 +103,24 @@
useUserPackages = true; useUserPackages = true;
verbose = true; verbose = true;
backupFileExtension = "bak"; backupFileExtension = "bak";
users = { users = { "pingu" = import ./home.nix; };
"pingu" = import ./home.nix;
};
}; };
systemd = { systemd = {
user.services.polkit-gnome-authentication-agent-1 = { user.services.polkit-gnome-authentication-agent-1 = {
description = "polkit-gnome-authentication-agent-1"; description = "polkit-gnome-authentication-agent-1";
wantedBy = [ "graphical-session.target" ]; wantedBy = [ "graphical-session.target" ];
wants = [ "graphical-session.target" ]; wants = [ "graphical-session.target" ];
after = [ "graphical-session.target" ]; after = [ "graphical-session.target" ];
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";
ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; ExecStart =
"${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
Restart = "on-failure"; Restart = "on-failure";
RestartSec = 1; RestartSec = 1;
TimeoutStopSec = 10; TimeoutStopSec = 10;
}; };
}; };
}; };
@ -147,9 +135,7 @@
portalPackage = inputs.hyprland.packages."${pkgs.system}".hyprland; portalPackage = inputs.hyprland.packages."${pkgs.system}".hyprland;
}; };
direnv = { direnv = { enable = true; };
enable = true;
};
nh = { nh = {
enable = true; enable = true;
@ -204,8 +190,16 @@
qt.enable = true; qt.enable = true;
environment.sessionVariables.GST_PLUGIN_SYSTEM_PATH_1_0 =
lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" (with pkgs.gst_all_1; [
gst-plugins-good
gst-plugins-bad
gst-plugins-ugly
gst-libav
]);
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
matugen inputs.matugen.packages."${pkgs.system}".default
nautilus nautilus
diff-so-fancy diff-so-fancy
eog eog
@ -286,6 +280,7 @@
material-symbols material-symbols
material-icons material-icons
maple-mono maple-mono
maple-mono-NF
]; ];
programs.gnupg.agent = { programs.gnupg.agent = {

View file

@ -1,4 +1,4 @@
{ modulesPath, lib, pkgs, ... }: { { config, modulesPath, lib, pkgs, ... }: {
system.stateVersion = "24.11"; system.stateVersion = "24.11";
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];

View file

@ -15,6 +15,7 @@
hyprpicker hyprpicker
pwvucontrol pwvucontrol
which which
python312Packages.gpustat
]; ];
programs.ags = { programs.ags = {
@ -27,6 +28,7 @@
# additional packages to add to gjs's runtime # additional packages to add to gjs's runtime
extraPackages = with pkgs; [ extraPackages = with pkgs; [
accountsservice accountsservice
gtk-session-lock
]; ];
}; };
} }

View file

@ -46,7 +46,7 @@
enable = true; enable = true;
enable32Bit = true; enable32Bit = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
mesa mesa.drivers
egl-wayland egl-wayland
rocmPackages.clr.icd rocmPackages.clr.icd
amdvlk amdvlk

View file

@ -1,5 +1,4 @@
{ pkgs, lib, config, ... }: { pkgs, lib, config, ... }: {
{
boot = { boot = {
initrd.kernelModules = lib.mkBefore [ initrd.kernelModules = lib.mkBefore [
"kvm-amd" "kvm-amd"
@ -17,9 +16,13 @@
]; ];
extraModprobeConfig = '' extraModprobeConfig = ''
softdep drm pre: vfio-pci softdep drm pre: vfio-pci
options kvm_amd nested=1
options kvm ignore_msrs=1 report_ignored_msrs=0
''; '';
}; };
hardware.ksm.enable = true;
virtualisation = { virtualisation = {
libvirtd = { libvirtd = {
enable = true; enable = true;
@ -32,22 +35,21 @@
}; };
}; };
docker = { docker = { enable = true; };
enable = true;
};
}; };
programs = { programs = { virt-manager = { enable = true; }; };
virt-manager = {
enable = true;
};
};
users.users.pingu.extraGroups = [ "qemu-libvirtd" "libvirtd" "disk" "kvm" "docker" ]; users.users.pingu.extraGroups =
[ "qemu-libvirtd" "libvirtd" "disk" "kvm" "docker" ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
python3 # scripts, cba to use nix shell all the time
usbutils
pciutils
virt-manager virt-manager
moonlight-qt # for linux vms
looking-glass-client # for windows vms :husk:
]; ];
} }