alyraffauf/nixcfg
1
0
Fork 0
mirror of https://github.com/alyraffauf/nixcfg.git synced 2024-11-22 01:33:55 -05:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

moved and simplified overlays from baseModules

Browse source
This commit is contained in:
Aly Raffauf 2024-07-07 23:54:00 -04:00
parent 97f265bd4d
commit 0a58af6500
14 changed files with 54 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
baseModules/default.nix
View file

@ -4,8 +4,6 @@ inputs: {
pkgs,
...
}: {
imports = [./nixpkgs.nix];
console.useXkbConfig = true;
environment.systemPackages = with pkgs; [

43
baseModules/nixpkgs.nix
View file

@ -1,43 +0,0 @@
{
config,
inputs,
lib,
pkgs,
...
}: {
nixpkgs = let
unstable = import inputs.nixpkgsUnstable {
system = pkgs.system;
config.allowUnfree = true; # Allow unfree packages
};
in {
config.allowUnfree = true; # Allow unfree packages
# Overlays over default packages.
overlays = [
inputs.nur.overlay
(final: prev: {
alyraffauf-wallpapers = inputs.wallpapers.packages.${pkgs.system}.default;
brave = prev.brave.override {commandLineArgs = "--gtk-version=4 --enable-wayland-ime";};
google-chrome = prev.google-chrome.override {commandLineArgs = "--gtk-version=4 --enable-wayland-ime";};
nerdfonts = prev.nerdfonts.override {fonts = ["Noto"];};
obsidian = prev.obsidian.overrideAttrs (old: {
installPhase =
builtins.replaceStrings ["--ozone-platform=wayland"]
["--ozone-platform=wayland --enable-wayland-ime"]
old.installPhase;
});
vscodium = prev.vscodium.override {commandLineArgs = "--enable-wayland-ime";};
webcord = prev.webcord.overrideAttrs (old: {
installPhase =
builtins.replaceStrings ["--ozone-platform-hint=auto"]
["--ozone-platform-hint=auto --enable-wayland-ime"]
old.installPhase;
});
})
];
};
}

7
homeManagerModules/desktop/sway/randomWallpaper.nix
View file

@ -1,14 +1,15 @@
{
pkgs,
lib,
config,
inputs,
lib,
pkgs,
...
}: let
sway-randomWallpaper = pkgs.writeShellScriptBin "sway-randomWallpaper" ''
kill `pidof swaybg`
OLD_PIDS=()
directory=${pkgs.alyraffauf-wallpapers}/share/backgrounds
directory=${inputs.wallpapers.packages.${pkgs.system}.default}/share/backgrounds
if [ -d "$directory" ]; then
while true; do

3
homeManagerModules/options.nix
View file

@ -1,5 +1,6 @@
{
config,
inputs,
lib,
osConfig,
pkgs,
@ -283,7 +284,7 @@ in {
wallpaper = lib.mkOption {
description = "Default wallpaper.";
default = "${pkgs.alyraffauf-wallpapers}/share/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg";
default = "${inputs.wallpapers.packages.${pkgs.system}.defaults}/share/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg";
type = lib.types.str;
};
};

2
homeManagerModules/theme.nix
View file

@ -54,7 +54,7 @@
font = {
name = "NotoSans Nerd Font";
package = pkgs.nerdfonts;
package = pkgs.nerdfonts.override {fonts = ["Noto"];};
size = lib.mkDefault 11;
};

2
homes/aly/default.nix
View file

@ -66,7 +66,7 @@ inputs: self: {
theme = {
enable = true;
wallpaper = "${pkgs.alyraffauf-wallpapers}/share/backgrounds/wallhaven-3led2d.jpg";
wallpaper = "${inputs.wallpapers.packages.${pkgs.system}.default}/share/backgrounds/wallhaven-3led2d.jpg";
};
};
}

4
homes/aly/firefox/default.nix
View file

@ -20,7 +20,7 @@
profiles = {
default = {
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
extensions = with config.nur.repos.rycee.firefox-addons; [
augmented-steam
decentraleyes
keepassxc-browser
@ -161,7 +161,7 @@
};
work = {
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
extensions = with config.nur.repos.rycee.firefox-addons; [
clearurls
consent-o-matic
decentraleyes

2
homes/dustin/default.nix
View file

@ -41,7 +41,7 @@ inputs: self: {
theme = {
enable = true;
wallpaper = "${pkgs.alyraffauf-wallpapers}/share/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg";
wallpaper = "${inputs.wallpapers.packages.${pkgs.system}.default}/share/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg";
};
};
}

2
homes/morgan/default.nix
View file

@ -38,7 +38,7 @@ inputs: self: {
theme = {
enable = true;
wallpaper = "${pkgs.alyraffauf-wallpapers}/share//backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg";
wallpaper = "${inputs.wallpapers.packages.${pkgs.system}.default}/share//backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg";
};
};
}

12
hosts/common.nix
View file

@ -1,5 +1,6 @@
{
config,
inputs,
lib,
pkgs,
...
@ -58,6 +59,17 @@
nix.settings.trusted-users = ["aly"];
nixpkgs = {
config.allowUnfree = true; # Allow unfree packages
overlays = [
(final: prev: {
hyprland = inputs.hyprland.packages.${pkgs.system}.hyprland;
xdg-desktop-portal-hyprland = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
})
];
};
networking.networkmanager = {
enable = true;

23
hosts/petalburg/default.nix
View file

@ -20,6 +20,29 @@
environment.variables.GDK_SCALE = "2";
networking.hostName = "petalburg";
nixpkgs.overlays = [
(final: prev: {
brave = prev.brave.override {commandLineArgs = "--gtk-version=4 --enable-wayland-ime";};
obsidian = prev.obsidian.overrideAttrs (old: {
installPhase =
builtins.replaceStrings ["--ozone-platform=wayland"]
["--ozone-platform=wayland --enable-wayland-ime"]
old.installPhase;
});
vscodium = prev.vscodium.override {commandLineArgs = "--enable-wayland-ime";};
webcord = prev.webcord.overrideAttrs (old: {
installPhase =
builtins.replaceStrings ["--ozone-platform-hint=auto"]
["--ozone-platform-hint=auto --enable-wayland-ime"]
old.installPhase;
});
})
];
system.stateVersion = "24.05";
ar = {

4
nixosModules/desktop/cinnamon/default.nix
View file

@ -28,8 +28,8 @@
};
font = {
name = "NotoSans Nerd Font Regular";
package = pkgs.nerdfonts;
name = "NotoSans Nerd Font";
package = pkgs.nerdfonts.override {fonts = ["Noto"];};
};
iconTheme = {

9
nixosModules/desktop/default.nix
View file

@ -1,7 +1,8 @@
{
pkgs,
lib,
config,
inputs,
lib,
pkgs,
...
}: {
imports = [
@ -23,12 +24,10 @@
) {
environment = {
sessionVariables.NIXOS_OZONE_WL = "1";
systemPackages = [pkgs.alyraffauf-wallpapers];
};
fonts.packages = with pkgs; [
liberation_ttf
nerdfonts
];
hardware.logitech.wireless = {
@ -55,10 +54,12 @@
xserver = {
enable = true;
xkb = {
layout = "us";
variant = "altgr-intl";
};
excludePackages = with pkgs; [xterm];
};
};

7
nixosModules/desktop/hyprland/default.nix
View file

@ -19,13 +19,6 @@
];
};
nixpkgs.overlays = [
(final: prev: {
hyprland = inputs.hyprland.packages.${pkgs.system}.hyprland;
xdg-desktop-portal-hyprland = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
})
];
programs = {
hyprland = {
enable = true;