From 19951860a73ac250de41d902ed7e93b5b2ce644b Mon Sep 17 00:00:00 2001 From: Daniel Bulant Date: Mon, 30 Dec 2024 21:34:11 +0100 Subject: [PATCH] update --- .config/hypr/hyprland.conf | 4 +- configuration.nix | 31 +++++++++++ flake.lock | 107 +++++++++++++++++++++++++------------ flake.nix | 8 ++- home.nix | 11 +++- remove-old-nix.sh | 2 +- 6 files changed, 121 insertions(+), 42 deletions(-) diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index db4d052..543456b 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -77,11 +77,11 @@ exec-once=swaybg -m fill -i ~/.config/hypr/wallpapers/sunflowers.jpg exec-once=waybar exec-once=blueman-applet exec-once=dunst -# exec-once=udev-block-notify +exec-once=udev-block-notify #exec-once=~/.config/hypr/scripts/sleep.sh exec-once=echo us > /tmp/kb_layout #exec-once=hyprctl setcursor Sweet 30 -exec-once=aw-qt& sleep 2; awatcher +exec-once=sleep 10;aw-qt& sleep 2; awatcher exec-once = nm-applet --indicator # systray app for Network/Wifi exec-once=kdeconnect-indicator exec-once = hyprpm reload -n diff --git a/configuration.nix b/configuration.nix index 7c6860a..6411c40 100644 --- a/configuration.nix +++ b/configuration.nix @@ -25,6 +25,7 @@ nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" "cinny-unwrapped-4.2.3" + "cinny-4.2.3" # "qbittorrent-4.6.4" # "cinny-3.2.0" "dotnet-sdk-wrapped-7.0.410" @@ -283,10 +284,40 @@ ]; networking.firewall.allowedUDPPorts = [ 5353 # Google cast discovery + 42000 # warpinator + 42001 # warpinator ]; # Or disable the firewall altogether. # networking.firewall.enable = false; + services.udev.extraRules = '' + # Wooting One Legacy + + SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", TAG+="uaccess" + + SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", TAG+="uaccess" + + # Wooting One update mode + + SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", TAG+="uaccess" + + # Wooting Two Legacy + + SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", TAG+="uaccess" + + SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", TAG+="uaccess" + + # Wooting Two update mode + + SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", TAG+="uaccess" + + # Generic Wootings + + SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", TAG+="uaccess" + + SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", TAG+="uaccess" + ''; + # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave diff --git a/flake.lock b/flake.lock index 715ea52..e3f6b08 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -58,11 +58,11 @@ ] }, "locked": { - "lastModified": 1733050161, - "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", + "lastModified": 1733951536, + "narHash": "sha256-Zb5ZCa7Xj+0gy5XVXINTSr71fCfAv+IKtmIXNrykT54=", "owner": "nix-community", "repo": "home-manager", - "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", + "rev": "1318c3f3b068cdcea922fa7c1a0a1f0c96c22f5f", "type": "github" }, "original": { @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1732053779, - "narHash": "sha256-v9FS0r2XWMf/+uwevvzaF/2TimMFeLEQTf4T8cgc6c0=", + "lastModified": 1733324289, + "narHash": "sha256-5gCIIiQT9JlBPO1M98j1Aaboa2CTKtwBqiksCLf6qC0=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "0bc619b2c3b4f9c2b65247e81d69f8bbc573d991", + "rev": "2530394e67b436f4aea8225111cf37c1403ccb78", "type": "github" }, "original": { @@ -296,11 +296,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1733101372, - "narHash": "sha256-mkyyBVPj8SIc01zEBX3gZ2ATJj8Fb06nxDME7pDxYQo=", + "lastModified": 1734140730, + "narHash": "sha256-BG6y/y2ieDLGOs9bxnnYGfAuGdMMM/U8lg0SKLLB/JI=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "094b2c4ee459dd5d3d1611c919d59f26110053b0", + "rev": "3a6e0ed3690b565fb91f5ad242c493e46d8cc3a2", "type": "github" }, "original": { @@ -316,11 +316,11 @@ ] }, "locked": { - "lastModified": 1733024876, - "narHash": "sha256-vy9Q41hBE7Zg0yakF79neVgb3i3PQMSMR7uHPpPywFE=", + "lastModified": 1733629314, + "narHash": "sha256-U0vivjQFAwjNDYt49Krevs1murX9hKBFe2Ye0cHpgbU=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "6e0b7f81367069589a480b91603a10bcf71f3103", + "rev": "f1e477a7dd11e27e7f98b646349cd66bbabf2fb8", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733217105, - "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", + "lastModified": 1733861262, + "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", + "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5", "type": "github" }, "original": { @@ -362,23 +362,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1730504152, - "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", + "lastModified": 1733096140, + "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733015953, - "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "type": "github" }, "original": { @@ -390,11 +390,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1732997066, - "narHash": "sha256-9Vvu3a1ep1LB6F/kVE2hHH2HQzhSFtUyJYiJRkUkC4Q=", + "lastModified": 1733376361, + "narHash": "sha256-aLJxoTDDSqB+/3orsulE6/qdlX6MzDLIITLZqdgMpqo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "33b9d57c656e65a9c88c5f34e4eb00b83e2b0ca9", + "rev": "929116e316068c7318c54eb4d827f7d9756d5e9c", "type": "github" }, "original": { @@ -406,11 +406,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1733120037, - "narHash": "sha256-En+gSoVJ3iQKPDU1FHrR6zIxSLXKjzKY+pnh9tt+Yts=", + "lastModified": 1734083684, + "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9f0d5c5380be0a599b1fb54641fa99af8281539", + "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", "type": "github" }, "original": { @@ -446,9 +446,31 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", + "suyu": "suyu", "zen-browser": "zen-browser" } }, + "suyu": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_2" + }, + "locked": { + "lastModified": 1714727263, + "narHash": "sha256-R+x0UZrBedeR6w+h44JaGwuQJrut5VVD2yjNgYNt9f4=", + "ref": "refs/heads/master", + "rev": "4013bb63ca2217eab5c4a25e266d68d908b96791", + "revCount": 15, + "type": "git", + "url": "https://git.suyu.dev/suyu/nix-flake" + }, + "original": { + "type": "git", + "url": "https://git.suyu.dev/suyu/nix-flake" + } + }, "systems": { "locked": { "lastModified": 1689347949, @@ -464,6 +486,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "umu": { "inputs": { "nixpkgs": [ @@ -473,11 +510,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1733037609, - "narHash": "sha256-HkS24indfMaQbVZ+9GY5BHc+rqPvh8htF0rWYhvgPKI=", + "lastModified": 1733509971, + "narHash": "sha256-LZIrb7HNWyLMU+dSI4fhbo2dMzJbbKKFWwYOpJwVXKE=", "ref": "refs/heads/main", - "rev": "e559e2e50999093c3e837d33886f9e14e34ead0a", - "revCount": 863, + "rev": "562e3900eebde0fb276dd2f425c097c8b44ccb92", + "revCount": 865, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" diff --git a/flake.nix b/flake.nix index 79467ab..a5b1b02 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,10 @@ url = "github:hyprwm/hyprland-plugins"; inputs.hyprland.follows = "hyprland"; }; + suyu = { + url = "git+https://git.suyu.dev/suyu/nix-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; home-manager = { url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; @@ -20,7 +24,7 @@ nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { nixpkgs, home-manager, nixpkgs-unstable, nix-gaming, nix-index-database, ... }@attrs: { + outputs = { nixpkgs, home-manager, nixpkgs-unstable, nix-gaming, suyu, nix-index-database, ... }@attrs: { nixosConfigurations.lenovo-nix = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = attrs; @@ -28,7 +32,7 @@ # ./obs.nix # doesn't work. Use nix-shell -p obs-studio instead home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; - home-manager.users.dan = (import ./home.nix) { inherit nixpkgs-unstable nix-gaming; }; + home-manager.users.dan = (import ./home.nix) { inherit nixpkgs-unstable nix-gaming suyu; }; home-manager.backupFileExtension = "backup"; } ./configuration.nix diff --git a/home.nix b/home.nix index 8eae2b5..72d48ba 100644 --- a/home.nix +++ b/home.nix @@ -1,4 +1,4 @@ -{ nix-gaming, nixpkgs-unstable,... }: +{ nix-gaming, nixpkgs-unstable, suyu, ... }: { pkgs, hyprland-plugins, inputs, ...}: let @@ -13,6 +13,9 @@ in packages = with pkgs; [ # acpilight + wootility + surrealdb + surrealist wpsoffice pico-sdk elf2uf2-rs @@ -89,7 +92,7 @@ in heroic heaptrack - cinny + cinny-desktop gping # redisinsight valgrind @@ -136,6 +139,7 @@ in qpwgraph nixpkgs-unstable.legacyPackages.${system}.zed-editor + # suyu.packages.${pkgs.stdenv.hostPlatform.system}.suyu android-tools hyperfine @@ -163,6 +167,9 @@ in nix-du graphviz + blender + warpinator + awatcher tigervnc diff --git a/remove-old-nix.sh b/remove-old-nix.sh index a4cc4f8..6f01430 100644 --- a/remove-old-nix.sh +++ b/remove-old-nix.sh @@ -1,4 +1,4 @@ # sudo nix profile wipe-history --profile /nix/var/nix/profiles/system --older-than 30d # nix-env --delete-generations 30d # nix-collect-garbage -nh clean all -k 5 -K 20d +nh clean all -k 4 -K 10d