current state of things
This commit is contained in:
parent
63fbd6d499
commit
b8d157ab6f
85 changed files with 895 additions and 6014 deletions
|
@ -58,7 +58,7 @@
|
|||
services.power-profiles-daemon.enable = false;
|
||||
services.tlp.enable = true;
|
||||
|
||||
environment.sessionVariables = rec {
|
||||
environment.sessionVariables = {
|
||||
NIXOS_OZONE_WL = "1";
|
||||
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE = "fg=5";
|
||||
EDITOR = "hx";
|
||||
|
@ -77,16 +77,18 @@
|
|||
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
extraPortals = with pkgs; [
|
||||
xdg-desktop-portal-gtk
|
||||
extraPortals = [
|
||||
pkgs.xdg-desktop-portal-gtk
|
||||
];
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
wl-clipboard
|
||||
wl-clipboard-x11
|
||||
xclip
|
||||
];
|
||||
environment.systemPackages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
wl-clipboard
|
||||
wl-clipboard-x11
|
||||
xclip
|
||||
;
|
||||
};
|
||||
|
||||
networking.hostName = "adrift"; # Define your hostname.
|
||||
users.users.plank = {
|
||||
|
|
|
@ -1,12 +0,0 @@
|
|||
{
|
||||
nix = {
|
||||
settings = {
|
||||
substituters = [
|
||||
"https://nix-community.cachix.org"
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
|
@ -5,49 +5,12 @@
|
|||
mainUser,
|
||||
...
|
||||
}:
|
||||
let
|
||||
getFlakePackage = package: inputs."${package}".packages.x86_64-linux.default;
|
||||
in
|
||||
{
|
||||
# these settings propagate to home-manager's nixpkgs
|
||||
nixpkgs = {
|
||||
overlays = [
|
||||
# inputs.nix-rice.overlays.default
|
||||
inputs.helix.overlays.default
|
||||
inputs.nil.overlays.nil
|
||||
inputs.niri.overlays.niri
|
||||
];
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
allowUnfreePredicate = _: true;
|
||||
cudaSupport = true;
|
||||
};
|
||||
};
|
||||
|
||||
nix = {
|
||||
# add flake inputs to our registry to allow global use
|
||||
registry = lib.mapAttrs (_: value: { flake = value; }) inputs;
|
||||
settings = {
|
||||
# trusted-users = ["bolt" "plank"];
|
||||
experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
"pipe-operator"
|
||||
];
|
||||
substitute = true;
|
||||
};
|
||||
extraOptions = ''
|
||||
keep-outputs = true
|
||||
keep-derivations = true
|
||||
'';
|
||||
optimise.automatic = true;
|
||||
# package = pkgs.lix;
|
||||
};
|
||||
|
||||
imports = [
|
||||
./modules/network.nix
|
||||
./modules/term.nix
|
||||
./modules/systemdboot.nix
|
||||
./modules/limine.nix
|
||||
./modules/sound.nix
|
||||
./modules/sydney.nix
|
||||
./modules/docs.nix
|
||||
|
@ -57,11 +20,6 @@ in
|
|||
./modules/culr.nix
|
||||
];
|
||||
|
||||
programs.meat = {
|
||||
enable = true;
|
||||
flake = "/home/${mainUser}/.nix";
|
||||
};
|
||||
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
hardware.enableAllFirmware = true;
|
||||
|
||||
|
@ -102,20 +60,12 @@ in
|
|||
# services.tailscale.enable = true;
|
||||
|
||||
# TODO - move these to more appropriate places
|
||||
environment.systemPackages = with pkgs; [
|
||||
curl
|
||||
eza
|
||||
git
|
||||
jujutsu
|
||||
];
|
||||
|
||||
# services.atuin.enable = true;
|
||||
|
||||
programs.nh = {
|
||||
enable = true;
|
||||
clean.enable = true;
|
||||
clean.extraArgs = "--keep-since 3d --keep 3";
|
||||
package = getFlakePackage "nh";
|
||||
environment.systemPackages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
curl
|
||||
eza
|
||||
git
|
||||
;
|
||||
};
|
||||
|
||||
programs.nix-index-database.comma.enable = true;
|
||||
|
@ -131,5 +81,5 @@ in
|
|||
|
||||
systemd.user.extraConfig = "LogLevel=debug";
|
||||
|
||||
system.nixos.tags = [ "fatcock" ];
|
||||
system.nixos.tags = [ "fatcock-xxl" ];
|
||||
}
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
services.desktopManager.cosmic = {
|
||||
enable = true;
|
||||
};
|
||||
environment.cosmic.excludePackages = with pkgs; [
|
||||
cosmic-store
|
||||
cosmic-edit
|
||||
cosmic-term
|
||||
];
|
||||
services.displayManager.cosmic-greeter.enable = true;
|
||||
services.system76-scheduler.enable = true;
|
||||
}
|
|
@ -1,9 +1,11 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
man-pages
|
||||
man-pages-posix
|
||||
];
|
||||
environment.systemPackages = {
|
||||
inherit (pkgs)
|
||||
man-pages
|
||||
man-pages-posix
|
||||
;
|
||||
};
|
||||
|
||||
documentation.dev.enable = true;
|
||||
documentation.man.enable = true;
|
||||
|
|
42
system/modules/limine.nix
Normal file
42
system/modules/limine.nix
Normal file
|
@ -0,0 +1,42 @@
|
|||
{
|
||||
lib,
|
||||
rice,
|
||||
...
|
||||
}:
|
||||
{
|
||||
boot.loader.limine = {
|
||||
enable = true;
|
||||
style =
|
||||
let
|
||||
pal = rice.palette.shortHex;
|
||||
in
|
||||
{
|
||||
wallpapers = [ ../../wallpaper.jpg ];
|
||||
interface = {
|
||||
brandingColor = 1;
|
||||
branding = "welcome to quiver";
|
||||
};
|
||||
graphicalTerminal =
|
||||
let
|
||||
getPal = p: builtins.attrValues p |> builtins.concatStringsSep ";";
|
||||
in
|
||||
{
|
||||
palette = getPal pal.normal;
|
||||
brightPalette = getPal pal.bright;
|
||||
marginGradient = 0;
|
||||
margin = 256;
|
||||
foreground = pal.util.fg;
|
||||
background = "20" + pal.util.bg;
|
||||
brightForeground = pal.bright.yellow;
|
||||
brightBackground = pal.util.bg;
|
||||
};
|
||||
backdrop = pal.util.bg;
|
||||
};
|
||||
maxGenerations = 5;
|
||||
extraEntries = ''
|
||||
/Windows
|
||||
protocol: efi
|
||||
path: boot():/EFI/Microsoft/Boot/bootmgfw.efi
|
||||
'';
|
||||
};
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
pkgs,
|
||||
mainUser,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
|
@ -21,6 +21,13 @@
|
|||
};
|
||||
programs.niri = {
|
||||
enable = true;
|
||||
package = pkgs.niri-unstable;
|
||||
package = inputs.niri.packages.x86_64-linux.niri-unstable;
|
||||
};
|
||||
services.niri-session-manager = {
|
||||
enable = true;
|
||||
# settings = {
|
||||
# save-interval = 5;
|
||||
# max-backup-count = 12;
|
||||
# };
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,12 +1,63 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
home-manager
|
||||
cachix
|
||||
nixfmt-rfc-style
|
||||
nil
|
||||
statix
|
||||
deadnix
|
||||
npins
|
||||
];
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
mainUser,
|
||||
...
|
||||
}:
|
||||
{
|
||||
# these settings propagate to home-manager's nixpkgs
|
||||
nixpkgs = {
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
allowUnfreePredicate = _: true;
|
||||
cudaSupport = true;
|
||||
};
|
||||
};
|
||||
|
||||
nix = {
|
||||
# add flake inputs to our registry to allow global use
|
||||
registry = lib.mapAttrs (_: value: { flake = value; }) inputs;
|
||||
settings = {
|
||||
# trusted-users = ["bolt" "plank"];
|
||||
experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
"pipe-operator"
|
||||
];
|
||||
substitute = true;
|
||||
};
|
||||
extraOptions = ''
|
||||
keep-outputs = true
|
||||
keep-derivations = true
|
||||
'';
|
||||
optimise.automatic = true;
|
||||
# package = pkgs.lix;
|
||||
};
|
||||
|
||||
# services.smooooth = {
|
||||
# enable = true;
|
||||
# path = "/home/${mainUser}/.nix";
|
||||
# blockers = [
|
||||
# "hx"
|
||||
# {
|
||||
# nix = "die";
|
||||
# }
|
||||
# ];
|
||||
# nixPackage = pkgs.lix;
|
||||
# };
|
||||
|
||||
programs.meat = {
|
||||
enable = true;
|
||||
flake = "/home/${mainUser}/.nix";
|
||||
};
|
||||
|
||||
environment.systemPackages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
home-manager
|
||||
cachix
|
||||
nixfmt-rfc-style
|
||||
;
|
||||
inherit (inputs.nil.packages.${pkgs.system}) nil;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,12 +1,15 @@
|
|||
{ pkgs, ... }:
|
||||
let
|
||||
inherit (pkgs) fish elvish;
|
||||
inherit (pkgs) fish;
|
||||
in
|
||||
{
|
||||
programs.fish = {
|
||||
enable = true;
|
||||
};
|
||||
programs.autojump.enable = true;
|
||||
programs.zoxide = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
};
|
||||
environment.systemPackages = [
|
||||
fish
|
||||
];
|
||||
|
|
|
@ -51,8 +51,11 @@
|
|||
"vt.global_cursor_default=0"
|
||||
];
|
||||
|
||||
boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linuxPackages_cachyos;
|
||||
# pkgs.linuxPackages_xanmod_latest;
|
||||
services.scx = {
|
||||
enable = true;
|
||||
scheduler = "scx_bpfland";
|
||||
};
|
||||
boot.kernelPackages = pkgs.linuxPackages_cachyos;
|
||||
boot.supportedFilesystems = {
|
||||
ntfs = true;
|
||||
btrfs = true;
|
||||
|
@ -61,10 +64,10 @@
|
|||
boot.loader.systemd-boot.configurationLimit = 5;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
boot.plymouth = {
|
||||
enable = true;
|
||||
inherit (rice.plymouth) theme themePackages font;
|
||||
};
|
||||
# boot.plymouth = {
|
||||
# enable = true;
|
||||
# inherit (rice.plymouth) theme themePackages font;
|
||||
# };
|
||||
|
||||
security.tpm2.enable = true;
|
||||
|
||||
|
@ -90,10 +93,6 @@
|
|||
|
||||
nix.settings.trusted-users = [ "bolt" ];
|
||||
|
||||
virtualisation.lxc = {
|
||||
unprivilegedContainers = true;
|
||||
enable = true;
|
||||
};
|
||||
virtualisation.oci-containers.backend = "podman";
|
||||
hardware.nvidia-container-toolkit.enable = true;
|
||||
virtualisation = {
|
||||
|
@ -130,14 +129,22 @@
|
|||
# motherboard = "amd";
|
||||
# };
|
||||
|
||||
# hardware.ckb-next.enable = true;
|
||||
environment.systemPackages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
wl-clipboard
|
||||
wl-clipboard-x11
|
||||
xclip
|
||||
;
|
||||
};
|
||||
hardware.ckb-next.enable = true;
|
||||
environment.systemPackages =
|
||||
builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
wl-clipboard
|
||||
wl-clipboard-x11
|
||||
xclip
|
||||
;
|
||||
inherit (pkgs.kdePackages) qtbase qtdeclarative;
|
||||
}
|
||||
++ [
|
||||
(inputs.quickshell.packages.${pkgs.system}.default.override {
|
||||
withHyprland = false;
|
||||
withI3 = false;
|
||||
})
|
||||
];
|
||||
programs.fuse.userAllowOther = true;
|
||||
services.libinput.mouse = {
|
||||
accelProfile = "flat";
|
||||
|
@ -189,4 +196,7 @@
|
|||
DATABASE_URL = "sqlite:///${config.services.open-webui.stateDir}/newdb.db";
|
||||
};
|
||||
};
|
||||
|
||||
# for quickshell
|
||||
qt.enable = true;
|
||||
}
|
||||
|
|
|
@ -7,23 +7,15 @@
|
|||
"https://cache.nixos.org"
|
||||
"https://nix-community.cachix.org"
|
||||
"https://helix.cachix.org"
|
||||
"https://cuda-maintainers.cachix.org"
|
||||
"https://cache.garnix.io"
|
||||
"https://walker-git.cachix.org"
|
||||
"https://anmonteiro.nix-cache.workers.dev"
|
||||
"https://viperml.cachix.org"
|
||||
"https://drakon64-nixos-cachyos-kernel.cachix.org"
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||
"helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="
|
||||
"cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
|
||||
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
|
||||
"walker-git.cachix.org-1:vmC0ocfPWh0S/vRAQGtChuiZBTAe4wiKDeyyXM0/7pM="
|
||||
"ocaml.nix-cache.com-1:/xI2h2+56rwFfKyyFVbkJSeGqSIYMC/Je+7XXqGKDIY="
|
||||
"viperml.cachix.org-1:qZhKBMTfmcLL+OG6fj/hzsMEedgKvZVFRRAhq7j8Vh8="
|
||||
"drakon64-nixos-cachyos-kernel.cachix.org-1:J3gjZ9N6S05pyLA/P0M5y7jXpSxO/i0rshrieQJi5D0="
|
||||
];
|
||||
};
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue