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

organisation + move config for all devices to 'global' counterparts

Browse Source
This commit is contained in:
greyweather committed 2026-07-04 20:36:27 +01:00
1 parent f73926592f
commit be100cfe97
10 files changed
+245 -114
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

hosts/nixos-vm/configs/fastfetch.nix
-122
View File
@@ -1,122 +0,0 @@
{
pkgs,
...
}: {
programs.fastfetch = {
enable = true;
settings = {
logo = {
source = "/home/grey/nixos/assets/jiji.jpg";
width = 25;
padding = {
top = 1;
left = 2;
right = 2;
};
};
modules = [
{
type = "separator";
string = " ";
times = 0;
}
{
type = "title";
color = {
user = "green";
host = "green";
};
}
{
type = "separator";
string = "-";
times = 0;
}
{
type = "os";
}
{
type = "kernel";
}
{
type = "uptime";
}
{
type = "shell";
}
{
type = "de";
}
{
type = "terminal";
}
{
type = "cpu";
temp = false;
showPeCoreCount = false;
}
{
type = "gpu";
driverSpecific = false;
detectionMethod = "pci";
temp = false;
hideType = "integrated";
percent = {
green = 50;
yellow = 80;
type = 0;
};
}
{
type = "memory";
percent = {
green = 50;
yellow = 80;
type = 0;
};
}
{
type = "swap";
percent = {
green = 50;
yellow = 80;
type = 0;
};
separate = false;
}
{
type = "disk";
showRegular = true;
showExternal = false;
showHidden = false;
showSubvolumes = false;
showReadOnly = true;
ShowUnknown = false;
hideFolders = "/efi:/boot:/boot/*:/run/media/*";
useAvailable = false;
percent = {
green = 50;
yellow = 80;
type = 0;
};
}
{
type = "localip";
showIpv4 = true;
showIpv6 = false;
showMac = false;
showLoop = false;
showPrefixLen = true;
showMtu = false;
showSpeed = false;
showFlags = false;
compact = false;
defaultRouteOnly = true;
showAllIps = false;
namePrefix = "";
}
];
};
};
}
hosts/nixos-vm/configs/plasma.nix
-130
View File
@@ -1,130 +0,0 @@
{
pkgs,
lib,
...
}: {
home.packages = [
pkgs.bibata-cursors
pkgs.papirus-icon-theme
pkgs.kdePackages.oxygen
pkgs.kdePackages.oxygen-sounds
];
home.activation = {
linkThemingAssets = lib.hm.dag.entryAfter ["writeBoundary"] ''
#!/bin/bash
if [ ! -d /home/grey/.local/share/wallpapers/ExposeAir ]; then
mkdir -p /home/grey/.local/share/wallpapers
ln -s /home/grey/nixos/assets/expose-air/wallpapers/ExposeAir /home/grey/.local/share/wallpapers/ExposeAir
fi
if [ ! -f /home/grey/.local/share/color-schemes/OxygenDarkEdit.colors ]; then
mkdir -p /home/grey/.local/share/color-schemes
ln -s /home/grey/nixos/assets/OxygenDarkEdit.colors /home/grey/.local/share/color-schemes/OxygenDarkEdit.colors
fi
if [ ! -f /home/grey/.config/oxygenrc ]; then
ln -s /home/grey/nixos/assets/oxygenrc /home/grey/.config/oxygenrc
fi
if [ ! -d /home/grey/.local/share/plasma/desktoptheme/exposeair ]; then
mkdir -p /home/grey/.local/share/plasma/desktoptheme
ln -s /home/grey/nixos/assets/expose-air/desktoptheme/exposeair /home/grey/.local/share/plasma/desktoptheme/exposeair
fi
'';
};
programs.plasma = {
enable = true;
overrideConfig = true;
session.sessionRestore.restoreOpenApplicationsOnLogin = "startWithEmptySession";
input.keyboard.numlockOnStartup = "on";
workspace = {
clickItemTo = "select";
colorScheme = "OxygenDarkEdit";
cursor = {
size = 22;
theme = "Bibata-Modern-Ice";
};
iconTheme = "Papirus-Dark";
theme = "exposeair";
wallpaper = "/home/grey/.local/share/wallpapers/ExposeAir/contents/images/2560x1440.png";
windowDecorations = {
library = "org.kde.oxygen";
theme = "oxygen";
};
soundTheme = "oxygen";
};
hotkeys.commands."rebuild-flake" = {
name = "Rebuild NixOS Flake";
key = "Meta+Z";
command = "kitty --hold bash -c \"nh os switch /home/grey/nixos; if [ \\$? == 0 ]; then exit; fi\"";
};
shortcuts = {
plasmashell = {
"Show Activity Switcher" = "none";
"manage activities" = "none";
};
kwin = {
"Close Window" = "Meta+Q";
"Window Close" = "Meta+Q";
};
"services/kitty.desktop"."_launch" = "Meta+Return";
};
panels = [
{
location = "bottom";
widgets = [
{
name = "org.kde.plasma.kickoff";
config = {
General = {
icon = "nix-snowflake";
};
};
}
{
name = "org.kde.plasma.icontasks";
config = {
iconsOnly = true;
launchers = [
"applications:zen-beta.desktop"
"applications:thunderbird.desktop"
"applications:org.kde.dolphin.desktop"
"applications:equibop.desktop"
"applications:spotify.desktop"
"applications:steam.desktop"
"applications:org.prismlauncher.PrismLauncher.desktop"
"applications:obsidian.desktop"
"applications:github-desktop.desktop"
"applications:unityhub.desktop"
"applications:org.godotengine.Godot4.6.desktop"
"applications:code.desktop"
"applications:idea.desktop"
"applications:clion.desktop"
"applications:com.obsproject.Studio.desktop"
"applications:proton.vpn.app.gtk.desktop"
"applications:systemsettings.desktop"
"applications:io.ente.auth.desktop"
"applications:io.github.ilya_zlobintsev.LACT.desktop"
];
};
}
"org.kde.plasma.marginsseparator"
"org.kde.plasma.systemtray"
"org.kde.plasma.digitalclock"
"org.kde.plasma.showdesktop"
];
height = 48;
}
];
};
}
hosts/nixos-vm/default.nix
+8 -71
View File
@@ -6,23 +6,18 @@
config,
pkgs,
...
}: let name = "nixos-vm"; in {
}: let
name = "nixos-vm";
modules-dir = ../../modules;
in {
imports = [
./hardware-configuration.nix
../../flakes/nh.nix
../../flakes/plasma-desktop.nix
../../flakes/home-manager.nix
../../global-default.nix
${modules-dir}/nh.nix
${modules-dir}/plasma-desktop.nix
${modules-dir}/home-manager.nix
];
nix.settings.experimental-features = [
"nix-command"
"flakes"
];
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
networking.hostName = name; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
@@ -30,59 +25,9 @@
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Enable networking
networking.networkmanager.enable = true;
# Set your time zone.
time.timeZone = "Europe/London";
# Select internationalisation properties.
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";
};
# Configure keymap in X11
services.xserver.xkb = {
layout = "gb";
variant = "";
};
# Configure console keymap
console.keyMap = "uk";
# Define a user account. Don't forget to set a password with ‘passwd’.
users.users."grey" = {
isNormalUser = true;
description = "grey";
extraGroups = [ "networkmanager" "wheel" ];
packages = with pkgs; [];
};
virtualisation.virtualbox.guest.enable = true;
virtualisation.virtualbox.guest.dragAndDrop = true;
# Allow unfree packages
nixpkgs.config.allowUnfree = true;
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
pkgs.pipewire
pkgs.git
pkgs.fzf
pkgs.jq
];
programs.zsh.enable = true;
users.defaultUserShell = pkgs.zsh;
users.users."grey".shell = pkgs.zsh;
@@ -104,12 +49,4 @@
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "26.05"; # Did you read the comment?
}
hosts/nixos-vm/home.nix
+8 -43
View File
@@ -4,18 +4,16 @@
inputs,
lib,
...
}: {
}: let
global-configs-dir = ../../global-configs;
in {
imports = [
./configs/plasma.nix
./configs/fastfetch.nix
./configs/zen-browser.nix
../../global-home.nix
${global-configs-dir}/plasma.nix
${global-configs-dir}/fastfetch.nix
${global-configs-dir}/zen-browser.nix
];
home.username = "grey";
home.homeDirectory = "/home/grey";
home.stateVersion = "26.05";
home.packages = with pkgs; [
pkgs.steam
pkgs.equibop
@@ -35,40 +33,6 @@
pkgs.lact
];
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";
};
};
};
home.shell.enableZshIntegration = true;
programs.zsh = {
@@ -100,6 +64,7 @@
confirm_os_window_close = -1;
};
shellIntegration.enableBashIntegration = true;
shellIntegration.enableZshIntegration = true;
themeFile = "Arthur";
};