chore: disable plasma-manager for now, disko

This commit is contained in:
Ruben 2024-04-23 15:37:44 -05:00
commit c7e4d8c281
No known key found for this signature in database
GPG key ID: AE181294E97E4802
11 changed files with 314 additions and 89 deletions

View file

@ -60,29 +60,4 @@
}; };
}; };
}; };
# Enable sound with pipewire.
sound.enable = true;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
# wireplumber exists!
wireplumber.enable = true;
};
services.pipewire.wireplumber.configPackages = [
(pkgs.writeTextDir "share/wireplumber/bluetooth.lua.d/51-bluez-config.lua" ''
bluez_monitor.properties = {
["bluez5.enable-sbc-xq"] = true,
["bluez5.enable-msbc"] = true,
["bluez5.enable-hw-volume"] = true,
["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
}
'')
];
} }

59
config/disko.nix Normal file
View file

@ -0,0 +1,59 @@
{
disko.devices = {
disk = {
vdb = {
type = "disk";
device = "/dev/disk/by-diskseq/1";
content = {
type = "gpt";
partitions = {
ESP = {
priority = 1;
name = "ESP";
start = "1MiB";
end = "1G";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
};
};
root = {
size = "100%";
content = {
type = "btrfs";
extraArgs = [ "-f" ]; # Override existing partition
# Subvolumes must set a mountpoint in order to be mounted,
# unless their parent is mounted
subvolumes = {
"/rootfs" = {
mountOptions = [ "compress=zstd" ];
mountpoint = "/";
};
"/home" = {
mountOptions = [ "compress=zstd" ];
mountpoint = "/home";
};
"/nix" = {
mountOptions = [ "compress=zstd" "noatime" ];
mountpoint = "/nix";
};
"/persist" = {
mountOptions = [ "compress=zstd" "noatime" ];
mountpoint = "/persist";
};
"/log" = {
mountOptions = [ "compress=zstd" "noatime" ];
mountpoint = "/var/log";
};
};
};
};
};
};
};
};
};
}

View file

@ -1,12 +0,0 @@
# This is your system's configuration file.
# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix)
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
}

View file

@ -45,15 +45,19 @@
substituters = [ substituters = [
"https://cache.nixos.org" "https://cache.nixos.org"
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
"https://nyx.chaotic.cx"
]; ];
trusted-public-keys = [ trusted-public-keys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="
]; ];
}; };
# use linux-zen # according to research: zen helps by trying to keep a reponsive desktop when i'm doing like millions of things
boot.kernelPackages = pkgs.linuxKernel.packages.linux_zen; # at once
# TODO: theres also cachyos which i've tried for a short while, maybe poke at it again?
boot.kernelPackages = pkgs.linuxPackages_zen;
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
@ -80,9 +84,35 @@
# https://nixos.wiki/wiki/Bluetooth # https://nixos.wiki/wiki/Bluetooth
hardware.bluetooth = { hardware.bluetooth = {
enable = true; enable = true;
package = pkgs.bluez;
powerOnBoot = false; powerOnBoot = false;
}; };
# Enable sound with pipewire.
sound.enable = true;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
# wireplumber exists!
wireplumber.enable = true;
};
services.pipewire.wireplumber.configPackages = [
(pkgs.writeTextDir "share/wireplumber/bluetooth.lua.d/51-bluez-config.lua" ''
bluez_monitor.properties = {
["bluez5.enable-sbc-xq"] = true,
["bluez5.enable-msbc"] = true,
["bluez5.enable-hw-volume"] = true,
["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
}
'')
];
# Enable CUPS to print documents. # Enable CUPS to print documents.
services.printing = { services.printing = {
enable = true; enable = true;
@ -91,6 +121,10 @@
services.avahi.enable = true; services.avahi.enable = true;
services.avahi.nssmdns4 = true; services.avahi.nssmdns4 = true;
# xbox LIVE !!!!
hardware.xpadneo.enable = true;
hardware.xone.enable = true;
# enable zram for swap stuff # enable zram for swap stuff
zramSwap.enable = true; zramSwap.enable = true;

View file

@ -41,7 +41,9 @@
distrobox distrobox
virt-manager virt-manager
kdePackages.kdeconnect-kde
kde-rounded-corners kde-rounded-corners
wl-clipboard
]; ];
# steam # steam

View file

@ -13,11 +13,8 @@
# use shared configuration # use shared configuration
../../config/nixos.nix ../../config/nixos.nix
# laptop configuration # intel configuration
#../../config/laptop.nix #../../config/intel.nix
# intel opengl setup
../../config/intel.nix
]; ];
# who up thonking they # who up thonking they

View file

@ -13,11 +13,8 @@
# use shared configuration # use shared configuration
../../config/nixos.nix ../../config/nixos.nix
# laptop configuration # intel configuration
#../../config/laptop.nix #../../config/intel.nix
# intel opengl setup
../../config/intel.nix
]; ];
# who up thunking they # who up thunking they

View file

@ -16,7 +16,7 @@
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/169dd244-d0c4-4a9d-a11f-3e25452d153f"; { device = "/dev/disk/by-uuid/169dd244-d0c4-4a9d-a11f-3e25452d153f";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@" ]; options = [ "compress-force=zstd:3" "subvol=@" ];
}; };
fileSystems."/boot" = fileSystems."/boot" =

View file

@ -0,0 +1,119 @@
# `sheldon` configuration file
# ----------------------------
#
# You can modify this file directly or you can use one of the following
# `sheldon` commands which are provided to assist in editing the config file:
#
# - `sheldon add` to add a new plugin to the config file
# - `sheldon edit` to open up the config file in the default editor
# - `sheldon remove` to remove a plugin from the config file
#
# See the documentation for more https://github.com/rossmacarthur/sheldon#readme
shell = "zsh"
[plugins]
# deferred loading
[plugins.zsh-defer]
github = "romkatv/zsh-defer"
[templates]
defer = "{{ hooks?.pre | nl }}{% for file in files %}zsh-defer source \"{{ file }}\"\n{% endfor %}{{ hooks?.post | nl }}"
# completions
[plugins.completion]
github = "mattmc3/zephyr"
use = ["plugins/{{ name }}"]
# shell benchmarking
[plugins.zsh-bench]
github = "romkatv/zsh-bench"
apply = ["PATH"]
# oh-my-zsh
[plugins.key-bindings]
github = "ohmyzsh/ohmyzsh"
use = ["lib/{{ name }}.zsh"]
[plugins.omz-completion]
github = "ohmyzsh/ohmyzsh"
use = ["lib/completion.zsh"]
[plugins.clipboard]
github = "ohmyzsh/ohmyzsh"
use = ["lib/{{ name }}.zsh"]
[plugins.copybuffer]
github = "ohmyzsh/ohmyzsh"
use = ["plugins/{{ name }}"]
[plugins.copyfile]
github = "ohmyzsh/ohmyzsh"
use = ["plugins/{{ name }}"]
[plugins.copypath]
github = "ohmyzsh/ohmyzsh"
use = ["plugins/{{ name }}"]
[plugins.extract]
github = "ohmyzsh/ohmyzsh"
use = ["plugins/{{ name }}"]
apply = ["defer"]
# zsh-utils
[plugins.history]
github = "belak/zsh-utils"
[plugins.utility]
github = "belak/zsh-utils"
[plugins.editor]
local = "~/.config/zsh/plugins/{{ name }}"
# deferred plugins go below
# git-open
[plugins.git-open]
github = "paulirish/git-open"
apply = ["defer"]
# yt-dlp completions and aliases
[plugins.yt-dlp]
github = "clavelm/yt-dlp-omz-plugin"
apply = ["defer"]
# completions learning daemon
[plugins.cod]
github = "dim-an/cod"
apply = ["defer"]
# shift select
[plugins.shift-select]
github = "jirutka/zsh-shift-select"
apply = ["defer"]
# fast syntax highlighting
[plugins.fast-syntax-highlighting]
github = "zdharma-continuum/fast-syntax-highlighting"
apply = ["defer"]
# auto suggestions
[plugins.zsh-autosuggestions]
github = "zsh-users/zsh-autosuggestions"
apply = ["defer"]
# command history searching
[plugins.zsh-history-substring-search]
github = "zsh-users/zsh-history-substring-search"
apply = ["defer"]
# fzf searching plugin
[plugins.fzf-zsh-plugin]
github = "unixorn/fzf-zsh-plugin"
apply = ["defer"]
# git credeeztials manager or something like that
#[plugins.blackbox]
#github = "StackExchange/blackbox"
#apply = ["defer"]

View file

@ -25,13 +25,13 @@
flake-inputs.catppuccin.homeManagerModules.catppuccin flake-inputs.catppuccin.homeManagerModules.catppuccin
# plasma-manager # plasma-manager
flake-inputs.plasma-manager.homeManagerModules.plasma-manager #flake-inputs.plasma-manager.homeManagerModules.plasma-manager
# user packages # user packages
./packages.nix ./packages.nix
# plasma config # plasma config
./desktop.nix #./desktop.nix
# theme config # theme config
./themes.nix ./themes.nix
@ -55,6 +55,11 @@
source = ./config/zsh; source = ./config/zsh;
recursive = true; recursive = true;
}; };
# sheldon plugins
home.file.".config/sheldon" = {
source = ./config/sheldon;
recursive = true;
};
# ╭───────────────────────────────────────────────╮ # ╭───────────────────────────────────────────────╮
# │ _ __ _ │ # │ _ __ _ │

View file

@ -35,8 +35,8 @@
sd sd
zoxide zoxide
krabby krabby
#sheldonkdePackages.kdeconnect-kde
cod cod
atuin
alejandra alejandra
usbutils usbutils
@ -48,6 +48,11 @@
wgcf wgcf
mpdris2 mpdris2
rustc
cargo
openssl
gcc
firefox firefox
thunderbird thunderbird
birdtray birdtray
@ -111,41 +116,54 @@
dotDir = ".config/zsh"; dotDir = ".config/zsh";
history.size = 50000; history.size = 50000;
antidote.enable = true; # ╭───────────────────────────────────╮
antidote.plugins = [ # │ _ _ _ _ │
# completions # │ __ _ _ _| |_(_)__| |___| |_ ___ │
"mattmc3/zephyr path:plugins/completion" # │ / _` | ' \ _| / _` / _ \ _/ -_) │
# │ \__,_|_||_\__|_\__,_\___/\__\___| │
# shell benchmarking # │ antidote │
"romkatv/zsh-bench kind:path kind:defer" # ╰───────────────────────────────────╯
# NOTE: disables for now to try sheldon
# oh my zsh #antidote.enable = true;
"ohmyzsh/ohmyzsh path:lib/key-bindings.zsh" #antidote.plugins = [
"ohmyzsh/ohmyzsh path:lib/clipboard.zsh" # # completions
#"ohmyzsh/ohmyzsh path:lib/completion.zsh" # "mattmc3/zephyr path:plugins/completion"
"ohmyzsh/ohmyzsh path:plugins/copybuffer" #
"ohmyzsh/ohmyzsh path:plugins/copyfile" # # shell benchmarking
"ohmyzsh/ohmyzsh path:plugins/copypath" # "romkatv/zsh-bench kind:path kind:defer"
"ohmyzsh/ohmyzsh path:plugins/extract kind:defer" #
# # oh my zsh
# zsh-utils # "ohmyzsh/ohmyzsh path:lib/key-bindings.zsh"
"belak/zsh-utils path:history" # "ohmyzsh/ohmyzsh path:lib/clipboard.zsh"
"belak/zsh-utils path:utility" # "ohmyzsh/ohmyzsh path:lib/completion.zsh kind:defer"
"${config.home.homeDirectory}/${config.programs.zsh.dotDir}/plugins/editor" # "ohmyzsh/ohmyzsh path:plugins/copybuffer kind:defer"
# "ohmyzsh/ohmyzsh path:plugins/copyfile kind:defer"
# useful plugins # "ohmyzsh/ohmyzsh path:plugins/copypath kind:defer"
"atuinsh/atuin kind:defer" # "ohmyzsh/ohmyzsh path:plugins/extract kind:defer"
"paulirish/git-open kind:defer" #
"clavelm/yt-dlp-omz-plugin kind:defer" # # zsh-utils (modified editor plugin to remove block cursor)
"dim-an/cod kind:defer" # "belak/zsh-utils path:utility kind:defer"
"jirutka/zsh-shift-select kind:defer" # "${config.home.homeDirectory}/${config.programs.zsh.dotDir}/plugins/editor"
"unixorn/fzf-zsh-plugin kind:defer" #
# # useful plugins
"zdharma-continuum/fast-syntax-highlighting kind:defer" # "atuinsh/atuin kind:defer"
"zsh-users/zsh-autosuggestions kind:defer" # "paulirish/git-open kind:defer"
"zsh-users/zsh-history-substring-search kind:defer" # "clavelm/yt-dlp-omz-plugin kind:defer"
]; # "dim-an/cod kind:defer"
# "jirutka/zsh-shift-select kind:defer"
# "unixorn/fzf-zsh-plugin kind:defer"
#
# "zdharma-continuum/fast-syntax-highlighting kind:defer"
# "zsh-users/zsh-autosuggestions kind:defer"
#];
# ╭────────────────────────────╮
# │ _ _ │
# │ __ _| (_)__ _ ___ ___ ___ │
# │ / _` | | / _` (_-</ -_|_-< │
# │ \__,_|_|_\__,_/__/\___/__/ │
# │ aliases │
# ╰────────────────────────────╯
shellAliases = { shellAliases = {
# kitty # kitty
s = "kitten ssh"; s = "kitten ssh";
@ -170,6 +188,13 @@
for-the-love-of-god = "sudo"; for-the-love-of-god = "sudo";
}; };
# ╭───────────────────────╮
# │ _ │
# │ _____| |_ _ _ __ │
# │ _|_ (_-< ' \| '_/ _| │
# │ (_)__/__/_||_|_| \__| │
# │ .zshrc / zsh config │
# ╰───────────────────────╯
initExtra = '' initExtra = ''
# export some custom paths # export some custom paths
# (required for some packages/scripts/applications and some things in here) # (required for some packages/scripts/applications and some things in here)
@ -179,8 +204,8 @@
# funny pokemon # funny pokemon
krabby random krabby random
# load zoxide # load sheldon
eval "$(zoxide init zsh)" eval "$(sheldon source)"
''; '';
}; };
@ -235,6 +260,30 @@
catppuccin.enable = true; catppuccin.enable = true;
}; };
# ╭────────────────────────╮
# │ _ _ │
# │ __ _| |_ _ _(_)_ _ │
# │ / _` | _| || | | ' \ │
# │ \__,_|\__|\_,_|_|_||_| │
# │ atuin │
# ╰────────────────────────╯
programs.atuin = {
enable = true;
enableZshIntegration = true;
};
# ╭─────────────────────────╮
# │ _ _ │
# │ ________ _(_)__| |___ │
# │ |_ / _ \ \ / / _` / -_) │
# │ /__\___/_\_\_\__,_\___| │
# │ zoxide │
# ╰─────────────────────────╯
programs.zoxide = {
enable = true;
enableZshIntegration = true;
};
# ╭──────────────╮ # ╭──────────────╮
# │ _ _ │ # │ _ _ │
# │ __ _(_) |_ │ # │ __ _(_) |_ │