toph/dot.nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: toph:f07e5a72e576bb3033c6f5cea1cd703a59d1d65c
Branches Tags
toph:main
toph:user-expansion
..
compare: toph:c942130d467659599c27c2406b7a7acccbae03fa
Branches Tags
toph:main
toph:user-expansion

No commits in common. "f07e5a72e576bb3033c6f5cea1cd703a59d1d65c" and "c942130d467659599c27c2406b7a7acccbae03fa" have entirely different histories.
f07e5a72e5 ... c942130d46

25 changed files with 57 additions and 214 deletions
Show stats Expand all files Collapse all files

145
flake.lock generated
View file

@ -129,38 +129,6 @@
}
},
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1650374568,
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b4a34015c698c7793d592d66adbab377907a2be8",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_3": {
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
@ -246,46 +214,9 @@
"type": "github"
}
},
"flake-utils-plus": {
"inputs": {
"flake-utils": "flake-utils_2"
},
"locked": {
"lastModified": 1715533576,
"narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=",
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
"type": "github"
},
"original": {
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"inputs": {
"systems": "systems_6"
"systems": "systems_5"
},
"locked": {
"lastModified": 1681202837,
@ -301,9 +232,9 @@
"type": "github"
}
},
"flake-utils_4": {
"flake-utils_3": {
"inputs": {
"systems": "systems_7"
"systems": "systems_6"
},
"locked": {
"lastModified": 1731533236,
@ -733,7 +664,6 @@
"nixvirt": "nixvirt",
"rose-pine-hyprcursor": "rose-pine-hyprcursor",
"snapraid-aio": "snapraid-aio",
"solaar": "solaar",
"stylix": "stylix",
"vscode-server": "vscode-server",
"yay": "yay",
@ -816,52 +746,6 @@
"type": "github"
}
},
"snowfall-lib": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-utils-plus": "flake-utils-plus",
"nixpkgs": [
"solaar",
"nixpkgs"
]
},
"locked": {
"lastModified": 1718097323,
"narHash": "sha256-zCgs8Wp7rdt0tjNUHMUIvi6sIvDoprWIHwvTGq+LMK0=",
"owner": "snowfallorg",
"repo": "lib",
"rev": "aa19b02b63025263cec041fcb7a0857c3cb98859",
"type": "github"
},
"original": {
"owner": "snowfallorg",
"ref": "v3.0.3",
"repo": "lib",
"type": "github"
}
},
"solaar": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": [
"nixpkgs"
],
"snowfall-lib": "snowfall-lib"
},
"locked": {
"lastModified": 1736760170,
"narHash": "sha256-GvMN9vsy59xitBKt0Qh/grANYi0AWHXokrr6FY4JXRM=",
"owner": "Svenum",
"repo": "Solaar-Flake",
"rev": "255c70259546c7201141e7903cd94b0507c6377e",
"type": "github"
},
"original": {
"owner": "Svenum",
"repo": "Solaar-Flake",
"type": "github"
}
},
"stylix": {
"inputs": {
"base16": "base16",
@ -869,14 +753,14 @@
"base16-helix": "base16-helix",
"base16-vim": "base16-vim",
"firefox-gnome-theme": "firefox-gnome-theme",
"flake-compat": "flake-compat_3",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts_2",
"git-hooks": "git-hooks",
"gnome-shell": "gnome-shell",
"home-manager": "home-manager_3",
"nixpkgs": "nixpkgs_4",
"nur": "nur",
"systems": "systems_5",
"systems": "systems_4",
"tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes",
@ -987,21 +871,6 @@
"type": "github"
}
},
"systems_7": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"tinted-foot": {
"flake": false,
"locked": {
@ -1125,7 +994,7 @@
},
"vscode-server": {
"inputs": {
"flake-utils": "flake-utils_3",
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs-unstable"
]
@ -1146,7 +1015,7 @@
},
"yay": {
"inputs": {
"flake-utils": "flake-utils_4",
"flake-utils": "flake-utils_3",
"nixpkgs": [
"nixpkgs"
]

5
flake.nix
View file

@ -49,11 +49,6 @@
# inputs.nixpkgs.follows = "nixpkgs";
# };
solaar = {
url = "github:Svenum/Solaar-Flake";
inputs.nixpkgs.follows = "nixpkgs";
};
snapraid-aio = {
# url = "git+https://git.ryot.foo/toph/snapraid-aio.nix.git";
url = "git+https://git.ryot.foo/toph/snapraid-aio.nix.git";

1
home/global/common/gnome/dconf.nix
View file

@ -131,7 +131,6 @@ with lib.hm.gvariant;
"quicksettings-audio-devices-renamer@marcinjahn.com"
"undecorate@sun.wxg@gmail.com"
"user-theme@gnome-shell-extensions.gcampax.github.com"
"solaar-extension@sidevesh"
"Vitals@CoreCoding.com"
];
favorite-apps = lib.mkDefault [

5
home/global/core/default.nix
View file

@ -37,6 +37,8 @@ in
preferXdgDirectories = true; # whether to make programs use XDG directories whenever supported
};
#TODO(xdg): maybe move this to its own xdg.nix?
# xdg packages are pulled in below
xdg = {
enable = true;
userDirs = {
@ -57,12 +59,12 @@ in
direnv # environment per directory
dust # disk usage
eza # ls replacement
microsoft-edit
nmap # network scanner
trashy # trash cli
unrar # rar extraction
unzip # zip extraction
zip # zip compression
microsoft-edit
;
};
@ -70,6 +72,7 @@ in
enable = true;
};
# disable manuals as nmd fails to build often
manual = {
html.enable = false;
json.enable = false;

3
home/hosts/cloud/default.nix Normal file
View file

@ -0,0 +1,3 @@
{
# No Special Home
}

1
home/hosts/gojo/default.nix
View file

@ -40,7 +40,6 @@
## Tools ##
bitwarden-desktop
inspector
solaar
## Productivity ##
gimp

1
home/hosts/haze/config/dconf.nix
View file

@ -16,7 +16,6 @@ with lib.hm.gvariant;
"org.telegram.desktop.desktop"
"steam.desktop"
"Ryujinx.desktop"
"Overwatch 2.desktop"
"Marvel Rivals.desktop"
];
};

1
home/hosts/haze/default.nix
View file

@ -34,7 +34,6 @@
## Tools ##
bitwarden-desktop
inspector
solaar
## Productivity ##
gimp

11
home/hosts/komodo/default.nix Normal file
View file

@ -0,0 +1,11 @@
{
config,
...
}:
{
home.file = {
Pool.source = config.lib.file.mkOutOfStoreSymlink "/pool";
DockerStorage.source = config.lib.file.mkOutOfStoreSymlink "/mnt/DockerStorage";
};
}

3
home/hosts/lxc/default.nix Normal file
View file

@ -0,0 +1,3 @@
{
# No Special Home
}

3
home/hosts/proxy/default.nix Normal file
View file

@ -0,0 +1,3 @@
{
# No Special Home
}

1
home/hosts/rune/default.nix
View file

@ -37,7 +37,6 @@
bitwarden-desktop
inspector
remmina
solaar
vial # KB setup
## Productivity ##

5
home/users/cesar/default.nix
View file

@ -1,6 +1,5 @@
{
lib,
pkgs,
hostSpec,
...
}:
@ -12,7 +11,7 @@
];
home.sessionVariables = {
EDITOR = "${lib.getExe pkgs.microsoft-edit}";
VISUAL = "${lib.getExe pkgs.microsoft-edit}";
EDITOR = lib.mkDefault "${lib.getExe pkgs.microsoft-edit}";
VISUAL = lib.mkDefault "${lib.getExe pkgs.microsoft-edit}";
};
}

5
home/users/gio/default.nix
View file

@ -1,6 +1,5 @@
{
lib,
pkgs,
hostSpec,
...
}:
@ -12,7 +11,7 @@
];
home.sessionVariables = {
EDITOR = "${lib.getExe pkgs.microsoft-edit}";
VISUAL = "${lib.getExe pkgs.microsoft-edit}";
EDITOR = lib.mkDefault "${lib.getExe pkgs.microsoft-edit}";
VISUAL = lib.mkDefault "${lib.getExe pkgs.microsoft-edit}";
};
}

5
home/users/toph/config/theme/default.nix
View file

@ -5,8 +5,6 @@
...
}:
let
isServer = hostSpec.isServer or false;
qogir = pkgs.qogir-icon-theme.override {
colorVariants = [
"dark"
@ -16,8 +14,9 @@ let
"ubuntu"
];
};
in
lib.mkIf (!isServer) {
{
imports = [
inputs.stylix.homeManagerModules.stylix
];

18
hosts/global/common/solaar.nix
View file

@ -1,18 +0,0 @@
{ pkgs, inputs, ... }:
{
imports = [
inputs.solaar.nixosModules.default
];
services.solaar = {
enable = true; # Enable the service
package = pkgs.solaar; # The package to use
window = "hide"; # Show the window on startup (show, *hide*, only [window only])
batteryIcons = "symbolic"; # Which battery icons to use (*regular*, symbolic, solaar)
extraArgs = ""; # Extra arguments to pass to solaar on startup
};
environment.systemPackages = with pkgs; [
gnomeExtensions.solaar-extension
];
}

19
hosts/global/core/user.nix
View file

@ -71,26 +71,22 @@ in
};
}
// lib.optionalAttrs (inputs ? "home-manager") {
# Setup root home?
home-manager.users.root = lib.optionalAttrs (!isMinimal) {
home.stateVersion = "24.05"; # Avoid error
};
# Set up home-manager for the configured user
home-manager = {
extraSpecialArgs = {
inherit pkgs inputs;
inherit (config) secretsSpec hostSpec;
};
users = {
root.home.stateVersion = "24.05"; # Avoid error
${username} = {
users.${username} = lib.optionalAttrs (!isMinimal) {
imports = [
(
{ config, ... }:
import
(
if isMinimal then
lib.custom.relativeToRoot "home/global/core"
else
lib.custom.relativeToRoot "home/users/${username}"
)
{
import (lib.custom.relativeToRoot "home/users/${username}") {
inherit
config
hostSpec
@ -103,5 +99,4 @@ in
];
};
};
};
}

1
hosts/nixos/cloud/default.nix
View file

@ -45,7 +45,6 @@ in
handle = user.handle;
userFullName = user.fullName;
isServer = true;
isMinimal = true;
};
networking = {

1
hosts/nixos/gojo/default.nix
View file

@ -40,7 +40,6 @@ in
"hosts/global/common/gnome.nix"
"hosts/global/common/nvtop.nix" # GPU monitor (not available in home-manager)
"hosts/global/common/plymouth.nix" # fancy boot screen
"hosts/global/common/solaar.nix" # Logitech Unifying Receiver support
])
];

1
hosts/nixos/haze/default.nix
View file

@ -40,7 +40,6 @@ in
"hosts/global/common/gnome.nix"
"hosts/global/common/nvtop.nix" # GPU monitor (not available in home-manager)
"hosts/global/common/plymouth.nix" # fancy boot screen
"hosts/global/common/solaar.nix" # Logitech Unifying Receiver support
])
];

1
hosts/nixos/komodo/default.nix
View file

@ -45,7 +45,6 @@ in
handle = user.handle;
userFullName = user.fullName;
isServer = true;
isMinimal = true;
};
networking = {

6
hosts/nixos/komodo/hardware.nix
View file

@ -9,10 +9,4 @@
"hosts/global/common/system/pool.nix"
])
];
## Easy links, I use this dirs more often in this host
systemd.user.tmpfiles.rules = [
"L+ %h/Pool - - - - /pool"
"L+ %h/DockerStorage - - - - /mnt/DockerStorage"
];
}

1
hosts/nixos/lxc/default.nix
View file

@ -38,7 +38,6 @@ in
handle = user.handle;
userFullName = user.fullName;
isServer = true;
isMinimal = true;
};
networking = {

1
hosts/nixos/proxy/default.nix
View file

@ -46,7 +46,6 @@ in
handle = user.handle;
userFullName = user.fullName;
isServer = true;
isMinimal = true;
};
networking = {

1
hosts/nixos/rune/default.nix
View file

@ -42,7 +42,6 @@ in
"hosts/global/common/libvirt.nix" # vm tools
"hosts/global/common/nvtop.nix" # GPU monitor (not available in home-manager)
"hosts/global/common/plymouth.nix" # fancy boot screen
"hosts/global/common/solaar.nix" # Logitech Unifying Receiver support
"hosts/global/common/vial.nix" # KB setup
])
];