a
This commit is contained in:
Kris
@@ -3,8 +3,6 @@
|
||||
let
|
||||
userName = "kris";
|
||||
realName = "Kris";
|
||||
configRoot = "/etc/nixos";
|
||||
quickshellRoot = "${configRoot}/Shell";
|
||||
in {
|
||||
|
||||
imports = [
|
||||
@@ -17,11 +15,16 @@ in {
|
||||
# ./apps/ancs.nix
|
||||
];
|
||||
|
||||
services.displayManager.gdm.enable = true;
|
||||
services.displayManager.sddm.enable = true;
|
||||
services.displayManager.sddm.wayland.enable = true;
|
||||
services.displayManager.autoLogin = {
|
||||
enable = true;
|
||||
user = userName;
|
||||
};
|
||||
|
||||
boot.loader.grub.theme = inputs.deltarune-grub-theme;
|
||||
boot.loader.grub.theme = lib.mkDefault inputs.deltarune-grub-theme;
|
||||
|
||||
boot.kernelPackages = pkgs.linuxPackages_cachyos-lto;
|
||||
# boot.kernelPackages = pkgs.linuxPackages_cachyos-lto;
|
||||
|
||||
services.scx.enable = true;
|
||||
services.scx.scheduler = "scx_bpfland";
|
||||
@@ -39,20 +42,6 @@ in {
|
||||
|
||||
# services.ancs.enable = true;
|
||||
|
||||
services.flatpak.enable = true;
|
||||
services.flatpak.remotes = [
|
||||
{
|
||||
name = "flathub";
|
||||
location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
|
||||
}
|
||||
];
|
||||
services.flatpak.packages = [
|
||||
{
|
||||
appId = "com.modrinth.ModrinthApp";
|
||||
origin = "flathub";
|
||||
}
|
||||
];
|
||||
|
||||
services.printing = {
|
||||
enable = true;
|
||||
drivers = with pkgs; [
|
||||
@@ -95,12 +84,6 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
# Sadly, I don't know how to install flatpaks like this.
|
||||
# services.flatpak.packages = [
|
||||
# "com.usebottles.bottles"
|
||||
# { flatpakref = "https://sober.vinegarhq.org/sober.flatpakref"; sha256 = "0"; }
|
||||
# ];
|
||||
|
||||
programs.hyprland = {
|
||||
enable = true;
|
||||
xwayland.enable = true;
|
||||
@@ -123,10 +106,7 @@ in {
|
||||
equibop
|
||||
code-cursor
|
||||
kdePackages.kdenlive
|
||||
libsForQt5.qt5ct
|
||||
catppuccin-qt5ct
|
||||
darkly
|
||||
kdePackages.qt6ct
|
||||
hyfetch
|
||||
kitty
|
||||
];
|
||||
@@ -138,8 +118,6 @@ in {
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
extraPortals = [
|
||||
pkgs.xdg-desktop-portal-gnome
|
||||
pkgs.xdg-desktop-portal-gtk
|
||||
inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland
|
||||
];
|
||||
};
|
||||
@@ -173,6 +151,7 @@ in {
|
||||
|
||||
programs.dconf.enable = true;
|
||||
services.gvfs.enable = true;
|
||||
services.flatpak.enable = true;
|
||||
|
||||
# home-manager.services.mpris-proxy.enable = true;
|
||||
|
||||
@@ -184,7 +163,10 @@ in {
|
||||
accent = "blue";
|
||||
};
|
||||
|
||||
home-manager.users.${userName} = { programs, config, pkgs, ... }: {
|
||||
home-manager.users.${userName} = { programs, config, pkgs, ... }:
|
||||
let
|
||||
system = pkgs.stdenv.hostPlatform.system;
|
||||
in {
|
||||
|
||||
imports = [
|
||||
inputs.catppuccin.homeModules.catppuccin
|
||||
@@ -193,11 +175,7 @@ in {
|
||||
|
||||
gtk = {
|
||||
enable = true;
|
||||
|
||||
cursorTheme = {
|
||||
name = "RalseiCursors";
|
||||
package = pkgs.callPackage ./packages/ralsei-cursors/default.nix {};
|
||||
};
|
||||
gtk4.theme = config.gtk.theme;
|
||||
|
||||
iconTheme = {
|
||||
name = "Arashi";
|
||||
@@ -205,12 +183,29 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
home.pointerCursor = {
|
||||
name = "RalseiCursors";
|
||||
package = pkgs.callPackage ./packages/ralsei-cursors/default.nix {};
|
||||
size = 24;
|
||||
gtk.enable = true;
|
||||
x11.enable = true;
|
||||
};
|
||||
|
||||
catppuccin = {
|
||||
enable = true;
|
||||
flavor = "mocha";
|
||||
accent = "blue";
|
||||
# we're already using arashi
|
||||
gtk.icon.enable = false;
|
||||
cursors.enable = false;
|
||||
qt5ct.enable = true;
|
||||
kvantum.enable = true;
|
||||
};
|
||||
|
||||
qt = {
|
||||
enable = true;
|
||||
platformTheme.name = "qtct";
|
||||
style.name = "kvantum";
|
||||
};
|
||||
|
||||
programs.zen-browser = {
|
||||
@@ -222,63 +217,26 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
home.file.".config/fastfetch" = {
|
||||
source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/fastfetch";
|
||||
recursive = true;
|
||||
};
|
||||
|
||||
home.file.".config/dunst" = {
|
||||
source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/dunst";
|
||||
recursive = true;
|
||||
};
|
||||
|
||||
# home.file.".config/gtk-3.0" = {
|
||||
# source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/gtk-3.0";
|
||||
# recursive = true;
|
||||
# };
|
||||
|
||||
home.file.".config/hypr" = {
|
||||
source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/hypr";
|
||||
recursive = true;
|
||||
};
|
||||
|
||||
home.file.".config/xdg-desktop-portal" = {
|
||||
source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/xdg-desktop-portal";
|
||||
recursive = true;
|
||||
};
|
||||
|
||||
home.file.".local/share/fonts/DotfilesFont.otf" = {
|
||||
source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/dotfile_deps/DotfilesFont.otf";
|
||||
source = ../../config/dotfile_deps/DotfilesFont.otf;
|
||||
};
|
||||
|
||||
home.file.".config/wlogout" = {
|
||||
source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/wlogout";
|
||||
recursive = true;
|
||||
programs.quickshell = {
|
||||
enable = true;
|
||||
package = inputs.quickshell.packages.${system}.default.withModules (
|
||||
with pkgs.qt6; [
|
||||
qtimageformats
|
||||
qtmultimedia
|
||||
qtsvg
|
||||
qt5compat
|
||||
]
|
||||
);
|
||||
configs = {
|
||||
default = ../../Shell;
|
||||
DeltaruneQuickshell = ../../Shell;
|
||||
};
|
||||
};
|
||||
|
||||
home.file.".config/qt5ct" = {
|
||||
source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/qt5ct";
|
||||
recursive = true;
|
||||
};
|
||||
|
||||
home.file.".config/wofi" = {
|
||||
source = config.lib.file.mkOutOfStoreSymlink "${configRoot}/config/wofi";
|
||||
recursive = true;
|
||||
};
|
||||
|
||||
home.file.".config/quickshell/default" = {
|
||||
source = config.lib.file.mkOutOfStoreSymlink quickshellRoot;
|
||||
recursive = true;
|
||||
};
|
||||
|
||||
home.file.".config/quickshell/DeltaruneQuickshell" = {
|
||||
source = config.lib.file.mkOutOfStoreSymlink quickshellRoot;
|
||||
recursive = true;
|
||||
};
|
||||
|
||||
|
||||
# xdg.configHome = "${configRoot}/config";
|
||||
|
||||
services.mpris-proxy.enable = true;
|
||||
|
||||
programs.chromium = {
|
||||
@@ -309,8 +267,11 @@ in {
|
||||
|
||||
programs.git = {
|
||||
enable = true;
|
||||
userName = realName;
|
||||
userEmail = "kris@kris.darkworld.download";
|
||||
signing.format = "openpgp";
|
||||
settings.user = {
|
||||
name = realName;
|
||||
email = "kris@kris.darkworld.download";
|
||||
};
|
||||
};
|
||||
|
||||
programs.obs-studio = {
|
||||
|
||||
@@ -8,43 +8,36 @@
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
|
||||
boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/5ca305a1-d705-4c99-913c-a2d1c3447282";
|
||||
fileSystems."/" = lib.mkDefault
|
||||
{ device = "/dev/disk/by-uuid/d18510ee-3ef5-4ab0-a94b-aa6c4f4e0c31";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=root" ];
|
||||
options = [ "subvol=@root" ];
|
||||
};
|
||||
|
||||
fileSystems."/home" =
|
||||
{ device = "/dev/disk/by-uuid/5ca305a1-d705-4c99-913c-a2d1c3447282";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=home" ];
|
||||
};
|
||||
|
||||
fileSystems."/nix" =
|
||||
{ device = "/dev/disk/by-uuid/5ca305a1-d705-4c99-913c-a2d1c3447282";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=nix" "noatime" ];
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/732D-084E";
|
||||
fileSystems."/boot" = lib.mkDefault
|
||||
{ device = "/dev/disk/by-uuid/EA40-0DB9";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
|
||||
# swapDevices = [ { device = "/swap/swapfile"; } ];
|
||||
fileSystems."/home" = lib.mkDefault
|
||||
{ device = "/dev/disk/by-uuid/d18510ee-3ef5-4ab0-a94b-aa6c4f4e0c31";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@home" ];
|
||||
};
|
||||
|
||||
# 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.enp3s0.useDHCP = lib.mkDefault true;
|
||||
fileSystems."/nix" = lib.mkDefault
|
||||
{ device = "/dev/disk/by-uuid/d18510ee-3ef5-4ab0-a94b-aa6c4f4e0c31";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@nix" ];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
|
||||
@@ -24,9 +24,20 @@
|
||||
'';
|
||||
};
|
||||
|
||||
system.activationScripts.xdgDesktopPortal = {
|
||||
system.activationScripts.linkDotConfigChildren = {
|
||||
text = ''
|
||||
echo "${pkgs.xdg-desktop-portal-gtk}/libexec/xdg-desktop-portal-gtk" > /.xdg.sh
|
||||
config_root=/etc/nixos/config
|
||||
target_root=/home/kris/.config
|
||||
|
||||
mkdir -p "$target_root"
|
||||
|
||||
for src in "$config_root"/*; do
|
||||
name=$(basename "$src")
|
||||
dst="$target_root/$name"
|
||||
rm -rf "$dst"
|
||||
ln -s "$src" "$dst"
|
||||
chown -h kris:users "$dst"
|
||||
done
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fonts.packages = with pkgs; [
|
||||
noto-fonts
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-emoji
|
||||
noto-fonts-color-emoji
|
||||
monaspace
|
||||
geist-font
|
||||
nerd-fonts.geist-mono
|
||||
@@ -13,8 +13,6 @@
|
||||
minecraftia
|
||||
];
|
||||
|
||||
programs.seahorse.enable = true;
|
||||
|
||||
environment.sessionVariables.LD_LIBRARY_PATH = "${pkgs.gcc15}/lib";
|
||||
|
||||
security.polkit.enable = true;
|
||||
@@ -39,19 +37,14 @@
|
||||
(writeShellScriptBin "kaijuparadise" "xdg-open roblox://placeId=6456351776")
|
||||
(writeShellScriptBin "sewh" "xdg-open roblox://placeId=16991287194")
|
||||
|
||||
(writeShellScriptBin "fix-gtk" ''${
|
||||
inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland
|
||||
}/bin/hyprctl dispatch exec "${pkgs.xdg-desktop-portal-gtk}/libexec/xdg-desktop-portal-gtk -r"'')
|
||||
(callPackage ./apps/wl-shimeji.nix {})
|
||||
(writeShellScriptBin "stop-shimejis" ''${
|
||||
inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland
|
||||
}/bin/hyprctl dispatch exec "shimejictl stop"'')
|
||||
|
||||
inputs.quickshell.packages.${pkgs.stdenv.hostPlatform.system}.default
|
||||
tailscale
|
||||
bitwarden-desktop
|
||||
kdePackages.qtdeclarative
|
||||
catppuccin-gtk
|
||||
catppuccin
|
||||
catppuccin-qt5ct
|
||||
catppuccin-catwalk
|
||||
@@ -60,7 +53,6 @@
|
||||
libxkbcommon
|
||||
ffmpeg-full
|
||||
gnupg
|
||||
code-cursor
|
||||
nix-direnv
|
||||
htop
|
||||
nixpkgs-fmt
|
||||
@@ -74,8 +66,8 @@
|
||||
alacritty
|
||||
libimobiledevice
|
||||
direnv
|
||||
nautilus
|
||||
kdePackages.dolphin
|
||||
kdePackages.kleopatra
|
||||
kdePackages.kservice
|
||||
qpwgraph
|
||||
wget
|
||||
@@ -94,12 +86,8 @@
|
||||
xclip
|
||||
gamescope
|
||||
yt-dlp
|
||||
fontforge-gtk
|
||||
deno
|
||||
wofi
|
||||
waybar
|
||||
hyprpaper
|
||||
dunst
|
||||
swww
|
||||
swappy
|
||||
slurp
|
||||
@@ -109,18 +97,13 @@
|
||||
github-cli
|
||||
cliphist
|
||||
pywal
|
||||
pavucontrol
|
||||
wlogout
|
||||
libnotify
|
||||
killall
|
||||
networkmanagerapplet
|
||||
blueman
|
||||
arrpc
|
||||
playerctl
|
||||
mangohud
|
||||
jq
|
||||
file
|
||||
nwg-look
|
||||
hyprpolkitagent
|
||||
|
||||
glib
|
||||
@@ -130,7 +113,7 @@
|
||||
gobject-introspection
|
||||
gimp3
|
||||
mpv
|
||||
nixfmt-rfc-style
|
||||
nixfmt
|
||||
|
||||
kdePackages.kdialog
|
||||
|
||||
|
||||
@@ -215,6 +215,8 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
networking.hostName = "kris-server";
|
||||
|
||||
# Lock /etc/nixos to read-only mode (config lives in /home/ocbwoy3/config).
|
||||
systemd.tmpfiles.rules = [
|
||||
"z /etc/nixos 0555 root root - -"
|
||||
|
||||
Reference in New Issue
Block a user