From def29befcc20c9f9408d512fb265a061edbd820f Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Tue, 14 May 2024 00:54:35 +0200 Subject: [PATCH] more hyprland foolery --- flake.lock | 75 +++++++++++++++++++++++++++++-- flake.nix | 2 +- hosts/vali/mars/configuration.nix | 1 + hosts/vali/mars/programs.nix | 3 -- modules/gui/default.nix | 1 + modules/gui/spicetify.nix | 15 +++++++ options/common/gpu/nvidia.nix | 2 +- 7 files changed, 91 insertions(+), 8 deletions(-) create mode 100644 modules/gui/spicetify.nix diff --git a/flake.lock b/flake.lock index 8b1cf7b..4192931 100644 --- a/flake.lock +++ b/flake.lock @@ -399,6 +399,24 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { @@ -928,6 +946,22 @@ } }, "nixpkgs_7": { + "locked": { + "lastModified": 1686020360, + "narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4729ffac6fd12e26e5a8de002781ffc49b0e94b7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { "locked": { "lastModified": 1713596654, "narHash": "sha256-LJbHQQ5aX1LVth2ST+Kkse/DRzgxlVhTL1rxthvyhZc=", @@ -943,7 +977,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1711163522, "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", @@ -987,6 +1021,7 @@ "nixpkgs": "nixpkgs_4", "nixpkgs-wayland": "nixpkgs-wayland", "nur": "nur", + "spicetify-nix": "spicetify-nix", "split-monitor-workspaces": "split-monitor-workspaces", "stylix": "stylix", "waybar": "waybar" @@ -1009,6 +1044,25 @@ "type": "github" } }, + "spicetify-nix": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1704167711, + "narHash": "sha256-kFDq+kf/Di/P8bq5sUP8pVwRkrSVrABksBjMPmLic3s=", + "owner": "the-argus", + "repo": "spicetify-nix", + "rev": "1325416f951d6a82cfddb1289864ad782e2b87c4", + "type": "github" + }, + "original": { + "owner": "the-argus", + "repo": "spicetify-nix", + "type": "github" + } + }, "split-monitor-workspaces": { "inputs": { "hyprland": [ @@ -1042,7 +1096,7 @@ "flake-compat": "flake-compat_3", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1714555012, @@ -1118,6 +1172,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1143,7 +1212,7 @@ "waybar": { "inputs": { "flake-compat": "flake-compat_4", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1714718861, diff --git a/flake.nix b/flake.nix index 38a3620..7ffe388 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,7 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - + spicetify-nix.url = "github:the-argus/spicetify-nix"; nur = { url = "github:nix-community/NUR"; #inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/vali/mars/configuration.nix b/hosts/vali/mars/configuration.nix index be67e2f..dd2060e 100644 --- a/hosts/vali/mars/configuration.nix +++ b/hosts/vali/mars/configuration.nix @@ -55,6 +55,7 @@ emacs.enable = true; fish.enable = true; stylix.enable = true; +# spicetify.enable = true; anyrun.enable = true; }; services = { diff --git a/hosts/vali/mars/programs.nix b/hosts/vali/mars/programs.nix index 8ed09b5..754dde2 100644 --- a/hosts/vali/mars/programs.nix +++ b/hosts/vali/mars/programs.nix @@ -10,10 +10,8 @@ in { asciinema bibata-cursors blanket - blugon difftastic dig - dmenu easyeffects element-desktop evince @@ -28,7 +26,6 @@ in { ffmpeg-full fftw flameshot - foot grimblast gcc gdb diff --git a/modules/gui/default.nix b/modules/gui/default.nix index ca21122..583cb04 100644 --- a/modules/gui/default.nix +++ b/modules/gui/default.nix @@ -6,6 +6,7 @@ _: { ./qt.nix ./zathura.nix ./stylix.nix + #./spicetify.nix ./anyrun ./rofi.nix ./kitty.nix diff --git a/modules/gui/spicetify.nix b/modules/gui/spicetify.nix new file mode 100644 index 0000000..2f1d7a8 --- /dev/null +++ b/modules/gui/spicetify.nix @@ -0,0 +1,15 @@ +{ config, pkgs, lib, inputs, ... }: +with lib; let + cfg = config.modules.programs.spicetify; + username = config.modules.other.system.username; + #inherit (inputs.spicetify-nix.packages.${pkgs.system}.default) spicePkgs; + inherit (inputs.spicetify-nix.packages.${pkgs.system}) spicetify-nix; +in { + options.modules.programs.spicetify.enable = mkEnableOption "spicetify"; + imports = [ spicetify-nix.homeManagerModule ]; + config = mkIf cfg.enable { + programs.spicetify = { + enable = true; + }; + }; +} diff --git a/options/common/gpu/nvidia.nix b/options/common/gpu/nvidia.nix index f94ff0d..c40c5e1 100644 --- a/options/common/gpu/nvidia.nix +++ b/options/common/gpu/nvidia.nix @@ -8,7 +8,7 @@ }; hardware.nvidia = { modesetting.enable = true; - open = false; + open = true; powerManagement.enable = false; powerManagement.finegrained = false; nvidiaSettings = false;