refactor: remove mentions of x86

This commit is contained in:
matt1432 2023-12-08 12:48:48 -05:00
parent 409890686f
commit a500d682bb
6 changed files with 21 additions and 26 deletions

View file

@ -68,21 +68,21 @@
home-manager.users = let home-manager.users = let
default = { default = {
imports = [ imports = [
# Make the vars be the same on Nix and HM
./vars.nix
({osConfig, ...}: {vars = osConfig.vars;})
nur.hmModules.nur nur.hmModules.nur
./home ./home
./pkgs ./pkgs
# Make the vars be the same on Nix and HM
./vars.nix
({osConfig, ...}: {vars = osConfig.vars;})
]; ];
home.packages = home.packages =
[ [
config.customPkgs.repl config.customPkgs.repl
nix-melt.packages.x86_64-linux.default nix-melt.packages.${pkgs.system}.default
nurl.packages.x86_64-linux.default nurl.packages.${pkgs.system}.default
] ]
++ (with config.nur.repos.rycee; [ ++ (with config.nur.repos.rycee; [
mozilla-addons-to-nix mozilla-addons-to-nix

View file

@ -40,8 +40,13 @@
}; };
themes = { themes = {
dracula-bat = { dracula-bat = {
src = "${pkgs.dracula-theme}/bat"; src = pkgs.fetchFromGitHub {
file = "dracula-bat.tmTheme"; owner = "matt1432";
repo = "bat";
rev = "270bce892537311ac92494a2a7663e3ecf772092";
hash = "sha256-UyZ3WFfrEEBjtdb//5waVItmjKorkOiNGtu9eeB3lOw=";
};
file = "Dracula.tmTheme";
}; };
}; };
extraPackages = with pkgs.bat-extras; [ extraPackages = with pkgs.bat-extras; [

View file

@ -15,13 +15,6 @@
hash = "sha256-3tKjKn5IHIByj+xgi2AIL1vZANlb0vlYJsPjH6BHGxM="; hash = "sha256-3tKjKn5IHIByj+xgi2AIL1vZANlb0vlYJsPjH6BHGxM=";
}; };
bat-theme = pkgs.fetchFromGitHub {
owner = "matt1432";
repo = "bat";
rev = "270bce892537311ac92494a2a7663e3ecf772092";
hash = "sha256-UyZ3WFfrEEBjtdb//5waVItmjKorkOiNGtu9eeB3lOw=";
};
wallpaper = pkgs.fetchurl { wallpaper = pkgs.fetchurl {
url = "https://github.com/aynp/dracula-wallpapers/blob/main/Art/4k/Waves%201.png?raw=true"; url = "https://github.com/aynp/dracula-wallpapers/blob/main/Art/4k/Waves%201.png?raw=true";
hash = "sha256-f9FwSOSvqTeDj4bOjYUQ6TM+/carCD9o5dhg/MnP/lk="; hash = "sha256-f9FwSOSvqTeDj4bOjYUQ6TM+/carCD9o5dhg/MnP/lk=";
@ -50,13 +43,6 @@ in {
mkdir -p $out mkdir -p $out
cp -a ./git-colors $out cp -a ./git-colors $out
# Bat colors
mkdir -p ./bat $out/bat
cp -a ${bat-theme}/Dracula.tmTheme ./bat/dracula-bat.tmTheme
chmod 777 ./bat/dracula-bat.tmTheme
cp -a ./bat/dracula-bat.tmTheme $out/bat
# Plymouth # Plymouth
cp -a ${plymouth}/dracula ./dracula cp -a ${plymouth}/dracula ./dracula
chmod 777 ./dracula chmod 777 ./dracula

View file

@ -1,5 +1,9 @@
{nixpkgs-wayland, ...}: let {
waypkgs = nixpkgs-wayland.packages.x86_64-linux; nixpkgs-wayland,
pkgs,
...
}: let
waypkgs = nixpkgs-wayland.packages.${pkgs.system};
in { in {
programs = { programs = {
obs-studio = { obs-studio = {

View file

@ -23,7 +23,7 @@ in {
programs.ags = { programs.ags = {
enable = true; enable = true;
configDir = symlink "${config.vars.configDir}/ags"; configDir = symlink "${config.vars.configDir}/ags";
package = ags.packages.x86_64-linux.default; package = ags.packages.${pkgs.system}.default;
extraPackages = [pkgs.libgudev]; extraPackages = [pkgs.libgudev];
}; };

View file

@ -53,7 +53,7 @@ in {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
package = hyprland.packages.x86_64-linux.default; package = hyprland.packages.${pkgs.system}.default;
plugins = plugins =
[] []