refactor: clean up

This commit is contained in:
Mohammad Rafiq 2025-03-12 03:49:11 +08:00
parent 45c4e136c4
commit 630b3ce27b
25 changed files with 195 additions and 210 deletions

View file

@ -35,25 +35,7 @@
}
{
name = "orpheus";
value = nixpkgs.lib.nixosSystem {
specialArgs = args;
modules = [
inputs.nixos-hardware.nixosModules.raspberry-pi-4
"${nixpkgs}/nixos/modules/profiles/minimal.nix"
./systems/orpheus.nix
home-manager.nixosModules.home-manager
{
home-manager = {
useUserPackages = true;
extraSpecialArgs = args;
users.rafiq.imports = [
./users/rafiq.nix
];
};
}
];
};
value = mkSystem "orpheus";
}
];
};
@ -61,19 +43,14 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixos-hardware.url = "github:nixos/nixos-hardware";
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
hyprland.url = "github:hyprwm/Hyprland";
yazi.url = "github:sxyazi/yazi";
nvf.url = "github:notashelf/nvf";
nixvim.url = "github:nix-community/nixvim";
nixvim.inputs.nixpkgs.follows = "nixpkgs";
nixd.url = "github:nix-community/nixd";
stylix.url = "github:danth/stylix";
};
}

View file

@ -1,30 +1,34 @@
# 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")
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = [];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/e5005ea6-6c5a-4ab3-9767-ce7772582024";
fileSystems."/" = {
device = "/dev/disk/by-uuid/e5005ea6-6c5a-4ab3-9767-ce7772582024";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/6BBE-0E70";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/6BBE-0E70";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
options = ["fmask=0077" "dmask=0077"];
};
swapDevices = [ ];
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

View file

@ -0,0 +1,6 @@
{
# Use the extlinux boot loader. (NixOS wants to enable GRUB by default)
boot.loader.grub.enable = false;
# Enables the generation of /boot/extlinux/extlinux.conf
boot.loader.generic-extlinux-compatible.enable = true;
}

View file

@ -5,12 +5,11 @@
extraGroups = ["networkmanager" "wheel"];
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILv8HqazE294YdyGaXK6q2EniDlTpGaUL071kk9+W0GJ rafiq@nemesis"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICbZfOYt6zydLyO4f9JAsxb1i6kHAjYzqa0SOqef6MKM rafiq@orpheus"
];
};
security.sudo = {
wheelNeedsPassword = false;
};
security.sudo.wheelNeedsPassword = false;
# Enable basic fonts for reasonable Unicode coverage
fonts.enableDefaultPackages = true;

View file

@ -1,4 +1,8 @@
{ pkgs, config, ... }: {
{
pkgs,
config,
...
}: {
fonts.packages = with pkgs; [
nerd-fonts.terminess-ttf
];

View file

@ -1,5 +1,5 @@
{ pkgs, ... }: {
services.xserver.videoDrivers = [ "nvidia" ];
{pkgs, ...}: {
services.xserver.videoDrivers = ["nvidia"];
hardware.graphics = {
enable = true;
extraPackages = with pkgs; [

View file

@ -8,8 +8,6 @@
];
networking = {
# Enable networkManager
# TODO: Look into the networkManager options.
networkmanager.enable = true;
# Configures a simple stateful firewall.
@ -37,6 +35,5 @@
];
};
# TODO: look into openssh and tailscale settings.
services.openssh.enable = true;
}

View file

@ -1,4 +1,8 @@
{ inputs, pkgs, ... }: {
{
inputs,
pkgs,
...
}: {
programs.uwsm = {
enable = false;
};

View file

@ -1,4 +1,4 @@
{ inputs, ... }: {
{inputs, ...}: {
imports = [
inputs.stylix.nixosModules.stylix
./themes/catppuccin.nix

View file

@ -1,3 +1,3 @@
{ pkgs, ... }: {
{pkgs, ...}: {
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
}

View file

@ -3,15 +3,13 @@
./hw-nemesis.nix
./modules/bootloaders/systemd-boot.nix
./modules/common.nix
./modules/desktop.nix
./modules/hardware/nvidia.nix
./modules/networking.nix
./modules/desktop.nix
./modules/stylix.nix
];
networking.hostName = "nemesis";
boot.binfmt.emulatedSystems = ["wasm32-wasi" "x86_64-windows" "aarch64-linux"];
system.stateVersion = "24.11";
boot.binfmt.emulatedSystems = ["wasm32-wasi" "x86_64-windows" "aarch64-linux"];
}

View file

@ -1,25 +1,14 @@
{
config,
lib,
pkgs,
...
}: {
{inputs, ...}: {
imports = [
# Include the results of the hardware scan.
./hw-orpheus.nix
./modules/bootloaders/extlinux.nix
./modules/common.nix
./modules/networking.nix
./modules/stylix.nix
inputs.nixos-hardware.nixosModules.raspberry-pi-4
"${inputs.nixpkgs}/nixos/modules/profiles/minimal.nix"
];
# Use the extlinux boot loader. (NixOS wants to enable GRUB by default)
boot.loader.grub.enable = false;
# Enables the generation of /boot/extlinux/extlinux.conf
boot.loader.generic-extlinux-compatible.enable = true;
networking.hostName = "orpheus"; # Define your hostname.
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
services.openssh.enable = true;
networking.firewall.enable = false;
networking.hostName = "orpheus";
system.stateVersion = "25.05";
}

View file

@ -2,10 +2,10 @@
fonts = {
fontconfig = {
enable = true;
defaultFonts.emoji = [ "Terminess Nerd Font" ];
defaultFonts.monospace = [ "Terminess Nerd Font Mono" ];
defaultFonts.sansSerif = [ "Terminess Nerd Font" ];
defaultFonts.serif = [ "Terminess Nerd Font" ];
defaultFonts.emoji = ["Terminess Nerd Font"];
defaultFonts.monospace = ["Terminess Nerd Font Mono"];
defaultFonts.sansSerif = ["Terminess Nerd Font"];
defaultFonts.serif = ["Terminess Nerd Font"];
};
};
}

View file

@ -1,4 +1,8 @@
{ config, lib, ... }: {
{
config,
lib,
...
}: {
home.sessionVariables.NIXOS_OZONE_WL = "1";
wayland.windowManager.hyprland = {
enable = true;

View file

@ -1,4 +1,4 @@
{ inputs, ... }: {
{inputs, ...}: {
imports = [
inputs.nixvim.homeManagerModules.nixvim
./nixvim/conform-nvim.nix # formatter
@ -54,8 +54,7 @@
silent = true;
};
}
];
];
clipboard.providers.wl-copy.enable = true;
};

View file

@ -19,7 +19,10 @@
view = {
cursorline = true;
side = "right";
width = { min = "25%"; max = "25%"; };
width = {
min = "25%";
max = "25%";
};
};
};
};

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: {
{pkgs, ...}: {
# Terminal Multiplexing
programs.tmux = {
enable = true;
@ -26,7 +26,7 @@
# inherit environment variables from outside so that we can use wl-copy etc
setenv -g WAYLAND_DISPLAY "$WAYLAND_DISPLAY"
setenv -g XDG_RUNTIME_DIR "$XDG_RUNTIME_DIR"
setenv -g XDG_RUNTIME_DIR "$XDG_RUNTIME_DIR"
'';
};
}

View file

@ -1,4 +1,8 @@
{ inputs, pkgs, ... }: {
{
inputs,
pkgs,
...
}: {
programs.yazi = {
enable = true;
package = inputs.yazi.packages.${pkgs.system}.default;

View file

@ -1,12 +1,10 @@
{ pkgs, ... }: {
{pkgs, ...}: {
home.packages = [
(pkgs.writers.writePython3Bin "git-extract" {
libraries = with pkgs.python3Packages; [
magic
chardet
];
} (builtins.readFile ./git-extract.py))
(pkgs.writeShellScriptBin "rebuild" (builtins.readFile ./rebuild.sh))

View file

@ -1,5 +1,4 @@
{pkgs, ...}: {
home.packages = with pkgs; [
fastfetch # system info
wl-clipboard # provides cli copy and paste commands

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: {
{pkgs, ...}: {
imports = [
./modules/sh.nix
./modules/de.nix