Compare commits
3 Commits
ixion-buil
...
obsidian
| Author | SHA1 | Date | |
|---|---|---|---|
| 45de738d59 | |||
| e6ae0c4c35 | |||
| 739f2e125f |
72
flake.lock
generated
72
flake.lock
generated
@@ -7,11 +7,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1757432263,
|
||||
"narHash": "sha256-qHn+/0+IOz5cG68BZUwL9BV3EO/e9eNKCjH3+N7wMdI=",
|
||||
"lastModified": 1749744770,
|
||||
"narHash": "sha256-MEM9XXHgBF/Cyv1RES1t6gqAX7/tvayBC1r/KPyK1ls=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "1fef4404de4d1596aa5ab2bd68078370e1b9dcdb",
|
||||
"rev": "536f951efb1ccda9b968e3c9dee39fbeb6d3fdeb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -64,11 +64,11 @@
|
||||
"zon2nix": "zon2nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1759330332,
|
||||
"narHash": "sha256-ZKyOgOOm9Itjbc5xi89xMtw+cnnOFfl79zndPMTzKpU=",
|
||||
"lastModified": 1753816554,
|
||||
"narHash": "sha256-eyFfBXb5IJaNTGTdkjpWKSMTs8wiJ0i+9n5jUKtVFa4=",
|
||||
"owner": "ghostty-org",
|
||||
"repo": "ghostty",
|
||||
"rev": "a5aff0e347b0016e2735d4ec4b4cdca96b5438d1",
|
||||
"rev": "c78d32074ebab14d2060e5cd3c7667cbe37ab8ee",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -84,11 +84,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1758463745,
|
||||
"narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
|
||||
"lastModified": 1753592768,
|
||||
"narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
|
||||
"rev": "fc3add429f21450359369af74c2375cb34a2d204",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -129,24 +129,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1758360447,
|
||||
"narHash": "sha256-XDY3A83bclygHDtesRoaRTafUd80Q30D/Daf9KSG6bs=",
|
||||
"rev": "8eaee110344796db060382e15d3af0a9fc396e0e",
|
||||
"type": "tarball",
|
||||
"url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre864002.8eaee1103447/nixexprs.tar.xz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1759281824,
|
||||
"narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=",
|
||||
"lastModified": 1753749649,
|
||||
"narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5b5be50345d4113d04ba58c444348849f5585b4a",
|
||||
"rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -156,29 +143,13 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"quadlet-nix": {
|
||||
"locked": {
|
||||
"lastModified": 1758631655,
|
||||
"narHash": "sha256-EGeZ963L7xsNAY7snvP1JHQe7LWLVCM6f49+PzWjhEE=",
|
||||
"owner": "SEIAROTg",
|
||||
"repo": "quadlet-nix",
|
||||
"rev": "2ebe01b175e2e1e6de3f172d23f0c3b88713eec9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "SEIAROTg",
|
||||
"repo": "quadlet-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"darwin": "darwin",
|
||||
"ghostty": "ghostty",
|
||||
"home-manager": "home-manager",
|
||||
"nix-flatpak": "nix-flatpak",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"quadlet-nix": "quadlet-nix"
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
@@ -227,20 +198,27 @@
|
||||
},
|
||||
"zon2nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
"flake-utils": [
|
||||
"ghostty",
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"ghostty",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1758405547,
|
||||
"narHash": "sha256-WgaDgvIZMPvlZcZrpPMjkaalTBnGF2lTG+62znXctWM=",
|
||||
"lastModified": 1742104771,
|
||||
"narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=",
|
||||
"owner": "jcollie",
|
||||
"repo": "zon2nix",
|
||||
"rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245",
|
||||
"rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "jcollie",
|
||||
"repo": "zon2nix",
|
||||
"rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245",
|
||||
"rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
|
||||
78
flake.nix
78
flake.nix
@@ -2,35 +2,42 @@
|
||||
description = "Wyatt's nix configuration suite";
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
|
||||
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.6.0";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-25.05";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
home-manager-unstable = {
|
||||
url = "https://github.com/nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||
};
|
||||
darwin = {
|
||||
url = "github:lnl7/nix-darwin/nix-darwin-25.05";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
ghostty.url = "github:ghostty-org/ghostty";
|
||||
quadlet-nix.url = "github:SEIAROTg/quadlet-nix";
|
||||
};
|
||||
|
||||
outputs = inputs @ {
|
||||
self,
|
||||
nixpkgs,
|
||||
nixpkgs-unstable,
|
||||
nix-flatpak,
|
||||
darwin,
|
||||
home-manager,
|
||||
home-manager-unstable,
|
||||
ghostty,
|
||||
quadlet-nix,
|
||||
...
|
||||
}: let
|
||||
userName = "wyatt";
|
||||
userEmail = "wyatt@wyattjmiller.com";
|
||||
extraSpecialArgs = {
|
||||
inherit userName userEmail ghostty;
|
||||
};
|
||||
|
||||
# use this variable to take inputs and use them as arguments in your modules, this will be the common one
|
||||
customArgs = {
|
||||
inherit userName userEmail ghostty quadlet-nix;
|
||||
obsidianOverlay = final: prev: {
|
||||
obsidian = nixpkgs-unstable.legacyPackages.${final.system}.obsidian;
|
||||
};
|
||||
in {
|
||||
meta = import ./meta;
|
||||
@@ -38,7 +45,8 @@
|
||||
# Primary laptop - MacBook Pro (2023, M3)
|
||||
darwinConfigurations."sephiroth" = darwin.lib.darwinSystem {
|
||||
system = "aarch64-darwin";
|
||||
specialArgs = customArgs // {
|
||||
specialArgs = {
|
||||
inherit userName userEmail ghostty;
|
||||
hostname = "sephiroth";
|
||||
role = "devel";
|
||||
};
|
||||
@@ -50,9 +58,7 @@
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = customArgs // {
|
||||
inherit home-manager;
|
||||
};
|
||||
home-manager.extraSpecialArgs = extraSpecialArgs;
|
||||
home-manager.users.${userName} = import ./home;
|
||||
}
|
||||
];
|
||||
@@ -61,7 +67,8 @@
|
||||
# Primary desktop computer
|
||||
nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = customArgs // {
|
||||
specialArgs = {
|
||||
inherit userName userEmail ghostty;
|
||||
hostname = "cloud";
|
||||
role = "devel";
|
||||
};
|
||||
@@ -70,13 +77,15 @@
|
||||
./modules/common
|
||||
./modules/machine/cloud
|
||||
|
||||
{
|
||||
nixpkgs.overlays = [ obsidianOverlay ];
|
||||
}
|
||||
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = customArgs // {
|
||||
inherit home-manager;
|
||||
};
|
||||
home-manager.extraSpecialArgs = extraSpecialArgs;
|
||||
home-manager.users.${userName}.imports = [
|
||||
./home
|
||||
];
|
||||
@@ -87,7 +96,8 @@
|
||||
# Apartment appliance server
|
||||
nixosConfigurations."valefor" = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = customArgs // {
|
||||
specialArgs = {
|
||||
inherit userName userEmail;
|
||||
hostname = "valefor";
|
||||
role = "server";
|
||||
};
|
||||
@@ -99,9 +109,7 @@
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = customArgs // {
|
||||
inherit home-manager;
|
||||
};
|
||||
home-manager.extraSpecialArgs = extraSpecialArgs;
|
||||
home-manager.users.${userName}.imports = [
|
||||
./home
|
||||
];
|
||||
@@ -112,25 +120,29 @@
|
||||
# Storage, status, game, and media server
|
||||
nixosConfigurations."ixion" = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = customArgs // {
|
||||
specialArgs = {
|
||||
inherit userName userEmail;
|
||||
hostname = "ixion";
|
||||
role = "server";
|
||||
};
|
||||
modules = [
|
||||
quadlet-nix.nixosModules.quadlet
|
||||
./modules/common
|
||||
./modules/machine/ixion
|
||||
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = customArgs;
|
||||
home-manager.users.${userName}.imports = [
|
||||
./home
|
||||
];
|
||||
}
|
||||
];
|
||||
# modules = [
|
||||
# nix-flatpak.nixosModules.nix-flatpak
|
||||
# nix-ld.nixosModules.nix-ld
|
||||
# ./modules/nixos/hardware-configuration.nix
|
||||
# ./modules/nix-core.nix
|
||||
# ./modules/nixos/configuration.nix
|
||||
# ./modules/host-users.nix
|
||||
#
|
||||
# home-manager.nixosModules.home-manager
|
||||
# {
|
||||
# home-manager.useGlobalPkgs = true;
|
||||
# home-manager.useUserPackages = true;
|
||||
# home-manager.extraSpecialArgs = extraSpecialArgs;
|
||||
# home-manager.users.${userName}.imports = [
|
||||
# ./home
|
||||
# ];
|
||||
# }
|
||||
# ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
userName,
|
||||
@@ -13,7 +14,7 @@
|
||||
};
|
||||
in {
|
||||
# Import sub modules
|
||||
imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty;}) [
|
||||
imports = map (module: import module {inherit config lib pkgs dirs userName userEmail ghostty;}) [
|
||||
./atuin.nix
|
||||
./shell.nix
|
||||
./packages
|
||||
@@ -27,6 +28,7 @@ in {
|
||||
./browser.nix
|
||||
./zellij.nix
|
||||
./bat.nix
|
||||
./obsidian.nix
|
||||
];
|
||||
|
||||
# Home Manager needs a bit of information about you and the
|
||||
@@ -56,7 +58,7 @@ in {
|
||||
size = 22;
|
||||
};
|
||||
|
||||
stateVersion = "24.11";
|
||||
stateVersion = "25.05";
|
||||
};
|
||||
|
||||
# Let Home Manager install and manage itself.
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
extraConfig = {
|
||||
init.defaultBranch = "master";
|
||||
push.autoSetupRemote = true;
|
||||
pull.rebase = false;
|
||||
pull.merge = true;
|
||||
merge.tool = "nvimdiff";
|
||||
mergetool.keepBackup = false;
|
||||
};
|
||||
|
||||
53
home/obsidian.nix
Normal file
53
home/obsidian.nix
Normal file
@@ -0,0 +1,53 @@
|
||||
{ config, home-manager-unstable, pkgs, ...}: {
|
||||
home.packages = with pkgs; [
|
||||
obsidian
|
||||
obsidian-export
|
||||
];
|
||||
programs.obsidian = {
|
||||
enable = true;
|
||||
package =
|
||||
vaults = {
|
||||
"notes" = {
|
||||
enable = true;
|
||||
target = "${config.home.homeDirectory}/Documents/obsidian/notes";
|
||||
};
|
||||
"work-notes" = {
|
||||
enable = true;
|
||||
target = "${config.home.homeDirectory}/Documents/obsidian/work-notes";
|
||||
};
|
||||
};
|
||||
# defaultSettings = {
|
||||
# themes = [ "catppuccin" ];
|
||||
# };
|
||||
};
|
||||
|
||||
home.activation.obsidianRepos = config.lib.dag.entryAfter ["writeBoundary"] ''
|
||||
REPOS_DIR="${config.home.homeDirectory}/Documents/obsidian"
|
||||
|
||||
# Create the repos directory if it doesn't exist
|
||||
mkdir -p "$REPOS_DIR"
|
||||
|
||||
# Function to clone or update a repository
|
||||
clone_or_update() {
|
||||
local repo_url="$1"
|
||||
local vault_name="$2"
|
||||
local vault_path="$REPOS_DIR/$vault_name"
|
||||
|
||||
if [ -d "$vault_path/.git" ]; then
|
||||
echo "Updating existing vault: $vault_name"
|
||||
cd "$vault_path"
|
||||
${pkgs.git}/bin/git pull origin main || ${pkgs.git}/bin/git pull origin master || true
|
||||
else
|
||||
echo "Cloning new vault: $vault_name"
|
||||
rm -rf "$vault_path" # Remove if exists but not a git repo
|
||||
${pkgs.git}/bin/git clone "$repo_url" "$vault_path" || true
|
||||
fi
|
||||
}
|
||||
|
||||
# Clone repositories
|
||||
clone_or_update "https://scm.wyattjmiller.com/NoteFolio/notes.git" "notes"
|
||||
clone_or_update "https://scm.wyattjmiller.com/NoteFolio/work-notes.git" "work-notes"
|
||||
|
||||
echo "Obsidian repository vaults setup complete in $REPOS_DIR"
|
||||
'';
|
||||
}
|
||||
@@ -23,7 +23,6 @@
|
||||
fh
|
||||
aria2
|
||||
yt-dlp
|
||||
obsidian
|
||||
vscode
|
||||
weechat
|
||||
inetutils
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{pkgs, lib, ...}: {
|
||||
{pkgs, ...}: {
|
||||
programs.fish = {
|
||||
enable = true;
|
||||
# initExtra = ''
|
||||
@@ -52,27 +52,6 @@
|
||||
'';
|
||||
onEvent = "fish_greeting";
|
||||
};
|
||||
} // lib.optionalAttrs pkgs.stdenv.isLinux {
|
||||
block = {
|
||||
body = ''
|
||||
systemd-inhibit --what=sleep --who="$USER" --why="manual invocation" --mode=block sleep infinity &
|
||||
set -g INHIBIT_PID $last_pid
|
||||
echo "Sleep inhibited. PID: $INHIBIT_PID"
|
||||
'';
|
||||
};
|
||||
|
||||
unblock = {
|
||||
body = ''
|
||||
if set -q INHIBIT_PID
|
||||
kill $INHIBIT_PID 2>/dev/null
|
||||
and echo "Sleep inhibitor removed. PID: $INHIBIT_PID"
|
||||
or echo "Failed to kill process or already terminated."
|
||||
set -e INHIBIT_PID
|
||||
else
|
||||
echo "No active sleep inhibitor found."
|
||||
end
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -147,5 +147,20 @@ in {
|
||||
programs.waybar = {
|
||||
enable = pkgs.stdenv.isLinux;
|
||||
systemd.enable = true;
|
||||
|
||||
package = pkgs.waybar.overrideAttrs (old: {
|
||||
version = "0.13.0";
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "Alexays";
|
||||
repo = "Waybar";
|
||||
rev = "0fcda9afa519eb84deda68c051f7938a6c6bdbce";
|
||||
sha256 = "sha256-Puo/Y4qotb6uEEe9vbu/hyFXwLntr48R2C6mrmDKs0c=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
buildInputs = old.buildInputs ++ [ pkgs.fftw ];
|
||||
mesonFlags = (old.mesonFlags or []) ++ [ "-Dcava=disabled" ];
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.appimage;
|
||||
in {
|
||||
options.appimage = {
|
||||
enable = mkEnableOption "AppImage support";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
appimageupdate
|
||||
appimage-run
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -1,23 +1,20 @@
|
||||
{ lib, pkgs, ... }: {
|
||||
# Common packages that every system will use
|
||||
environment.systemPackages = with pkgs; [
|
||||
git
|
||||
vim
|
||||
neovim
|
||||
usbutils
|
||||
coreutils
|
||||
lshw
|
||||
systemd
|
||||
dmidecode
|
||||
pciutils
|
||||
nix-ld
|
||||
patchelf
|
||||
htop
|
||||
] ++
|
||||
lib.optionals pkgs.stdenv.isLinux (with pkgs; [
|
||||
systemd
|
||||
lshw
|
||||
dmidecode
|
||||
nix-ld
|
||||
]) ++
|
||||
lib.optionals pkgs.stdenv.isDarwin (with pkgs; [
|
||||
# nothing here, yet ;)
|
||||
]);
|
||||
];
|
||||
|
||||
# Common environment variables that every system will use
|
||||
environment.variables.EDITOR = "nvim";
|
||||
}
|
||||
|
||||
@@ -1,23 +1,30 @@
|
||||
{ lib, pkgs, userName, hostname, ... }:
|
||||
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
userName,
|
||||
hostname,
|
||||
...
|
||||
} @ args: {
|
||||
networking.hostName = hostname;
|
||||
|
||||
users.users."${userName}" = {
|
||||
home = if pkgs.stdenv.isDarwin
|
||||
# Don't forget to set a password with ‘passwd’!
|
||||
users.users."${userName}" = lib.mkMerge [
|
||||
{
|
||||
home =
|
||||
if pkgs.stdenv.isDarwin
|
||||
then "/Users/${userName}"
|
||||
else "/home/${userName}";
|
||||
description = userName;
|
||||
} // lib.optionalAttrs pkgs.stdenv.isLinux {
|
||||
}
|
||||
|
||||
(lib.mkIf (pkgs.stdenv.isLinux) {
|
||||
group = "${userName}";
|
||||
isNormalUser = true;
|
||||
};
|
||||
})
|
||||
];
|
||||
|
||||
users.groups.wyatt = {};
|
||||
nix.settings.trusted-users = [userName];
|
||||
|
||||
security = lib.optionalAttrs pkgs.stdenv.isLinux {
|
||||
sudo.extraRules = [
|
||||
security.sudo = {
|
||||
extraRules = [
|
||||
{
|
||||
groups = [ "wheel" ];
|
||||
commands = [
|
||||
@@ -30,9 +37,7 @@
|
||||
];
|
||||
};
|
||||
|
||||
environment = lib.optionalAttrs pkgs.stdenv.isDarwin {
|
||||
etc."sudoers.d/wheel-nopasswd".text = ''
|
||||
%wheel ALL=(ALL:ALL) NOPASSWD: SETENV: ALL
|
||||
'';
|
||||
};
|
||||
users.groups.wyatt = {};
|
||||
|
||||
nix.settings.trusted-users = [userName];
|
||||
}
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
"info.beyondallreason.bar"
|
||||
"io.dbeaver.DBeaverCommunity"
|
||||
"io.openrct2.OpenRCT2"
|
||||
"md.obsidian.Obsidian"
|
||||
"org.prismlauncher.PrismLauncher"
|
||||
"sh.cider.Cider"
|
||||
];
|
||||
@@ -21,13 +20,11 @@ in {
|
||||
inherit lib pkgs flatpakPackages;
|
||||
})
|
||||
../../apps/gaming.nix
|
||||
../../apps/appimage.nix
|
||||
../../graphics
|
||||
../../pwrMgmt
|
||||
../../networking/core.nix
|
||||
../../sound/pipewire.nix
|
||||
../../sound/shairport.nix
|
||||
../../sound/focusrite.nix
|
||||
../../virtualization/podman.nix
|
||||
../../virtualization/hardware.nix
|
||||
];
|
||||
@@ -36,13 +33,9 @@ in {
|
||||
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||
|
||||
# Custom kernel/boot stuff
|
||||
boot = {
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
loader = {
|
||||
systemd-boot.enable = true;
|
||||
efi.canTouchEfiVariables = true;
|
||||
};
|
||||
};
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
# Enable Bluetooth if present
|
||||
hardware.bluetooth.enable = true;
|
||||
@@ -69,6 +62,21 @@ in {
|
||||
wl-clip-persist
|
||||
];
|
||||
|
||||
# Enable OpenSSH
|
||||
services.openssh.enable = true;
|
||||
|
||||
# Enable keyring
|
||||
services.gnome.gnome-keyring.enable = true;
|
||||
|
||||
# Enable GnuPG
|
||||
programs.gnupg.agent = {
|
||||
enable = true;
|
||||
enableSSHSupport = true;
|
||||
};
|
||||
|
||||
# Enable SUID wrappers (some programs need them)
|
||||
programs.mtr.enable = true;
|
||||
|
||||
# Enable Polkit
|
||||
security.polkit.enable = true;
|
||||
|
||||
@@ -136,39 +144,14 @@ in {
|
||||
networkManager.enable = true;
|
||||
};
|
||||
|
||||
programs = {
|
||||
# Enable GnuPG
|
||||
gnupg.agent = {
|
||||
enable = true;
|
||||
enableSSHSupport = true;
|
||||
};
|
||||
|
||||
# Enable SUID wrappers (some programs need them)
|
||||
mtr.enable = true;
|
||||
|
||||
# Enable dconf
|
||||
dconf.enable = true;
|
||||
};
|
||||
programs.dconf.enable = true;
|
||||
|
||||
# Add username to groups "wheel" and "video" - more may be added here later
|
||||
users.users.${userName}.extraGroups = ["wheel" "video" "gamemode" "podman" "network"];
|
||||
|
||||
services = {
|
||||
# Enable OpenSSH
|
||||
openssh.enable = true;
|
||||
|
||||
# Enable keyring
|
||||
gnome.gnome-keyring.enable = true;
|
||||
|
||||
# Flatpak packages (see ../../apps/flatpak.nix)
|
||||
flatpak.packages = flatpakPackages;
|
||||
};
|
||||
|
||||
# Focusrite Scarlett audio interface support (see ../../sound/focusrite.nix)
|
||||
sound.hardware.focusrite.enable = true;
|
||||
|
||||
# AppImage support
|
||||
appimage.enable = true;
|
||||
services.flatpak.packages = flatpakPackages;
|
||||
|
||||
# XDG stuff
|
||||
xdg = {
|
||||
|
||||
@@ -1,84 +0,0 @@
|
||||
{
|
||||
pkgs,
|
||||
userName,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
../../pwrMgmt
|
||||
../../networking/core.nix
|
||||
../../virtualization/podman.nix
|
||||
../../virtualization/quadlet.nix
|
||||
../../virtualization/hardware.nix
|
||||
];
|
||||
|
||||
# Enable flakes for NixOS
|
||||
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||
|
||||
# Custom kernel/boot stuff
|
||||
boot = {
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
loader = {
|
||||
systemd-boot.enable = true;
|
||||
efi.canTouchEfiVariables = true;
|
||||
};
|
||||
};
|
||||
|
||||
# Enable Polkit
|
||||
security.polkit.enable = true;
|
||||
|
||||
# Make sure Bluetooth is off!
|
||||
hardware.bluetooth.enable = false;
|
||||
|
||||
# Set your timezone
|
||||
time.timeZone = "America/Detroit";
|
||||
|
||||
# Power management module
|
||||
pwrMgmt = {
|
||||
enable = true;
|
||||
cpuFreqGovernor = "performance";
|
||||
powertop.enable = false;
|
||||
};
|
||||
|
||||
# Podman module (see ../../virtualization/podman.nix)
|
||||
podman = {
|
||||
enable = true;
|
||||
extraPackages = with pkgs; [
|
||||
docker-credential-helpers
|
||||
toolbox
|
||||
cosign
|
||||
crane
|
||||
podman-tui
|
||||
];
|
||||
};
|
||||
|
||||
# Core networking module (see ../../networking/core.nix)
|
||||
network = {
|
||||
firewall.enable = true;
|
||||
networkManager.enable = true;
|
||||
};
|
||||
|
||||
programs = {
|
||||
# Enable GnuPG
|
||||
gnupg.agent = {
|
||||
enable = true;
|
||||
enableSSHSupport = true;
|
||||
};
|
||||
|
||||
# Enable SUID wrappers (some programs need them)
|
||||
mtr.enable = true;
|
||||
};
|
||||
|
||||
users.users.${userName}.extraGroups = ["wheel" "video" "podman" "network"];
|
||||
|
||||
services = {
|
||||
# Enable OpenSSH
|
||||
openssh.enable = true;
|
||||
};
|
||||
|
||||
# Install packages to be installed system-wide
|
||||
environment.systemPackages = with pkgs; [
|
||||
wireguard-tools
|
||||
];
|
||||
|
||||
system.stateVersion = "25.05";
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
{...}: {
|
||||
imports = [
|
||||
./configuration.nix
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
}
|
||||
@@ -1,46 +0,0 @@
|
||||
# --- DO NOT USE ---
|
||||
#
|
||||
# this is copied from ../valefor/hardware-configuration.nix
|
||||
# generate a new hardware-configuration.nix before using this!
|
||||
#
|
||||
# ------------------
|
||||
#
|
||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/ff89bde1-4b33-4277-b649-b92700b2406c";
|
||||
fsType = "xfs";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/3A4B-6866";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.eno1.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
@@ -1,12 +1,12 @@
|
||||
# Power management modules
|
||||
|
||||
This directory houses my own custom defined power management settings as NixOS modules. These are set in the machine-specific configurations (typically).
|
||||
This directory houses my own custom defined power management settings. These are set in the machine-specific configurations (typically).
|
||||
|
||||
## Examples
|
||||
|
||||
Given that this configuration is in the `machine/<hostname>` directory (where hostname is the name of the computer your configuring):
|
||||
|
||||
### Desktop/server configuration
|
||||
### Desktop configuration
|
||||
|
||||
```nix
|
||||
imports = [
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
}:
|
||||
with lib; {
|
||||
options = {
|
||||
security.sudoers = {
|
||||
security.sudo = {
|
||||
needsPassword = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
# Must be paired with the pipewire Nix module, this does nothing but install packages
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.sound.hardware.focusrite;
|
||||
in {
|
||||
options.sound.hardware.focusrite = {
|
||||
enable = mkEnableOption "Focusrite audio interface support";
|
||||
guiSupport = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Enable GUI support for Focusrite Scarlett audio interface (installs alsa-scarlett-gui)";
|
||||
};
|
||||
};
|
||||
config = mkIf cfg.enable (mkMerge [
|
||||
{
|
||||
environment.systemPackages = with pkgs;
|
||||
[
|
||||
scarlett2
|
||||
alsa-scarlett-gui
|
||||
]
|
||||
++ (
|
||||
if cfg.guiSupport
|
||||
then [pkgs.alsa-scarlett-gui]
|
||||
else []
|
||||
);
|
||||
}
|
||||
]);
|
||||
}
|
||||
@@ -40,13 +40,7 @@ Example:
|
||||
};
|
||||
```
|
||||
|
||||
To get a full, comprehensive list of what you can do with the podman module, please check out [podman.nix](./podman.nix)!
|
||||
|
||||
### Podman Quadlets
|
||||
|
||||
This is a wrapper around a project called [`quadlet-nix`](https://github.com/SEIAROTg/quadlet-nix), a way of defining systemd services as containers with Nix! Since I have existing services running inside of containers and don't want to risk breaking _everything_ that I have running, I figured this would be a safe, transitionary approach to handle this.
|
||||
|
||||
This is still a work-in-progress, check back soon on progress on this.
|
||||
To get a full, comprehensive list of what you can do with the podman module, please check out (podman.nix)[./podman.nix]!
|
||||
|
||||
## Kubernetes
|
||||
|
||||
|
||||
@@ -1,47 +0,0 @@
|
||||
# ----------------------
|
||||
# Wrapper for defining Quadlets in Nix via quadlet-nix
|
||||
#
|
||||
# Still WIP
|
||||
# ----------------------
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.quadlet;
|
||||
in {
|
||||
options = {
|
||||
quadlet = {
|
||||
enable = lib.mkEnableOption "Enable Podman's Quadlet systemd integration";
|
||||
|
||||
autoUpdate = {
|
||||
enable = lib.mkEnableOption "Enable the auto update mechanism";
|
||||
|
||||
calendar = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "*-*-* 03:30:00";
|
||||
description = "When the auto update mechanism is triggered, the calendar option will tell the auto update when to start";
|
||||
};
|
||||
};
|
||||
|
||||
extraPackages = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.package;
|
||||
default = [];
|
||||
description = "Additional container-related packages to install (these likely will be installed with Podman though)";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
virtualisation.quadlet = {
|
||||
enable = true;
|
||||
autoUpdate = {
|
||||
enable = cfg.autoUpdate.enable;
|
||||
calendar = cfg.autoUpdate.calendar;
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = cfg.extraPackages;
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user