From a1709f033f0b54e54b0def5790bbab289d69b259 Mon Sep 17 00:00:00 2001 From: Alejandro Angulo Date: Wed, 4 Oct 2023 20:36:21 -0700 Subject: [PATCH] Upgraded snowfall lib --- flake.lock | 29 +++++++++--------- flake.nix | 8 ++--- modules/{ => nixos}/apps/bat/default.nix | 0 modules/{ => nixos}/apps/btop/default.nix | 0 modules/{ => nixos}/apps/firefox/default.nix | 0 modules/{ => nixos}/apps/neovim/default.nix | 2 ++ .../{ => nixos}/apps/neovim/generate_theme.sh | 0 modules/{ => nixos}/apps/neovim/tmux_theme | 0 modules/{ => nixos}/apps/steam/default.nix | 0 modules/{ => nixos}/apps/tmux/default.nix | 0 modules/{ => nixos}/apps/yubikey/default.nix | 0 .../archetypes/workstation/default.nix | 0 .../desktop/addons/alacritty/default.nix | 0 .../desktop/addons/gammastep/default.nix | 0 .../desktop/addons/mako/default.nix | 0 .../desktop/addons/playerctl/default.nix | 0 .../desktop/addons/rofi/default.nix | 0 .../desktop/addons/swayidle/default.nix | 0 .../desktop/addons/swaylock/default.nix | 0 .../desktop/addons/waybar/default.nix | 0 .../desktop/addons/waybar/waybar_style.css | 0 modules/{ => nixos}/desktop/sway/default.nix | 0 modules/{ => nixos}/desktop/sway/skull.png | Bin modules/{ => nixos}/desktop/sway/vertical.png | Bin .../{ => nixos}/desktop/sway/wallpaper.jpg | Bin .../{ => nixos}/hardware/audio/default.nix | 0 .../hardware/bluetooth/default.nix | 0 .../{ => nixos}/hardware/logitech/default.nix | 0 modules/{ => nixos}/hardware/tlp/default.nix | 0 modules/{ => nixos}/home/default.nix | 0 modules/{ => nixos}/nix/default.nix | 2 ++ modules/{ => nixos}/security/acme/default.nix | 0 .../services/adguardhome/default.nix | 0 .../{ => nixos}/services/grafana/default.nix | 0 modules/{ => nixos}/services/loki/default.nix | 0 .../services/nextcloud/default.nix | 0 .../services/nix-serve/default.nix | 0 .../services/octoprint/default.nix | 0 .../{ => nixos}/services/openssh/default.nix | 0 .../{ => nixos}/services/printing/default.nix | 0 .../services/prometheus/default.nix | 0 .../{ => nixos}/services/promtail/default.nix | 0 .../{ => nixos}/services/syncoid/default.nix | 0 .../services/tailscale/default.nix | 0 .../{ => nixos}/suites/desktop/default.nix | 0 .../suites/development/default.nix | 0 modules/{ => nixos}/suites/gaming/default.nix | 0 modules/{ => nixos}/suites/utils/default.nix | 0 modules/{ => nixos}/system/fonts/default.nix | 0 .../{ => nixos}/system/monitoring/default.nix | 0 modules/{ => nixos}/system/zfs/default.nix | 0 modules/{ => nixos}/tools/direnv/default.nix | 0 modules/{ => nixos}/tools/eza/default.nix | 0 modules/{ => nixos}/tools/git/default.nix | 0 modules/{ => nixos}/tools/gpg/default.nix | 0 modules/{ => nixos}/tools/zsh/default.nix | 0 modules/{ => nixos}/tools/zsh/p10k.zsh | 0 modules/{ => nixos}/user/default.nix | 0 58 files changed, 22 insertions(+), 19 deletions(-) rename modules/{ => nixos}/apps/bat/default.nix (100%) rename modules/{ => nixos}/apps/btop/default.nix (100%) rename modules/{ => nixos}/apps/firefox/default.nix (100%) rename modules/{ => nixos}/apps/neovim/default.nix (99%) rename modules/{ => nixos}/apps/neovim/generate_theme.sh (100%) rename modules/{ => nixos}/apps/neovim/tmux_theme (100%) rename modules/{ => nixos}/apps/steam/default.nix (100%) rename modules/{ => nixos}/apps/tmux/default.nix (100%) rename modules/{ => nixos}/apps/yubikey/default.nix (100%) rename modules/{ => nixos}/archetypes/workstation/default.nix (100%) rename modules/{ => nixos}/desktop/addons/alacritty/default.nix (100%) rename modules/{ => nixos}/desktop/addons/gammastep/default.nix (100%) rename modules/{ => nixos}/desktop/addons/mako/default.nix (100%) rename modules/{ => nixos}/desktop/addons/playerctl/default.nix (100%) rename modules/{ => nixos}/desktop/addons/rofi/default.nix (100%) rename modules/{ => nixos}/desktop/addons/swayidle/default.nix (100%) rename modules/{ => nixos}/desktop/addons/swaylock/default.nix (100%) rename modules/{ => nixos}/desktop/addons/waybar/default.nix (100%) rename modules/{ => nixos}/desktop/addons/waybar/waybar_style.css (100%) rename modules/{ => nixos}/desktop/sway/default.nix (100%) rename modules/{ => nixos}/desktop/sway/skull.png (100%) rename modules/{ => nixos}/desktop/sway/vertical.png (100%) rename modules/{ => nixos}/desktop/sway/wallpaper.jpg (100%) rename modules/{ => nixos}/hardware/audio/default.nix (100%) rename modules/{ => nixos}/hardware/bluetooth/default.nix (100%) rename modules/{ => nixos}/hardware/logitech/default.nix (100%) rename modules/{ => nixos}/hardware/tlp/default.nix (100%) rename modules/{ => nixos}/home/default.nix (100%) rename modules/{ => nixos}/nix/default.nix (96%) rename modules/{ => nixos}/security/acme/default.nix (100%) rename modules/{ => nixos}/services/adguardhome/default.nix (100%) rename modules/{ => nixos}/services/grafana/default.nix (100%) rename modules/{ => nixos}/services/loki/default.nix (100%) rename modules/{ => nixos}/services/nextcloud/default.nix (100%) rename modules/{ => nixos}/services/nix-serve/default.nix (100%) rename modules/{ => nixos}/services/octoprint/default.nix (100%) rename modules/{ => nixos}/services/openssh/default.nix (100%) rename modules/{ => nixos}/services/printing/default.nix (100%) rename modules/{ => nixos}/services/prometheus/default.nix (100%) rename modules/{ => nixos}/services/promtail/default.nix (100%) rename modules/{ => nixos}/services/syncoid/default.nix (100%) rename modules/{ => nixos}/services/tailscale/default.nix (100%) rename modules/{ => nixos}/suites/desktop/default.nix (100%) rename modules/{ => nixos}/suites/development/default.nix (100%) rename modules/{ => nixos}/suites/gaming/default.nix (100%) rename modules/{ => nixos}/suites/utils/default.nix (100%) rename modules/{ => nixos}/system/fonts/default.nix (100%) rename modules/{ => nixos}/system/monitoring/default.nix (100%) rename modules/{ => nixos}/system/zfs/default.nix (100%) rename modules/{ => nixos}/tools/direnv/default.nix (100%) rename modules/{ => nixos}/tools/eza/default.nix (100%) rename modules/{ => nixos}/tools/git/default.nix (100%) rename modules/{ => nixos}/tools/gpg/default.nix (100%) rename modules/{ => nixos}/tools/zsh/default.nix (100%) rename modules/{ => nixos}/tools/zsh/p10k.zsh (100%) rename modules/{ => nixos}/user/default.nix (100%) diff --git a/flake.lock b/flake.lock index 31bf58a..e0528d3 100644 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,11 @@ ] }, "locked": { - "lastModified": 1695384796, + "lastModified": 1696775529, "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=", "owner": "ryantm", "repo": "agenix", - "rev": "1f677b3e161d3bdbfd08a939e8f25de2568e0ef4", + "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4", "type": "github" }, "original": { @@ -121,11 +121,11 @@ ] }, "locked": { - "lastModified": 1696446489, - "narHash": "sha256-xSjMKdNR+q/3hdSPyg/LUMsZT/WIoUi8dcm5zT4SMUQ=", + "lastModified": 1697662575, + "narHash": "sha256-fVtd4Le9edB831xyGWu0aqSfg6YVbkCNMX/IE3SUIdk=", "owner": "nix-community", "repo": "home-manager", - "rev": "68f7d8c0fb0bfc67d1916dd7f06288424360d43a", + "rev": "3433206e51766b4164dad368a81325efbf343fbe", "type": "github" }, "original": { @@ -173,11 +173,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1696161939, - "narHash": "sha256-HI1DxS//s46/qv9dcW06TzXaBjxL2DVTQP8R1QsnHzM=", + "lastModified": 1697100850, + "narHash": "sha256-qSAzJVzNRIo+r3kBjL8TcpJctcgcHlnZyqdzpWgtg0M=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "0ab3ee718e964fb42dc57ace6170f19cb0b66532", + "rev": "fb6af288f6cf0f00d3af60cf9d5110433b954565", "type": "github" }, "original": { @@ -189,11 +189,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1696193975, - "narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", + "lastModified": 1697456312, + "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242", + "rev": "ca012a02bf8327be9e488546faecae5e05d7d749", "type": "github" }, "original": { @@ -223,17 +223,16 @@ ] }, "locked": { - "lastModified": 1692934017, - "narHash": "sha256-aj2T1ivZ21qNxguZQKyu7hvCGUAYVR2jd5iMNnM/27o=", + "lastModified": 1696432959, + "narHash": "sha256-oJQZv2MYyJaVyVJY5IeevzqpGvMGKu5pZcCCJvb+xjc=", "owner": "snowfallorg", "repo": "lib", - "rev": "1aae2b325fc0c5839283a0af5c247fcb596c097f", + "rev": "92803a029b5314d4436a8d9311d8707b71d9f0b6", "type": "github" }, "original": { "owner": "snowfallorg", "repo": "lib", - "rev": "1aae2b325fc0c5839283a0af5c247fcb596c097f", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 248a54a..46493cc 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ nixos-generators.url = "github:nix-community/nixos-generators"; nixos-generators.inputs.nixpkgs.follows = "nixpkgs"; - snowfall-lib.url = "github:snowfallorg/lib/1aae2b325fc0c5839283a0af5c247fcb596c097f"; + snowfall-lib.url = "github:snowfallorg/lib"; snowfall-lib.inputs.nixpkgs.follows = "nixpkgs"; deploy-rs.url = "github:serokell/deploy-rs"; @@ -29,12 +29,12 @@ inherit inputs; src = ./.; - overlay-package-namespace = "aa"; - # snowfall.namespace = "aa"; + # overlay-package-namespace = "aa"; + snowfall.namespace = "aa"; channels-config.allowUnfree = true; - systems.modules = with inputs; [ + systems.modules.nixos = with inputs; [ agenix.nixosModules.default home-manager.nixosModules.home-manager ]; diff --git a/modules/apps/bat/default.nix b/modules/nixos/apps/bat/default.nix similarity index 100% rename from modules/apps/bat/default.nix rename to modules/nixos/apps/bat/default.nix diff --git a/modules/apps/btop/default.nix b/modules/nixos/apps/btop/default.nix similarity index 100% rename from modules/apps/btop/default.nix rename to modules/nixos/apps/btop/default.nix diff --git a/modules/apps/firefox/default.nix b/modules/nixos/apps/firefox/default.nix similarity index 100% rename from modules/apps/firefox/default.nix rename to modules/nixos/apps/firefox/default.nix diff --git a/modules/apps/neovim/default.nix b/modules/nixos/apps/neovim/default.nix similarity index 99% rename from modules/apps/neovim/default.nix rename to modules/nixos/apps/neovim/default.nix index 23f3520..00f15c8 100644 --- a/modules/apps/neovim/default.nix +++ b/modules/nixos/apps/neovim/default.nix @@ -52,6 +52,8 @@ in { # base16-vim nvim-base16 + markdown-preview-nvim + { plugin = lualine-nvim; type = "lua"; diff --git a/modules/apps/neovim/generate_theme.sh b/modules/nixos/apps/neovim/generate_theme.sh similarity index 100% rename from modules/apps/neovim/generate_theme.sh rename to modules/nixos/apps/neovim/generate_theme.sh diff --git a/modules/apps/neovim/tmux_theme b/modules/nixos/apps/neovim/tmux_theme similarity index 100% rename from modules/apps/neovim/tmux_theme rename to modules/nixos/apps/neovim/tmux_theme diff --git a/modules/apps/steam/default.nix b/modules/nixos/apps/steam/default.nix similarity index 100% rename from modules/apps/steam/default.nix rename to modules/nixos/apps/steam/default.nix diff --git a/modules/apps/tmux/default.nix b/modules/nixos/apps/tmux/default.nix similarity index 100% rename from modules/apps/tmux/default.nix rename to modules/nixos/apps/tmux/default.nix diff --git a/modules/apps/yubikey/default.nix b/modules/nixos/apps/yubikey/default.nix similarity index 100% rename from modules/apps/yubikey/default.nix rename to modules/nixos/apps/yubikey/default.nix diff --git a/modules/archetypes/workstation/default.nix b/modules/nixos/archetypes/workstation/default.nix similarity index 100% rename from modules/archetypes/workstation/default.nix rename to modules/nixos/archetypes/workstation/default.nix diff --git a/modules/desktop/addons/alacritty/default.nix b/modules/nixos/desktop/addons/alacritty/default.nix similarity index 100% rename from modules/desktop/addons/alacritty/default.nix rename to modules/nixos/desktop/addons/alacritty/default.nix diff --git a/modules/desktop/addons/gammastep/default.nix b/modules/nixos/desktop/addons/gammastep/default.nix similarity index 100% rename from modules/desktop/addons/gammastep/default.nix rename to modules/nixos/desktop/addons/gammastep/default.nix diff --git a/modules/desktop/addons/mako/default.nix b/modules/nixos/desktop/addons/mako/default.nix similarity index 100% rename from modules/desktop/addons/mako/default.nix rename to modules/nixos/desktop/addons/mako/default.nix diff --git a/modules/desktop/addons/playerctl/default.nix b/modules/nixos/desktop/addons/playerctl/default.nix similarity index 100% rename from modules/desktop/addons/playerctl/default.nix rename to modules/nixos/desktop/addons/playerctl/default.nix diff --git a/modules/desktop/addons/rofi/default.nix b/modules/nixos/desktop/addons/rofi/default.nix similarity index 100% rename from modules/desktop/addons/rofi/default.nix rename to modules/nixos/desktop/addons/rofi/default.nix diff --git a/modules/desktop/addons/swayidle/default.nix b/modules/nixos/desktop/addons/swayidle/default.nix similarity index 100% rename from modules/desktop/addons/swayidle/default.nix rename to modules/nixos/desktop/addons/swayidle/default.nix diff --git a/modules/desktop/addons/swaylock/default.nix b/modules/nixos/desktop/addons/swaylock/default.nix similarity index 100% rename from modules/desktop/addons/swaylock/default.nix rename to modules/nixos/desktop/addons/swaylock/default.nix diff --git a/modules/desktop/addons/waybar/default.nix b/modules/nixos/desktop/addons/waybar/default.nix similarity index 100% rename from modules/desktop/addons/waybar/default.nix rename to modules/nixos/desktop/addons/waybar/default.nix diff --git a/modules/desktop/addons/waybar/waybar_style.css b/modules/nixos/desktop/addons/waybar/waybar_style.css similarity index 100% rename from modules/desktop/addons/waybar/waybar_style.css rename to modules/nixos/desktop/addons/waybar/waybar_style.css diff --git a/modules/desktop/sway/default.nix b/modules/nixos/desktop/sway/default.nix similarity index 100% rename from modules/desktop/sway/default.nix rename to modules/nixos/desktop/sway/default.nix diff --git a/modules/desktop/sway/skull.png b/modules/nixos/desktop/sway/skull.png similarity index 100% rename from modules/desktop/sway/skull.png rename to modules/nixos/desktop/sway/skull.png diff --git a/modules/desktop/sway/vertical.png b/modules/nixos/desktop/sway/vertical.png similarity index 100% rename from modules/desktop/sway/vertical.png rename to modules/nixos/desktop/sway/vertical.png diff --git a/modules/desktop/sway/wallpaper.jpg b/modules/nixos/desktop/sway/wallpaper.jpg similarity index 100% rename from modules/desktop/sway/wallpaper.jpg rename to modules/nixos/desktop/sway/wallpaper.jpg diff --git a/modules/hardware/audio/default.nix b/modules/nixos/hardware/audio/default.nix similarity index 100% rename from modules/hardware/audio/default.nix rename to modules/nixos/hardware/audio/default.nix diff --git a/modules/hardware/bluetooth/default.nix b/modules/nixos/hardware/bluetooth/default.nix similarity index 100% rename from modules/hardware/bluetooth/default.nix rename to modules/nixos/hardware/bluetooth/default.nix diff --git a/modules/hardware/logitech/default.nix b/modules/nixos/hardware/logitech/default.nix similarity index 100% rename from modules/hardware/logitech/default.nix rename to modules/nixos/hardware/logitech/default.nix diff --git a/modules/hardware/tlp/default.nix b/modules/nixos/hardware/tlp/default.nix similarity index 100% rename from modules/hardware/tlp/default.nix rename to modules/nixos/hardware/tlp/default.nix diff --git a/modules/home/default.nix b/modules/nixos/home/default.nix similarity index 100% rename from modules/home/default.nix rename to modules/nixos/home/default.nix diff --git a/modules/nix/default.nix b/modules/nixos/nix/default.nix similarity index 96% rename from modules/nix/default.nix rename to modules/nixos/nix/default.nix index a603959..8690b14 100644 --- a/modules/nix/default.nix +++ b/modules/nixos/nix/default.nix @@ -50,6 +50,8 @@ in { else []; }; + # TODO: Configure distributedBuilds and buildMachines? + gc = { automatic = true; dates = "weekly"; diff --git a/modules/security/acme/default.nix b/modules/nixos/security/acme/default.nix similarity index 100% rename from modules/security/acme/default.nix rename to modules/nixos/security/acme/default.nix diff --git a/modules/services/adguardhome/default.nix b/modules/nixos/services/adguardhome/default.nix similarity index 100% rename from modules/services/adguardhome/default.nix rename to modules/nixos/services/adguardhome/default.nix diff --git a/modules/services/grafana/default.nix b/modules/nixos/services/grafana/default.nix similarity index 100% rename from modules/services/grafana/default.nix rename to modules/nixos/services/grafana/default.nix diff --git a/modules/services/loki/default.nix b/modules/nixos/services/loki/default.nix similarity index 100% rename from modules/services/loki/default.nix rename to modules/nixos/services/loki/default.nix diff --git a/modules/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix similarity index 100% rename from modules/services/nextcloud/default.nix rename to modules/nixos/services/nextcloud/default.nix diff --git a/modules/services/nix-serve/default.nix b/modules/nixos/services/nix-serve/default.nix similarity index 100% rename from modules/services/nix-serve/default.nix rename to modules/nixos/services/nix-serve/default.nix diff --git a/modules/services/octoprint/default.nix b/modules/nixos/services/octoprint/default.nix similarity index 100% rename from modules/services/octoprint/default.nix rename to modules/nixos/services/octoprint/default.nix diff --git a/modules/services/openssh/default.nix b/modules/nixos/services/openssh/default.nix similarity index 100% rename from modules/services/openssh/default.nix rename to modules/nixos/services/openssh/default.nix diff --git a/modules/services/printing/default.nix b/modules/nixos/services/printing/default.nix similarity index 100% rename from modules/services/printing/default.nix rename to modules/nixos/services/printing/default.nix diff --git a/modules/services/prometheus/default.nix b/modules/nixos/services/prometheus/default.nix similarity index 100% rename from modules/services/prometheus/default.nix rename to modules/nixos/services/prometheus/default.nix diff --git a/modules/services/promtail/default.nix b/modules/nixos/services/promtail/default.nix similarity index 100% rename from modules/services/promtail/default.nix rename to modules/nixos/services/promtail/default.nix diff --git a/modules/services/syncoid/default.nix b/modules/nixos/services/syncoid/default.nix similarity index 100% rename from modules/services/syncoid/default.nix rename to modules/nixos/services/syncoid/default.nix diff --git a/modules/services/tailscale/default.nix b/modules/nixos/services/tailscale/default.nix similarity index 100% rename from modules/services/tailscale/default.nix rename to modules/nixos/services/tailscale/default.nix diff --git a/modules/suites/desktop/default.nix b/modules/nixos/suites/desktop/default.nix similarity index 100% rename from modules/suites/desktop/default.nix rename to modules/nixos/suites/desktop/default.nix diff --git a/modules/suites/development/default.nix b/modules/nixos/suites/development/default.nix similarity index 100% rename from modules/suites/development/default.nix rename to modules/nixos/suites/development/default.nix diff --git a/modules/suites/gaming/default.nix b/modules/nixos/suites/gaming/default.nix similarity index 100% rename from modules/suites/gaming/default.nix rename to modules/nixos/suites/gaming/default.nix diff --git a/modules/suites/utils/default.nix b/modules/nixos/suites/utils/default.nix similarity index 100% rename from modules/suites/utils/default.nix rename to modules/nixos/suites/utils/default.nix diff --git a/modules/system/fonts/default.nix b/modules/nixos/system/fonts/default.nix similarity index 100% rename from modules/system/fonts/default.nix rename to modules/nixos/system/fonts/default.nix diff --git a/modules/system/monitoring/default.nix b/modules/nixos/system/monitoring/default.nix similarity index 100% rename from modules/system/monitoring/default.nix rename to modules/nixos/system/monitoring/default.nix diff --git a/modules/system/zfs/default.nix b/modules/nixos/system/zfs/default.nix similarity index 100% rename from modules/system/zfs/default.nix rename to modules/nixos/system/zfs/default.nix diff --git a/modules/tools/direnv/default.nix b/modules/nixos/tools/direnv/default.nix similarity index 100% rename from modules/tools/direnv/default.nix rename to modules/nixos/tools/direnv/default.nix diff --git a/modules/tools/eza/default.nix b/modules/nixos/tools/eza/default.nix similarity index 100% rename from modules/tools/eza/default.nix rename to modules/nixos/tools/eza/default.nix diff --git a/modules/tools/git/default.nix b/modules/nixos/tools/git/default.nix similarity index 100% rename from modules/tools/git/default.nix rename to modules/nixos/tools/git/default.nix diff --git a/modules/tools/gpg/default.nix b/modules/nixos/tools/gpg/default.nix similarity index 100% rename from modules/tools/gpg/default.nix rename to modules/nixos/tools/gpg/default.nix diff --git a/modules/tools/zsh/default.nix b/modules/nixos/tools/zsh/default.nix similarity index 100% rename from modules/tools/zsh/default.nix rename to modules/nixos/tools/zsh/default.nix diff --git a/modules/tools/zsh/p10k.zsh b/modules/nixos/tools/zsh/p10k.zsh similarity index 100% rename from modules/tools/zsh/p10k.zsh rename to modules/nixos/tools/zsh/p10k.zsh diff --git a/modules/user/default.nix b/modules/nixos/user/default.nix similarity index 100% rename from modules/user/default.nix rename to modules/nixos/user/default.nix