ringofstorms/dotfiles
ringofstorms/dotfiles
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update oren to new common flake modules

Browse source
This commit is contained in:
RingOfStorms (Joshua Bell) 2025-03-18 15:43:08 -05:00
parent 02b89592d1
commit ec7b724091
3 changed files with 67 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hosts/gpdPocket3/flake.nix
View file

@ -32,6 +32,11 @@
( (
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [
lua
qdirstat
];
ringofstorms_common = { ringofstorms_common = {
systemName = configuration_name; systemName = configuration_name;
boot.systemd.enable = true; boot.systemd.enable = true;

34
hosts/lio/flake.nix
View file

@ -34,6 +34,23 @@
( (
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
programs = {
steam.enable = true;
};
environment.systemPackages = with pkgs; [
lua
qdirstat
steam
];
# Also allow this key to work for root user, this will let us use this as a remote builder easier
users.users.root.openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJN2nsLmAlF6zj5dEBkNSJaqcCya+aB6I0imY8Q5Ew0S nix2lio"
];
# Allow emulation of aarch64-linux binaries for cross compiling
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
ringofstorms_common = { ringofstorms_common = {
systemName = configuration_name; systemName = configuration_name;
boot.systemd.enable = true; boot.systemd.enable = true;
@ -102,23 +119,6 @@
}; };
}; };
programs = {
steam.enable = true;
};
environment.systemPackages = with pkgs; [
lua
qdirstat
# qflipper
steam
];
# Also allow this key to work for root user, this will let us use this as a remote builder easier
users.users.root.openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJN2nsLmAlF6zj5dEBkNSJaqcCya+aB6I0imY8Q5Ew0S nix2lio"
];
# Allow emulation of aarch64-linux binaries for cross compiling
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
} }
) )
]; ];

105
hosts/oren/flake.nix
View file

@ -1,24 +1,20 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
# nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
# Use relative to get current version for testing # Use relative to get current version for testing
common.url = "path:../../common"; # common.url = "path:../../common";
# Pin to specific version common.url = "git+https://git.joshuabell.xyz/dotfiles";
# common.url = "git+https://git.joshuabell.xyz/dotfiles?rev=88f2d95e6a871f084dccfc4f45ad9d2b31720998";
ros_neovim.url = "git+https://git.joshuabell.xyz/nvim"; ros_neovim.url = "git+https://git.joshuabell.xyz/nvim";
mod_common.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_common";
mod_secrets.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_secrets";
# mod_boot_systemd.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_boot_systemd";
mod_de_gnome.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_de_gnome";
mod_home-manager.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_home_manager";
mod_home-manager.inputs.home-manager.url = "github:rycee/home-manager/release-24.11";
}; };
outputs = outputs =
{ {
nixpkgs, nixpkgs,
common,
ros_neovim,
... ...
}@inputs: }@inputs:
let let
@ -27,29 +23,20 @@
in in
{ {
nixosConfigurations = { nixosConfigurations = {
"${configuration_name}" = "${configuration_name}" = (
let lib.nixosSystem {
auto_modules = builtins.concatMap (
input:
lib.optionals
(builtins.hasAttr "nixosModules" input && builtins.hasAttr "default" input.nixosModules)
[
input.nixosModules.default
]
) (builtins.attrValues inputs);
in
(lib.nixosSystem {
modules = [ modules = [
common.nixosModules.default
ros_neovim.nixosModules.default
./configuration.nix ./configuration.nix
./hardware-configuration.nix ./hardware-configuration.nix
(import ./containers.nix { inherit inputs; })
( (
{ pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ programs = {
../../components/nix/rust-dev.nix steam.enable = true;
../../components/nix/qflipper.nix };
../../components/nix/tailscale.nix
];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
lua lua
@ -59,8 +46,21 @@
ringofstorms_common = { ringofstorms_common = {
systemName = configuration_name; systemName = configuration_name;
boot.systemd.enable = true; boot.systemd.enable = true;
general = {
disableRemoteBuildsOnLio = true;
};
desktopEnvironment.gnome.enable = true;
programs = {
qFlipper.enable = true;
rustDev.enable = true;
uhkAgent.enable = true;
tailnet.enable = true;
ssh.enable = true;
docker.enable = true;
};
users = { users = {
admins = [ "josh" ]; # Users are all normal users and default password is password1
admins = [ "josh" ]; # First admin is also the primary user owning nix config
users = { users = {
josh = { josh = {
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
@ -73,11 +73,9 @@
]; ];
shell = pkgs.zsh; shell = pkgs.zsh;
packages = with pkgs; [ packages = with pkgs; [
signal-desktop
google-chrome google-chrome
discordo discordo
discord discord
firefox-esr
spotify spotify
vlc vlc
vaultwarden vaultwarden
@ -86,45 +84,32 @@
}; };
}; };
}; };
}; homeManager = {
mods = {
common = {
systemName = configuration_name;
allowUnfree = true;
primaryUser = "josh";
docker = true;
zsh = true;
};
home_manager = {
users = { users = {
josh = { josh = {
imports = [ imports = with common.homeManagerModules; [
../../components/hm/tmux/tmux.nix zsh
../../components/hm/alacritty.nix ssh
../../components/hm/kitty.nix starship
../../components/hm/atuin.nix zoxide
../../components/hm/direnv.nix tmux
../../components/hm/git.nix atuin
../../components/hm/nix_deprecations.nix kitty
../../components/hm/postgres.nix direnv
../../components/hm/ssh.nix git
../../components/hm/starship.nix nix_deprecations
../../components/hm/zoxide.nix obs
../../components/hm/zsh.nix postgres
]; ];
components.kitty.font_size = 20.0;
}; };
}; };
}; };
}; };
} }
) )
] ++ auto_modules; ];
specialArgs = { }
inherit inputs; );
};
});
}; };
}; };
} }