diff --git a/flake.lock b/flake.lock index 67fce83..849b474 100644 --- a/flake.lock +++ b/flake.lock @@ -215,6 +215,7 @@ "peerix": "peerix", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix", + "swaysw": "swaysw", "zremap": "zremap" } }, @@ -264,6 +265,26 @@ "type": "github" } }, + "swaysw": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1698350641, + "narHash": "sha256-Eh0tgCg7sMIp3Q0q8WH+lI03Ilw8ljyzDc74k16GiVQ=", + "ref": "refs/heads/master", + "rev": "ced545f644d2be67877b3b7a5798b11722a95cfd", + "revCount": 1, + "type": "git", + "url": "https://git.project-cloud.net/asmir/swaysw" + }, + "original": { + "type": "git", + "url": "https://git.project-cloud.net/asmir/swaysw" + } + }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 1f1e090..aae5d1d 100644 --- a/flake.nix +++ b/flake.nix @@ -19,6 +19,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + swaysw = { + url = "git+https://git.project-cloud.net/asmir/swaysw"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -42,6 +47,7 @@ peerix, simple-nixos-mailserver, sops-nix, + swaysw, zremap, ... }: let @@ -61,6 +67,7 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.akill = import ./home/home.nix; + home-manager.extraSpecialArgs = {inherit inputs;}; } peerix.nixosModules.peerix { diff --git a/home/home.nix b/home/home.nix index c99c647..f1e3731 100644 --- a/home/home.nix +++ b/home/home.nix @@ -2,6 +2,7 @@ pkgs, config, lib, + inputs, ... }: with lib; let diff --git a/home/home_packages.nix b/home/home_packages.nix index 49a1bb9..9744cde 100644 --- a/home/home_packages.nix +++ b/home/home_packages.nix @@ -1,84 +1,87 @@ { config, pkgs, + inputs, ... }: { - home.packages = with pkgs; [ - alejandra - appimage-run - arp-scan - birdtray - blackmagic - btop - cached-nix-shell - caddy - cargo - ccls - cemu - cmake - compsize - cura - deluge - ffmpeg-full - firefox - gcc - gdb - glab - glaxnimate - gnumake - go - grim - hyperfine - imagemagick - imv - jellyfin-media-player - kdenlive - kicad - kodi-wayland - libnotify - libreoffice - libva-utils - mediainfo - ncdu - neovide - ngspice - nix-init - nodePackages.peerflix - openocd - pandoc - pass - patchelf - pavucontrol - pirate-get - powertop - pulsemixer - python3 - python3Packages.west - remmina - river - rtorrent - rustc - screen - seer - sioyek - skypeforlinux - slurp - texlive.combined.scheme-full - thunderbird - upx - waybar - wdisplays - whatsapp-for-linux - wireshark - wl-clipboard - wlr-randr - wofi - x2goclient - yewtube - yt-dlp - zathura - zeal-qt6 - zig - zls - ]; + home.packages = with pkgs; + [ + alejandra + appimage-run + arp-scan + birdtray + blackmagic + btop + cached-nix-shell + caddy + cargo + ccls + cemu + cmake + compsize + cura + deluge + ffmpeg-full + firefox + gcc + gdb + glab + glaxnimate + gnumake + go + grim + hyperfine + imagemagick + imv + jellyfin-media-player + kdenlive + kicad + kodi-wayland + libnotify + libreoffice + libva-utils + mediainfo + ncdu + neovide + ngspice + nix-init + nodePackages.peerflix + openocd + pandoc + pass + patchelf + pavucontrol + pirate-get + powertop + pulsemixer + python3 + python3Packages.west + remmina + river + rtorrent + rustc + screen + seer + sioyek + skypeforlinux + slurp + texlive.combined.scheme-full + thunderbird + upx + waybar + wdisplays + whatsapp-for-linux + wireshark + wl-clipboard + wlr-randr + wofi + x2goclient + yewtube + yt-dlp + zathura + zeal-qt6 + zig + zls + ] + ++ [inputs.swaysw.packages.x86_64-linux.swaysw]; }