js0ny/dotfiles
1
0
Fork 0
mirror of https://github.com/js0ny/dotfiles.git synced 2025-12-21 08:43: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 = outputs = {
{ self,
self, nixpkgs,
nixpkgs, nix-flatpak,
nix-flatpak, nix-darwin,
nix-darwin, home-manager,
home-manager, plasma-manager,
plasma-manager, nur,
nur, winboat,
winboat, caelestia-shell,
caelestia-shell, ...
... } @ inputs: let
}@inputs: overlays = [
let nur.overlays.default
overlays = [ (final: prev: {
nur.overlays.default winboat = winboat.packages.x86_64-linux.winboat;
(final: prev: { caelestia-shell = caelestia-shell.packages.x86_64-linux.caelestia-shell;
winboat = winboat.packages.x86_64-linux.winboat; })
}) ];
]; forSystem = system:
forSystem = import nixpkgs {
system: inherit system overlays;
import nixpkgs { config.allowUnfree = true;
inherit system overlays; };
config.allowUnfree = true; specialArgs = {inherit inputs overlays;};
}; nixosHosts = [
specialArgs = { inherit inputs; }; "zp"
nixosHosts = [ "zephyrus"
"zp" "nixvirt"
"zephyrus" ];
"nixvirt"
];
mkNixosSystem = mkNixosSystem = hostname:
hostname: nixpkgs.lib.nixosSystem {
nixpkgs.lib.nixosSystem { system = "x86_64-linux";
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";
inherit specialArgs; 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 = [ modules = [
./hosts/zen ./users/js0ny
]; ];
}; };
"js0ny@zephyrus" = home-manager.lib.homeManagerConfiguration {
homeConfigurations = { pkgs = forSystem "x86_64-linux";
js0ny = home-manager.lib.homeManagerConfiguration { extraSpecialArgs = specialArgs;
pkgs = forSystem "x86_64-linux"; modules = [
extraSpecialArgs = specialArgs; ./users/js0ny/zephyrus.nix
modules = [ plasma-manager.homeModules.plasma-manager
./users/js0ny nix-flatpak.homeManagerModules.nix-flatpak
]; ];
}; };
"js0ny@zephyrus" = home-manager.lib.homeManagerConfiguration { "js0ny@nixvirt" = home-manager.lib.homeManagerConfiguration {
pkgs = forSystem "x86_64-linux"; pkgs = forSystem "x86_64-linux";
extraSpecialArgs = specialArgs; extraSpecialArgs = specialArgs;
modules = [ modules = [
./users/js0ny/zephyrus.nix ./users/js0ny/nixvirt.nix
plasma-manager.homeModules.plasma-manager ];
nix-flatpak.homeManagerModules.nix-flatpak };
]; "js0ny@zen" = home-manager.lib.homeManagerConfiguration {
}; pkgs = forSystem "aarch64-darwin";
"js0ny@nixvirt" = home-manager.lib.homeManagerConfiguration { extraSpecialArgs = specialArgs;
pkgs = forSystem "x86_64-linux"; modules = [
extraSpecialArgs = specialArgs; ./users/js0ny/zen.nix
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/chromium.nix
../../modules/nixos/obs-studio.nix ../../modules/nixos/obs-studio.nix
../../modules/nixos/wine.nix ../../modules/nixos/wine.nix
../../modules/nixos/gnome-keyring.nix
../../modules/nixos/desktop/kde.nix ../../modules/nixos/desktop/kde.nix
../../modules/nixos/desktop/hyprland.nix ../../modules/nixos/desktop/hyprland.nix
../../modules/nixos/display-manager/sddm.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; [ home.packages = with pkgs; [
gcr gcr
]; ];

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

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

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

@ -1,8 +1,4 @@
{ {pkgs, ...}: let
pkgs,
config,
...
}: let
fontPkgs = [ fontPkgs = [
pkgs.maple-mono.NF pkgs.maple-mono.NF
pkgs.sarasa-gothic pkgs.sarasa-gothic
@ -51,7 +47,7 @@ in {
fontPkgs fontPkgs
++ [ ++ [
# Add cursor supports # Add cursor supports
pkgs.libsForQt5.breeze-qt5 pkgs.kdePackages.breeze
]; # with pkgs; [ ]; # with pkgs; [
# libsForQt5.breeze-qt5 # 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; package = pkgs.qemu_kvm;
runAsRoot = true; runAsRoot = true;
swtpm.enable = true; swtpm.enable = true;
ovmf = { # ovmf = {
enable = true; # enable = true;
packages = [ # packages = [
(pkgs.OVMF.override { # (pkgs.OVMF.override {
secureBoot = true; # secureBoot = true;
tpmSupport = true; # tpmSupport = true;
}).fd # }).fd
]; # ];
}; # };
}; };
}; };
users.users.js0ny = { users.users.js0ny = {

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

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