feat: ralph, waybar, formatted

This commit is contained in:
jackjohn7 2026-03-28 18:35:54 -05:00
parent 774daebdff
commit 1eb01464e1
38 changed files with 1913 additions and 609 deletions

View file

@ -1,8 +1,9 @@
{ self, inputs, ... }:
{
flake.nixosModules.desktopConfiguration = {pkgs, lib, ... }: {
imports =
[
flake.nixosModules.desktopConfiguration =
{ pkgs, lib, ... }:
{
imports = [
self.nixosModules.base
self.nixosModules.pipewire
self.nixosModules.fonts
@ -15,66 +16,69 @@
self.nixosModules.user-jingus
];
programs.firefox.enable = true;
programs.zsh.enable = true;
programs.firefox.enable = true;
programs.zsh.enable = true;
# Enable Gnome and GDM for login management and some decent default apps
services.displayManager.gdm.enable = true;
services.desktopManager.gnome.enable = true;
# Enable Gnome and GDM for login management and some decent default apps
services.displayManager.gdm.enable = true;
services.desktopManager.gnome.enable = true;
# Allow unfree packages
nixpkgs.config.allowUnfree = true;
# Allow unfree packages
nixpkgs.config.allowUnfree = true;
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
vesktop
pavucontrol
keepassxc
amberol
];
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
vesktop
pavucontrol
keepassxc
amberol
];
nix.settings.experimental-features = [ "nix-command" "flakes" ];
nix.settings.experimental-features = [
"nix-command"
"flakes"
];
services.xserver.videoDrivers = [ "amdgpu" ];
services.xserver.videoDrivers = [ "amdgpu" ];
hardware.graphics = {
enable = true;
enable32Bit = true;
hardware.graphics = {
enable = true;
enable32Bit = true;
};
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
# Use latest kernel.
boot.kernelPackages = pkgs.linuxPackages_latest;
networking.hostName = "nixos"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Enable networking
networking.networkmanager.enable = true;
# Enable the OpenSSH daemon.
# services.openssh.enable = true;
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. Its perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "25.11"; # Did you read the comment?
};
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
# Use latest kernel.
boot.kernelPackages = pkgs.linuxPackages_latest;
networking.hostName = "nixos"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Enable networking
networking.networkmanager.enable = true;
# Enable the OpenSSH daemon.
# services.openssh.enable = true;
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. Its perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "25.11"; # Did you read the comment?
};
}

View file

@ -1,4 +1,5 @@
{ self, inputs, ... }: {
{ self, inputs, ... }:
{
flake.nixosConfigurations.desktop = inputs.nixpkgs.lib.nixosSystem {
modules = [
self.nixosModules.desktopConfiguration

View file

@ -1,30 +1,50 @@
{ self, inputs, ... }: {
flake.nixosModules.desktopHardware = { config, lib, pkgs, modulesPath, nixpkgs, ... }: {
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
{ self, inputs, ... }:
{
flake.nixosModules.desktopHardware =
{
config,
lib,
pkgs,
modulesPath,
nixpkgs,
...
}:
{
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/7001a8e1-003d-4119-afbb-5d6d25759e08";
boot.initrd.availableKernelModules = [
"nvme"
"ahci"
"xhci_pci"
"usbhid"
"usb_storage"
"sd_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" = {
device = "/dev/disk/by-uuid/7001a8e1-003d-4119-afbb-5d6d25759e08";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/5752-EAAD";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/5752-EAAD";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
options = [
"fmask=0077"
"dmask=0077"
];
};
swapDevices =
[ { device = "/dev/disk/by-uuid/e87cbcca-c7c6-4e03-90e7-5852ab59f0b9"; }
swapDevices = [
{ device = "/dev/disk/by-uuid/e87cbcca-c7c6-4e03-90e7-5852ab59f0b9"; }
];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
};
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
};
}

View file

@ -1,8 +1,9 @@
{ self, inputs, ... }:
{
flake.nixosModules.laptopConfiguration = {pkgs, lib, ... }: {
imports =
[
flake.nixosModules.laptopConfiguration =
{ pkgs, lib, ... }:
{
imports = [
self.nixosModules.laptopHardware
self.nixosModules.base
self.nixosModules.fonts
@ -13,133 +14,155 @@
self.nixosModules.user-jingo
];
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
# Use latest kernel.
boot.kernelPackages = pkgs.linuxPackages_latest;
# Use latest kernel.
boot.kernelPackages = pkgs.linuxPackages_latest;
networking.hostName = "nixos"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
networking.hostName = "nixos"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Enable networking
networking.networkmanager.enable = true;
# Enable networking
networking.networkmanager.enable = true;
# Configure keymap in X11
services.xserver.xkb = {
layout = "us";
variant = "";
};
# Configure keymap in X11
services.xserver.xkb = {
layout = "us";
variant = "";
};
# Define a user account. Don't forget to set a password with passwd.
users.users.jingo = {
isNormalUser = true;
description = "j";
extraGroups = [ "networkmanager" "wheel" "docker" "dialout" ];
packages = with pkgs; [];
shell = pkgs.zsh;
};
# Define a user account. Don't forget to set a password with passwd.
users.users.jingo = {
isNormalUser = true;
description = "j";
extraGroups = [
"networkmanager"
"wheel"
"docker"
"dialout"
];
packages = with pkgs; [ ];
shell = pkgs.zsh;
};
# Allow unfree packages
nixpkgs.config.allowUnfree = true;
# Allow unfree packages
nixpkgs.config.allowUnfree = true;
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
wget
git
kitty
wofi
firefox
waybar
wl-clipboard
ripgrep
emacs-pgtk
zsh
zellij
zip
unzip
gnome-keyring
usbutils
dfu-util
libsecret
seahorse
];
programs.zsh.enable = true;
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
# programs.mtr.enable = true;
# programs.gnupg.agent = {
# enable = true;
# enableSSHSupport = true;
# };
virtualisation.docker.enable = true;
# enable emulation for ARM (for cross-compiling for RaspberryPi)
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
# List services that you want to enable:
services.displayManager.ly = {
enable = true;
};
programs.seahorse.enable = true;
services.gnome.gnome-keyring.enable = true;
services.dbus = {
enable = true;
packages = [ pkgs.gnome-keyring pkgs.gcr ];
};
# Define udev rules for DFU devices
services.udev.extraRules = ''
# Generic DFU rule (for meshtastic thingy)
SUBSYSTEM=="tty", ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="ea60", MODE="0666", GROUP="dialout"
SUBSYSTEM=="usb", ATTRS{idVendor}=="303a", ATTRS{idProduct}=="1001", MODE="0666", GROUP="dialout"
'';
# Enable the OpenSSH daemon.
# services.openssh.enable = true;
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;
security.pam.services.ly.enableGnomeKeyring = true;
nix.settings = {
experimental-features = [ "nix-command" "flakes" ];
substituters = [
"https://cache.nixos.org/"
"https://cache.garnix.io"
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
fastfetch
wget
git
kitty
wofi
firefox
waybar
wl-clipboard
ripgrep
emacs-pgtk
zsh
zellij
zip
unzip
gnome-keyring
usbutils
dfu-util
libsecret
seahorse
gnupg
gowall
gimp3
chatterino7
mumble
(element-desktop.override {
commandLineArgs = "--password-store=gnome-libsecret";
})
self.packages.${pkgs.stdenv.hostPlatform.system}.ralph
];
trusted-public-keys = [
# Default NixOS cache key
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
# Garnix cache key
"cache.garnix.io:Lf0liRJ2oT5zekG0arzGcHtrIfuVjGrAG1MxRCBuFlA="
programs.zsh.enable = true;
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
# programs.mtr.enable = true;
# programs.gnupg.agent = {
# enable = true;
# enableSSHSupport = true;
# };
virtualisation.docker.enable = true;
# enable emulation for ARM (for cross-compiling for RaspberryPi)
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
# List services that you want to enable:
services.displayManager.ly = {
enable = true;
};
programs.seahorse.enable = true;
services.gnome.gnome-keyring.enable = true;
services.dbus = {
enable = true;
packages = [
pkgs.gnome-keyring
pkgs.gcr
];
};
# Define udev rules for DFU devices
services.udev.extraRules = ''
# Generic DFU rule (for meshtastic thingy)
SUBSYSTEM=="tty", ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="ea60", MODE="0666", GROUP="dialout"
SUBSYSTEM=="usb", ATTRS{idVendor}=="303a", ATTRS{idProduct}=="1001", MODE="0666", GROUP="dialout"
'';
# Enable the OpenSSH daemon.
# services.openssh.enable = true;
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;
security.pam.services.ly.enableGnomeKeyring = true;
nix.settings = {
experimental-features = [
"nix-command"
"flakes"
];
substituters = [
"https://cache.nixos.org/"
"https://cache.garnix.io"
];
trusted-public-keys = [
# Default NixOS cache key
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
# Garnix cache key
"cache.garnix.io:Lf0liRJ2oT5zekG0arzGcHtrIfuVjGrAG1MxRCBuFlA="
];
download-buffer-size = 524288000;
};
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. Its perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "25.05"; # Did you read the comment?
swapDevices = [
{
device = "/dev/disk/by-label/swap"; # Or "/dev/sda2"
}
];
download-buffer-size = 524288000;
};
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. Its perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "25.05"; # Did you read the comment?
swapDevices = [ {
device = "/dev/disk/by-label/swap"; # Or "/dev/sda2"
} ];
};
}

View file

@ -1,4 +1,5 @@
{ self, inputs, ... }: {
{ self, inputs, ... }:
{
flake.nixosConfigurations.laptop = inputs.nixpkgs.lib.nixosSystem {
modules = [
self.nixosModules.laptopConfiguration

View file

@ -1,37 +1,56 @@
{ self, inputs, ... }: {
flake.nixosModules.laptopHardware = { config, lib, pkgs, modulesPath, nixpkgs, ... }: {
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
{ self, inputs, ... }:
{
flake.nixosModules.laptopHardware =
{
config,
lib,
pkgs,
modulesPath,
nixpkgs,
...
}:
{
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
boot.initrd.availableKernelModules = [
"nvme"
"xhci_pci"
"ahci"
"usb_storage"
"sd_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/78d511b1-8932-4af7-b74d-8194aeef0903";
fileSystems."/" = {
device = "/dev/disk/by-uuid/78d511b1-8932-4af7-b74d-8194aeef0903";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/776B-1FD9";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/776B-1FD9";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
options = [
"fmask=0077"
"dmask=0077"
];
};
swapDevices =
[ { device = "/dev/disk/by-uuid/a0077d83-9d7b-4ecd-b60b-2de46562d841"; }
swapDevices = [
{ device = "/dev/disk/by-uuid/a0077d83-9d7b-4ecd-b60b-2de46562d841"; }
];
# 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.wlp1s0.useDHCP = lib.mkDefault true;
# 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.wlp1s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
};
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
};
}