mirror of
https://github.com/TheWanderingCrow/CrOS.git
synced 2026-02-21 19:52:31 -05:00
move some misc stuff into deferred apps
This commit is contained in:
parent
778be6480a
commit
90d25fb17a
10 changed files with 8 additions and 241 deletions
|
|
@ -7,7 +7,6 @@
|
|||
common/optional/comms
|
||||
common/optional/media
|
||||
common/optional/gaming
|
||||
common/optional/misc/ai.nix
|
||||
common/optional/deferred-apps.nix
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,9 +7,6 @@
|
|||
common/optional/comms
|
||||
common/optional/media
|
||||
common/optional/gaming
|
||||
common/optional/misc/gromit-mpx.nix
|
||||
common/optional/misc/art.nix
|
||||
common/optional/misc/ai.nix
|
||||
common/optional/deferred-apps.nix
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -14,21 +14,28 @@
|
|||
enable = true;
|
||||
packages = builtins.attrValues {
|
||||
inherit (pkgs.unstable)
|
||||
# CAD
|
||||
orca-slicer
|
||||
super-slicer
|
||||
meshlab
|
||||
openscad
|
||||
freecad
|
||||
# Local AI
|
||||
lmstudio
|
||||
;
|
||||
inherit (pkgs)
|
||||
# Utilities
|
||||
appimage-run
|
||||
steam-run
|
||||
bitwarden-cli
|
||||
protonvpn-gui
|
||||
imagemagick
|
||||
httpie
|
||||
mkvtoolnix
|
||||
distrobox
|
||||
distroshelf
|
||||
# Art
|
||||
gimp
|
||||
krita
|
||||
;
|
||||
};
|
||||
apps = [ "signal-desktop" ];
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
home.packages = builtins.attrValues {
|
||||
inherit (pkgs.unstable)
|
||||
lmstudio
|
||||
;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
{pkgs, ...}: {
|
||||
home.packages = builtins.attrValues {
|
||||
inherit
|
||||
(pkgs)
|
||||
krita
|
||||
;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
# Allows drawing over the screen overlay with our fancy wacom tablet
|
||||
{pkgs, ...}: let
|
||||
makimaConfig = ''
|
||||
[commands]
|
||||
BTN_STYLUS = ["gromit-mpx -t"]
|
||||
|
||||
[settings]
|
||||
GRAB_DEVICE = "false"
|
||||
'';
|
||||
in {
|
||||
home.file.".config/makima/Wacom One by Wacom S Pen.toml".text = makimaConfig;
|
||||
|
||||
home.packages = builtins.attrValues {
|
||||
inherit
|
||||
(pkgs)
|
||||
makima
|
||||
gromit-mpx
|
||||
;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
{...}: {
|
||||
imports = [
|
||||
common/core
|
||||
];
|
||||
}
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
hostSpec,
|
||||
...
|
||||
}: let
|
||||
platform =
|
||||
if hostSpec.isDarwin
|
||||
then "darwin"
|
||||
else "nixos";
|
||||
in {
|
||||
imports = lib.flatten [
|
||||
(map lib.custom.relativeToRoot [
|
||||
"modules/common/host-spec.nix"
|
||||
#"modules/home"
|
||||
])
|
||||
#./${platform.nix}
|
||||
];
|
||||
|
||||
inherit hostSpec;
|
||||
|
||||
home = {
|
||||
username = lib.mkDefault config.hostSpec.username;
|
||||
homeDirectory = lib.mkDefault config.hostSpec.home;
|
||||
stateVersion = lib.mkDefault "24.05";
|
||||
|
||||
sessionVariables = {
|
||||
SHELL = "zsh";
|
||||
TERM = "konsole";
|
||||
TERMINAL = "konsole";
|
||||
VISUAL = "nvim";
|
||||
EDITOR = "nvim";
|
||||
NIX_AUTO_RUN = "1";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,99 +0,0 @@
|
|||
#####################
|
||||
# #
|
||||
# Natsirt - Desktop #
|
||||
# #
|
||||
#####################
|
||||
{
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = lib.flatten [
|
||||
# Hardware
|
||||
./hardware-configuration.nix # I want to use factor if possible
|
||||
|
||||
#FIXME: This will require a reinstall so probably hold off on this for now
|
||||
# Disks
|
||||
#inputs.disko.nixosModules.disko
|
||||
#(lib.custom.relativeToRoot "hosts/common/disks/btrfs-disk.nix")
|
||||
#{
|
||||
# _module.args = {
|
||||
# #FIXME: pretty sure this is an ssd
|
||||
# disk = "/dev/nvme0n1";
|
||||
# withSwap = true;
|
||||
# swapSize = 8;
|
||||
# };
|
||||
#}
|
||||
|
||||
# Misc
|
||||
|
||||
(map lib.custom.relativeToRoot [
|
||||
# Required configs
|
||||
"hosts/common/core"
|
||||
|
||||
# Optional configs
|
||||
"hosts/common/optional/audio.nix"
|
||||
"hosts/common/optional/bluetooth.nix"
|
||||
"hosts/common/optional/gaming.nix"
|
||||
])
|
||||
];
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
|
||||
hostSpec = {
|
||||
username = "natsirt";
|
||||
handle = "natsirt";
|
||||
hostName = "Natsirt";
|
||||
persistFolder = "/persist";
|
||||
};
|
||||
|
||||
networking = {
|
||||
networkmanager.enable = true;
|
||||
enableIPv6 = false;
|
||||
};
|
||||
|
||||
boot.loader = {
|
||||
systemd-boot.enable = true;
|
||||
efi = {
|
||||
canTouchEfiVariables = true;
|
||||
};
|
||||
};
|
||||
|
||||
# FIXME(todo): convert this into a desktop module
|
||||
# Enable the X11 windowing system.
|
||||
# You can disable this if you're only using the Wayland session.
|
||||
services.xserver.enable = true;
|
||||
|
||||
# Enable the KDE Plasma Desktop Environment.
|
||||
services.displayManager.sddm.enable = true;
|
||||
services.desktopManager.plasma6.enable = true;
|
||||
|
||||
# Configure keymap in X11
|
||||
services.xserver.xkb = {
|
||||
layout = "us";
|
||||
variant = "";
|
||||
};
|
||||
|
||||
services.cups.enable = true;
|
||||
|
||||
environment.systemPackages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
wine
|
||||
krita
|
||||
appimage-run
|
||||
nix-ld
|
||||
(retroarch.override {
|
||||
cores = with libretro; [
|
||||
nestopia
|
||||
dolphin
|
||||
citra
|
||||
bsnes
|
||||
parallel-n64
|
||||
pcsx2
|
||||
pcsx-rearmed
|
||||
];
|
||||
})
|
||||
supermariowar;
|
||||
];
|
||||
}
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
# 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 = [
|
||||
"nvme"
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
"usb_storage"
|
||||
"usbhid"
|
||||
"sd_mod"
|
||||
];
|
||||
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/b1a6e175-8510-47d1-94b1-db74d050fe05";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/8082-C66D";
|
||||
fsType = "vfat";
|
||||
options = [
|
||||
"fmask=0077"
|
||||
"dmask=0077"
|
||||
];
|
||||
};
|
||||
|
||||
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.enp4s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
hardware.amdgpu = {
|
||||
initrd.enable = true;
|
||||
legacySupport.enable = true;
|
||||
opencl.enable = true;
|
||||
};
|
||||
hardware.graphics.enable32Bit = true;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue