mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
mjallen18
2025-08-20 18:19:20 -05:00
parent dc382dcfcc
commit 68f732ec4b
31 changed files with 351 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
homes/aarch64-linux/matt@pi5/default.nix
View File

@@ -57,4 +57,8 @@ in
programs = {
zsh.shellAliases = shellAliases;
};
services = {
kdeconnect.enable = false;
};
}

2
homes/x86_64-linux/deck@steamdeck/default.nix
View File

@@ -78,6 +78,6 @@ in
mgba
prismlauncher
ryujinx-greemdev
vmware-horizon-client
omnissa-horizon-client
];
}

6
modules/home/desktop/hyprland/default.nix
View File

@@ -292,7 +292,8 @@ in
"tag +waydroid, class:([Ww]aydroid.*)"
"float, tag:waydroid"
"pin, tag:waydroid"
] ++ cfg.windowRule;
]
++ cfg.windowRule;
plugin = {
touch_gestures = {
@@ -395,8 +396,7 @@ in
};
};
extraConfig =
''
extraConfig = ''
exec-once = dbus-update-activation-environment --systemd --all
exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1

2
modules/home/desktop/hyprland/services/hyprlock/default.nix
View File

@@ -12,7 +12,7 @@ in
config = lib.mkIf cfg.enable {
programs.hyprlock = {
enable = false;
enable = true;
settings = {
background = [
{

12
modules/home/home/default.nix
View File

@@ -52,10 +52,14 @@
nh = {
enable = true;
flake = "/etc/nixos";
clean = {
enable = true;
extraArgs = "--keep 5";
};
};
micro = {
enable = true;
enable = lib.mkDefault true;
settings = {
autoindent = true;
autosu = true;
@@ -66,7 +70,7 @@
};
tmux = {
enable = true;
enable = lib.mkDefault true;
terminal = "screen-256color";
sensibleOnTop = true;
focusEvents = true;
@@ -109,8 +113,8 @@
nextcloud-client.enable = lib.mkDefault true;
pass-secret-service.enable = lib.mkDefault true;
kdeconnect = {
enable = true;
indicator = true;
enable = lib.mkDefault true;
indicator = lib.mkDefault true;
};
};
}

6
modules/home/programs/waybar/default.nix
View File

@@ -323,14 +323,14 @@ in
format = "&nbsp";
tooltip = false;
};
} // cfg.extraModules;
}
// cfg.extraModules;
};
# * { font-size: 13px; }
# window.eDP-1 * { font-size: 10px; }
style =
''
style = ''
.blink_me {
animation: blinker 1s linear infinite;
}

3
modules/home/user/default.nix
View File

@@ -65,8 +65,7 @@ in
];
home = {
file =
{
file = {
"Desktop/.keep".text = "";
"Documents/.keep".text = "";
"Downloads/.keep".text = "";

2
modules/nixos/desktop/gnome/default.nix
View File

@@ -28,7 +28,7 @@ in
programs = {
kdeconnect = {
enable = true;
enable = lib.mkDefault true;
package = pkgs.gnomeExtensions.gsconnect;
};
};

12
modules/nixos/ollama/default.nix
View File

@@ -8,18 +8,6 @@
with lib;
let
cfg = config.${namespace}.services.ollama;
llamaPackage = pkgs.llama-cpp.overrideAttrs (_old: {
src = pkgs.fetchFromGitHub {
owner = "ggml-org";
repo = "llama.cpp";
rev = "b4920";
sha256 = "sha256-SnQIeY74JpAPRMxWcpklDH5D4CQvAgi0GYx5+ECk2J4=";
};
# Optionally override other attributes if you need to
# version = "my-fork-version";
# pname = "llama-cpp-custom";
});
in
{
imports = [ ./options.nix ];

6
modules/nixos/user/default.nix
View File

@@ -64,7 +64,8 @@ in
"power"
"nix"
"i2c"
] ++ cfg.extraGroups;
]
++ cfg.extraGroups;
group = "users";
home = "/home/${cfg.name}";
@@ -72,6 +73,7 @@ in
shell = lib.mkForce pkgs.zsh;
uid = 1000;
hashedPasswordFile = cfg.passwordFile;
} // cfg.extraOptions;
}
// cfg.extraOptions;
};
}

12
packages/open-remote-ssh/default.nix
View File

@@ -1,8 +1,8 @@
{ lib
, stdenv
, fetchurl
, vscode-utils
, pkgs
{
lib,
fetchurl,
vscode-utils,
pkgs,
}:
let
@@ -17,7 +17,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
vsix = fetchurl {
url = "https://open-vsx.org/api/${publisher}/${name}/${version}/file/${publisher}.${name}-${version}.vsix";
# Update this hash after downloading
sha256 = "sha256-QfJnAAx+kO2iJ1EzWoO5HLogJKg3RiC3hg1/u2Jm6t4=";
};
@@ -41,7 +40,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
homepage = "https://github.com/jeanp413/open-remote-ssh";
changelog = "https://github.com/jeanp413/open-remote-ssh/releases";
license = licenses.mit;
maintainers = with maintainers; [ /* add your name here if you maintain this */ ];
platforms = platforms.all;
};
}

10
packages/pipewire-python/default.nix
View File

@@ -1,5 +1,5 @@
{ python3Packages, fetchFromGitHub, ... }:
python3Packages.buildPythonPackage rec {
python3Packages.buildPythonPackage {
pname = "pipewire-python";
version = "0.2.3";
format = "pyproject";
@@ -12,6 +12,10 @@ python3Packages.buildPythonPackage rec {
};
buildInputs = with python3Packages; [ flit-core ];
nativeBuildInputs = with python3Packages; [ build wheel ];
doCheck = false; # no tests in the PyPI tarball
nativeBuildInputs = with python3Packages; [
build
wheel
];
doCheck = false;
}

5
packages/wyzeapy/default.nix
View File

@@ -11,7 +11,10 @@ python3Packages.buildPythonPackage rec {
sha256 = "sha256-rEmWsCIBGNmDEecVT8O9O5/E0WVpTfA7amFI70DEmiI=";
};
buildInputs = with python3Packages; [ poetry-core hatchling ];
buildInputs = with python3Packages; [
poetry-core
hatchling
];
nativeBuildInputs = with python3Packages; [
aiodns

1
systems/aarch64-darwin/macbook-pro/default.nix
View File

@@ -4,7 +4,6 @@
}:
{
imports = [
./nix.nix
./homebrew.nix
./programs.nix
./system.nix

17
systems/aarch64-darwin/macbook-pro/nix.nix
View File

@@ -1,17 +0,0 @@
{ ... }:
{
# Auto upgrade nix package and the daemon service.
# services.nix-daemon.enable = true;
# nix.package = pkgs.nix;
# Necessary for using flakes on this system.
nix = {
settings.experimental-features = "nix-command flakes";
};
# The platform the configuration will be used on.
nixpkgs = {
config.allowUnfree = true;
hostPlatform = "aarch64-darwin";
};
}

48
systems/aarch64-linux/macbook-pro-nixos/hardware-configuration.nix
View File

@@ -1,56 +1,66 @@
# 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, ... }:
{
lib,
modulesPath,
...
}:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "usb_storage" "sdhci_pci" ];
boot.initrd.availableKernelModules = [
"usb_storage"
"sdhci_pci"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "none";
fileSystems."/" = {
device = "none";
fsType = "tmpfs";
options = [ "mode=755" ];
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/E66E-1A03";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/E66E-1A03";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
options = [
"fmask=0022"
"dmask=0022"
];
};
fileSystems."/root" =
{ device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
fileSystems."/root" = {
device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
fsType = "btrfs";
options = [ "subvol=root" ];
};
fileSystems."/etc" =
{ device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
fileSystems."/etc" = {
device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
fsType = "btrfs";
options = [ "subvol=etc" ];
};
fileSystems."/nix" =
{ device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
fileSystems."/nix" = {
device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
fsType = "btrfs";
options = [ "subvol=nix" ];
};
fileSystems."/var/log" =
{ device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
fileSystems."/var/log" = {
device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
fsType = "btrfs";
options = [ "subvol=log" ];
};
fileSystems."/home" =
{ device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
fileSystems."/home" = {
device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
fsType = "btrfs";
options = [ "subvol=home" ];
};

26
systems/aarch64-linux/pi4/default.nix
View File

@@ -3,7 +3,6 @@
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{
config,
lib,
pkgs,
namespace,
@@ -26,19 +25,6 @@ in
hardware.disko.enable = true;
};
nix = {
settings = {
substituters = [
"https://nixos-raspberrypi.cachix.org"
"https://cache.mjallen.dev"
];
trusted-public-keys = [
"nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI="
"cache.mjallen.dev-1:IzFmKCd8/gggI6lcCXsW65qQwiCLGFFN9t9s2iw7Lvc="
];
};
};
# Configure nixpkgs
nixpkgs = {
overlays = lib.mkAfter [
@@ -53,20 +39,8 @@ in
})
];
};
programs.zsh.enable = true;
hardware.i2c.enable = true;
services = {
openssh = {
enable = true;
authorizedKeysFiles = [
config.sops.secrets."ssh-keys-public/pi5".path
];
hostKeys = [ ];
};
};
systemd.services.btattach = {
before = [ "bluetooth.service" ];
after = [ "dev-ttyAMA0.device" ];

20
systems/aarch64-linux/pi5/default.nix
View File

@@ -11,7 +11,7 @@
}:
let
user = "matt";
password = config.sops.secrets."pi5/matt-password".path;
# password = config.sops.secrets."pi5/matt-password".path;
kernelBundle = pkgs.linuxAndFirmware.latest;
in
{
@@ -30,20 +30,6 @@ in
};
};
# Enable nix flakes and nix-command tools
nix = {
settings = {
substituters = [
"https://nixos-raspberrypi.cachix.org"
# "https://cache.mjallen.dev"
];
trusted-public-keys = [
"nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI="
# "cache.mjallen.dev-1:IzFmKCd8/gggI6lcCXsW65qQwiCLGFFN9t9s2iw7Lvc="
];
};
};
# Configure nixpkgs
nixpkgs = {
overlays = lib.mkAfter [
@@ -119,5 +105,9 @@ in
users.root.shell = pkgs.zsh;
};
programs = {
kdeconnect.enable = false;
};
zramSwap.enable = true;
}

11
systems/x86_64-linux/desktop/configuration.nix
View File

@@ -51,17 +51,6 @@ let
];
in
{
# nix = {
# settings = {
# substituters = [
# "https://cache.mjallen.dev"
# ];
# trusted-public-keys = [
# "cache.mjallen.dev-1:IzFmKCd8/gggI6lcCXsW65qQwiCLGFFN9t9s2iw7Lvc="
# ];
# };
# };
chaotic.mesa-git.enable = false;
# Environment configuration

3
systems/x86_64-linux/desktop/filesystems.nix
View File

@@ -27,7 +27,8 @@ in
fsType = "bcachefs";
options = [
"noatime"
] ++ defaultLocalOptions;
]
++ defaultLocalOptions;
};
# Network shares

15
systems/x86_64-linux/desktop/hardware-configuration.nix
View File

@@ -32,7 +32,8 @@ in
options = [
"subvol=nix"
"noatime"
] ++ defeaultBtrfsOptions;
]
++ defeaultBtrfsOptions;
};
fileSystems."/etc" = {
@@ -41,7 +42,8 @@ in
options = [
"subvol=etc"
"noatime"
] ++ defeaultBtrfsOptions;
]
++ defeaultBtrfsOptions;
};
fileSystems."/root" = {
@@ -50,7 +52,8 @@ in
options = [
"subvol=root"
"noatime"
] ++ defeaultBtrfsOptions;
]
++ defeaultBtrfsOptions;
};
fileSystems."/var/log" = {
@@ -59,7 +62,8 @@ in
options = [
"subvol=log"
"noatime"
] ++ defeaultBtrfsOptions;
]
++ defeaultBtrfsOptions;
};
fileSystems."/home" = {
@@ -67,7 +71,8 @@ in
fsType = "btrfs";
options = [
"subvol=home"
] ++ defeaultBtrfsOptions;
]
++ defeaultBtrfsOptions;
};
fileSystems."/boot" = {

18
systems/x86_64-linux/nas/default.nix
View File

@@ -1,4 +1,3 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
@@ -19,7 +18,6 @@
./apps.nix
./grafana.nix
./networking.nix
./nixpkgs.nix
./ups.nix
./users.nix
./samba.nix
@@ -191,20 +189,4 @@
optimise.automatic = lib.mkDefault true;
};
# Nixpkgs configuration
nixpkgs = {
config = {
allowUnfree = lib.mkForce true;
allowUnsupportedSystem = true;
permittedInsecurePackages = [
# ...
];
};
};
nixpkgs.config.allowUnfreePredicate =
pkg:
builtins.elem (lib.getName pkg) [
"vscode-extension-github-copilot"
];
}

7
systems/x86_64-linux/nas/filesystems.nix
View File

@@ -1,11 +1,8 @@
{ ... }:
let
defaultOptions = [ "compress=zstd" ];
in
{
fileSystems."/mnt" = {
fileSystems."/media/nas/main" = {
label = "nas_pool";
# device = "/dev/sde:/dev/sdf:/dev/sdh:/dev/sdi:/dev/:sdj";
# device = "/dev/sde:/dev/sdf:/dev/sdh:/dev/sdi:/dev/sdj:/dev/nmve0n1:/dev/nvme1n1";
fsType = "bcachefs";
mountPoint = "/media/nas/main";
};

25
systems/x86_64-linux/nas/nixpkgs.nix
View File

@@ -1,25 +0,0 @@
{ ... }:
{
# Configure nixpkgs
nixpkgs = {
config = {
# Enable non free
allowUnfree = true;
# enable cuda support
cudaSupport = true;
allowUnfreePredicate =
p:
builtins.all (
license:
license.free
|| builtins.elem license.shortName [
"CUDA EULA"
"cuDNN EULA"
"cuTENSOR EULA"
"NVidia OptiX EULA"
]
) (if builtins.isList p.meta.license then p.meta.license else [ p.meta.license ]);
};
};
}

11
systems/x86_64-linux/nuc/default.nix
View File

@@ -45,15 +45,4 @@
optimise.automatic = lib.mkDefault true;
};
# Nixpkgs configuration
nixpkgs = {
config = {
allowUnfree = lib.mkForce true;
allowUnsupportedSystem = true;
permittedInsecurePackages = [
# ...
];
};
};
}

4
systems/x86_64-linux/steamdeck/boot.nix
View File

@@ -60,9 +60,5 @@ in
# Further reduce systemd output
systemd = {
services.systemd-udev-settle.enable = false;
extraConfig = ''
ShowStatus=no
DefaultTimeoutStartSec=15s
'';
};
}

2
systems/x86_64-linux/steamdeck/configuration.nix
View File

@@ -9,8 +9,6 @@
...
}:
{
nixpkgs.config.allowUnfree = lib.mkForce true;
# Define a user account. Don't forget to set a password with ‘passwd’.
users.users = {
deck = {

2
systems/x86_64-linux/steamdeck/default.nix
View File

@@ -19,8 +19,6 @@
./sops.nix
];
nixpkgs.config.allowUnfree = true;
${namespace} = {
hardware.disko.enable = true;
bootloader.lanzaboote.enable = true;