js0ny/dotfiles
1
0
Fork 0
mirror of https://github.com/js0ny/dotfiles.git synced 2025-12-21 00:33:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

nix: update to lockfile version

Browse source
This commit is contained in:
js0ny 2025-10-20 05:01:29 +01:00
parent c0572e749d
commit 8f3bcec6f1
8 changed files with 107 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

156
nixcfgs/flake.nix
View file

@ -27,91 +27,87 @@
};
};
outputs =
{
self,
nixpkgs,
nix-flatpak,
nix-darwin,
home-manager,
plasma-manager,
nur,
winboat,
caelestia-shell,
...
}@inputs:
let
overlays = [
nur.overlays.default
(final: prev: {
winboat = winboat.packages.x86_64-linux.winboat;
})
];
forSystem =
system:
import nixpkgs {
inherit system overlays;
config.allowUnfree = true;
};
specialArgs = { inherit inputs; };
nixosHosts = [
"zp"
"zephyrus"
"nixvirt"
];
outputs = {
self,
nixpkgs,
nix-flatpak,
nix-darwin,
home-manager,
plasma-manager,
nur,
winboat,
caelestia-shell,
...
} @ inputs: let
overlays = [
nur.overlays.default
(final: prev: {
winboat = winboat.packages.x86_64-linux.winboat;
caelestia-shell = caelestia-shell.packages.x86_64-linux.caelestia-shell;
})
];
forSystem = system:
import nixpkgs {
inherit system overlays;
config.allowUnfree = true;
};
specialArgs = {inherit inputs overlays;};
nixosHosts = [
"zp"
"zephyrus"
"nixvirt"
];
mkNixosSystem =
hostname:
nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
inherit specialArgs;
modules = [ ./hosts/${hostname} ];
};
in
{
# This will automatically generate nixOS config for `nixosHosts'
# Include the module ./hosts/${hostname} by default.
nixosConfigurations = nixpkgs.lib.genAttrs nixosHosts mkNixosSystem;
darwinConfigurations."zen" = nix-darwin.lib.darwinSystem {
system = "aarch64-darwin";
mkNixosSystem = hostname:
nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
inherit specialArgs;
modules = [./hosts/${hostname} {nixpkgs.overlays = overlays;}];
};
in {
# This will automatically generate nixOS config for `nixosHosts'
# Include the module ./hosts/${hostname} by default.
nixosConfigurations = nixpkgs.lib.genAttrs nixosHosts mkNixosSystem;
darwinConfigurations."zen" = nix-darwin.lib.darwinSystem {
system = "aarch64-darwin";
inherit specialArgs;
modules = [
./hosts/zen
];
};
homeConfigurations = {
js0ny = home-manager.lib.homeManagerConfiguration {
pkgs = forSystem "x86_64-linux";
extraSpecialArgs = specialArgs;
modules = [
./hosts/zen
./users/js0ny
];
};
homeConfigurations = {
js0ny = home-manager.lib.homeManagerConfiguration {
pkgs = forSystem "x86_64-linux";
extraSpecialArgs = specialArgs;
modules = [
./users/js0ny
];
};
"js0ny@zephyrus" = home-manager.lib.homeManagerConfiguration {
pkgs = forSystem "x86_64-linux";
extraSpecialArgs = specialArgs;
modules = [
./users/js0ny/zephyrus.nix
plasma-manager.homeModules.plasma-manager
nix-flatpak.homeManagerModules.nix-flatpak
];
};
"js0ny@nixvirt" = home-manager.lib.homeManagerConfiguration {
pkgs = forSystem "x86_64-linux";
extraSpecialArgs = specialArgs;
modules = [
./users/js0ny/nixvirt.nix
];
};
"js0ny@zen" = home-manager.lib.homeManagerConfiguration {
pkgs = forSystem "aarch64-darwin";
extraSpecialArgs = specialArgs;
modules = [
./users/js0ny/zen.nix
];
};
"js0ny@zephyrus" = home-manager.lib.homeManagerConfiguration {
pkgs = forSystem "x86_64-linux";
extraSpecialArgs = specialArgs;
modules = [
./users/js0ny/zephyrus.nix
plasma-manager.homeModules.plasma-manager
nix-flatpak.homeManagerModules.nix-flatpak
];
};
"js0ny@nixvirt" = home-manager.lib.homeManagerConfiguration {
pkgs = forSystem "x86_64-linux";
extraSpecialArgs = specialArgs;
modules = [
./users/js0ny/nixvirt.nix
];
};
"js0ny@zen" = home-manager.lib.homeManagerConfiguration {
pkgs = forSystem "aarch64-darwin";
extraSpecialArgs = specialArgs;
modules = [
./users/js0ny/zen.nix
];
};
};
};
}

1
nixcfgs/hosts/zephyrus/default.nix
View file

@ -14,6 +14,7 @@
../../modules/nixos/chromium.nix
../../modules/nixos/obs-studio.nix
../../modules/nixos/wine.nix
../../modules/nixos/gnome-keyring.nix
../../modules/nixos/desktop/kde.nix
../../modules/nixos/desktop/hyprland.nix
../../modules/nixos/display-manager/sddm.nix

4
nixcfgs/modules/home/gnome-keyrings.nix
View file

@ -1,6 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
home.packages = with pkgs; [
gcr
];

24
nixcfgs/modules/nixos/desktop/hyprland.nix
View file

@ -1,22 +1,18 @@
{
pkgs,
inputs,
...
}: {
{pkgs, ...}: {
programs.hyprland = {
enable = true;
withUWSM = false;
xwayland.enable = true;
};
environment.systemPackages = [
inputs.caelestia-shell.packages.x86_64-linux.default
pkgs.mako
pkgs.rofi-wayland
pkgs.xdg-desktop-portal-wlr
pkgs.xdg-desktop-portal-hyprland
pkgs.hyprpolkitagent
pkgs.cliphist
pkgs.grimblast
environment.systemPackages = with pkgs; [
caelestia-shell
mako
rofi
xdg-desktop-portal-wlr
xdg-desktop-portal-hyprland
hyprpolkitagent
cliphist
grimblast
];
}

8
nixcfgs/modules/nixos/fonts.nix
View file

@ -1,8 +1,4 @@
{
pkgs,
config,
...
}: let
{pkgs, ...}: let
fontPkgs = [
pkgs.maple-mono.NF
pkgs.sarasa-gothic
@ -51,7 +47,7 @@ in {
fontPkgs
++ [
# Add cursor supports
pkgs.libsForQt5.breeze-qt5
pkgs.kdePackages.breeze
]; # with pkgs; [
# libsForQt5.breeze-qt5

7
nixcfgs/modules/nixos/gnome-keyring.nix Normal file
View file

@ -0,0 +1,7 @@
{pkgs, ...}: {
services.gnome.gnome-keyring.enable = true;
services.gnome.gcr-ssh-agent.enable = true;
programs.ssh = {
enableAskPassword = true;
};
}

18
nixcfgs/modules/nixos/libvirt.nix
View file

@ -11,15 +11,15 @@
package = pkgs.qemu_kvm;
runAsRoot = true;
swtpm.enable = true;
ovmf = {
enable = true;
packages = [
(pkgs.OVMF.override {
secureBoot = true;
tpmSupport = true;
}).fd
];
};
# ovmf = {
# enable = true;
# packages = [
# (pkgs.OVMF.override {
# secureBoot = true;
# tpmSupport = true;
# }).fd
# ];
# };
};
};
users.users.js0ny = {

2
nixcfgs/modules/nixos/rime.nix
View file

@ -13,7 +13,7 @@
type = "fcitx5";
fcitx5 = {
waylandFrontend = true;
plasma6Support = true;
# plasma6Support = true;
addons = with pkgs; [
fcitx5-rime
kdePackages.fcitx5-configtool