Wallpaper changes to not be a flake any more
This commit is contained in:
parent
c09b1c7f03
commit
9cdc091141
|
@ -228,12 +228,13 @@
|
|||
}
|
||||
},
|
||||
"wallpapers": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1694436191,
|
||||
"narHash": "sha256-eWhgMiKKxVX47IIfSvs4FmxPlR35okVOrXxbzKwNa4A=",
|
||||
"lastModified": 1694496009,
|
||||
"narHash": "sha256-1GygepmH3Y91aYW2QeFEP8oIqNbPgMa46xoO/lSy9Qs=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "1b0a2a35be9fbab42ed25fb49a6960d31d899fa9",
|
||||
"revCount": 4,
|
||||
"rev": "12accd90c68cc5e90e5b2000fc18f07cf4f33acb",
|
||||
"revCount": 5,
|
||||
"type": "git",
|
||||
"url": "https://git.xenia.me.uk/xenia/wallpapers.git"
|
||||
},
|
||||
|
|
14
flake.nix
14
flake.nix
|
@ -11,7 +11,12 @@
|
|||
url = "github:hyprwm/Hyprland";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
wallpapers.url = "git+https://git.xenia.me.uk/xenia/wallpapers.git";
|
||||
|
||||
# Non-flake inputs
|
||||
wallpapers = {
|
||||
url = "git+https://git.xenia.me.uk/xenia/wallpapers.git";
|
||||
flake = false;
|
||||
};
|
||||
catppuccin-alacritty = {
|
||||
url = "github:catppuccin/alacritty";
|
||||
flake = false;
|
||||
|
@ -45,6 +50,7 @@
|
|||
outputs = { self, nixpkgs, ... }@inputs:
|
||||
let
|
||||
flakeURL = "git+https://git.xenia.me.uk/xenia/nixos.git?ref=main";
|
||||
wallpapers = { default = "${inputs.wallpapers}/waves/cat-waves.png"; };
|
||||
catppuccin-themes = with inputs; {
|
||||
alacritty = "${catppuccin-alacritty}/catppuccin-macchiato.yml";
|
||||
bat = "${catppuccin-bat}/Catppuccin-macchiato.tmTheme";
|
||||
|
@ -170,9 +176,8 @@
|
|||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
extraSpecialArgs = {
|
||||
inherit hostName user shell inputs catppuccin-themes;
|
||||
inherit hostName user shell inputs wallpapers catppuccin-themes;
|
||||
hyprland = inputs.hyprland;
|
||||
wallpapers = inputs.wallpapers;
|
||||
};
|
||||
users.${user} = let
|
||||
username = user;
|
||||
|
@ -210,8 +215,7 @@
|
|||
inputs.home-manager.lib.homeManagerConfiguration {
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
extraSpecialArgs = {
|
||||
inherit hostName user shell inputs catppuccin-themes;
|
||||
wallpapers = inputs.wallpapers;
|
||||
inherit hostName user shell inputs wallpapers catppuccin-themes;
|
||||
};
|
||||
modules = [
|
||||
./home/shell/${shell}.nix
|
||||
|
|
|
@ -44,8 +44,8 @@
|
|||
};
|
||||
xdg.configFile = {
|
||||
"hypr/hyprpaper.conf".text = ''
|
||||
preload = ${wallpapers.outputs.default}
|
||||
wallpaper = ,${wallpapers.outputs.default}
|
||||
preload = ${wallpapers.default}
|
||||
wallpaper = ,${wallpapers.default}
|
||||
'';
|
||||
"hypr/macchiato.conf".source = ./macchiato.conf;
|
||||
"hypr/extra.conf" = lib.mkDefault { text = ""; };
|
||||
|
|
|
@ -29,6 +29,8 @@ in {
|
|||
display-calc = " Calculator ";
|
||||
display-combi = " Combi ";
|
||||
};
|
||||
theme = ./theme.rasi;
|
||||
theme = ./theme.rasi
|
||||
|
||||
;
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue