From 1db4c3ae4135633d1fb5e76d3d5497f1efcc5a48 Mon Sep 17 00:00:00 2001 From: Tyler Kelley Date: Wed, 17 Jan 2024 22:57:28 -0600 Subject: [PATCH] Switching to profiles, this is also probably broken --- config/home/files.nix | 11 ++++++----- config/{ => home}/files/base16-themes | 0 config/{ => home}/files/emoji | 0 config/{ => home}/files/face.jpg | Bin config/{ => home}/files/fonts/UniSans-Heavy.otf | Bin config/{ => home}/files/media/zaney-stinger.mov | Bin config/{ => home}/files/rofi.jpg | Bin config/home/rofi.nix | 2 -- config/system/amd-opengl.nix | 4 ++-- config/system/intel-opengl.nix | 4 ++-- home.nix | 4 ++-- 11 files changed, 12 insertions(+), 13 deletions(-) rename config/{ => home}/files/base16-themes (100%) rename config/{ => home}/files/emoji (100%) rename config/{ => home}/files/face.jpg (100%) rename config/{ => home}/files/fonts/UniSans-Heavy.otf (100%) rename config/{ => home}/files/media/zaney-stinger.mov (100%) rename config/{ => home}/files/rofi.jpg (100%) diff --git a/config/home/files.nix b/config/home/files.nix index 0231c83..9771efd 100644 --- a/config/home/files.nix +++ b/config/home/files.nix @@ -2,12 +2,13 @@ { # Place Files Inside Home Directory - home.file.".config/zaney-stinger.mov".source = ../files/media/zaney-stinger.mov; - home.file.".emoji".source = ../files/emoji; - home.file.".base16-themes".source = ../files/base16-themes; - home.file.".face".source = ../files/face.jpg; + home.file.".config/zaney-stinger.mov".source = ./files/media/zaney-stinger.mov; + home.file.".emoji".source = ./files/emoji; + home.file.".base16-themes".source = ./files/base16-themes; + home.file.".face".source = ./files/face.jpg; + home.file.".config/rofi/rofi.jpg".source = ./files/rofi.jpg; home.file.".local/share/fonts" = { - source = ../files/fonts; + source = ./files/fonts; recursive = true; }; } diff --git a/config/files/base16-themes b/config/home/files/base16-themes similarity index 100% rename from config/files/base16-themes rename to config/home/files/base16-themes diff --git a/config/files/emoji b/config/home/files/emoji similarity index 100% rename from config/files/emoji rename to config/home/files/emoji diff --git a/config/files/face.jpg b/config/home/files/face.jpg similarity index 100% rename from config/files/face.jpg rename to config/home/files/face.jpg diff --git a/config/files/fonts/UniSans-Heavy.otf b/config/home/files/fonts/UniSans-Heavy.otf similarity index 100% rename from config/files/fonts/UniSans-Heavy.otf rename to config/home/files/fonts/UniSans-Heavy.otf diff --git a/config/files/media/zaney-stinger.mov b/config/home/files/media/zaney-stinger.mov similarity index 100% rename from config/files/media/zaney-stinger.mov rename to config/home/files/media/zaney-stinger.mov diff --git a/config/files/rofi.jpg b/config/home/files/rofi.jpg similarity index 100% rename from config/files/rofi.jpg rename to config/home/files/rofi.jpg diff --git a/config/home/rofi.nix b/config/home/rofi.nix index 7173911..0704279 100644 --- a/config/home/rofi.nix +++ b/config/home/rofi.nix @@ -87,6 +87,4 @@ margin: 0 -2 0 0; } ''; - - home.file.".config/rofi/rofi.jpg".source = ./files/rofi.jpg; } diff --git a/config/system/amd-opengl.nix b/config/system/amd-opengl.nix index dee3381..d68a5c1 100644 --- a/config/system/amd-opengl.nix +++ b/config/system/amd-opengl.nix @@ -1,6 +1,6 @@ -{ pkgs, config, lib, ... }: +{ pkgs, config, lib, deviceProfile, ... }: -libmkIf (${deviceProfile} == "amd-desktop") { +lib.mkIf ("${deviceProfile}" == "amd-desktop") { # OpenGL hardware.opengl = { enable = true; diff --git a/config/system/intel-opengl.nix b/config/system/intel-opengl.nix index 8505922..d54a39c 100644 --- a/config/system/intel-opengl.nix +++ b/config/system/intel-opengl.nix @@ -1,6 +1,6 @@ -{ pkgs, config, lib, ... }: +{ pkgs, config, lib, deviceProfile, ... }: -libmkIf (${deviceProfile} == "intel-laptop") { +lib.mkIf ("${deviceProfile}" == "intel-laptop") { nixpkgs.config.packageOverrides = pkgs: { vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; }; diff --git a/home.nix b/home.nix index 4aeb882..26412bd 100644 --- a/home.nix +++ b/home.nix @@ -21,9 +21,9 @@ ./config/home/neofetch.nix ./config/home/hyprland.nix ./config/home/kitty.nix - ./config/home/rofi.nix + # ./config/home/rofi.nix ./config/home/vim.nix - ./config/home/files.nix + # ./config/home/files.nix ]; # Define Settings For Xresources