diff --git a/.gitattributes b/.gitattributes index d633a10..cb2a0c9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,3 @@ flake.lock -diff - -modules/home-manager/browser/floorp/chrome/* linguist-vendored +*.css linguist-detectable=false +*.css linguist-generated=true diff --git a/flake.lock b/flake.lock index 4f935fc..3a87bf4 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1730968822, - "narHash": "sha256-NocDjINsh6ismkhb0Xr6xPRksmhuB2WGf8ZmXMhxu7Y=", + "lastModified": 1731496216, + "narHash": "sha256-nlQrNN+tmJ+iP6Ck/czwZI0Hxz3oNvUyGkVruxJwgwA=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a49bc3583ff223f426cb3526fdaa4bcaa247ec14", + "rev": "3b00e96f90cb0040de6d88ad99bf5f4d443f0c59", "type": "github" }, "original": { @@ -78,11 +78,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1731286286, - "narHash": "sha256-7jpkIFzw+dHqtn6/iPHQLnxk6X4RdTwaE03ivRulmaY=", + "lastModified": 1731678403, + "narHash": "sha256-kcsXMNjQQK3hgUBaH9JoyHyESRvDhFV7L0GqVha3C40=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "363a6f38bc9a634e7431a5623194757b3f8c68a1", + "rev": "d9d59a2819215227199b5eeab06a7e5fb56681f7", "type": "github" }, "original": { @@ -121,11 +121,11 @@ ] }, "locked": { - "lastModified": 1731274291, - "narHash": "sha256-cZ0QMpv5p2a6WEE+o9uu0a4ma6RzQDOQTbm7PbixWz8=", + "lastModified": 1731746438, + "narHash": "sha256-f3SSp1axoOk0NAI7oFdRzbxG2XPBSIXC+/DaAXnvS1A=", "owner": "nix-community", "repo": "disko", - "rev": "486250f404f4a4f4f33f8f669d83ca5f6e6b7dfc", + "rev": "cb64993826fa7a477490be6ccb38ba1fa1e18fa8", "type": "github" }, "original": { @@ -312,11 +312,11 @@ ] }, "locked": { - "lastModified": 1731235328, - "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", + "lastModified": 1731535640, + "narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=", "owner": "nix-community", "repo": "home-manager", - "rev": "60bb110917844d354f3c18e05450606a435d2d10", + "rev": "35b055009afd0107b69c286fca34d2ad98940d57", "type": "github" }, "original": { @@ -332,11 +332,11 @@ ] }, "locked": { - "lastModified": 1731235328, - "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", + "lastModified": 1731786860, + "narHash": "sha256-130gQ5k8kZlxjBEeLpE+SvWFgSOFgQFeZlqIik7KgtQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "60bb110917844d354f3c18e05450606a435d2d10", + "rev": "1bd5616e33c0c54d7a5b37db94160635a9b27aeb", "type": "github" }, "original": { @@ -388,11 +388,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1731340175, - "narHash": "sha256-qhkP+XRa1AuKkVrxKDLdK4gby363vH6wEie5tb6rz2E=", + "lastModified": 1731775198, + "narHash": "sha256-WyPBmw5YMukhzZSZYFOzLi8Tmje8dj/mX+4TeUGthrY=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "f5fa84554ffe55e29a397014964238be89ffa54d", + "rev": "83be2480c45bdead9110fdf137a1cd2f5a203378", "type": "github" }, "original": { @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1731163338, - "narHash": "sha256-Qflei0JBeqQ0c8jxA8e982xAxJvfMwfx4Aci2eJi84s=", + "lastModified": 1731518387, + "narHash": "sha256-aZZw1ZvTMLkcA6udlvkA3hrCkuipoWLy8s/JNnIclxY=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "60d3dece30f98e8ad85131829c8529950630d6bc", + "rev": "315fba5d21d87ddb756d4bebdb49f99d86b0ffe8", "type": "github" }, "original": { @@ -585,11 +585,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1731152446, - "narHash": "sha256-RVqH/LZYFdjtM5z6n+FzEYhubd2zzXg5pzyEpC8xiyg=", + "lastModified": 1731508795, + "narHash": "sha256-+UibbVz5CTisKMms/5VXGe39FYr56qzaEtX4TWQPkjk=", "owner": "InioX", "repo": "matugen", - "rev": "bc520c597cfc26a683c1e7330958e35b01e6130e", + "rev": "cb9f81eb0150f6253895ea0adb1daa8534c15fc7", "type": "github" }, "original": { @@ -623,11 +623,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1731319897, + "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "dc460ec76cbff0e66e269457d7b728432263166c", "type": "github" }, "original": { @@ -671,11 +671,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1731139594, + "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "type": "github" }, "original": { @@ -703,11 +703,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1731319897, + "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "dc460ec76cbff0e66e269457d7b728432263166c", "type": "github" }, "original": { @@ -735,11 +735,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "lastModified": 1731319897, + "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "rev": "dc460ec76cbff0e66e269457d7b728432263166c", "type": "github" }, "original": { @@ -751,11 +751,11 @@ }, "nur": { "locked": { - "lastModified": 1731354313, - "narHash": "sha256-AEzoXzAJx09S7ADEaV9dFlPGgYedzua9DjANAC8qAxk=", + "lastModified": 1731789015, + "narHash": "sha256-WPdauhhD4ZdQ35p3WU8p95P6tN73K6s3w/MkBVW8+tI=", "owner": "nix-community", "repo": "NUR", - "rev": "9ed42d53fa81cc19986de870927e2760b37dfc8c", + "rev": "5b1a95e38d7c29f980061561cdbd793aa9596b08", "type": "github" }, "original": { @@ -775,11 +775,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1730814269, - "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "d70155fdc00df4628446352fc58adc640cd705c2", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -836,11 +836,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1731213149, - "narHash": "sha256-jR8i6nFLmSmm0cIoeRQ8Q4EBARa3oGaAtEER/OMMxus=", + "lastModified": 1731748189, + "narHash": "sha256-Zd/Uukvpcu26M6YGhpbsgqm6LUSLz+Q8mDZ5LOEGdiE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f1675e3b0e1e663a4af49be67ecbc9e749f85eb7", + "rev": "d2bd7f433b28db6bc7ae03d5eca43564da0af054", "type": "github" }, "original": { @@ -857,11 +857,11 @@ ] }, "locked": { - "lastModified": 1731298576, - "narHash": "sha256-l2m0LcSohbU7FXhdlJC/jbxt9PEvFfIcdEXQdSzbvL4=", + "lastModified": 1731759572, + "narHash": "sha256-wJfvdHRAQNIiWxvgFemX0ZsTCskq3QnD7HCG5Na7NLc=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "c503d1e7521af93013b6253a5f4899ea62a3c5a3", + "rev": "068214cd7f099b8ed9388986c6792b387f3b4276", "type": "github" }, "original": { @@ -990,11 +990,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1730734444, - "narHash": "sha256-lNgCAphrq3/bYGjgDxEl2rVcer6GnmfWXDhxc+kdYOk=", + "lastModified": 1731625276, + "narHash": "sha256-NbgX4nfGJYFflQauJZMTJrpgTD5oY3hgs+KNE3JJgSc=", "owner": "wez", "repo": "wezterm", - "rev": "51c794ac500a2033b9dc570c71810518bfa667a9", + "rev": "979df7826965348345a3305ed889a4b9aef838e1", "type": "github" }, "original": { @@ -1050,11 +1050,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1731281366, - "narHash": "sha256-GALaKG3LyiYw4EdFxSwJidgLHgaDsTuic5uiJlkpdrc=", + "lastModified": 1731689537, + "narHash": "sha256-0wN39XFD5bVcNANh9uLoQYyKbp9r6xX+oON1qI+L9iI=", "owner": "ch4og", "repo": "zen-browser-flake", - "rev": "d7c020d6b192bfa040a58efaf62be74f9155d1a0", + "rev": "064be844324965da1d596a541fdd831efe4a3a32", "type": "github" }, "original": { diff --git a/hosts/nyx/configuration.nix b/hosts/nyx/configuration.nix index 25041b4..32f0ae1 100644 --- a/hosts/nyx/configuration.nix +++ b/hosts/nyx/configuration.nix @@ -1,12 +1,11 @@ { config, pkgs, inputs, system, lib, ... }: { - imports = - [ - ./hardware-configuration.nix - ../../modules/nixos/default.nix - inputs.home-manager.nixosModules.default - ]; + imports = [ + ./hardware-configuration.nix + ../../modules/nixos/default.nix + inputs.home-manager.nixosModules.default + ]; documentation.nixos.enable = false; @@ -25,11 +24,7 @@ # package = pkgs.zfs_unstable; # }; kernelPackages = pkgs.linuxPackages_zen; - kernel = { - sysctl ={ - "vm.max_map_count" = 2147483642; - }; - }; + kernel = { sysctl = { "vm.max_map_count" = 2147483642; }; }; }; zramSwap = { @@ -40,20 +35,14 @@ networking = { 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; stevenblack = { enable = true; - block = [ - "fakenews" - "gambling" - ]; + block = [ "fakenews" "gambling" ]; }; - nameservers = [ - "1.1.1.1" - "1.0.0.1" - "9.9.9.9" - ]; + nameservers = [ "1.1.1.1" "1.0.0.1" "9.9.9.9" ]; }; time.timeZone = "Europe/Helsinki"; @@ -85,10 +74,10 @@ variant = "euro"; }; }; - + gnome.gnome-keyring.enable = true; - }; + }; hardware.pulseaudio.enable = false; security.rtkit.enable = true; @@ -114,31 +103,30 @@ useUserPackages = true; verbose = true; backupFileExtension = "bak"; - users = { - "pingu" = import ./home.nix; - }; + users = { "pingu" = import ./home.nix; }; }; systemd = { user.services.polkit-gnome-authentication-agent-1 = { - description = "polkit-gnome-authentication-agent-1"; - wantedBy = [ "graphical-session.target" ]; - wants = [ "graphical-session.target" ]; - after = [ "graphical-session.target" ]; - serviceConfig = { + description = "polkit-gnome-authentication-agent-1"; + wantedBy = [ "graphical-session.target" ]; + wants = [ "graphical-session.target" ]; + after = [ "graphical-session.target" ]; + serviceConfig = { 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"; RestartSec = 1; TimeoutStopSec = 10; }; - }; + }; }; programs = { firefox.enable = true; - + fish.enable = true; hyprland = { @@ -146,11 +134,9 @@ package = inputs.hyprland.packages."${pkgs.system}".hyprland; portalPackage = inputs.hyprland.packages."${pkgs.system}".hyprland; }; - - direnv = { - enable = true; - }; - + + direnv = { enable = true; }; + nh = { enable = true; flake = "/home/pingu/.config/nixos"; @@ -165,7 +151,7 @@ git = { enable = true; lfs.enable = true; - + }; }; @@ -189,23 +175,31 @@ "https://hyprland.cachix.org/" "https://anyrun.cachix.org" "https://wezterm.cachix.org" - "https://hydra.nixos.org/" + "https://hydra.nixos.org/" ]; - trusted-public-keys = [ + trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s=" "wezterm.cachix.org-1:kAbhjYUC9qvblTE+s7S+kl5XM1zVa4skO+E/1IDWdH0=" - "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=" + "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=" ]; }; }; 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; [ - matugen + inputs.matugen.packages."${pkgs.system}".default nautilus diff-so-fancy eog @@ -227,9 +221,9 @@ socat btrfs-progs btop - rocmPackages.rocm-smi + rocmPackages.rocm-smi hyprcursor - grimblast + grimblast neovim wget git @@ -286,6 +280,7 @@ material-symbols material-icons maple-mono + maple-mono-NF ]; programs.gnupg.agent = { diff --git a/hosts/theia/configuration.nix b/hosts/theia/configuration.nix index 1b92010..772ddc7 100644 --- a/hosts/theia/configuration.nix +++ b/hosts/theia/configuration.nix @@ -1,4 +1,4 @@ -{ modulesPath, lib, pkgs, ... }: { +{ config, modulesPath, lib, pkgs, ... }: { system.stateVersion = "24.11"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; diff --git a/modules/home-manager/ags/default.nix b/modules/home-manager/ags/default.nix index 3f386e8..76411aa 100644 --- a/modules/home-manager/ags/default.nix +++ b/modules/home-manager/ags/default.nix @@ -15,6 +15,7 @@ hyprpicker pwvucontrol which + python312Packages.gpustat ]; programs.ags = { @@ -27,6 +28,7 @@ # additional packages to add to gjs's runtime extraPackages = with pkgs; [ accountsservice + gtk-session-lock ]; }; } diff --git a/modules/nixos/games/default.nix b/modules/nixos/games/default.nix index e9d3b2d..13cb924 100644 --- a/modules/nixos/games/default.nix +++ b/modules/nixos/games/default.nix @@ -46,7 +46,7 @@ enable = true; enable32Bit = true; extraPackages = with pkgs; [ - mesa + mesa.drivers egl-wayland rocmPackages.clr.icd amdvlk diff --git a/modules/nixos/virtualisation.nix b/modules/nixos/virtualisation.nix index 40ee12a..80ea310 100644 --- a/modules/nixos/virtualisation.nix +++ b/modules/nixos/virtualisation.nix @@ -1,7 +1,6 @@ -{ pkgs, lib, config, ... }: -{ +{ pkgs, lib, config, ... }: { boot = { - initrd.kernelModules = lib.mkBefore [ + initrd.kernelModules = lib.mkBefore [ "kvm-amd" "vfio_pci" "vfio_iommu_type1" @@ -9,7 +8,7 @@ "amdgpu" ]; - kernelParams = [ + kernelParams = [ "amd_iommu=on" "amd_iommu=pt" "kvm.ignore_msrs=1" @@ -17,9 +16,13 @@ ]; extraModprobeConfig = '' softdep drm pre: vfio-pci + options kvm_amd nested=1 + options kvm ignore_msrs=1 report_ignored_msrs=0 ''; }; + hardware.ksm.enable = true; + virtualisation = { libvirtd = { enable = true; @@ -32,22 +35,21 @@ }; }; - docker = { - enable = true; - }; + docker = { enable = true; }; }; - programs = { - virt-manager = { - enable = true; - }; - }; + programs = { 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; [ + python3 # scripts, cba to use nix shell all the time + usbutils + pciutils virt-manager + moonlight-qt # for linux vms + looking-glass-client # for windows vms :husk: ]; - }