From d12a873a63e92eb35115e16ec1bfce9b152d343a Mon Sep 17 00:00:00 2001 From: Daniel Bulant Date: Tue, 3 Dec 2024 21:12:15 +0100 Subject: [PATCH] update --- .config/hypr/hyprland.conf | 8 +++--- configuration.nix | 23 +++++++++++------- flake.lock | 50 +++++++++++++++++++------------------- home.nix | 5 +++- upgrade-nix.sh | 4 +-- 5 files changed, 49 insertions(+), 41 deletions(-) diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index 700809d..db4d052 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -182,10 +182,10 @@ decoration { # xray = true } - drop_shadow = yes - shadow_range = 4 - shadow_render_power = 3 - col.shadow = rgba(1a1a1aee) + # drop_shadow = yes + # shadow_range = 4 + # shadow_render_power = 3 + # col.shadow = rgba(1a1a1aee) } animations { diff --git a/configuration.nix b/configuration.nix index fe93bd8..7c6860a 100644 --- a/configuration.nix +++ b/configuration.nix @@ -10,20 +10,21 @@ { imports = [ - # nixos-hardware.lenovo-legion-16ach6h-hybrid # this is borked in latest update for some reason, edid doesn't build - nixos-hardware.nixosModules.common-cpu-amd - nixos-hardware.nixosModules.common-cpu-amd-pstate - nixos-hardware.nixosModules.common-cpu-amd-zenpower - nixos-hardware.nixosModules.common-gpu-amd - nixos-hardware.nixosModules.common-gpu-nvidia - nixos-hardware.nixosModules.common-pc-laptop - nixos-hardware.nixosModules.common-pc-laptop-ssd + nixos-hardware.nixosModules.lenovo-legion-16ach6h-hybrid # this is borked in latest update for some reason, edid doesn't build + # nixos-hardware.nixosModules.common-cpu-amd + # nixos-hardware.nixosModules.common-cpu-amd-pstate + # nixos-hardware.nixosModules.common-cpu-amd-zenpower + # nixos-hardware.nixosModules.common-gpu-amd + # nixos-hardware.nixosModules.common-gpu-nvidia + # nixos-hardware.nixosModules.common-pc-laptop + # nixos-hardware.nixosModules.common-pc-laptop-ssd ./hardware-configuration.nix # /etc/nixos/cachix.nix ]; nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" + "cinny-unwrapped-4.2.3" # "qbittorrent-4.6.4" # "cinny-3.2.0" "dotnet-sdk-wrapped-7.0.410" @@ -248,6 +249,10 @@ # Steam support enable32Bit = true; # package32 = unstable-pkgs.pkgsi686Linux.mesa.drivers; + extraPackages = with pkgs; [ + libvdpau-va-gl + nvidia-vaapi-driver + ]; }; boot.kernelModules = ["amdgpu" "nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm"]; @@ -292,7 +297,7 @@ nix.settings.experimental-features = [ "nix-command" "flakes" ]; + # /etc/hosts :) networking.extraHosts = '' - 10.99.24.21 supersecureservice.cypherfix.tcc ''; } diff --git a/flake.lock b/flake.lock index 5d8686e..715ea52 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ ] }, "locked": { - "lastModified": 1732466619, - "narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=", + "lastModified": 1733050161, + "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", "owner": "nix-community", "repo": "home-manager", - "rev": "f3111f62a23451114433888902a55cf0692b408d", + "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", "type": "github" }, "original": { @@ -296,11 +296,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1732758553, - "narHash": "sha256-divlhUduT0/t8D9k11Yd3Ah3xpr302vV1KXxIMb8I3M=", + "lastModified": 1733101372, + "narHash": "sha256-mkyyBVPj8SIc01zEBX3gZ2ATJj8Fb06nxDME7pDxYQo=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "effe1d54e23f430d3e803f63e9e47aba33acfb63", + "rev": "094b2c4ee459dd5d3d1611c919d59f26110053b0", "type": "github" }, "original": { @@ -316,11 +316,11 @@ ] }, "locked": { - "lastModified": 1732519917, - "narHash": "sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q=", + "lastModified": 1733024876, + "narHash": "sha256-vy9Q41hBE7Zg0yakF79neVgb3i3PQMSMR7uHPpPywFE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "f4a5ca5771ba9ca31ad24a62c8d511a405303436", + "rev": "6e0b7f81367069589a480b91603a10bcf71f3103", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1732483221, - "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", + "lastModified": 1733217105, + "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", + "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", "type": "github" }, "original": { @@ -374,11 +374,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1732758367, - "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", + "lastModified": 1733015953, + "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", + "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", "type": "github" }, "original": { @@ -390,11 +390,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1731890469, - "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", + "lastModified": 1732997066, + "narHash": "sha256-9Vvu3a1ep1LB6F/kVE2hHH2HQzhSFtUyJYiJRkUkC4Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5083ec887760adfe12af64830a66807423a859a7", + "rev": "33b9d57c656e65a9c88c5f34e4eb00b83e2b0ca9", "type": "github" }, "original": { @@ -406,11 +406,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1732981179, - "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", + "lastModified": 1733120037, + "narHash": "sha256-En+gSoVJ3iQKPDU1FHrR6zIxSLXKjzKY+pnh9tt+Yts=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", + "rev": "f9f0d5c5380be0a599b1fb54641fa99af8281539", "type": "github" }, "original": { @@ -473,11 +473,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1732337089, - "narHash": "sha256-dwFza03ETqrcmVGSCdgDDKTWKRgckpQ3vXkZRCYtM9g=", + "lastModified": 1733037609, + "narHash": "sha256-HkS24indfMaQbVZ+9GY5BHc+rqPvh8htF0rWYhvgPKI=", "ref": "refs/heads/main", - "rev": "f6a6af3191f5497d95d8f8aaa08826a45da199c4", - "revCount": 842, + "rev": "e559e2e50999093c3e837d33886f9e14e34ead0a", + "revCount": 863, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" diff --git a/home.nix b/home.nix index d5693bc..8eae2b5 100644 --- a/home.nix +++ b/home.nix @@ -89,7 +89,7 @@ in heroic heaptrack - # cinny + cinny gping # redisinsight valgrind @@ -164,6 +164,9 @@ in graphviz awatcher + tigervnc + + libva-utils # (python312.withPackages (ps: with ps; [ # pyquery diff --git a/upgrade-nix.sh b/upgrade-nix.sh index dfff5c0..5ccb6e9 100644 --- a/upgrade-nix.sh +++ b/upgrade-nix.sh @@ -6,5 +6,5 @@ if [ -z "$(which nh)" ]; then else sudo nix-channel --update sudo nix flake update - sudo nh os switch . -fi \ No newline at end of file + nh os switch . +fi