Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nixos unstable #5

Merged
merged 8 commits into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3,094 changes: 2,798 additions & 296 deletions flake.lock

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion home-manager/default/dconf.nix
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,13 @@ in {
};

org.gnome.desktop = {
interface.color-scheme = "prefer-dark"; # dark mode
interface = {
color-scheme = "prefer-dark"; # dark mode
cursor-theme = "Adwaita";
cursor-size = 50;
icon-theme = "Adwaita";
gtk-theme = "adw-gtk3";
};

# Change background
# background = {
Expand Down
2 changes: 2 additions & 0 deletions home-manager/default/packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
with pkgs; lib.mkIf (! config.data ? isMinimal || ! config.data.isMinimal) [
# cli
element # periodic table
encore # awesome tools for developing go and typescript
# matui
ttyper # monkeytype in terminal
# mastodon
# ytui-music

Expand Down
6 changes: 2 additions & 4 deletions programs/cli/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
# comma # also this, very suck
# fmpkgs.scribd-downloader # scribd downloader 😱, tai
# nh # wrapper nixos-rebuild & home-manager with nvd + nix-output-monitor
nvd # nix diff
nix-output-monitor # nix beautiful output
# nvd # nix diff
# nix-output-monitor # nix beautiful output
# nix-du
# ctop # top for container
# kdash # dashboard kubernetes
Expand All @@ -41,14 +41,12 @@
# aerc # neomutt alternative
# frogmouth # tui markdown viewer. awesome but, very lag
# manix # nix options search
encore # awesome tools for developing go and typescript
nix-init # automate builder nix derivation
# nurl # ?
rclone
cachix # unofficial binary cache server (another binary cache in cache.nixos.org)
nixfmt-rfc-style # fmt for nix
nmap # hem...
ttyper # monkeytype in terminal
# wayvnc # vnc for wayland / especially wlroots
flyctl # fly.io management in terminal
wrangler # cloudflare worker management in terminal
Expand Down
4 changes: 4 additions & 0 deletions programs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ in {
# allow insecure packages
permittedInsecurePackages = [
"python3.12-youtube-dl-2021.12.17"
"dotnet-runtime-wrapped-6.0.36"
"dotnet-runtime-6.0.36"
"dotnet-sdk-wrapped-6.0.428"
"dotnet-sdk-6.0.428"
];
};

Expand Down
1 change: 1 addition & 0 deletions systems/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ in treeImport {
"services/phpfpm"
"networking/wg-quick"
"networking/wireguard"
"systemd/services"
# "services/stubby"
];

Expand Down
7 changes: 5 additions & 2 deletions systems/extra/fonts.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@
};
aggregatedIcons = pkgs.buildEnv {
name = "system-icons";
paths = with pkgs; [
# libsForQt5.breeze-qt5 # for plasma
paths = with pkgs;
lib.optionals (config.services.xserver.desktopManager.gnome.enable) [
gnome-themes-extra
]
++ lib.optionals (config.services.desktopManager.plasma6.enable) [
libsForQt5.breeze-qt5
];
pathsToLink = [ "/share/icons" ];
};
Expand Down
16 changes: 0 additions & 16 deletions systems/fileSystems.nix

This file was deleted.

145 changes: 73 additions & 72 deletions systems/fonts.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,78 +11,79 @@
noto-fonts-emoji
roboto
liberation_ttf
(nerdfonts.override {
fonts = [
# "0xProto"
"3270"
# "Agave"
# "AnonymousPro"
# "Arimo"
# "AurulentSansMono"
# "BigBlueTerminal"
# "BitstreamVeraSansMono"
# "CascadiaCode"
# "CascadiaMono"
# "CodeNewRoman"
# "ComicShannsMono"
# "CommitMono"
# "Cousine"
# "D2Coding"
# "DaddyTimeMono"
"DejaVuSansMono"
# "DroidSansMono"
# "EnvyCodeR"
# "FantasqueSansMono"
"FiraCode"
# "FiraMono"
# "GeistMono"
# "Go-Mono"
# "Gohu"
# "Hack"
# "Hasklig"
# "HeavyData"
# "Hermit"
# "IBMPlexMono"
# "Inconsolata"
# "InconsolataGo"
# "InconsolataLGC"
# "IntelOneMono"
# "Iosevka"
# "IosevkaTerm"
# "IosevkaTermSlab"
"JetBrainsMono"
# "Lekton"
# "LiberationMono"
# "Lilex"
# "MPlus"
# "MartianMono"
# "Meslo"
# "Monaspace"
# "Monofur"
# "Monoid"
# "Mononoki"
# "NerdFontsSymbolsOnly"
# "Noto"
# "OpenDyslexic"
# "Overpass"
# "ProFont"
# "ProggyClean"
# "Recursive"
# "RobotoMono"
# "ShareTechMono"
# "SourceCodePro"
# "SpaceMono"
# "Terminus"
# "Tinos"
"Ubuntu"
# "UbuntuMono"
# "UbuntuSans"
# "VictorMono"
# "ZedMono"
# "iA-Writer"
];
})
dejavu_fonts
roboto-serif
];
] ++ map (x: nerd-fonts.${x}) [
# "_0xproto"
"_3270"
# "agave"
# "anonymice"
# "arimo"
# "aurulent-sans-mono"
# "bigblue-terminal"
# "bitstream-vera-sans-mono"
# "blex-mono"
# "caskaydia-cove"
# "caskaydia-mono"
# "code-new-roman"
# "comic-shanns-mono"
# "commit-mono"
# "cousine"
# "d2coding"
# "daddy-time-mono"
"dejavu-sans-mono"
# "departure-mono"
# "droid-sans-mono"
# "envy-code-r"
# "fantasque-sans-mono"
"fira-code"
"fira-mono"
# "geist-mono"
# "go-mono"
# "gohufont"
# "hack"
# "hasklug"
# "heavy-data"
# "hurmit"
# "im-writing"
# "inconsolata"
# "inconsolata-go"
# "inconsolata-lgc"
# "intone-mono"
# "iosevka"
# "iosevka-term"
# "iosevka-term-slab"
"jetbrains-mono"
# "lekton"
# "liberation"
# "lilex"
# "martian-mono"
# "meslo-lg"
# "monaspace"
# "monofur"
# "monoid"
# "mononoki"
# "mplus"
# "noto"
# "open-dyslexic"
# "overpass"
# "override"
# "overrideDerivation"
# "profont"
# "proggy-clean-tt"
# "recurseForDerivations"
# "recursive-mono"
# "roboto-mono"
# "sauce-code-pro"
# "shure-tech-mono"
# "space-mono"
# "symbols-only"
# "terminess-ttf"
# "tinos"
"ubuntu"
# "ubuntu-mono"
# "ubuntu-sans"
# "victor-mono"
# "zed-mono"
];
}
4 changes: 2 additions & 2 deletions systems/services/caddy/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ domains, lib, ... }: let
{ config, domains, lib, ... }: let
inherit (builtins) attrNames map;
inherit (lib) listToAttrs;
inherit (lib.fmway)
excludeItems
;
in {
enable = true;
enable = ! (config.data.isMinimal or false);
virtualHosts = listToAttrs (map (x: let
v = domains.${x};
enable =
Expand Down
4 changes: 2 additions & 2 deletions systems/services/fcgiwrap/instances.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ config, ... }:
{ config, lib, ... }:
{
"${config.data.defaultUser}" = {
"${config.data.defaultUser}" = lib.mkIf (! (config.data.isMinimal or false)) {
socket = {
group = config.services.caddy.group;
user = config.users.users.${config.data.defaultUser}.name;
Expand Down
4 changes: 2 additions & 2 deletions systems/services/gitea.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
enable = true;
{ config, ... }: {
enable = ! (config.data.isMinimal or false);
appName = "My Git (eaaa)";
lfs.enable = true; # enable git lfs
settings = {
Expand Down
2 changes: 1 addition & 1 deletion systems/services/nginx/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ config, pkgs, ... }:
{
enable = ! config.services.caddy.enable;
enable = ! config.services.caddy.enable && ! (config.data.isMinimal or false);
recommendedProxySettings = true;
recommendedTlsSettings = true;
package = pkgs.nginxStable.override {
Expand Down
4 changes: 2 additions & 2 deletions systems/services/phpfpm/pools/mypool.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ config }:
{
{ config, lib, ... }:
lib.mkIf (! (config.data.isMinimal or false)) {
user = "nobody";
settings = {
"pm" = "dynamic";
Expand Down
23 changes: 0 additions & 23 deletions top-level/nixosConfigurations.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{ inputs, lib, self, ... }: let
system = "x86_64-linux";
# inherit (self) outputs;
in {
flake.nixosConfigurations = let
defaultModules = with inputs; [
Expand Down Expand Up @@ -35,28 +34,6 @@ in {
withHM = [ "fmway" ];
sharedHM = true;
};
# Namaku1801 = inputs.nixpkgs.lib.nixosSystem {
# inherit system;
# specialArgs = self.lib.genSpecialArgs {
# inherit inputs outputs system;
# };
# modules = with inputs; [
# ../configuration.nix
# ../hardware-configuration.nix
# ../disk.nix
# ../secrets
# ({ pkgs, ... }: {
# users.users = self.lib.genUsers [ "fmway" ] (user: {
# home = "/home/${user}";
# shell = pkgs.fish;
# });
# })
# agenix.nixosModules.default
# disko.nixosModules.default
# nixos-hardware.nixosModules.lenovo-thinkpad-t480
# self.nixosModules.default
# ];
# };
};
flake.legacyPackages.${system} = self.nixosConfigurations.Namaku1801.pkgs;
}
Loading