feat: removed a bunch of flake inputs

This commit is contained in:
Nick 2025-02-03 00:02:52 -06:00
parent 4a9592dad8
commit 17ea540427
8 changed files with 95 additions and 1032 deletions

1022
flake.lock generated

File diff suppressed because it is too large Load diff

View file

@ -11,14 +11,15 @@
url = "github:hercules-ci/flake-parts"; url = "github:hercules-ci/flake-parts";
inputs.nixpkgs-lib.follows = "nixpkgs"; inputs.nixpkgs-lib.follows = "nixpkgs";
}; };
systems.url = "github:nix-systems/x86_64-linux";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
ngipkgs.url = "github:ngi-nix/ngipkgs";
ghostty = { ghostty = {
url = "github:ghostty-org/ghostty"; url = "github:ghostty-org/ghostty";
}; };
ngipkgs.url = "github:ngi-nix/ngipkgs";
nur = { nur = {
url = "github:nix-community/NUR"; url = "github:nix-community/NUR";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -27,7 +28,6 @@
url = "github:cachix/pre-commit-hooks.nix"; url = "github:cachix/pre-commit-hooks.nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
systems.url = "github:nix-systems/x86_64-linux";
sops-nix = { sops-nix = {
url = "github:Mic92/sops-nix"; url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -37,30 +37,6 @@
url = "github:helix-editor/helix"; url = "github:helix-editor/helix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
hyprland = {
url = "github:hyprwm/Hyprland";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland-portal = {
url = "github:hyprwm/xdg-desktop-portal-hyprland";
inputs.nixpkgs.follows = "nixpkgs";
};
hypridle = {
url = "github:hyprwm/hypridle";
inputs.nixpkgs.follows = "nixpkgs";
};
wpaperd = {
url = "github:danyspin97/wpaperd";
inputs.nixpkgs.follows = "nixpkgs";
};
waybar = {
url = "github:Alexays/Waybar";
inputs.nixpkgs.follows = "nixpkgs";
};
direnv = {
url = "github:direnv/direnv";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = outputs =

View file

@ -1,12 +1,6 @@
{
flake,
pkgs,
...
}:
{ {
programs.direnv = { programs.direnv = {
enable = true; enable = true;
package = flake.inputs.direnv.packages.${pkgs.system}.default;
nix-direnv.enable = true; nix-direnv.enable = true;
}; };
} }

View file

@ -1,35 +1,35 @@
{ pkgs, ... }: { pkgs, ... }:
let
flameshotGrim = pkgs.flameshot.overrideAttrs (oldAttrs: {
src = pkgs.fetchFromGitHub {
owner = "flameshot-org";
repo = "flameshot";
rev = "3d21e4967b68e9ce80fb2238857aa1bf12c7b905";
sha256 = "sha256-OLRtF/yjHDN+sIbgilBZ6sBZ3FO6K533kFC1L2peugc=";
};
cmakeFlags = [
"-DUSE_WAYLAND_CLIPBOARD=1"
"-DUSE_WAYLAND_GRIM=1"
];
buildInputs = oldAttrs.buildInputs ++ [ pkgs.libsForQt5.kguiaddons ];
});
in
{ {
# let services.flameshot = {
# flameshotGrim = pkgs.flameshot.overrideAttrs (oldAttrs: { enable = true;
# src = pkgs.fetchFromGitHub { package = flameshotGrim;
# owner = "flameshot-org"; settings = {
# repo = "flameshot"; General = {
# rev = "3d21e4967b68e9ce80fb2238857aa1bf12c7b905"; disabledTrayIcon = false;
# sha256 = "sha256-OLRtF/yjHDN+sIbgilBZ6sBZ3FO6K533kFC1L2peugc="; showStartupLaunchMessage = false;
# }; # disabledGrimWarning = false;
# cmakeFlags = [ };
# "-DUSE_WAYLAND_CLIPBOARD=1" };
# "-DUSE_WAYLAND_GRIM=1" };
# ];
# buildInputs = oldAttrs.buildInputs ++ [ pkgs.libsForQt5.kguiaddons ];
# });
# in
# {
# services.flameshot = {
# enable = true;
# # package = flameshotGrim;
# settings = {
# General = {
# disabledTrayIcon = false;
# showStartupLaunchMessage = false;
# # disabledGrimWarning = false;
# };
# };
# };
home.packages = builtins.attrValues { home.packages = builtins.attrValues {
inherit (pkgs) inherit (pkgs)
flameshot # flameshot
; ;
}; };
} }

View file

@ -1,8 +1,3 @@
{
flake,
pkgs,
...
}:
let let
configPath = ./config; configPath = ./config;
settingsPath = import (configPath + /settings.nix); settingsPath = import (configPath + /settings.nix);
@ -10,7 +5,6 @@ in
{ {
services.hypridle = { services.hypridle = {
enable = true; enable = true;
package = flake.inputs.hypridle.packages.${pkgs.system}.hypridle;
settings = settingsPath; settings = settingsPath;
}; };
} }

View file

@ -1,5 +1,4 @@
{ {
pkgs,
flake, flake,
config, config,
... ...
@ -29,7 +28,6 @@ in
{ {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
package = flake.inputs.hyprland.packages.${pkgs.system}.hyprland;
xwayland.enable = true; xwayland.enable = true;
systemd.enable = false; systemd.enable = false;
settings = configImports; settings = configImports;

View file

@ -12,7 +12,6 @@ in
{ {
programs.waybar = { programs.waybar = {
enable = true; enable = true;
package = flake.inputs.waybar.packages.${pkgs.system}.default;
settings = settingsPath; settings = settingsPath;
style = stylePath; style = stylePath;
}; };

View file

@ -1,12 +1,6 @@
{
flake,
pkgs,
...
}:
{ {
programs.wpaperd = { programs.wpaperd = {
enable = true; enable = true;
package = flake.inputs.wpaperd.packages.${pkgs.system}.default;
settings = { settings = {
"default" = { "default" = {
path = "~/Files/Projects/dotfiles/home/modules/gui/desktop/wpaperd/wallpaper"; path = "~/Files/Projects/dotfiles/home/modules/gui/desktop/wpaperd/wallpaper";