Compare commits
3 Commits
d3ce08e765
...
078351becd
Author | SHA1 | Date | |
---|---|---|---|
078351becd
|
|||
46be9aa879
|
|||
8f91352720
|
@ -30,7 +30,7 @@
|
||||
};
|
||||
stylix = {
|
||||
enable = true;
|
||||
theme = "gruvbox-dark-pale";
|
||||
theme = "vesper";
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -1,76 +0,0 @@
|
||||
{disk, ...}: {
|
||||
type = "disk";
|
||||
device = disk;
|
||||
content = {
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
ESP = {
|
||||
size = "2G";
|
||||
type = "EF00";
|
||||
content = {
|
||||
type = "filesystem";
|
||||
format = "vfat";
|
||||
mountpoint = "/boot";
|
||||
mountOptions = [
|
||||
"umask=0077"
|
||||
"fmask=0022"
|
||||
"dmask=0022"
|
||||
"noexec"
|
||||
"nosuid"
|
||||
"nodev"
|
||||
];
|
||||
};
|
||||
};
|
||||
luks = {
|
||||
size = "100%";
|
||||
content = {
|
||||
type = "luks";
|
||||
name = "luks-main";
|
||||
initrdUnlock = true;
|
||||
settings.allowDiscards = true;
|
||||
content = {
|
||||
type = "btrfs";
|
||||
extraArgs = ["-f"];
|
||||
subvolumes = {
|
||||
"@nixos-root" = {
|
||||
mountpoint = "/";
|
||||
mountOptions = [
|
||||
"compress=zstd"
|
||||
"noatime"
|
||||
"noexec"
|
||||
];
|
||||
};
|
||||
"@home" = {
|
||||
mountpoint = "/home";
|
||||
mountOptions = [
|
||||
"compress=zstd"
|
||||
"noatime"
|
||||
];
|
||||
};
|
||||
"@storage" = {
|
||||
mountpoint = "/storage";
|
||||
mountOptions = [
|
||||
"compress=zstd"
|
||||
"noatime"
|
||||
];
|
||||
};
|
||||
"@nix" = {
|
||||
mountpoint = "/nix";
|
||||
mountOptions = [
|
||||
"compress-force=zstd"
|
||||
"noatime"
|
||||
];
|
||||
};
|
||||
"@swap" = {
|
||||
mountpoint = "/swap";
|
||||
mountOptions = [
|
||||
"noatime"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
@ -16,7 +16,7 @@ in {
|
||||
gcr_4
|
||||
libsecret
|
||||
];
|
||||
# programs.seahorse.enable = true;
|
||||
programs.seahorse.enable = true;
|
||||
services.gnome.gnome-keyring.enable = true;
|
||||
xdg.portal.config.common = {
|
||||
"org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
|
||||
|
@ -1,4 +1,12 @@
|
||||
{lib, ...}: {
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
boot.tmp.cleanOnBoot = lib.mkDefault true;
|
||||
|
||||
console.font = "${pkgs.spleen}/share/consolefonts/spleen-16x32.psfu";
|
||||
|
||||
environment = {
|
||||
ldso32 = null;
|
||||
memoryAllocator.provider = "mimalloc";
|
||||
@ -9,8 +17,6 @@
|
||||
|
||||
networking.networkmanager.enable = true;
|
||||
|
||||
boot.tmp.cleanOnBoot = lib.mkDefault true;
|
||||
|
||||
services.openssh = {
|
||||
settings.X11Forwarding = false;
|
||||
settings.KbdInteractiveAuthentication = false;
|
||||
|
@ -5,71 +5,69 @@
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (builtins) fetchurl;
|
||||
inherit (lib) mkEnableOption mkOption mkIf;
|
||||
inherit (lib) optionalAttrs;
|
||||
inherit (lib.types) bool str;
|
||||
inherit (config.system) stateVersion;
|
||||
|
||||
cfg = config.module.stylix;
|
||||
|
||||
interPackage = pkgs.inter-nerdfont;
|
||||
iosevkaPackage =
|
||||
if stateVersion == "24.11"
|
||||
then pkgs.nerdfonts.override {fonts = ["Iosevka"];}
|
||||
else pkgs.nerd-fonts.iosevka;
|
||||
iosevkaTermPackage =
|
||||
if stateVersion == "24.11"
|
||||
then pkgs.nerdfonts.override {fonts = ["Iosevka Term"];}
|
||||
else pkgs.nerd-fonts.iosevka-term;
|
||||
mesloLgPackage =
|
||||
if stateVersion == "24.11"
|
||||
then pkgs.nerdfonts.override {fonts = ["MesloLG"];}
|
||||
else pkgs.nerd-fonts.meslo-lg;
|
||||
jetBrainsMonoPackage =
|
||||
if stateVersion == "24.11"
|
||||
then pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];}
|
||||
else pkgs.nerd-fonts.jetbrains-mono;
|
||||
geistMonoPackage =
|
||||
if stateVersion == "24.11"
|
||||
then pkgs.nerdfonts.override {fonts = ["GeistMono"];}
|
||||
else pkgs.nerd-fonts.geist-mono;
|
||||
iosevkaPackage = pkgs.nerd-fonts.iosevka;
|
||||
iosevkaTermPackage = pkgs.nerd-fonts.iosevka-term;
|
||||
mesloLgPackage = pkgs.nerd-fonts.meslo-lg;
|
||||
# jetBrainsMonoPackage = pkgs.nerd-fonts.jetbrains-mono;
|
||||
geistMonoPackage = pkgs.nerd-fonts.geist-mono;
|
||||
geistPackage = pkgs.geist-font;
|
||||
|
||||
wallpapers = {
|
||||
fern-outline = builtins.fetchurl {
|
||||
abstract = {
|
||||
squares = fetchurl {
|
||||
url = "https://w.wallhaven.cc/full/p9/wallhaven-p91dym.jpg";
|
||||
name = "wallhaven-p91dym.jpg";
|
||||
sha256 = "wnsAhh0Soxm+lxahh+Xc/+CAw/abWgPIkeoOlzNGaDo=";
|
||||
};
|
||||
};
|
||||
fern-outline = fetchurl {
|
||||
url = "https://w.wallhaven.cc/full/p9/wallhaven-p9m7ve.png";
|
||||
name = "wallhaven-p9m7ve.png";
|
||||
sha256 = "0r7dl4fjwv2p5q5ggr4sjsl2h5m0s98k9qhiwkvmwi010lyffkx7";
|
||||
};
|
||||
mountains-pink = builtins.fetchurl {
|
||||
mountains-pink = fetchurl {
|
||||
url = "https://w.wallhaven.cc/full/yq/wallhaven-yq7gox.jpg";
|
||||
name = "wallhaven-yq7gox.jpg";
|
||||
sha256 = "09s31spp9mq71fgkl1w80nzdc1458p1gjfyi3y6fy14wj2dza0pj";
|
||||
};
|
||||
mountains-black = builtins.fetchurl {
|
||||
mountains-black = fetchurl {
|
||||
url = "https://w.wallhaven.cc/full/9d/wallhaven-9djzww.jpg";
|
||||
name = "wallhaven-9djzww.jpg";
|
||||
sha256 = "1p2si922i9qs09h8c74lrvx0f284g0xvm7lh85gk1x7lqhn611zm";
|
||||
};
|
||||
cyber-dawn = builtins.fetchurl {
|
||||
cyber-dawn = fetchurl {
|
||||
url = "https://w.wallhaven.cc/full/ym/wallhaven-ymo2y7.png";
|
||||
name = "wallhaven-ymo2y7.png";
|
||||
sha256 = "1b3j0hxxy8m25scq42lxsxc99xvr15pha1j4wplgz761asrvxly3";
|
||||
};
|
||||
nixos-rainbow = builtins.fetchurl {
|
||||
nixos-rainbow = fetchurl {
|
||||
url = "https://w.wallhaven.cc/full/p9/wallhaven-p9pd23.png";
|
||||
name = "wallhaven-p9pd23.png";
|
||||
sha256 = "7CMuETntiVUCKhUIdJzX+sf3F47GvuX2a61o4xbEzww=";
|
||||
};
|
||||
mountains-sepia = builtins.fetchurl {
|
||||
mountains-sepia = fetchurl {
|
||||
url = "https://w.wallhaven.cc/full/k8/wallhaven-k89k81.jpg";
|
||||
name = "wallhaven-k89k81.jpg";
|
||||
sha256 = "C0lvJ0ff0mCC3i9mmeHZsj/n6Ehkp3jaslVr7VDUB3k=";
|
||||
};
|
||||
jcurry-cloud = builtins.fetchurl {
|
||||
jcurry-cloud = fetchurl {
|
||||
url = "https://w.wallhaven.cc/full/7j/wallhaven-7j6wpy.jpg";
|
||||
name = "wallhaven-je8rwq.jpg";
|
||||
sha256 = "xsuCYc0mCDkrJZ+BUmEEclAfF17g1n39JHeubtZHP78=";
|
||||
};
|
||||
vapor-moon = fetchurl {
|
||||
url = "https://w.wallhaven.cc/full/lm/wallhaven-lm6d2r.png";
|
||||
name = "wallhaven-lm6d2r.png";
|
||||
sha256 = "V07kj2zwFHDwzIN8QE8IFrJMXxDOBoK9C11sQGgTjyQ=";
|
||||
};
|
||||
};
|
||||
themes = {
|
||||
rose-pine-dawn = {
|
||||
@ -99,9 +97,7 @@
|
||||
wallpaper = wallpapers.cyber-dawn;
|
||||
|
||||
serif = {
|
||||
# package = iosevkaPackage;
|
||||
# name = "Iosevka Nerd Font Propo";
|
||||
package = pkgs.geist-font;
|
||||
package = geistPackage;
|
||||
name = "Geist Light";
|
||||
};
|
||||
|
||||
@ -122,9 +118,7 @@
|
||||
wallpaper = wallpapers.mountains-sepia;
|
||||
|
||||
serif = {
|
||||
# package = iosevkaPackage;
|
||||
# name = "Iosevka Nerd Font Propo";
|
||||
package = pkgs.geist-font;
|
||||
package = geistPackage;
|
||||
name = "Geist";
|
||||
};
|
||||
|
||||
@ -142,7 +136,7 @@
|
||||
nord = {
|
||||
polarity = "dark";
|
||||
scheme = "${pkgs.base16-schemes}/share/themes/nord.yaml";
|
||||
wallpaper = builtins.fetchurl {
|
||||
wallpaper = fetchurl {
|
||||
url = "https://w.wallhaven.cc/full/l8/wallhaven-l8l9gq.png";
|
||||
name = "wallhaven-l8l9gq.png";
|
||||
sha256 = "0ypr44sg0fn55m1b52dgr1nnscpi2p6rfkjsm7vvrdqw7bafbx2z";
|
||||
@ -168,7 +162,7 @@
|
||||
nord-light = {
|
||||
polarity = "light";
|
||||
scheme = "${pkgs.base16-schemes}/share/themes/nord-light.yaml";
|
||||
wallpaper = builtins.fetchurl {
|
||||
wallpaper = fetchurl {
|
||||
url = "https://w.wallhaven.cc/full/l8/wallhaven-l8l9gq.png";
|
||||
name = "wallhaven-l8l9gq.png";
|
||||
sha256 = "0ypr44sg0fn55m1b52dgr1nnscpi2p6rfkjsm7vvrdqw7bafbx2z";
|
||||
@ -194,7 +188,7 @@
|
||||
helios = {
|
||||
polarity = "dark";
|
||||
scheme = "${pkgs.base16-schemes}/share/themes/helios.yaml";
|
||||
wallpaper = builtins.fetchurl {
|
||||
wallpaper = fetchurl {
|
||||
url = "https://w.wallhaven.cc/full/lq/wallhaven-lqorw2.png";
|
||||
name = "wallhaven-lqorw2.png";
|
||||
sha256 = "sha256:1rjchjq4pc2jyq8dvpa17mmscv9qcm0h0zv468lsf8s51anpid6p";
|
||||
@ -220,7 +214,7 @@
|
||||
sulphurpool = {
|
||||
polarity = "dark";
|
||||
scheme = "${pkgs.base16-schemes}/share/themes/atelier-sulphurpool.yaml";
|
||||
wallpaper = builtins.fetchurl {
|
||||
wallpaper = fetchurl {
|
||||
url = "https://w.wallhaven.cc/full/rd/wallhaven-rd5q3m.jpg";
|
||||
name = "wallhaven-rd5q3m.jpg";
|
||||
sha256 = "sha256:1sa2739vwwv1xafzjvxlg3kvq26xmcxg6hrwq29q40j617r63sy6";
|
||||
@ -258,6 +252,48 @@
|
||||
name = "MesloLGM Nerd Font Mono";
|
||||
};
|
||||
|
||||
cursor = {
|
||||
package = pkgs.bibata-cursors;
|
||||
name = "Bibata-Modern-Ice";
|
||||
size = 24;
|
||||
};
|
||||
};
|
||||
vesper = {
|
||||
polarity = "dark";
|
||||
scheme = "${pkgs.base16-schemes}/share/themes/vesper.yaml";
|
||||
wallpaper = wallpapers.abstract.squares;
|
||||
|
||||
serif = {
|
||||
package = geistPackage;
|
||||
name = "Geist";
|
||||
};
|
||||
|
||||
monospace = {
|
||||
package = geistMonoPackage;
|
||||
name = "GeistMono Nerd Font";
|
||||
};
|
||||
|
||||
cursor = {
|
||||
package = pkgs.bibata-cursors;
|
||||
name = "Bibata-Modern-Classic";
|
||||
size = 24;
|
||||
};
|
||||
};
|
||||
github = {
|
||||
polarity = "light";
|
||||
scheme = "${pkgs.base16-schemes}/share/themes/github.yaml";
|
||||
wallpaper = wallpapers.abstract.squares;
|
||||
|
||||
serif = {
|
||||
package = geistPackage;
|
||||
name = "Geist Light";
|
||||
};
|
||||
|
||||
monospace = {
|
||||
package = geistMonoPackage;
|
||||
name = "GeistMono Nerd Font";
|
||||
};
|
||||
|
||||
cursor = {
|
||||
package = pkgs.bibata-cursors;
|
||||
name = "Bibata-Modern-Ice";
|
||||
|
@ -30,8 +30,10 @@
|
||||
};
|
||||
};
|
||||
openssh.enable = true;
|
||||
scx.enable = true;
|
||||
scx.scheduler = "scx_flash";
|
||||
scx = {
|
||||
enable = true;
|
||||
scheduler = "scx_flash";
|
||||
};
|
||||
syncthing.openDefaultPorts = true;
|
||||
userborn.enable = true;
|
||||
};
|
||||
|
Reference in New Issue
Block a user