tidying in core/
This commit is contained in:
parent
6b02c9ebfd
commit
bb4c184ffb
8 changed files with 92 additions and 168 deletions
|
|
@ -3,10 +3,7 @@
|
||||||
## https://github.com/musnix/musnix
|
## https://github.com/musnix/musnix
|
||||||
## https://nixos.wiki/wiki/Audio_production
|
## https://nixos.wiki/wiki/Audio_production
|
||||||
|
|
||||||
{ ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [ ];
|
|
||||||
|
|
||||||
## Can't remember what this does,
|
## Can't remember what this does,
|
||||||
## recommended to be enabled though
|
## recommended to be enabled though
|
||||||
|
|
@ -15,10 +12,13 @@
|
||||||
## Not using pulse directly
|
## Not using pulse directly
|
||||||
hardware.pulseaudio.enable = false;
|
hardware.pulseaudio.enable = false;
|
||||||
|
|
||||||
|
## Musnix for audio production
|
||||||
|
musnix.enable = true;
|
||||||
|
|
||||||
## Using pipewire baybee
|
## Using pipewire baybee
|
||||||
services.pipewire = {
|
services.pipewire = {
|
||||||
enable = true;
|
enable = true;
|
||||||
## Uncomment if ypu(g.) want to use JACK applications
|
## Uncomment if you(g.) want to use JACK applications
|
||||||
#jack.enable = true;
|
#jack.enable = true;
|
||||||
pulse.enable = true;
|
pulse.enable = true;
|
||||||
alsa = {
|
alsa = {
|
||||||
|
|
@ -63,10 +63,4 @@
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
musnix = {
|
|
||||||
|
|
||||||
enable = true;
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
|
|
||||||
## Semi-modularised config
|
## Semi-modularised config
|
||||||
./jellyfin.nix # unfinished
|
./jellyfin.nix # unfinished
|
||||||
|
|
@ -10,6 +10,7 @@ imports = [
|
||||||
./misc.nix # stuff that doesn't work in home-manager :(
|
./misc.nix # stuff that doesn't work in home-manager :(
|
||||||
./display.nix # declarations for display management
|
./display.nix # declarations for display management
|
||||||
./gaming.nix # for gaming stuff, ideally would be in home/
|
./gaming.nix # for gaming stuff, ideally would be in home/
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -70,8 +70,6 @@
|
||||||
};
|
};
|
||||||
systemPackages = with pkgs; [
|
systemPackages = with pkgs; [
|
||||||
xorg.xhost
|
xorg.xhost
|
||||||
#dconf # redundant, adding for completeness
|
|
||||||
dconf-editor # For editing dconf settings graphically
|
|
||||||
#qt5.wayland
|
#qt5.wayland
|
||||||
#xdg-utils
|
#xdg-utils
|
||||||
#xdg-desktop-portal
|
#xdg-desktop-portal
|
||||||
|
|
|
||||||
|
|
@ -2,12 +2,6 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
imports = [
|
|
||||||
];
|
|
||||||
|
|
||||||
nixpkgs = {
|
|
||||||
};
|
|
||||||
|
|
||||||
hardware = {
|
hardware = {
|
||||||
|
|
||||||
opentabletdriver = {
|
opentabletdriver = {
|
||||||
|
|
@ -32,11 +26,8 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
environment = {
|
environment = {
|
||||||
## All common gaming packages declared here
|
## Mouse config
|
||||||
systemPackages = with pkgs; [
|
systemPackages = with pkgs; [ piper ];
|
||||||
#steam # games storefront/launcher
|
|
||||||
piper # mouse configuration
|
|
||||||
];
|
|
||||||
## These are important apparently :uh:
|
## These are important apparently :uh:
|
||||||
sessionVariables = {
|
sessionVariables = {
|
||||||
XDG_CACHE_HOME = "$HOME/.cache";
|
XDG_CACHE_HOME = "$HOME/.cache";
|
||||||
|
|
@ -50,11 +41,10 @@
|
||||||
SDL_VIDEODRIVER = "wayland";
|
SDL_VIDEODRIVER = "wayland";
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
## Java for some reason
|
|
||||||
#java.enable = true;
|
|
||||||
|
|
||||||
## To run "normal" linux applications seamlessly
|
## To run "normal" linux applications seamlessly
|
||||||
appimage = {
|
appimage = {
|
||||||
|
|
@ -62,17 +52,6 @@
|
||||||
binfmt = true;
|
binfmt = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
## Gamescope compositor for steam
|
|
||||||
## (config copy-pasted from nixos wiki)
|
|
||||||
#gamescope = {
|
|
||||||
#enable = true;
|
|
||||||
#capSysNice = true;
|
|
||||||
#args = [
|
|
||||||
#"--rt"
|
|
||||||
#"--expose-wayland"
|
|
||||||
#];
|
|
||||||
#};
|
|
||||||
|
|
||||||
## "GameMode" - https://nixos.wiki/wiki/Gamemode
|
## "GameMode" - https://nixos.wiki/wiki/Gamemode
|
||||||
## (config copy-pasted from mynixos)
|
## (config copy-pasted from mynixos)
|
||||||
gamemode = {
|
gamemode = {
|
||||||
|
|
|
||||||
|
|
@ -2,9 +2,6 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
imports = [
|
|
||||||
];
|
|
||||||
|
|
||||||
## Dunno if i did this right, but possible needed for keyring/polkit stuff ?
|
## Dunno if i did this right, but possible needed for keyring/polkit stuff ?
|
||||||
security.pam.services.serenity.enableGnomeKeyring = true;
|
security.pam.services.serenity.enableGnomeKeyring = true;
|
||||||
|
|
||||||
|
|
@ -23,8 +20,6 @@
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
#dconf.enable = true;
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
|
|
@ -38,13 +33,9 @@
|
||||||
upower.enable = true;
|
upower.enable = true;
|
||||||
## for managing disks
|
## for managing disks
|
||||||
udisks2.enable = true;
|
udisks2.enable = true;
|
||||||
gnome = {
|
## GNOME keyring
|
||||||
## GNOME keyring
|
gnome.gnome-keyring.enable = true;
|
||||||
gnome-keyring.enable = true;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
];
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,6 @@
|
||||||
{ inputs, outputs, lib, config, pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
|
||||||
];
|
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
|
|
||||||
|
|
@ -11,7 +9,7 @@
|
||||||
greetd = {
|
greetd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings.default_session = {
|
settings.default_session = {
|
||||||
command = "${pkgs.greetd.regreet}/bin/regreet --cmd hyprland";
|
command = "${pkgs.greetd.regreet}/bin/regreet --cmd sway";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,29 +2,26 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
imports = [
|
imports = [ ];
|
||||||
];
|
|
||||||
|
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
## Place insecure packages here
|
## Place insecure packages here
|
||||||
permittedInsecurePackages = [
|
permittedInsecurePackages = [ "olm-3.2.16" ];
|
||||||
"olm-3.2.16"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
## [START - Stolen code, no clue how it works :3 ]
|
## [START - Stolen code, no clue how it works :3 ]
|
||||||
overlays = [
|
overlays = [
|
||||||
## to use overlays exported from other flakes:
|
## to use overlays exported from other flakes:
|
||||||
#neovim-nightly-overlay.overlays.default
|
#neovim-nightly-overlay.overlays.default
|
||||||
|
|
||||||
## or define it inline, for example:
|
## or define it inline, for example:
|
||||||
#(final: prev: {
|
#(final: prev: {
|
||||||
#hi = final.hello.overrideAttrs (oldAttrs: {
|
#hi = final.hello.overrideAttrs (oldAttrs: {
|
||||||
#patches = [ ./change-hello-to-hi.patch ];
|
#patches = [ ./change-hello-to-hi.patch ];
|
||||||
#});
|
#});
|
||||||
#})
|
#})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
@ -32,36 +29,28 @@
|
||||||
|
|
||||||
## This will add each flake input as a registry
|
## This will add each flake input as a registry
|
||||||
## To make nix3 commands consistent with your flake
|
## To make nix3 commands consistent with your flake
|
||||||
nix.registry = (lib.mapAttrs (_: flake: {inherit flake;})) ((lib.filterAttrs (_: lib.isType "flake")) inputs);
|
nix.registry = (lib.mapAttrs (_: flake: { inherit flake; }))
|
||||||
|
((lib.filterAttrs (_: lib.isType "flake")) inputs);
|
||||||
## This will additionally add your inputs to the system's legacy channels
|
## This will additionally add your inputs to the system's legacy channels
|
||||||
## Making legacy nix commands consistent as well, awesome!
|
## Making legacy nix commands consistent as well, awesome!
|
||||||
nix.nixPath = ["/etc/nix/path"];
|
nix.nixPath = [ "/etc/nix/path" ];
|
||||||
environment.etc =
|
environment.etc = lib.mapAttrs' (name: value: {
|
||||||
lib.mapAttrs'
|
name = "nix/path/${name}";
|
||||||
(name: value: {
|
value.source = value.flake;
|
||||||
name = "nix/path/${name}";
|
}) config.nix.registry;
|
||||||
value.source = value.flake;
|
|
||||||
})
|
|
||||||
config.nix.registry;
|
|
||||||
## [END - Stolen code, mostly understand from here again]
|
## [END - Stolen code, mostly understand from here again]
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
|
|
||||||
## Neovim declared here too, just in case
|
## Neovim declared here too, just in case
|
||||||
neovim = {
|
neovim = { enable = true; };
|
||||||
enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
## A catgirl's favourite shell - NEEDS OWN NIX MODULE
|
## A catgirl's favourite shell - NEEDS OWN NIX MODULE
|
||||||
fish = {
|
fish = { enable = true; };
|
||||||
enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
## Added here in case the user level declaration
|
## Added here in case the user level declaration
|
||||||
## is wonky with nvim editor?
|
## is wonky with nvim editor?
|
||||||
git = {
|
git = { enable = true; };
|
||||||
enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
## NixOS CLI helper
|
## NixOS CLI helper
|
||||||
nh = {
|
nh = {
|
||||||
|
|
@ -78,80 +67,67 @@
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
## Wei have switched to neovim
|
environment = {
|
||||||
## full-time, sorry Micro. <3
|
|
||||||
environment.variables = {
|
## Install a stub ELF loader to print an informative
|
||||||
EDITOR = "neovim";
|
## error message in the event that a user attempts
|
||||||
VISUAL = "neovim";
|
## to run an ELF binary not compiled for NixOS.
|
||||||
SYSTEMD_EDITOR = "neovim";
|
stub-ld.enable = true;
|
||||||
|
|
||||||
|
variables = {
|
||||||
|
## Wei have switched to neovim
|
||||||
|
## full-time, sorry Micro. <3
|
||||||
|
EDITOR = "neovim";
|
||||||
|
VISUAL = "neovim";
|
||||||
|
SYSTEMD_EDITOR = "neovim";
|
||||||
|
};
|
||||||
|
|
||||||
|
## All COMMON system-level packages declared here
|
||||||
|
systemPackages = with pkgs; [
|
||||||
|
|
||||||
|
## Nix specific tools
|
||||||
|
nix-tree # Dependency tree viewer for nix store
|
||||||
|
nix-init # Generate nix packages from URLs
|
||||||
|
nix-index # Database for nixpkgs
|
||||||
|
nix-output-monitor # Shows extra information on nix commands
|
||||||
|
|
||||||
|
## Filsesystem utilities
|
||||||
|
ddrutility # Set of tools for HDD rescure
|
||||||
|
exfatprogs # ExFAT filesystem
|
||||||
|
btrfs-progs # BTRFS filesystem
|
||||||
|
ntfs3g # NTFS filesystem
|
||||||
|
scrounge-ntfs # NTFS data recovery
|
||||||
|
|
||||||
|
## CLI tools & utilities
|
||||||
|
fd # Find, but faster
|
||||||
|
bc # Calculator
|
||||||
|
zip # What it says on the tin
|
||||||
|
btop # System metrics and process viewer
|
||||||
|
tldr # Simpler manual pages
|
||||||
|
wget # Retrieves files over HTTP, HTTPS, and FTP
|
||||||
|
curl # Pulls data from a URL
|
||||||
|
bash # Terminal shell
|
||||||
|
file # Shows type of files
|
||||||
|
tree # Tree view of directory structure
|
||||||
|
unzip # What it says on the tin
|
||||||
|
gnupg # Create encryption keys
|
||||||
|
s-tui # Metrics and stress testing
|
||||||
|
udiskie # Disk automount
|
||||||
|
busybox # Utilities
|
||||||
|
ripgrep # Searches files for a given input
|
||||||
|
killall # Kills all
|
||||||
|
usbutils # USB utils
|
||||||
|
pciutils # PCI utils
|
||||||
|
moreutils # Woah, even more utils
|
||||||
|
libsecret # Library for storing and retrieving secrets
|
||||||
|
git-crypt # Transparent file encryption in git
|
||||||
|
undervolt # Utility to change CPU settings
|
||||||
|
android-tools # Commands for interfacing with android devices
|
||||||
|
smartmontools # Tools for monitoring HDD health
|
||||||
|
magic-wormhole # Direct file sharing
|
||||||
|
|
||||||
|
];
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
## Install a stub ELF loader to print an informative
|
|
||||||
## error message in the event that a user attempts
|
|
||||||
## to run an ELF binary not compiled for NixOS.
|
|
||||||
environment.stub-ld.enable = true;
|
|
||||||
|
|
||||||
## All COMMON system-level packages declared here
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
|
|
||||||
########
|
|
||||||
## Needed for that graphical config manager, suspect that the
|
|
||||||
## whole inputs.nix- yaddah yaddah is unnecessary.
|
|
||||||
## and look, -we- don't need a graphical config editor, but
|
|
||||||
## the end goal here is to make a system environment that could
|
|
||||||
## theoretically pass off as a complete linux distribution.
|
|
||||||
## So there needs to be -some- way for users who are unwilling
|
|
||||||
## to use a terminal and are more comfortable with a GUI.
|
|
||||||
#inputs.nixos-conf-editor.packages.${system}.nixos-conf-editor
|
|
||||||
#nixos-conf-editor
|
|
||||||
## Disabling this for now. Eats disk space, and it's useless until
|
|
||||||
## wei make a single "control" module using 'let bindings' anyway.
|
|
||||||
########
|
|
||||||
|
|
||||||
## Nix specific tools
|
|
||||||
nix-tree # Dependency tree viewer for nix store
|
|
||||||
nix-init # Generate nix packages from URLs
|
|
||||||
#nix-index # Database for nixpkgs
|
|
||||||
#nixpkgs-review # Review nixpkgs PRs
|
|
||||||
nix-output-monitor # Shows extra information on nix commands
|
|
||||||
|
|
||||||
## Filsesystem utilities
|
|
||||||
#xfsprogs # XFS filesystem
|
|
||||||
ddrutility #Set of tools for HDD rescure
|
|
||||||
exfatprogs # ExFAT filesystem
|
|
||||||
btrfs-progs # BTRFS filesystem
|
|
||||||
ntfs3g # NTFS filesystem
|
|
||||||
#ntfs2btrfs # Converts NTFS to BTRFS
|
|
||||||
scrounge-ntfs # NTFS data recovery
|
|
||||||
|
|
||||||
## CLI tools & utilities
|
|
||||||
fd # Find, but faster
|
|
||||||
bc # Calculator
|
|
||||||
zip # What it says on the tin
|
|
||||||
btop # System metrics and process viewer
|
|
||||||
tldr # Simpler manual pages
|
|
||||||
wget # Retrieves files over HTTP, HTTPS, and FTP
|
|
||||||
curl # Pulls data from a URL
|
|
||||||
bash # Terminal shell
|
|
||||||
file # Shows type of files
|
|
||||||
tree # Tree view of directory structure
|
|
||||||
unzip # What it says on the tin
|
|
||||||
gnupg # Create encryption keys
|
|
||||||
s-tui # Metrics and stress testing
|
|
||||||
udiskie # Disk automount
|
|
||||||
busybox # Utilities
|
|
||||||
ripgrep # Searches files for a given input
|
|
||||||
killall # Kills all
|
|
||||||
usbutils # USB utils
|
|
||||||
pciutils # PCI utils
|
|
||||||
moreutils # Woah, even more utils
|
|
||||||
libsecret # Library for storing and retrieving secrets
|
|
||||||
git-crypt # Transparent file encryption in git
|
|
||||||
undervolt # Utility to change CPU settings
|
|
||||||
android-tools # Commands for interfacing with android devices
|
|
||||||
smartmontools # Tools for monitoring HDD health
|
|
||||||
magic-wormhole # Direct file sharing
|
|
||||||
|
|
||||||
];
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
15
flake.nix
15
flake.nix
|
|
@ -101,21 +101,9 @@
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
## Graphical config editor? seeing what's up w/ it - removed ForNow:tm:
|
|
||||||
#nixos-conf-editor.url = "github:snowfallorg/nixos-conf-editor";
|
|
||||||
|
|
||||||
## Easy themeing <3
|
## Easy themeing <3
|
||||||
nix-colors.url = "github:misterio77/nix-colors";
|
nix-colors.url = "github:misterio77/nix-colors";
|
||||||
|
|
||||||
## Wayland compositor with eye-candy (for edgelords)
|
|
||||||
hyprland.url = "github:hyprwm/Hyprland";
|
|
||||||
#hyprland.inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
hyprland-plugins = {
|
|
||||||
url = "github:hyprwm/hyprland-plugins";
|
|
||||||
inputs.hyprland.follows = "hyprland";
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
## nixos generators
|
## nixos generators
|
||||||
nixos-generators = {
|
nixos-generators = {
|
||||||
url = "github:nix-community/nixos-generators";
|
url = "github:nix-community/nixos-generators";
|
||||||
|
|
@ -124,8 +112,7 @@
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, disko, sops-nix, home-manager,
|
outputs = { self, nixpkgs, disko, sops-nix, musnix, nixos-generators, ... }
|
||||||
nixvim, musnix, nix-colors, hyprland, hyprland-plugins, nixos-generators, ... }
|
|
||||||
|
|
||||||
@ inputs: let
|
@ inputs: let
|
||||||
inherit (self) outputs;
|
inherit (self) outputs;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue