Compare commits
8 commits
e4b2e3e3c5
...
86396163c3
Author | SHA1 | Date | |
---|---|---|---|
86396163c3 | |||
d0a2e0235c | |||
5cef304b5c | |||
cfdbf4a977 | |||
fb4b434fce | |||
75e70d85da | |||
684f265e89 | |||
f6d8a4dd29 |
12 changed files with 653 additions and 178 deletions
12
flake.in.nix
12
flake.in.nix
|
@ -28,12 +28,12 @@
|
|||
nixos-hardware = flake "github:NixOS/nixos-hardware";
|
||||
|
||||
### Stable
|
||||
# TODO: Upgrade to NixOS 24.11 stable
|
||||
nixpkgs-stable = flake "github:NixOS/nixpkgs/nixos-24.05";
|
||||
nixpkgs-stable = flake "github:NixOS/nixpkgs/nixos-24.11";
|
||||
|
||||
aagl-gtk-on-nix-stable = flake "github:ezKEa/aagl-gtk-on-nix/release-24.05" // stable "nixpkgs";
|
||||
home-manager-stable = flake "github:nix-community/home-manager/release-24.05" // stable "nixpkgs";
|
||||
aagl-gtk-on-nix-stable = flake "github:ezKEa/aagl-gtk-on-nix/release-24.11" // stable "nixpkgs";
|
||||
home-manager-stable = flake "github:nix-community/home-manager/release-24.11" // stable "nixpkgs";
|
||||
nix-index-database-stable = flake "github:nix-community/nix-index-database" // stable "nixpkgs";
|
||||
stylix-stable = flake "github:danth/stylix/release-24.11" // stable "nixpkgs";
|
||||
|
||||
### Unstable
|
||||
nixpkgs-unstable = flake "github:NixOS/nixpkgs/nixos-unstable";
|
||||
|
@ -63,7 +63,7 @@
|
|||
nix-index-database-unstable = flake "github:nix-community/nix-index-database" // unstable "nixpkgs";
|
||||
nix-vscode-extensions = flake "github:nix-community/nix-vscode-extensions" // unstable "nixpkgs";
|
||||
nixd = flake "github:nix-community/nixd" // unstable "nixpkgs";
|
||||
stylix = flake "github:danth/stylix" // unstable "nixpkgs";
|
||||
stylix-unstable = flake "github:danth/stylix" // unstable "nixpkgs";
|
||||
walker = flake "github:abenz1267/walker?ref=v0.10.15" // unstable "nixpkgs";
|
||||
|
||||
### Staging
|
||||
|
@ -116,12 +116,12 @@
|
|||
inputs."aagl-gtk-on-nix-${branch}".nixosModules.default
|
||||
inputs."home-manager-${branch}".nixosModules.home-manager
|
||||
inputs."nix-index-database-${branch}".nixosModules.nix-index
|
||||
inputs."stylix-${branch}".nixosModules.stylix
|
||||
inputs.agenix.nixosModules.default
|
||||
inputs.arion.nixosModules.arion
|
||||
inputs.disko.nixosModules.disko
|
||||
inputs.fw-fanctrl.nixosModules.default
|
||||
inputs.niri-flake.nixosModules.niri
|
||||
inputs.stylix.nixosModules.stylix
|
||||
];
|
||||
|
||||
# TODO: Use home-manager.sharedModules for all options
|
||||
|
|
738
flake.lock
generated
738
flake.lock
generated
File diff suppressed because it is too large
Load diff
12
flake.nix
12
flake.nix
|
@ -4,7 +4,7 @@
|
|||
inputs = {
|
||||
aagl-gtk-on-nix-stable = {
|
||||
inputs.nixpkgs.follows = "nixpkgs-stable";
|
||||
url = "github:ezKEa/aagl-gtk-on-nix/release-24.05";
|
||||
url = "github:ezKEa/aagl-gtk-on-nix/release-24.11";
|
||||
};
|
||||
aagl-gtk-on-nix-unstable = {
|
||||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||
|
@ -53,7 +53,7 @@
|
|||
};
|
||||
home-manager-stable = {
|
||||
inputs.nixpkgs.follows = "nixpkgs-stable";
|
||||
url = "github:nix-community/home-manager/release-24.05";
|
||||
url = "github:nix-community/home-manager/release-24.11";
|
||||
};
|
||||
home-manager-unstable = {
|
||||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||
|
@ -121,14 +121,18 @@
|
|||
url = "github:nix-community/nixd";
|
||||
};
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
||||
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05";
|
||||
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11";
|
||||
nixpkgs-staging-next.url = "github:NixOS/nixpkgs/staging-next";
|
||||
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
steamtinkerlaunch = {
|
||||
flake = false;
|
||||
url = "github:sonic2kk/steamtinkerlaunch";
|
||||
};
|
||||
stylix = {
|
||||
stylix-stable = {
|
||||
inputs.nixpkgs.follows = "nixpkgs-stable";
|
||||
url = "github:danth/stylix/release-24.11";
|
||||
};
|
||||
stylix-unstable = {
|
||||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||
url = "github:danth/stylix";
|
||||
};
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM docker.io/netboxcommunity/netbox:v4.0.11
|
||||
FROM docker.io/netboxcommunity/netbox:v4.1.11
|
||||
|
||||
# Install extra configuration
|
||||
COPY ./extra.py /etc/netbox/config/
|
||||
|
|
|
@ -6,24 +6,28 @@ LOGIN_PERSISTENCE = True
|
|||
# BUG: pynetbox does not send token with version requests
|
||||
# https://github.com/netbox-community/Device-Type-Library-Import/issues/134
|
||||
# https://github.com/netbox-community/pynetbox/pull/641
|
||||
# ?? LOGIN_REQUIRED = False
|
||||
LOGIN_REQUIRED = True
|
||||
|
||||
MEDIA_ROOT = "/opt/netbox/netbox/media" # Default /opt/netbox/media
|
||||
TIME_ZONE = "America/Chicago"
|
||||
|
||||
# https://netboxlabs.com/docs/netbox/en/stable/plugins/installation/
|
||||
# TODO: Upgrade to v4.2 when supported by plugins
|
||||
#!! "ImproperlyConfigured: Application labels aren't unique, duplicates: <plugin>" means incompatible version
|
||||
PLUGINS = [
|
||||
"netbox_acls",
|
||||
"netbox_attachments",
|
||||
"netbox_dns",
|
||||
"netbox_interface_synchronization",
|
||||
# // "netbox_lists",
|
||||
# "netbox_lists",
|
||||
"netbox_otp_plugin",
|
||||
"netbox_reorder_rack",
|
||||
# // "netbox_routing",
|
||||
"netbox_secrets",
|
||||
# "netbox_routing",
|
||||
# "netbox_secrets",
|
||||
"netbox_storage",
|
||||
"netbox_topology_views",
|
||||
# // "slurpit_netbox",
|
||||
# "slurpit_netbox",
|
||||
]
|
||||
|
||||
PLUGINS_CONFIG = {
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
netbox-acls == 1.6.* # https://github.com/netbox-community/netbox-acls
|
||||
netbox-attachments == 5.* # https://github.com/Kani999/netbox-attachments
|
||||
netbox-interface-synchronization == 4.0.* # https://github.com/NetTech2001/netbox-interface-synchronization
|
||||
#// netbox-lists == 4.0.* # https://github.com/devon-mar/netbox-lists
|
||||
netbox-acls == 1.7.* # https://github.com/netbox-community/netbox-acls
|
||||
netbox-attachments == 6.* # https://github.com/Kani999/netbox-attachments
|
||||
netbox-interface-synchronization == 4.1.* # https://github.com/NetTech2001/netbox-interface-synchronization
|
||||
# netbox-lists == 4.0.* # https://github.com/devon-mar/netbox-lists
|
||||
netbox-otp-plugin == 1.3.* # https://github.com/k1nky/netbox-otp-plugin
|
||||
netbox-plugin-dns == 1.1.* # https://github.com/peteeckel/netbox-plugin-dns
|
||||
netbox-reorder-rack == 1.1.* # https://github.com/netbox-community/netbox-reorder-rack
|
||||
#// netbox-routing == 0.2.* # https://github.com/DanSheps/netbox-routing
|
||||
netbox-secrets == 2.0.* # https://github.com/Onemind-Services-LLC/netbox-secrets
|
||||
# netbox-routing == 0.2.* # https://github.com/DanSheps/netbox-routing
|
||||
# netbox-secrets == 2.1.* # https://github.com/Onemind-Services-LLC/netbox-secrets
|
||||
netbox-storage-plugin == 0.7.* # https://github.com/viroge/netbox-storage
|
||||
netbox-topology-views == 4.1.* # https://github.com/netbox-community/netbox-topology-views
|
||||
#// slurpit_netbox == 0.9.* # https://gitlab.com/slurpit.io/slurpit-netbox
|
||||
# slurpit_netbox == 0.9.* # https://gitlab.com/slurpit.io/slurpit-netbox
|
||||
|
|
|
@ -42,7 +42,8 @@ in {
|
|||
"ponfpcnoihfmfllpaingbgckeeldkhle" # Enhancer for YouTube
|
||||
#// "fnaicdffflnofjppbagibeoednhnbjhg" # floccus
|
||||
#// "bnomihfieiccainjcjblhegjgglakjdd" # Improve YouTube
|
||||
"pnjaodmkngahhkoihejjehlcdlnohgmp" # RSS Feed Reader
|
||||
#// "pnjaodmkngahhkoihejjehlcdlnohgmp" # RSS Feed Reader
|
||||
"kfimphpokifbjgmjflanmfeppcjimgah" # RSS Reader Extension (by Inoreader)
|
||||
"mnjggcdmjocbbbhaepdhchncahnbgone" # SponsorBlock
|
||||
"clngdbkpkpeebahjckkjfobafhncgmne" # Stylus
|
||||
#// "kfidecgcdjjfpeckbblhmfkhmlgecoff" # Svelte DevTools
|
||||
|
|
|
@ -32,12 +32,13 @@ with lib; {
|
|||
dconf.enable = true;
|
||||
firefox.enable = true;
|
||||
#// foot.enable = true;
|
||||
ghostty.enable = true;
|
||||
#// gnome-terminal.enable = true;
|
||||
#// kdeconnect.enable = true;
|
||||
kitty.enable = true;
|
||||
nautilus.enable = true;
|
||||
nvtop.enable = true;
|
||||
#// wezterm.enable = true;
|
||||
wezterm.enable = true;
|
||||
})
|
||||
|
||||
(mkIf config.custom.full {
|
||||
|
|
28
options/custom/programs/ghostty.nix
Normal file
28
options/custom/programs/ghostty.nix
Normal file
|
@ -0,0 +1,28 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.custom.programs.ghostty;
|
||||
hm = config.home-manager.users.${config.custom.username};
|
||||
in {
|
||||
options.custom.programs.ghostty = {
|
||||
enable = mkOption {default = false;};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home-manager.sharedModules = [
|
||||
{
|
||||
# https://ghostty.org/
|
||||
programs.ghostty = {
|
||||
enable = true;
|
||||
|
||||
# https://ghostty.org/docs/config/reference
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
|
@ -130,6 +130,7 @@ in {
|
|||
# https://starship.rs/config/#local-ip
|
||||
localip = {
|
||||
disabled = false;
|
||||
format = "[$localipv4]($style)";
|
||||
};
|
||||
|
||||
# https://starship.rs/config/#os
|
||||
|
|
|
@ -5,7 +5,7 @@ config.enable_scroll_bar = true
|
|||
|
||||
-- # BUG: Wayland is currently a WIP
|
||||
-- https://github.com/wez/wezterm/issues/5793
|
||||
config.enable_wayland = false
|
||||
-- // config.enable_wayland = false
|
||||
|
||||
-- # BUG: Font weight does not render properly with WebGpu
|
||||
-- https://github.com/wez/wezterm/issues/3032
|
||||
|
@ -14,7 +14,7 @@ config.force_reverse_video_cursor = true -- Invert colors
|
|||
|
||||
-- # BUG: OpenGL/Software rendering is broken
|
||||
-- https://github.com/wez/wezterm/issues/5990
|
||||
config.front_end = 'WebGpu' -- Vulkan support
|
||||
-- // config.front_end = 'WebGpu' -- Vulkan support
|
||||
|
||||
config.hide_tab_bar_if_only_one_tab = true
|
||||
config.scrollback_lines = 10000
|
||||
|
|
|
@ -37,7 +37,7 @@ _build() {
|
|||
|
||||
# Build and send closures to remote machine
|
||||
if [[ "${argc_target:-}" ]]; then
|
||||
nixos-rebuild --flake ".#${argc_target}" --target-host "root@${argc_target}" "$1" ${argc_extra:+"${argc_extra[@]}"}
|
||||
nixos-rebuild --flake ".#${argc_target}" --target-host "root@${argc_target}" "$1" -- --show-trace ${argc_extra:+"${argc_extra[@]}"}
|
||||
else
|
||||
# Build current system
|
||||
if [[ "${argc_builder:-}" == nh ]]; then
|
||||
|
|
Loading…
Add table
Reference in a new issue