tristan/nix
1
0
Fork 0
Code Projects Releases Packages Activity

format + add alpine

Browse source
This commit is contained in:
Tristan 2024-02-14 23:35:50 +00:00
parent e9a22d817e
commit 3bf9f9b6d1
8 changed files with 90 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

4
flake.nix
View file

@ -16,7 +16,7 @@
system = "x86_64-linux";
pkgs = import inputs.nixpkgs {
inherit system;
overlays = [ inputs.hyprland.overlays ];
overlays = [inputs.hyprland.overlays];
};
user = "tristan";
userFullname = "Tristan Beedell";
@ -49,6 +49,8 @@
./home/desktop/hyprland/.
];
alpine = mkConf [./hardware/alpine.nix] [];
vm-sway =
builtins.trace ''
use super+enter to start a terminal.

76
hardware/alpine.nix
View file

@ -1,45 +1,48 @@
# 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,
...
}: let
user = config.user;
in {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "sd_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = [];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/979fe496-10e8-41be-97d1-3d000cd2b384";
fileSystems."/" = {
device = "/dev/disk/by-uuid/979fe496-10e8-41be-97d1-3d000cd2b384";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/72d527de-fead-43d5-8f29-e06d2c584a18";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/72d527de-fead-43d5-8f29-e06d2c584a18";
fsType = "ext4";
};
fileSystems."/mnt/disk1" =
{ device = "/dev/disk/by-uuid/caba0b6c-00d2-495a-8c04-67ea584f1a63";
fileSystems."/mnt/disk1" = {
device = "/dev/disk/by-uuid/caba0b6c-00d2-495a-8c04-67ea584f1a63";
fsType = "ext4";
};
fileSystems."/mnt/disk2" =
{ device = "/dev/disk/by-uuid/e3828580-625e-4f93-974f-9c7fed99dee2";
fileSystems."/mnt/disk2" = {
device = "/dev/disk/by-uuid/e3828580-625e-4f93-974f-9c7fed99dee2";
fsType = "ext4";
};
fileSystems."/mnt/disk3" =
{ device = "/dev/disk/by-uuid/28f15a05-d550-4a41-a951-244af6140831";
fileSystems."/mnt/disk3" = {
device = "/dev/disk/by-uuid/28f15a05-d550-4a41-a951-244af6140831";
fsType = "ext4";
};
fileSystems."/mnt/parity1" =
{ device = "/dev/disk/by-uuid/09fc062c-1a61-4e1b-802c-60f7178bc713";
fileSystems."/mnt/parity1" = {
device = "/dev/disk/by-uuid/09fc062c-1a61-4e1b-802c-60f7178bc713";
fsType = "ext4";
};
@ -47,6 +50,21 @@
# /mnt/disk1:/mnt/disk2:/mnt/disk3 /mnt/storage mergerfs direct_io,use_ino,allow_other,minfreespace=50G,fsname=mergerfs,category.create=mfs,func.mkdir=epall 0 0
fileSystems."/mnt/storage" = {
device = "/mnt/disk1:/mnt/disk2:/mnt/disk3";
fsType = "mergerfs";
depends = ["/mnt/disk1" "/mnt/disk2" "/mnt/disk3"];
options = [
"direct_io"
"use_ino"
"allow_other"
"minfreespace=50G"
"fsname=mergerfs"
"category.create=mfs"
"func.mkdir=epall"
];
};
# auto-generated-config: looks sus
# fileSystems."/mnt/storage" =
@ -60,8 +78,8 @@
# options = [ "bind" ];
# };
swapDevices =
[ { device = "/dev/disk/by-uuid/27ad4809-211f-4ae9-90da-d17d9c1df271"; }
swapDevices = [
{device = "/dev/disk/by-uuid/27ad4809-211f-4ae9-90da-d17d9c1df271";}
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@ -76,6 +94,11 @@
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
system.stateVersion = "24.05"; # don't change.
home-manager.users.${user}.imports = [
{
home.stateVersion = "24.05";
}
];
services.snapraid = {
enable = true;
@ -95,7 +118,4 @@
"/mnt/parity1/SnapRAID.parity"
];
};
}

6
home/desktop/hyprland/default.nix
View file

@ -197,9 +197,11 @@ in {
window=$(echo "$windows" | ${menu})
hyprctl dispatch focuswindow title:"$window"
'';
hotkeys = [{
hotkeys = [
{
key = "tab";
}];
}
];
}
];

4
home/desktop/utils/display.nix
View file

@ -1,6 +1,4 @@
{
pkgs, ...
}: {
{pkgs, ...}: {
home.packages = with pkgs; [wlr-randr nwg-displays];
wayland.windowManager.hyprland.settings.source = [

6
home/programs/graphical.nix
View file

@ -1,4 +1,8 @@
{pkgs,lib, ...}: {
{
pkgs,
lib,
...
}: {
imports = [
./qutebrowser.nix
./pcmanfm.nix

3
home/programs/mpv.nix
View file

@ -19,8 +19,7 @@
};
scripts = [
pkgs.mpvScripts.mpris
(pkgs.callPackage ../../pkgs/mpv-skipsilence.nix {inherit ( pkgs.mpvScripts ) buildLua;})
(pkgs.callPackage ../../pkgs/mpv-skipsilence.nix {inherit (pkgs.mpvScripts) buildLua;})
];
};
}

10
home/programs/work.nix
View file

@ -1,12 +1,14 @@
{config, pkgs, ...}:
let
{
config,
pkgs,
...
}: let
modifier = config.windowManager.modifierKey;
pwa = {
slack = "mpagibdhafmlkgpemeicgogjnhclenoc";
teams = "cifhbcnohmdccbgoicgdjpfamggdegmo";
};
in
{
in {
roles.email = {
enable = true;
email = "tristan.beedell@cryoserver.com";

13
pkgs/mpv-skipsilence.nix
View file

@ -1,9 +1,9 @@
{ lib
, buildLua
, fetchgit
, gitUpdater
{
lib,
buildLua,
fetchgit,
gitUpdater,
}:
buildLua rec {
pname = "mpv-skipsilence";
version = "1.0";
@ -18,7 +18,6 @@ buildLua rec {
description = "Increase playback speed during silence - a revolution in attention-deficit induction technology.";
homepage = "https://github.com/ferreum/mpv-skipsilence";
license = licenses.unlicense; # actually they don't have a license
maintainers = [ ];
maintainers = [];
};
}