pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Wallpaper changes to not be a flake any more

Browse source
This commit is contained in:
Evie Litherland-Smith 2023-09-12 06:24:56 +01:00
parent c09b1c7f03
commit 9cdc091141
4 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
flake.lock
View file

@ -228,12 +228,13 @@
} }
}, },
"wallpapers": { "wallpapers": {
"flake": false,
"locked": { "locked": {
"lastModified": 1694436191, "lastModified": 1694496009,
"narHash": "sha256-eWhgMiKKxVX47IIfSvs4FmxPlR35okVOrXxbzKwNa4A=", "narHash": "sha256-1GygepmH3Y91aYW2QeFEP8oIqNbPgMa46xoO/lSy9Qs=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "1b0a2a35be9fbab42ed25fb49a6960d31d899fa9", "rev": "12accd90c68cc5e90e5b2000fc18f07cf4f33acb",
"revCount": 4, "revCount": 5,
"type": "git", "type": "git",
"url": "https://git.xenia.me.uk/xenia/wallpapers.git" "url": "https://git.xenia.me.uk/xenia/wallpapers.git"
}, },

14
flake.nix
View file

@ -11,7 +11,12 @@
url = "github:hyprwm/Hyprland"; url = "github:hyprwm/Hyprland";
inputs.nixpkgs.follows = "nixpkgs"; 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 = { catppuccin-alacritty = {
url = "github:catppuccin/alacritty"; url = "github:catppuccin/alacritty";
flake = false; flake = false;
@ -45,6 +50,7 @@
outputs = { self, nixpkgs, ... }@inputs: outputs = { self, nixpkgs, ... }@inputs:
let let
flakeURL = "git+https://git.xenia.me.uk/xenia/nixos.git?ref=main"; flakeURL = "git+https://git.xenia.me.uk/xenia/nixos.git?ref=main";
wallpapers = { default = "${inputs.wallpapers}/waves/cat-waves.png"; };
catppuccin-themes = with inputs; { catppuccin-themes = with inputs; {
alacritty = "${catppuccin-alacritty}/catppuccin-macchiato.yml"; alacritty = "${catppuccin-alacritty}/catppuccin-macchiato.yml";
bat = "${catppuccin-bat}/Catppuccin-macchiato.tmTheme"; bat = "${catppuccin-bat}/Catppuccin-macchiato.tmTheme";
@ -170,9 +176,8 @@
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
extraSpecialArgs = { extraSpecialArgs = {
inherit hostName user shell inputs catppuccin-themes; inherit hostName user shell inputs wallpapers catppuccin-themes;
hyprland = inputs.hyprland; hyprland = inputs.hyprland;
wallpapers = inputs.wallpapers;
}; };
users.${user} = let users.${user} = let
username = user; username = user;
@ -210,8 +215,7 @@
inputs.home-manager.lib.homeManagerConfiguration { inputs.home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
extraSpecialArgs = { extraSpecialArgs = {
inherit hostName user shell inputs catppuccin-themes; inherit hostName user shell inputs wallpapers catppuccin-themes;
wallpapers = inputs.wallpapers;
}; };
modules = [ modules = [
./home/shell/${shell}.nix ./home/shell/${shell}.nix

4
home/hyprland/default.nix
View file

@ -44,8 +44,8 @@
}; };
xdg.configFile = { xdg.configFile = {
"hypr/hyprpaper.conf".text = '' "hypr/hyprpaper.conf".text = ''
preload = ${wallpapers.outputs.default} preload = ${wallpapers.default}
wallpaper = ,${wallpapers.outputs.default} wallpaper = ,${wallpapers.default}
''; '';
"hypr/macchiato.conf".source = ./macchiato.conf; "hypr/macchiato.conf".source = ./macchiato.conf;
"hypr/extra.conf" = lib.mkDefault { text = ""; }; "hypr/extra.conf" = lib.mkDefault { text = ""; };

18
home/hyprland/rofi/default.nix
View file

@ -21,14 +21,16 @@ in {
drun-display-format = "{icon} {name}"; drun-display-format = "{icon} {name}";
disable-history = false; disable-history = false;
hide-scrollbar = true; hide-scrollbar = true;
display-window = " 󰧨 Move "; display-window = " 󰧨 Move ";
display-run = " 󰅴 Run "; display-run = " 󰅴 Run ";
display-drun = " 󱓞 Launch "; display-drun = " 󱓞 Launch ";
display-ssh = " 󰢹 SSH "; display-ssh = " 󰢹 SSH ";
display-filebrowser = " 󰝰 Files "; display-filebrowser = " 󰝰 Files ";
display-calc = " 󰪚 Calculator "; display-calc = " 󰪚 Calculator ";
display-combi = " 󱗿 Combi "; display-combi = " 󱗿 Combi ";
}; };
theme = ./theme.rasi; theme = ./theme.rasi
;
}; };
} }