liv/nixos-config
1
0
Fork 0
mirror of https://github.com/Ahwxorg/nixos-config.git synced 2025-12-04 15:00:13 +01:00
Code Issues 1 Projects Releases Packages Wiki Activity Actions

chore: merge branches

Browse source
This commit is contained in:
Ahwx 2024-12-19 19:10:28 +01:00
commit 03d478863a
8 changed files with 101 additions and 1329 deletions
Download patch file Download diff file Expand all files Collapse all files

1296
flake.lock generated
View file

File diff suppressed because it is too large Load diff

9
flake.nix
View file

@ -16,6 +16,7 @@
};
hypr-contrib.url = "github:hyprwm/contrib";
hyprpicker.url = "github:hyprwm/hyprpicker";
hyprsunset.url = "github:hyprwm/hyprsunset";
Hyprspace = {
url = "github:KZDKM/Hyprspace";
inputs.hyprland.follows = "hyprland"; # Hyprspace uses latest Hyprland. We declare this to keep them in sync.
@ -59,6 +60,14 @@
];
specialArgs = { host="sakura"; inherit self inputs username ; };
};
ichiyo = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
(import ./hosts/ichiyo)
agenix.nixosModules.default
];
specialArgs = { host="sakura"; inherit self inputs username ; };
};
violet = nixpkgs.lib.nixosSystem {
inherit system;
modules = [

36
hosts/ichiyo/default.nix Normal file
View file

@ -0,0 +1,36 @@
{ lib, inputs, pkgs, config, ... }:
{
imports = [
./hardware-configuration.nix
./../../modules/core
];
powerManagement = {
enable = true;
# powertop.enable = true;
cpuFreqGovernor = lib.mkDefault "ondemand";
};
liv.laptop.enable = true;
# Bootloader stuff
boot.loader.grub.enable = lib.mkForce true;
boot.loader.grub.device = lib.mkForce "/dev/sda";
boot.loader.grub.useOSProber = lib.mkForce true;
boot.initrd.secrets = {
"/crypto_keyfile.bin" = null;
};
boot.loader.grub.enableCryptodisk = lib.mkForce true;
boot.initrd.luks.devices."luks-729500c5-557b-45c8-ab3f-5c365db28284".keyFile = lib.mkForce "/crypto_keyfile.bin";
networking.hostName = "ichiyo";
boot = {
extraModulePackages = with config.boot.kernelPackages;
[
acpi_call
cpupower
]
++ [pkgs.cpupower-gui];
};
}

36
hosts/ichiyo/hardware-configuration.nix Normal file
View file

@ -0,0 +1,36 @@
# 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" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/348a526e-113e-4b62-b54e-b0bf9ad101a2";
fsType = "ext4";
};
boot.initrd.luks.devices."luks-729500c5-557b-45c8-ab3f-5c365db28284".device = "/dev/disk/by-uuid/729500c5-557b-45c8-ab3f-5c365db28284";
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.enp0s25.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
# networking.interfaces.wwp0s20u4i6.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

22
modules/home/hyprland/config.nix
View file

@ -28,18 +28,18 @@
color = "black";
};
};
cursorTheme = {
name = "Bibata-Modern-Ice";
package = pkgs.bibata-cursors;
size = 24;
};
# cursorTheme = {
# name = "Bibata-Modern-Ice";
# package = pkgs.bibata-cursors;
# size = 24;
# };
};
home.pointerCursor = {
name = "Bibata-Modern-Ice";
package = pkgs.bibata-cursors;
size = 24;
};
# home.pointerCursor = {
# name = "Bibata-Modern-Ice";
# package = pkgs.bibata-cursors;
# size = 24;
# };
# gtk = {
# enable = true;
@ -228,8 +228,10 @@
"$mainMod SHIFT, F, exec, firefox"
"$mainMod SHIFT, W, exec, wdisplays"
"$mainMod SHIFT, T, exec, thunderbird"
"$mainMod SHIFT, E, exec, element-desktop"
"$mainMod SHIFT, P, exec, pavucontrol-qt"
"$mainMod SHIFT, N ,exec, notes" # should be added by scripts/custom packages
"$mainMod, N,exec, swaync-client -t"
# screenshot
"SUPER SHIFT, S, exec, grimblast --notify --cursor save area ~/Pictures/$(date +'%Y-%m-%d-At-%Ih%Mm%Ss').png"

3
modules/home/hyprland/hyprland.nix
View file

@ -11,6 +11,7 @@
glib
wayland
direnv
inputs.hyprsunset.packages.${pkgs.system}.hyprsunset
];
# systemd.user.targets.hyprland-session.Unit.Wants = [ "xdg-desktop-autostart.target" ];
wayland.windowManager.hyprland = {
@ -22,7 +23,7 @@
# enableNvidiaPatches = false;
systemd.enable = true;
plugins = [
# inputs.Hyprspace.packages.${pkgs.system}.Hyprspace
inputs.Hyprspace.packages.${pkgs.system}.Hyprspace
inputs.Hyswipe.packages.${pkgs.system}.Hyswipe
];
};

27
modules/home/packages.nix
View file

@ -5,43 +5,28 @@
bandwhich # Terminal bandwidth utilization tool
powertop
element-desktop # Nheko is kinda shit so sadly this has to happen
yewtube # Play YouTube videos via the terminal
iamb # In-terminal-Matrix-messaging
signal-desktop # Since the bridge is broken :(
socat # Required for `hyprland-smart-borders`
tesseract # Screen grabbing text from images/PDFs/etc
pixcat # Display images in the terminal
lm_sensors # Show sensor outputs, i.e. temperatures
yubikey-touch-detector # Display notification when YubiKey requires a headpat
bitwarden-cli # Use Bitwarden as a CLI secrets manager
gajim # XMPP client
nheko # Matrix client
linuxKernel.packages.linux_hardened.v4l2loopback # Use A7ii as webcam
# wikit # Wikipedia summaries from the terminal, not added to Nix yet
# reader # Firefox reader mode but in the terminal, not added to Nix yet
vimv # edit filenames in batch with $EDITOR
pastel # generate, analyze, convert and manipulate colors
# pastel # generate, analyze, convert and manipulate colors
glow # Render Markdown from the terminal
htmlq # jq but for HTML
lemmeknow # Identify anything
# htmlq # jq but for HTML
android-tools # ADB/Fastboot
eva # Calculator
tofi # drun type launcher
# termpdfpy # Read PDFs from the terminal, errors out for now
anki-bin # Learn languages
vimv # Bulk rename
audacity # Record audio stuff
anki-bin # Flashcards
obs-studio # Record video stuff
exiftool # Read exif data from CLI
pinta # "Paint.NET-like editor"
kdenlive # Video editor
translate-shell # Google Translate but in the CLI
wireguard-tools # VPN connections
openresolv # required for wireguard-tools
prusa-slicer
blender
progress
epy
zip
ripdrag
pwgen
@ -60,14 +45,13 @@
gitleaks # TODO: adds pre-commit hook
libreoffice
xfce.thunar
prismlauncher
lunar-client
jdk
ripgrep
yt-dlp
wineWowPackages.wayland
# wineWowPackages.wayland
# element-desktop # wayland version is very laggy for me
spotify
spotify-player
thunderbird
neofetch
nodejs_22
@ -83,7 +67,6 @@
ffmpeg
killall
libnotify
man-pages # extra man pages
mpv # video player
openssl
pamixer # pulseaudio command line mixer

1
modules/home/zsh.nix
View file

@ -152,6 +152,7 @@
# ];
shellAliases = {
spt = "spotify_player";
convert = "magick";
ls = "eza -lh --git";
la = "eza -A --git";