.
This commit is contained in:
parent
94b74abdd8
commit
ffec00d89d
3 changed files with 41 additions and 18 deletions
2
Makefile
2
Makefile
|
@ -45,6 +45,6 @@ install:
|
||||||
touch ~/.vw-session-key
|
touch ~/.vw-session-key
|
||||||
touch ~/.config/hypr/monitors.conf
|
touch ~/.config/hypr/monitors.conf
|
||||||
sudo nix-collect-garbage --delete-old
|
sudo nix-collect-garbage --delete-old
|
||||||
sudo env NIXPKGS_ALLOW_BROKEN=1 nixos-rebuild switch --flake .#ziltis-desktop --impure --show-trace
|
sudo env NIXPKGS_ALLOW_BROKEN=1 nixos-rebuild switch --recreate-lock-file --flake .#ziltis-desktop --impure --show-trace
|
||||||
|
|
||||||
# end
|
# end
|
||||||
|
|
10
flake.nix
10
flake.nix
|
@ -23,15 +23,16 @@
|
||||||
url = "github:nix-community/home-manager/master";
|
url = "github:nix-community/home-manager/master";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
flatpaks.url = "github:GermanBread/declarative-flatpak/stable-v3";
|
# flatpaks.url = "github:GermanBread/declarative-flatpak/stable-v3";
|
||||||
hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1&ref=refs/tags/v0.42.0";
|
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1";
|
||||||
|
hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1&ref=refs/tags/v0.43.0";
|
||||||
hyprsplit = {
|
hyprsplit = {
|
||||||
url = "github:shezdy/hyprsplit";
|
url = "github:shezdy/hyprsplit";
|
||||||
inputs.hyprland.follows = "hyprland";
|
inputs.hyprland.follows = "hyprland";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs@{ nixpkgs, home-manager, flatpaks, ... }: {
|
outputs = inputs@{ nixpkgs, home-manager, nix-flatpak, ... }: {
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
"ziltis-desktop" = nixpkgs.lib.nixosSystem {
|
"ziltis-desktop" = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
@ -45,7 +46,8 @@
|
||||||
home-manager.users.zilti = import ./home.nix;
|
home-manager.users.zilti = import ./home.nix;
|
||||||
home-manager.extraSpecialArgs = { inherit inputs; };
|
home-manager.extraSpecialArgs = { inherit inputs; };
|
||||||
home-manager.sharedModules = [
|
home-manager.sharedModules = [
|
||||||
flatpaks.homeManagerModules.default
|
# flatpaks.homeManagerModules.default
|
||||||
|
nix-flatpak.homeManagerModules.nix-flatpak
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
47
home.nix
47
home.nix
|
@ -1,4 +1,4 @@
|
||||||
args@{ config, pkgs, split-monitor-workspaces, flatpaks, ... }:
|
args@{ config, pkgs, split-monitor-workspaces, nix-flatpak, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
home.username = "zilti";
|
home.username = "zilti";
|
||||||
|
@ -217,20 +217,42 @@ args@{ config, pkgs, split-monitor-workspaces, flatpaks, ... }:
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# services.flatpak = {
|
||||||
|
# enableModule = true;
|
||||||
|
# remotes = {
|
||||||
|
# "flathub" = "https://dl.flathub.org/repo/flathub.flatpakrepo";
|
||||||
|
# "flathub-beta" =
|
||||||
|
# "https://dl.flathub.org/beta-repo/flathub-beta.flatpakrepo";
|
||||||
|
# };
|
||||||
|
# packages = [
|
||||||
|
# "flathub:app/com.github.tchx84.Flatseal//stable"
|
||||||
|
# "flathub:app/com.usebottles.bottles//stable"
|
||||||
|
# "flathub:app/info.beyondallreason.bar//stable"
|
||||||
|
# "flathub:app/com.valvesoftware.Steam//stable"
|
||||||
|
# "flathub:app/net.lutris.Lutris//stable"
|
||||||
|
# "flathub:runtime/org.freedesktop.Platform.VulkanLayer.gamescope//stable"
|
||||||
|
# ];
|
||||||
|
# };
|
||||||
|
|
||||||
services.flatpak = {
|
services.flatpak = {
|
||||||
enableModule = true;
|
update = {
|
||||||
remotes = {
|
onActivation = true;
|
||||||
"flathub" = "https://dl.flathub.org/repo/flathub.flatpakrepo";
|
auto = {
|
||||||
"flathub-beta" =
|
enable = true;
|
||||||
"https://dl.flathub.org/beta-repo/flathub-beta.flatpakrepo";
|
onCalendar = "weekly";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
remotes = [
|
||||||
|
{ name = "flathub"; location = "https://dl.flathub.org/repo/flathub.flatpakrepo"; }
|
||||||
|
{ name = "flathub-beta"; location = "https://dl.flathub.org/beta-repo/flathub-beta.flatpakrepo"; }
|
||||||
|
];
|
||||||
packages = [
|
packages = [
|
||||||
"flathub:app/com.github.tchx84.Flatseal//stable"
|
"com.github.tchx84.Flatseal"
|
||||||
"flathub:app/com.usebottles.bottles//stable"
|
"com.usebottles.bottles"
|
||||||
"flathub:app/info.beyondallreason.bar//stable"
|
"infor.beyondallreason.bar"
|
||||||
"flathub:app/com.valvesoftware.Steam//stable"
|
"com.valvesoftware.Steam"
|
||||||
"flathub:app/net.lutris.Lutris//stable"
|
"net.lutris.Lutris"
|
||||||
"flathub:runtime/org.freedesktop.Platform.VulkanLayer.gamescope//stable"
|
"org.freedesktop.Platform.VulkanLayer.gamescope"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -265,7 +287,6 @@ args@{ config, pkgs, split-monitor-workspaces, flatpaks, ... }:
|
||||||
name = "VictorMono Nerd Font Mono";
|
name = "VictorMono Nerd Font Mono";
|
||||||
size = 10;
|
size = 10;
|
||||||
};
|
};
|
||||||
theme = "Catppuccin-Frappe";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.bash = {
|
programs.bash = {
|
||||||
|
|
Loading…
Reference in a new issue