greyweather/nix-flake
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

start to remove modules in favour of options

Browse Source
This commit is contained in:
greyweather committed 2026-08-27 03:08:09 +01:00
1 parent 7245e872f6
commit f770b83b5c
23 files changed
+302 -389
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

global.nix
-148
View File
@@ -1,148 +0,0 @@
{ inputs, self, ... }: {
flake.nixosModules.global = { pkgs, config, lib, ... }: {
options = {
info.rootPath = lib.mkOption {
type = lib.types.str;
default = "/home/grey/nixos";
};
};
config = {
nix.settings.experimental-features = [
"nix-command"
"flakes"
];
nix.gc = {
automatic = true;
persistent = true;
dates = "Sun 05:00";
};
boot.loader.efi.canTouchEfiVariables = true;
networking.networkmanager.enable = true;
time.timeZone = "Europe/London";
i18n.defaultLocale = "en_GB.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "en_GB.UTF-8";
LC_IDENTIFICATION = "en_GB.UTF-8";
LC_MEASUREMENT = "en_GB.UTF-8";
LC_MONETARY = "en_GB.UTF-8";
LC_NAME = "en_GB.UTF-8";
LC_NUMERIC = "en_GB.UTF-8";
LC_PAPER = "en_GB.UTF-8";
LC_TELEPHONE = "en_GB.UTF-8";
LC_TIME = "en_GB.UTF-8";
};
services.xserver.xkb = {
layout = "gb";
variant = "";
};
console.keyMap = "uk";
users.users."grey" = {
isNormalUser = true;
description = "grey";
extraGroups = [ "networkmanager" "wheel" ];
};
nixpkgs.config.allowUnfree = true;
environment.systemPackages = with pkgs; [
git
fzf
jq
busybox
ethtool
wayland-utils
mesa-demos
vulkan-tools
hyperfine
];
fonts.packages = with pkgs; [
iosevka-comfy.comfy
nerd-fonts.jetbrains-mono
];
programs.nano = {
enable = true;
nanorc = ''
set nowrap
set tabstospaces
set tabsize 2
'';
};
hardware.bluetooth = {
enable = true;
powerOnBoot = false;
};
programs.gnupg.agent = {
enable = true;
};
};
};
flake.homeModules.global = { config, pkgs, ... }: {
nix.gc = {
automatic = true;
persistent = true;
dates = "Sun 05:00";
};
home.packages = with pkgs; [
bibata-cursors
x264
speedtest-go
gparted
vlc
];
programs.git = {
enable = true;
lfs.enable = true;
settings = {
user.name = "Grey Jones";
user.email = "grey@greyweather.dev";
};
signing = {
format = "openpgp";
key = "CC7388DF8E1890729921BCFF7C67C51C2FF524D9";
signByDefault = true;
};
};
programs.gpg = {
enable = true;
};
programs.ssh = {
enable = true;
enableDefaultConfig = false;
settings = {
"git.greyweather.dev" = {
HostName = "git.greyweather.dev";
Port = "222";
User = "git";
IdentityFile = "~/.ssh/id_gitea";
};
"github.com" = {
HostName = "github.com";
Port = 22;
User = "git";
IdentityFile = "~/.ssh/id_github";
};
};
};
home.shell.enableBashIntegration = true;
};
}
modules/capabilities/graphics.nix
+23
View File
@@ -0,0 +1,23 @@
{ inputs, self, ... }: {
flake.nixosModules.graphics = { config, pkgs, ... }: {
environment.systemPackages = with pkgs; [
wayland-utils
mesa-demos
vulkan-tools
];
fonts.packages = with pkgs; [
iosevka-comfy.comfy
nerd-fonts.jetbrains-mono
];
};
flake.homeModules.graphics = { config, pkgs, ... }: {
home.packages = with pkgs; [
bibata-cursors
x264
gparted
vlc
];
};
}
modules/components/shells/noctalia/noctalia.nix → modules/components/window-managers/shells/noctalia/noctalia.nix
View File
File renamed without changes.
modules/features/applications/cli/fastfetch.nix
+12
View File
@@ -0,0 +1,12 @@
{ inputs, self, ... }: {
flake.nixosModules.global = { lib, config, ... }: {
options.features.applications.cli.fastfetch.enable = lib.mkEnableOption "fastfetch";
};
flake.homeModules.global = { pkgs, lib, osConfig, ... }: {
config = lib.mkIf (osConfig.features.applications.cli.fastfetch.enable) ({
programs.zsh.initContent = lib.mkOrder 1500 "fastfetch";
programs.fastfetch.enable = true;
});
};
}
modules/programs/equibop.nix → modules/features/applications/gui/equibop.nix
View File
File renamed without changes.
modules/programs/floorp.nix → modules/features/applications/gui/floorp.nix
View File
File renamed without changes.
modules/programs/kitty.nix → modules/features/applications/gui/kitty.nix
View File
File renamed without changes.
modules/programs/nautilus.nix → modules/features/applications/gui/nautilus.nix
View File
File renamed without changes.
modules/programs/spotify.nix → modules/features/applications/gui/spotify.nix
+12 -12
View File
@@ -1,25 +1,25 @@
{ inputs, self, ... }: { { inputs, self, ... }: {
flake.homeModules.spotify = { pkgs, config, lib, ... }: { flake.nixosModules.graphics = { lib, ... }: {
options.features.applications.gui.spotify = {
enable = lib.mkEnableOption "spotify";
spicetify.enable = lib.mkEnableOption "spicetify";
};
};
flake.homeModules.graphics = { pkgs, config, lib, osConfig, ... }: {
imports = [ imports = [
inputs.spicetify.homeManagerModules.default inputs.spicetify.homeManagerModules.default
]; ];
options = {
features.spicetify.enable = lib.mkOption {
type = lib.types.bool;
default = false;
};
};
config = { config = {
home.packages = with pkgs; lib.mkIf (config.features.spicetify.enable == false) [ home.packages = lib.mkIf (with osConfig.features.applications.gui.spotify; enable && !spicetify.enable) (with pkgs; [
spotfify spotify
]; ]);
programs.spicetify = programs.spicetify =
let let
spicePkgs = inputs.spicetify.legacyPackages.${pkgs.stdenv.hostPlatform.system}; spicePkgs = inputs.spicetify.legacyPackages.${pkgs.stdenv.hostPlatform.system};
in lib.mkIf (config.features.spicetify.enable) { in lib.mkIf (with osConfig.features.applications.gui.spotify; enable && spicetify.enable) {
enable = true; enable = true;
enabledExtensions = with spicePkgs.extensions; [ enabledExtensions = with spicePkgs.extensions; [
hidePodcasts hidePodcasts
modules/programs/vscode.nix → modules/features/applications/gui/vscode.nix
View File
File renamed without changes.
modules/features/home-manager.nix
-12
View File
@@ -1,12 +0,0 @@
{ inputs, self, ... }: {
flake.nixosModules.home-manager = { pkgs, ... }: {
imports = [
inputs.home-manager.nixosModules.default
];
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
};
};
}
modules/features/nh.nix
-11
View File
@@ -1,11 +0,0 @@
{ inputs, self, ... }: {
flake.nixosModules.global = { pkgs, config, ... }: {
environment.systemPackages = [
inputs.nh.packages.${pkgs.stdenv.hostPlatform.system}.default
];
programs.nh = {
enable = true;
flake = "/home/grey/nixos";
};
};
}
modules/features/nixos/home-manager.nix
+15
View File
@@ -0,0 +1,15 @@
{ inputs, self, ... }: {
flake.nixosModules.global = { pkgs, lib, config, ... }: {
imports = [
inputs.home-manager.nixosModules.default
];
options.features.nixos.home-manager.enable = lib.mkEnableOption "home-manager";
config.home-manager = lib.mkIf (config.features.nixos.home-manager.enable) {
useGlobalPkgs = true;
useUserPackages = true;
users.grey = self.homeModules.${config.networking.hostName};
};
};
}
modules/features/nixos/nh.nix
+19
View File
@@ -0,0 +1,19 @@
{ inputs, self, ... }: {
flake.nixosModules.global = { pkgs, config, lib, ... }: {
options.features.nixos.nh.enable = lib.mkOption {
type = lib.types.bool;
default = true;
};
config = lib.mkIf (config.features.nixos.nh.enable) {
environment.systemPackages = [
inputs.nh.packages.${pkgs.stdenv.hostPlatform.system}.default
];
programs.nh = {
enable = true;
flake = "/home/grey/nixos";
};
};
};
}
modules/features/nixos/stylix.nix
+15
View File
@@ -0,0 +1,15 @@
{ inputs, self, ... }: {
flake.nixosModules.graphics = { pkgs, lib, config, ... }: {
imports = [
inputs.stylix.nixosModules.stylix
];
options.features.nixos.stylix.enable = lib.mkEnableOption "stylix";
config = lib.mkIf (config.features.nixos.stylix.enable) {
stylix.enable = true;
stylix.image = builtins.path { path = "${self.outPath}/modules/hosts/${config.networking.hostName}/wallpaper.jpg"; };
stylix.polarity = "dark";
};
};
}
modules/features/shells/zsh.nix
+38
View File
@@ -0,0 +1,38 @@
{ inputs, self, ... }: {
flake.nixosModules.global = { config, pkgs, lib, ... }: {
options.features.shells.zsh = {
enable = lib.mkEnableOption "zsh";
antidote.enable = lib.mkEnableOption "antidote";
};
config = lib.mkIf (config.features.shells.zsh.enable) {
programs.zsh.enable = true;
users.defaultUserShell = pkgs.zsh;
users.users."grey".shell = pkgs.zsh;
};
};
flake.homeModules.global = { pkgs, osConfig, lib, ... }: {
config = lib.mkIf (osConfig.features.shells.zsh.enable) {
home.shell.enableZshIntegration = true;
programs.kitty.shellIntegration.enableZshIntegration = true;
programs.zsh = {
enable = true;
completionInit = "";
antidote = lib.mkIf (osConfig.features.shells.zsh.antidote.enable) {
enable = true;
plugins = [
"getantidote/use-omz"
"ohmyzsh/ohmyzsh path:lib"
"ohmyzsh/ohmyzsh path:plugins/command-not-found"
"ohmyzsh/ohmyzsh path:themes/nanotech.zsh-theme"
"zsh-users/zsh-autosuggestions"
"zdharma-continuum/fast-syntax-highlighting"
];
};
};
};
};
}
modules/features/stylix.nix
-7
View File
@@ -1,7 +0,0 @@
{ inputs, self, ... }: {
flake.nixosModules.stylix = { pkgs, ... }: {
imports = [
inputs.stylix.nixosModules.stylix
];
};
}
modules/global.nix
-12
View File
@@ -57,17 +57,9 @@
jq jq
busybox busybox
ethtool ethtool
wayland-utils
mesa-demos
vulkan-tools
hyperfine hyperfine
]; ];
fonts.packages = with pkgs; [
iosevka-comfy.comfy
nerd-fonts.jetbrains-mono
];
programs.nano = { programs.nano = {
enable = true; enable = true;
nanorc = '' nanorc = ''
@@ -96,11 +88,7 @@
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [
bibata-cursors
x264
speedtest-go speedtest-go
gparted
vlc
]; ];
programs.git = { programs.git = {
modules/hosts/graphics.nix
-3
View File
@@ -1,3 +0,0 @@
{ inputs, self, ... }: {
# flake.nixosModules.graphics =
}
modules/hosts/kitagawa/home/fastfetch.nix
+138 -139
View File
@@ -1,145 +1,144 @@
{ inputs, self, ... }: { { inputs, self, ... }: {
flake.homeModules.kitagawa = { pkgs, lib, ... }: { flake.homeModules.kitagawa = { pkgs, lib, osConfig, ... }: {
programs.zsh.initContent = lib.mkOrder 1500 "fastfetch"; config = lib.mkIf (osConfig.features.applications.cli.fastfetch.enable) ({
programs.fastfetch = {
programs.fastfetch = { settings = {
enable = true; logo = {
settings = { type = "builtin";
logo = { padding = {
type = "builtin"; top = 1;
padding = { left = 2;
top = 1; right = 2;
left = 2; };
right = 2;
}; };
};
modules = [ modules = [
{ {
type = "custom"; type = "custom";
format = "┌────────────────── Software ──────────────────┐"; format = "┌────────────────── Software ──────────────────┐";
} }
{ {
type = "title"; type = "title";
key = " Session"; key = " Session";
format = "{user-name}@{host-name}"; format = "{user-name}@{host-name}";
} }
{ {
type = "os"; type = "os";
key = " Distro"; key = " Distro";
format = "{pretty-name}"; format = "{pretty-name}";
} }
{ {
type = "host"; type = "host";
key = " Device"; key = " Device";
format = "{version}"; format = "{version}";
} }
{ {
type = "kernel"; type = "kernel";
key = " Kernel"; key = " Kernel";
} }
{ {
type = "shell"; type = "shell";
key = " Shell"; key = " Shell";
} }
{ {
type = "terminal"; type = "terminal";
key = " Terminal"; key = " Terminal";
} }
{ {
type = "wm"; type = "wm";
key = " WM"; key = " WM";
} }
{ {
type = "custom"; type = "custom";
format = "└──────────────────────────────────────────────┘"; format = "└──────────────────────────────────────────────┘";
} }
"break" "break"
{ {
type = "custom"; type = "custom";
format = "┌────────────────── Hardware ──────────────────┐"; format = "┌────────────────── Hardware ──────────────────┐";
} }
{ {
type = "cpu"; type = "cpu";
key = " CPU"; key = " CPU";
format = "{name}"; format = "{name}";
} }
{ {
type = "memory"; type = "memory";
key = " RAM"; key = " RAM";
percent = { percent = {
green = 50; green = 50;
yellow = 80; yellow = 80;
type = 0; type = 0;
}; };
} }
{ {
type = "swap"; type = "swap";
key = " Swap"; key = " Swap";
percent = { percent = {
green = 50; green = 50;
yellow = 80; yellow = 80;
type = 0; type = 0;
}; };
separate = false; separate = false;
} }
{ {
type = "disk"; type = "disk";
key = " Disk"; key = " Disk";
showRegular = true; showRegular = true;
showExternal = false; showExternal = false;
showHidden = false; showHidden = false;
showSubvolumes = false; showSubvolumes = false;
showReadOnly = true; showReadOnly = true;
ShowUnknown = false; ShowUnknown = false;
hideFolders = "/efi:/boot:/boot/*:/run/media/*"; hideFolders = "/efi:/boot:/boot/*:/run/media/*";
useAvailable = false; useAvailable = false;
percent = { percent = {
green = 50; green = 50;
yellow = 80; yellow = 80;
type = 0; type = 0;
}; };
} }
{ {
type = "localip"; type = "localip";
key = " IP"; key = " IP";
showIpv4 = true; showIpv4 = true;
showIpv6 = false; showIpv6 = false;
showMac = false; showMac = false;
showLoop = false; showLoop = false;
showPrefixLen = true; showPrefixLen = true;
showMtu = false; showMtu = false;
showSpeed = false; showSpeed = false;
showFlags = false; showFlags = false;
compact = false; compact = false;
defaultRouteOnly = true; defaultRouteOnly = true;
showAllIps = false; showAllIps = false;
} }
{ {
type = "custom"; type = "custom";
format = "└──────────────────────────────────────────────┘"; format = "└──────────────────────────────────────────────┘";
} }
"break" "break"
{ {
type = "custom"; type = "custom";
format = "┌──────────────── Age + Uptime ────────────────┐"; format = "┌──────────────── Age + Uptime ────────────────┐";
} }
{ {
type = "disk"; type = "disk";
key = " OS Age"; key = " OS Age";
folders = "/"; folders = "/";
format = "{create-time:10} ({days} days)"; format = "{create-time:10} ({days} days)";
} }
{ {
type = "uptime"; type = "uptime";
key = " Uptime"; key = " Uptime";
} }
{ {
type = "custom"; type = "custom";
format = "└──────────────────────────────────────────────┘"; format = "└──────────────────────────────────────────────┘";
} }
]; ];
};
}; };
}; });
}; };
} }
modules/hosts/kitagawa/kitagawa.nix
+30 -16
View File
@@ -1,7 +1,9 @@
{ inputs, self, ... }: { { inputs, self, ... }: {
flake.nixosConfigurations.kitagawa = inputs.nixpkgs.lib.nixosSystem { flake.nixosConfigurations.kitagawa = inputs.nixpkgs.lib.nixosSystem {
modules = [ modules = with self.nixosModules; [
self.nixosModules.kitagawa global
graphics
kitagawa
]; ];
}; };
@@ -11,15 +13,36 @@
networking.hostName = "kitagawa"; networking.hostName = "kitagawa";
imports = with self.nixosModules; [ imports = with self.nixosModules; [
global
home-manager
stylix
ly ly
niri niri
noctalia noctalia
zsh
]; ];
features = {
nixos = {
home-manager.enable = true;
stylix.enable = true;
};
shells.zsh = {
enable = true;
antidote.enable = true;
};
applications = {
cli = {
fastfetch.enable = true;
};
gui = {
spotify = {
enable = true;
spicetify.enable = true;
};
};
};
};
nix.buildMachines = [ nix.buildMachines = [
{ {
hostName = "nixremote"; hostName = "nixremote";
@@ -63,12 +86,6 @@
maxGenerations = 10; maxGenerations = 10;
}; };
}; };
stylix.enable = true;
stylix.image = ./wallpaper.jpg;
stylix.polarity = "dark";
home-manager.users.grey = self.homeModules.kitagawa;
}; };
flake.homeModules.kitagawa = { config, pkgs, inputs, lib, ... }: { flake.homeModules.kitagawa = { config, pkgs, inputs, lib, ... }: {
@@ -76,18 +93,15 @@
imports = with self.homeModules; [ imports = with self.homeModules; [
global global
graphics
niri niri
noctalia noctalia
vscode vscode
kitty kitty
zsh
floorp floorp
equibop equibop
spotify
]; ];
features.spicetify.enable = true;
/* /*
imports = [ imports = [
#"${global-configs}/gnome.nix" #"${global-configs}/gnome.nix"
modules/features/flake-parts.nix → modules/meta/flake-parts.nix
View File
File renamed without changes.
modules/programs/zsh.nix
-29
View File
@@ -1,29 +0,0 @@
{ inputs, self, ... }: {
flake.nixosModules.zsh = { config, pkgs, ... }: {
programs.zsh.enable = true;
users.defaultUserShell = pkgs.zsh;
users.users."grey".shell = pkgs.zsh;
};
flake.homeModules.zsh = { pkgs, ... }: {
home.shell.enableZshIntegration = true;
programs.kitty.shellIntegration.enableZshIntegration = true;
programs.zsh = {
enable = true;
completionInit = "";
antidote = {
enable = true;
plugins = [
"getantidote/use-omz"
"ohmyzsh/ohmyzsh path:lib"
"ohmyzsh/ohmyzsh path:plugins/command-not-found"
"ohmyzsh/ohmyzsh path:themes/nanotech.zsh-theme"
"zsh-users/zsh-autosuggestions"
"zdharma-continuum/fast-syntax-highlighting"
];
};
};
};
}