From 15c686636268f86d22ea451fad243e75337e848f Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Sat, 25 Sep 2021 20:28:25 +0200 Subject: [PATCH] moved all to subfolder nixos --- .channelStable.json | 10 - .channelUnstable.json | 10 - .krops.json | 7 - .nix-writers.json | 10 - .nixos-generators.json | 10 - configs/workhorse/mattermost.nix | 135 ----- configurations.nix | 36 -- flake.lock | 415 +-------------- flake.nix | 47 +- krops.nix | 96 ---- {assets => nixos/assets}/jack.sh | 0 {assets => nixos/assets}/music-making.sh | 0 {assets => nixos/assets}/nginx-show-config.sh | 0 {assets => nixos/assets}/shrink_exports | 0 {assets => nixos/assets}/sprueche-axel | 0 {assets => nixos/assets}/sprueche-siw | 0 {assets => nixos/assets}/ssh/borg_access.pub | 0 {assets => nixos/assets}/ssh/card_rsa.pub | 0 {assets => nixos/assets}/tinc/mobi_host_file | 0 {assets => nixos/assets}/tinc/pepe_host_file | 0 .../assets}/tinc/porani_host_file | 0 .../assets}/tinc/retiolum/host_file | 0 .../assets}/tinc/sputnik_host_file | 0 .../assets}/tinc/sternchen_host_file | 0 .../assets}/tinc/sterni_host_file | 0 .../assets}/tinc/workhorse_host_file | 0 .../assets}/tinc/workout_host_file | 0 .../configs}/dummy/configuration.nix | 0 .../configs}/dummy/hardware-configuration.nix | 0 .../configs}/mobi/configuration.nix | 0 .../configs}/mobi/hardware-configuration.nix | 0 {configs => nixos/configs}/mobi/tinc.nix | 0 {configs => nixos/configs}/pepe/borg.nix | 0 .../configs}/pepe/configuration.nix | 0 {configs => nixos/configs}/pepe/dms.nix | 0 .../configs}/pepe/hardware-configuration.nix | 0 .../configs}/pepe/home-assistant.nix | 0 .../pepe/home-assistant/chaospott.nix | 0 .../pepe/home-assistant/iot-control.nix | 0 .../configs}/pepe/home-assistant/kodi.nix | 0 .../pepe/home-assistant/light-control.nix | 0 .../configs}/pepe/home-assistant/mpd.nix | 0 .../configs}/pepe/home-assistant/mqtt.nix | 0 .../configs}/pepe/home-assistant/sonoff.nix | 0 .../configs}/pepe/home-assistant/stocks.nix | 0 .../configs}/pepe/home-assistant/timer.nix | 0 .../configs}/pepe/home-assistant/weather.nix | 0 .../configs}/pepe/home-assistant/workday.nix | 0 .../pepe/home-assistant/zigbee2mqtt.nix | 0 .../home-assistant/zigbee2mqtt/buttons.nix | 0 .../zigbee2mqtt/configurationHelper.nix | 0 .../pepe/home-assistant/zigbee2mqtt/doors.nix | 0 .../home-assistant/zigbee2mqtt/fyrtur.nix | 0 .../home-assistant/zigbee2mqtt/heater.nix | 0 .../pepe/home-assistant/zigbee2mqtt/leds.nix | 0 .../home-assistant/zigbee2mqtt/lights.nix | 0 .../home-assistant/zigbee2mqtt/motion.nix | 0 .../home-assistant/zigbee2mqtt/repeater.nix | 0 .../home-assistant/zigbee2mqtt/service.nix | 0 .../home-assistant/zigbee2mqtt/temperatur.nix | 0 {configs => nixos/configs}/pepe/kodi.nix | 0 {configs => nixos/configs}/pepe/lan.nix | 0 {configs => nixos/configs}/pepe/syncthing.nix | 0 {configs => nixos/configs}/pepe/tinc.nix | 0 .../configs}/pepe/wifi-access-point.nix | 0 .../configs}/porani/configuration.nix | 0 .../porani/hardware-configuration.nix | 0 {configs => nixos/configs}/porani/kodi.nix | 0 {configs => nixos/configs}/porani/mpd.nix | 0 .../configs}/porani/packages.nix | 0 .../configs}/porani/syncthing.nix | 0 {configs => nixos/configs}/porani/tinc.nix | 0 .../configs}/porani/wifi-access-point.nix | 0 .../configs}/porani/wifi-networking.nix | 0 .../configs}/sputnik/bitwarden.nix | 0 {configs => nixos/configs}/sputnik/codimd.nix | 0 .../configs}/sputnik/configuration.nix | 0 .../sputnik/hardware-configuration.nix | 0 .../configs}/sputnik/iodined.nix | 0 {configs => nixos/configs}/sputnik/nginx.nix | 0 .../configs}/sputnik/syncplay.nix | 0 {configs => nixos/configs}/sputnik/tinc.nix | 0 .../configs}/sternchen/configuration.nix | 0 .../sternchen/hardware-configuration.nix | 0 .../configs}/sternchen/packages.nix | 0 .../configs}/sternchen/syncthing.nix | 0 {configs => nixos/configs}/sternchen/tinc.nix | 0 .../configs}/sternchen/wifi-access-point.nix | 0 .../configs}/sternchen/wireshark.nix | 0 .../configs}/sterni/configuration.nix | 1 + .../sterni/hardware-configuration.nix | 0 .../configs}/sterni/packages.nix | 0 .../configs}/sterni/syncthing.nix | 0 {configs => nixos/configs}/sterni/tinc.nix | 0 .../configs}/sterni/wifi-access-point.nix | 0 .../configs}/sterni/wireshark.nix | 0 {configs => nixos/configs}/workhorse/borg.nix | 0 .../configs}/workhorse/castget.nix | 0 .../configs}/workhorse/configuration.nix | 0 .../configs}/workhorse/finance.nix | 0 {configs => nixos/configs}/workhorse/gogs.nix | 0 .../configs}/workhorse/grafana.nix | 0 .../configs}/workhorse/graylog.nix | 0 .../workhorse/hardware-configuration.nix | 0 .../configs}/workhorse/jenkins.nix | 0 .../configs}/workhorse/jupyter.nix | 0 .../configs}/workhorse/kibana.nix | 0 .../configs}/workhorse/mail-fetcher.nix | 0 .../configs}/workhorse/metabase.nix | 0 .../configs}/workhorse/mining.nix | 0 .../configs}/workhorse/mysql.nix | 0 .../configs}/workhorse/nextcloud.nix | 0 .../configs}/workhorse/packages.nix | 0 .../configs}/workhorse/prometheus.nix | 0 .../configs}/workhorse/property.nix | 0 .../configs}/workhorse/syncthing.nix | 0 .../configs}/workhorse/taskserver.nix | 0 {configs => nixos/configs}/workhorse/tinc.nix | 0 .../configs}/workhorse/transmission.nix | 0 .../configs}/workhorse/weechat.nix | 0 .../configs}/workout/configuration.nix | 0 .../workout/hardware-configuration.nix | 0 {configs => nixos/configs}/workout/kibana.nix | 0 {configs => nixos/configs}/workout/lan.nix | 0 .../configs}/workout/packages.nix | 0 {configs => nixos/configs}/workout/slack.nix | 0 .../configs}/workout/syncthing.nix | 0 {configs => nixos/configs}/workout/tinc.nix | 0 nixos/flake.lock | 480 ++++++++++++++++++ nixos/flake.nix | 77 +++ nixos/krops.nix | 63 +++ {library => nixos/library}/default.nix | 0 {library => nixos/library}/jenkins.nix | 0 {modules => nixos/modules}/default.nix | 0 .../modules}/programs/browser.nix | 0 .../modules}/programs/citate.nix | 0 .../modules}/programs/curl-scripts.nix | 0 .../modules}/programs/easytag.nix | 0 {modules => nixos/modules}/programs/elm.nix | 0 .../modules}/programs/espeak.nix | 0 .../modules}/programs/ffmpeg.nix | 0 {modules => nixos/modules}/programs/git.nix | 0 .../modules}/programs/shell-bash.nix | 0 .../modules}/programs/shell-tools.nix | 0 .../modules}/programs/shell-zsh.nix | 0 {modules => nixos/modules}/programs/slack.nix | 0 {modules => nixos/modules}/programs/steam.nix | 0 .../modules}/programs/taskwarrior.nix | 0 {modules => nixos/modules}/programs/urxvt.nix | 0 {modules => nixos/modules}/programs/video.nix | 0 {modules => nixos/modules}/programs/vim.nix | 0 {modules => nixos/modules}/programs/xterm.nix | 0 .../modules}/services/castget.nix | 0 .../modules}/services/home-assistant.nix | 0 .../modules}/services/lektor.nix | 0 .../modules}/services/light-control.nix | 0 .../modules}/services/samba-share.nix | 0 {modules => nixos/modules}/services/sshd.nix | 0 .../modules}/services/videoencoder.nix | 0 {modules => nixos/modules}/system/audio.nix | 0 .../modules}/system/bluetooth.nix | 0 {modules => nixos/modules}/system/font.nix | 0 .../modules}/system/mainUser.nix | 0 .../modules}/system/on-failure.nix | 0 {modules => nixos/modules}/system/permown.nix | 0 {modules => nixos/modules}/system/wifi.nix | 0 {modules => nixos/modules}/system/x11.nix | 0 .../bitwig-studio-environment.nix | 0 .../pkgs}/bitwig-studio/bitwig-studio1.nix | 0 .../pkgs}/bitwig-studio/bitwig-studio2.nix | 0 .../pkgs}/bitwig-studio/bitwig-studio3.nix | 0 {pkgs => nixos/pkgs}/default.nix | 0 {pkgs => nixos/pkgs}/emoji/default.nix | 0 {pkgs => nixos/pkgs}/gitlog2json/default.nix | 0 .../pkgs}/gitlog2json/gitlog2json.py | 0 {pkgs => nixos/pkgs}/gitlog2json/log.py | 0 {pkgs => nixos/pkgs}/gitlog2json/shell.nix | 0 {pkgs => nixos/pkgs}/landingpage/default.nix | 0 .../pkgs}/light-control/default.nix | 0 {pkgs => nixos/pkgs}/otpmenu/default.nix | 0 {pkgs => nixos/pkgs}/pixelnuke/default.nix | 0 {pkgs => nixos/pkgs}/polygon-art/default.nix | 0 {pkgs => nixos/pkgs}/q/README.md | 0 {pkgs => nixos/pkgs}/q/default.nix | 0 .../pkgs}/sononym-crawler/default.nix | 0 {pkgs => nixos/pkgs}/sononym/default.nix | 0 .../pkgs}/taskwarrior-hooks/default.nix | 0 .../pkgs}/terminal-tools/default.nix | 0 {system => nixos/system}/all/borg-jobs.nix | 0 {system => nixos/system}/all/borg-scripts.nix | 0 {system => nixos/system}/all/default.nix | 3 - {system => nixos/system}/all/grub.nix | 0 {system => nixos/system}/all/hosts.nix | 0 .../system}/all/networking-qos.nix | 0 .../system}/all/nginx-landingpage.nix | 0 {system => nixos/system}/all/nginx.nix | 0 {system => nixos/system}/all/on-failure.nix | 0 {system => nixos/system}/all/packages.nix | 0 .../all/packages/llvm-config-dummy.nix | 0 {system => nixos/system}/all/shell.nix | 0 .../system}/all/sshd-known-hosts-bootup.nix | 0 .../system}/all/sshd-known-hosts-private.nix | 0 .../system}/all/sshd-known-hosts-public.nix | 0 {system => nixos/system}/all/sshd.nix | 0 {system => nixos/system}/all/syncthing.nix | 0 {system => nixos/system}/all/tinc.nix | 0 {system => nixos/system}/desktop/audio.nix | 0 {system => nixos/system}/desktop/browser.nix | 0 {system => nixos/system}/desktop/cachix.nix | 0 .../system}/desktop/cachix/all-hies.nix | 0 {system => nixos/system}/desktop/default.nix | 0 {system => nixos/system}/desktop/direnv.nix | 0 {system => nixos/system}/desktop/dnsmasq.nix | 0 .../system}/desktop/home-manager.nix | 0 .../desktop/home-manager/doom-emacs.nix | 0 .../desktop/home-manager/doom.d/config.el | 0 .../desktop/home-manager/doom.d/init.el | 0 .../desktop/home-manager/doom.d/packages.el | 0 .../system}/desktop/home-manager/dunst.nix | 0 .../desktop/home-manager/spacemacs.nix | 0 .../system}/desktop/home-manager/spacevim.nix | 0 .../system}/desktop/home-manager/ssh.nix | 0 .../system}/desktop/home-manager/xmonad.nix | 0 .../desktop/home-manager/xmonad/.envrc | 0 .../desktop/home-manager/xmonad/.gitignore | 0 .../home-manager/xmonad/BoringWindows.hs | 0 .../desktop/home-manager/xmonad/FloatKeys.hs | 0 .../desktop/home-manager/xmonad/LICENSE | 0 .../desktop/home-manager/xmonad/Main.hs | 0 .../desktop/home-manager/xmonad/Memo.hs | 0 .../home-manager/xmonad/NixCommands.hs | 0 .../desktop/home-manager/xmonad/Setup.hs | 0 .../home-manager/xmonad/SolarizedDark.hs | 0 .../home-manager/xmonad/SolarizedLight.hs | 0 .../desktop/home-manager/xmonad/SubLayouts.hs | 0 .../desktop/home-manager/xmonad/TabbedFix.hs | 0 .../home-manager/xmonad/current-project.nix | 0 .../desktop/home-manager/xmonad/env.nix | 0 .../desktop/home-manager/xmonad/lsp.nix | 0 .../home-manager/xmonad/palos-xmonad.cabal | 0 .../desktop/home-manager/xmonad/shell.nix | 0 {system => nixos/system}/desktop/icecast.nix | 0 .../system}/desktop/mail-stuff.nix | 0 {system => nixos/system}/desktop/mc.nix | 0 {system => nixos/system}/desktop/network.nix | 0 {system => nixos/system}/desktop/packages.nix | 0 {system => nixos/system}/desktop/pass.nix | 0 .../system}/desktop/remote-install.nix | 0 {system => nixos/system}/desktop/size.nix | 0 {system => nixos/system}/desktop/sshd.nix | 0 {system => nixos/system}/desktop/suspend.nix | 0 {system => nixos/system}/desktop/user.nix | 0 {system => nixos/system}/desktop/wtf.nix | 0 {system => nixos/system}/desktop/x11.nix | 0 {system => nixos/system}/desktop/xlock.nix | 0 {system => nixos/system}/desktop/yubikey.nix | 0 {system => nixos/system}/proxy/default.nix | 0 {system => nixos/system}/server/default.nix | 0 .../system}/server/graylog-exporter.nix | 0 {system => nixos/system}/server/initssh.nix | 0 {system => nixos/system}/server/netdata.nix | 0 {system => nixos/system}/server/packages.nix | 0 .../system}/server/prometheus-exporters.nix | 0 263 files changed, 638 insertions(+), 762 deletions(-) delete mode 100644 .channelStable.json delete mode 100644 .channelUnstable.json delete mode 100644 .krops.json delete mode 100644 .nix-writers.json delete mode 100644 .nixos-generators.json delete mode 100644 configs/workhorse/mattermost.nix delete mode 100644 configurations.nix delete mode 100644 krops.nix rename {assets => nixos/assets}/jack.sh (100%) rename {assets => nixos/assets}/music-making.sh (100%) rename {assets => nixos/assets}/nginx-show-config.sh (100%) rename {assets => nixos/assets}/shrink_exports (100%) rename {assets => nixos/assets}/sprueche-axel (100%) rename {assets => nixos/assets}/sprueche-siw (100%) rename {assets => nixos/assets}/ssh/borg_access.pub (100%) rename {assets => nixos/assets}/ssh/card_rsa.pub (100%) rename {assets => nixos/assets}/tinc/mobi_host_file (100%) rename {assets => nixos/assets}/tinc/pepe_host_file (100%) rename {assets => nixos/assets}/tinc/porani_host_file (100%) rename {assets => nixos/assets}/tinc/retiolum/host_file (100%) rename {assets => nixos/assets}/tinc/sputnik_host_file (100%) rename {assets => nixos/assets}/tinc/sternchen_host_file (100%) rename {assets => nixos/assets}/tinc/sterni_host_file (100%) rename {assets => nixos/assets}/tinc/workhorse_host_file (100%) rename {assets => nixos/assets}/tinc/workout_host_file (100%) rename {configs => nixos/configs}/dummy/configuration.nix (100%) rename {configs => nixos/configs}/dummy/hardware-configuration.nix (100%) rename {configs => nixos/configs}/mobi/configuration.nix (100%) rename {configs => nixos/configs}/mobi/hardware-configuration.nix (100%) rename {configs => nixos/configs}/mobi/tinc.nix (100%) rename {configs => nixos/configs}/pepe/borg.nix (100%) rename {configs => nixos/configs}/pepe/configuration.nix (100%) rename {configs => nixos/configs}/pepe/dms.nix (100%) rename {configs => nixos/configs}/pepe/hardware-configuration.nix (100%) rename {configs => nixos/configs}/pepe/home-assistant.nix (100%) rename {configs => nixos/configs}/pepe/home-assistant/chaospott.nix (100%) rename {configs => nixos/configs}/pepe/home-assistant/iot-control.nix (100%) rename {configs => nixos/configs}/pepe/home-assistant/kodi.nix (100%) rename {configs => nixos/configs}/pepe/home-assistant/light-control.nix (100%) rename {configs => nixos/configs}/pepe/home-assistant/mpd.nix (100%) rename {configs => nixos/configs}/pepe/home-assistant/mqtt.nix (100%) rename {configs => nixos/configs}/pepe/home-assistant/sonoff.nix (100%) rename {configs => nixos/configs}/pepe/home-assistant/stocks.nix (100%) rename {configs => nixos/configs}/pepe/home-assistant/timer.nix (100%) rename {configs => nixos/configs}/pepe/home-assistant/weather.nix (100%) rename {configs => nixos/configs}/pepe/home-assistant/workday.nix (100%) rename {configs => nixos/configs}/pepe/home-assistant/zigbee2mqtt.nix (100%) rename {configs => nixos/configs}/pepe/home-assistant/zigbee2mqtt/buttons.nix (100%) rename {configs => nixos/configs}/pepe/home-assistant/zigbee2mqtt/configurationHelper.nix (100%) rename {configs => nixos/configs}/pepe/home-assistant/zigbee2mqtt/doors.nix (100%) rename {configs => nixos/configs}/pepe/home-assistant/zigbee2mqtt/fyrtur.nix (100%) rename {configs => nixos/configs}/pepe/home-assistant/zigbee2mqtt/heater.nix (100%) rename {configs => nixos/configs}/pepe/home-assistant/zigbee2mqtt/leds.nix (100%) rename {configs => nixos/configs}/pepe/home-assistant/zigbee2mqtt/lights.nix (100%) rename {configs => nixos/configs}/pepe/home-assistant/zigbee2mqtt/motion.nix (100%) rename {configs => nixos/configs}/pepe/home-assistant/zigbee2mqtt/repeater.nix (100%) rename {configs => nixos/configs}/pepe/home-assistant/zigbee2mqtt/service.nix (100%) rename {configs => nixos/configs}/pepe/home-assistant/zigbee2mqtt/temperatur.nix (100%) rename {configs => nixos/configs}/pepe/kodi.nix (100%) rename {configs => nixos/configs}/pepe/lan.nix (100%) rename {configs => nixos/configs}/pepe/syncthing.nix (100%) rename {configs => nixos/configs}/pepe/tinc.nix (100%) rename {configs => nixos/configs}/pepe/wifi-access-point.nix (100%) rename {configs => nixos/configs}/porani/configuration.nix (100%) rename {configs => nixos/configs}/porani/hardware-configuration.nix (100%) rename {configs => nixos/configs}/porani/kodi.nix (100%) rename {configs => nixos/configs}/porani/mpd.nix (100%) rename {configs => nixos/configs}/porani/packages.nix (100%) rename {configs => nixos/configs}/porani/syncthing.nix (100%) rename {configs => nixos/configs}/porani/tinc.nix (100%) rename {configs => nixos/configs}/porani/wifi-access-point.nix (100%) rename {configs => nixos/configs}/porani/wifi-networking.nix (100%) rename {configs => nixos/configs}/sputnik/bitwarden.nix (100%) rename {configs => nixos/configs}/sputnik/codimd.nix (100%) rename {configs => nixos/configs}/sputnik/configuration.nix (100%) rename {configs => nixos/configs}/sputnik/hardware-configuration.nix (100%) rename {configs => nixos/configs}/sputnik/iodined.nix (100%) rename {configs => nixos/configs}/sputnik/nginx.nix (100%) rename {configs => nixos/configs}/sputnik/syncplay.nix (100%) rename {configs => nixos/configs}/sputnik/tinc.nix (100%) rename {configs => nixos/configs}/sternchen/configuration.nix (100%) rename {configs => nixos/configs}/sternchen/hardware-configuration.nix (100%) rename {configs => nixos/configs}/sternchen/packages.nix (100%) rename {configs => nixos/configs}/sternchen/syncthing.nix (100%) rename {configs => nixos/configs}/sternchen/tinc.nix (100%) rename {configs => nixos/configs}/sternchen/wifi-access-point.nix (100%) rename {configs => nixos/configs}/sternchen/wireshark.nix (100%) rename {configs => nixos/configs}/sterni/configuration.nix (97%) rename {configs => nixos/configs}/sterni/hardware-configuration.nix (100%) rename {configs => nixos/configs}/sterni/packages.nix (100%) rename {configs => nixos/configs}/sterni/syncthing.nix (100%) rename {configs => nixos/configs}/sterni/tinc.nix (100%) rename {configs => nixos/configs}/sterni/wifi-access-point.nix (100%) rename {configs => nixos/configs}/sterni/wireshark.nix (100%) rename {configs => nixos/configs}/workhorse/borg.nix (100%) rename {configs => nixos/configs}/workhorse/castget.nix (100%) rename {configs => nixos/configs}/workhorse/configuration.nix (100%) rename {configs => nixos/configs}/workhorse/finance.nix (100%) rename {configs => nixos/configs}/workhorse/gogs.nix (100%) rename {configs => nixos/configs}/workhorse/grafana.nix (100%) rename {configs => nixos/configs}/workhorse/graylog.nix (100%) rename {configs => nixos/configs}/workhorse/hardware-configuration.nix (100%) rename {configs => nixos/configs}/workhorse/jenkins.nix (100%) rename {configs => nixos/configs}/workhorse/jupyter.nix (100%) rename {configs => nixos/configs}/workhorse/kibana.nix (100%) rename {configs => nixos/configs}/workhorse/mail-fetcher.nix (100%) rename {configs => nixos/configs}/workhorse/metabase.nix (100%) rename {configs => nixos/configs}/workhorse/mining.nix (100%) rename {configs => nixos/configs}/workhorse/mysql.nix (100%) rename {configs => nixos/configs}/workhorse/nextcloud.nix (100%) rename {configs => nixos/configs}/workhorse/packages.nix (100%) rename {configs => nixos/configs}/workhorse/prometheus.nix (100%) rename {configs => nixos/configs}/workhorse/property.nix (100%) rename {configs => nixos/configs}/workhorse/syncthing.nix (100%) rename {configs => nixos/configs}/workhorse/taskserver.nix (100%) rename {configs => nixos/configs}/workhorse/tinc.nix (100%) rename {configs => nixos/configs}/workhorse/transmission.nix (100%) rename {configs => nixos/configs}/workhorse/weechat.nix (100%) rename {configs => nixos/configs}/workout/configuration.nix (100%) rename {configs => nixos/configs}/workout/hardware-configuration.nix (100%) rename {configs => nixos/configs}/workout/kibana.nix (100%) rename {configs => nixos/configs}/workout/lan.nix (100%) rename {configs => nixos/configs}/workout/packages.nix (100%) rename {configs => nixos/configs}/workout/slack.nix (100%) rename {configs => nixos/configs}/workout/syncthing.nix (100%) rename {configs => nixos/configs}/workout/tinc.nix (100%) create mode 100644 nixos/flake.lock create mode 100644 nixos/flake.nix create mode 100644 nixos/krops.nix rename {library => nixos/library}/default.nix (100%) rename {library => nixos/library}/jenkins.nix (100%) rename {modules => nixos/modules}/default.nix (100%) rename {modules => nixos/modules}/programs/browser.nix (100%) rename {modules => nixos/modules}/programs/citate.nix (100%) rename {modules => nixos/modules}/programs/curl-scripts.nix (100%) rename {modules => nixos/modules}/programs/easytag.nix (100%) rename {modules => nixos/modules}/programs/elm.nix (100%) rename {modules => nixos/modules}/programs/espeak.nix (100%) rename {modules => nixos/modules}/programs/ffmpeg.nix (100%) rename {modules => nixos/modules}/programs/git.nix (100%) rename {modules => nixos/modules}/programs/shell-bash.nix (100%) rename {modules => nixos/modules}/programs/shell-tools.nix (100%) rename {modules => nixos/modules}/programs/shell-zsh.nix (100%) rename {modules => nixos/modules}/programs/slack.nix (100%) rename {modules => nixos/modules}/programs/steam.nix (100%) rename {modules => nixos/modules}/programs/taskwarrior.nix (100%) rename {modules => nixos/modules}/programs/urxvt.nix (100%) rename {modules => nixos/modules}/programs/video.nix (100%) rename {modules => nixos/modules}/programs/vim.nix (100%) rename {modules => nixos/modules}/programs/xterm.nix (100%) rename {modules => nixos/modules}/services/castget.nix (100%) rename {modules => nixos/modules}/services/home-assistant.nix (100%) rename {modules => nixos/modules}/services/lektor.nix (100%) rename {modules => nixos/modules}/services/light-control.nix (100%) rename {modules => nixos/modules}/services/samba-share.nix (100%) rename {modules => nixos/modules}/services/sshd.nix (100%) rename {modules => nixos/modules}/services/videoencoder.nix (100%) rename {modules => nixos/modules}/system/audio.nix (100%) rename {modules => nixos/modules}/system/bluetooth.nix (100%) rename {modules => nixos/modules}/system/font.nix (100%) rename {modules => nixos/modules}/system/mainUser.nix (100%) rename {modules => nixos/modules}/system/on-failure.nix (100%) rename {modules => nixos/modules}/system/permown.nix (100%) rename {modules => nixos/modules}/system/wifi.nix (100%) rename {modules => nixos/modules}/system/x11.nix (100%) rename {pkgs => nixos/pkgs}/bitwig-studio/bitwig-studio-environment.nix (100%) rename {pkgs => nixos/pkgs}/bitwig-studio/bitwig-studio1.nix (100%) rename {pkgs => nixos/pkgs}/bitwig-studio/bitwig-studio2.nix (100%) rename {pkgs => nixos/pkgs}/bitwig-studio/bitwig-studio3.nix (100%) rename {pkgs => nixos/pkgs}/default.nix (100%) rename {pkgs => nixos/pkgs}/emoji/default.nix (100%) rename {pkgs => nixos/pkgs}/gitlog2json/default.nix (100%) rename {pkgs => nixos/pkgs}/gitlog2json/gitlog2json.py (100%) rename {pkgs => nixos/pkgs}/gitlog2json/log.py (100%) rename {pkgs => nixos/pkgs}/gitlog2json/shell.nix (100%) rename {pkgs => nixos/pkgs}/landingpage/default.nix (100%) rename {pkgs => nixos/pkgs}/light-control/default.nix (100%) rename {pkgs => nixos/pkgs}/otpmenu/default.nix (100%) rename {pkgs => nixos/pkgs}/pixelnuke/default.nix (100%) rename {pkgs => nixos/pkgs}/polygon-art/default.nix (100%) rename {pkgs => nixos/pkgs}/q/README.md (100%) rename {pkgs => nixos/pkgs}/q/default.nix (100%) rename {pkgs => nixos/pkgs}/sononym-crawler/default.nix (100%) rename {pkgs => nixos/pkgs}/sononym/default.nix (100%) rename {pkgs => nixos/pkgs}/taskwarrior-hooks/default.nix (100%) rename {pkgs => nixos/pkgs}/terminal-tools/default.nix (100%) rename {system => nixos/system}/all/borg-jobs.nix (100%) rename {system => nixos/system}/all/borg-scripts.nix (100%) rename {system => nixos/system}/all/default.nix (96%) rename {system => nixos/system}/all/grub.nix (100%) rename {system => nixos/system}/all/hosts.nix (100%) rename {system => nixos/system}/all/networking-qos.nix (100%) rename {system => nixos/system}/all/nginx-landingpage.nix (100%) rename {system => nixos/system}/all/nginx.nix (100%) rename {system => nixos/system}/all/on-failure.nix (100%) rename {system => nixos/system}/all/packages.nix (100%) rename {system => nixos/system}/all/packages/llvm-config-dummy.nix (100%) rename {system => nixos/system}/all/shell.nix (100%) rename {system => nixos/system}/all/sshd-known-hosts-bootup.nix (100%) rename {system => nixos/system}/all/sshd-known-hosts-private.nix (100%) rename {system => nixos/system}/all/sshd-known-hosts-public.nix (100%) rename {system => nixos/system}/all/sshd.nix (100%) rename {system => nixos/system}/all/syncthing.nix (100%) rename {system => nixos/system}/all/tinc.nix (100%) rename {system => nixos/system}/desktop/audio.nix (100%) rename {system => nixos/system}/desktop/browser.nix (100%) rename {system => nixos/system}/desktop/cachix.nix (100%) rename {system => nixos/system}/desktop/cachix/all-hies.nix (100%) rename {system => nixos/system}/desktop/default.nix (100%) rename {system => nixos/system}/desktop/direnv.nix (100%) rename {system => nixos/system}/desktop/dnsmasq.nix (100%) rename {system => nixos/system}/desktop/home-manager.nix (100%) rename {system => nixos/system}/desktop/home-manager/doom-emacs.nix (100%) rename {system => nixos/system}/desktop/home-manager/doom.d/config.el (100%) rename {system => nixos/system}/desktop/home-manager/doom.d/init.el (100%) rename {system => nixos/system}/desktop/home-manager/doom.d/packages.el (100%) rename {system => nixos/system}/desktop/home-manager/dunst.nix (100%) rename {system => nixos/system}/desktop/home-manager/spacemacs.nix (100%) rename {system => nixos/system}/desktop/home-manager/spacevim.nix (100%) rename {system => nixos/system}/desktop/home-manager/ssh.nix (100%) rename {system => nixos/system}/desktop/home-manager/xmonad.nix (100%) rename {system => nixos/system}/desktop/home-manager/xmonad/.envrc (100%) rename {system => nixos/system}/desktop/home-manager/xmonad/.gitignore (100%) rename {system => nixos/system}/desktop/home-manager/xmonad/BoringWindows.hs (100%) rename {system => nixos/system}/desktop/home-manager/xmonad/FloatKeys.hs (100%) rename {system => nixos/system}/desktop/home-manager/xmonad/LICENSE (100%) rename {system => nixos/system}/desktop/home-manager/xmonad/Main.hs (100%) rename {system => nixos/system}/desktop/home-manager/xmonad/Memo.hs (100%) rename {system => nixos/system}/desktop/home-manager/xmonad/NixCommands.hs (100%) rename {system => nixos/system}/desktop/home-manager/xmonad/Setup.hs (100%) rename {system => nixos/system}/desktop/home-manager/xmonad/SolarizedDark.hs (100%) rename {system => nixos/system}/desktop/home-manager/xmonad/SolarizedLight.hs (100%) rename {system => nixos/system}/desktop/home-manager/xmonad/SubLayouts.hs (100%) rename {system => nixos/system}/desktop/home-manager/xmonad/TabbedFix.hs (100%) rename {system => nixos/system}/desktop/home-manager/xmonad/current-project.nix (100%) rename {system => nixos/system}/desktop/home-manager/xmonad/env.nix (100%) rename {system => nixos/system}/desktop/home-manager/xmonad/lsp.nix (100%) rename {system => nixos/system}/desktop/home-manager/xmonad/palos-xmonad.cabal (100%) rename {system => nixos/system}/desktop/home-manager/xmonad/shell.nix (100%) rename {system => nixos/system}/desktop/icecast.nix (100%) rename {system => nixos/system}/desktop/mail-stuff.nix (100%) rename {system => nixos/system}/desktop/mc.nix (100%) rename {system => nixos/system}/desktop/network.nix (100%) rename {system => nixos/system}/desktop/packages.nix (100%) rename {system => nixos/system}/desktop/pass.nix (100%) rename {system => nixos/system}/desktop/remote-install.nix (100%) rename {system => nixos/system}/desktop/size.nix (100%) rename {system => nixos/system}/desktop/sshd.nix (100%) rename {system => nixos/system}/desktop/suspend.nix (100%) rename {system => nixos/system}/desktop/user.nix (100%) rename {system => nixos/system}/desktop/wtf.nix (100%) rename {system => nixos/system}/desktop/x11.nix (100%) rename {system => nixos/system}/desktop/xlock.nix (100%) rename {system => nixos/system}/desktop/yubikey.nix (100%) rename {system => nixos/system}/proxy/default.nix (100%) rename {system => nixos/system}/server/default.nix (100%) rename {system => nixos/system}/server/graylog-exporter.nix (100%) rename {system => nixos/system}/server/initssh.nix (100%) rename {system => nixos/system}/server/netdata.nix (100%) rename {system => nixos/system}/server/packages.nix (100%) rename {system => nixos/system}/server/prometheus-exporters.nix (100%) diff --git a/.channelStable.json b/.channelStable.json deleted file mode 100644 index fe8f27e..0000000 --- a/.channelStable.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "url": "https://github.com/NixOS/nixpkgs.git", - "rev": "6bfe71f2a4e2e425dee26b25d2309f341ff1600d", - "date": "2021-09-02T17:55:10+02:00", - "path": "/nix/store/wmg7a97b7ql8kj413wkvh2pmvl5m4nkd-nixpkgs", - "sha256": "1mpf700fqlzyj6vsy2c329zlgbk9g6giwiyb2g0yhc0a78h72g8l", - "fetchSubmodules": false, - "deepClone": false, - "leaveDotGit": false -} diff --git a/.channelUnstable.json b/.channelUnstable.json deleted file mode 100644 index 429e3d3..0000000 --- a/.channelUnstable.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "url": "https://github.com/NixOS/nixpkgs.git", - "rev": "a51aa6523bd8ee985bc70987909eff235900197a", - "date": "2021-09-04T10:19:48-03:00", - "path": "/nix/store/qylkdn96ah6r3mhh5m0p3yv236nxdbsa-nixpkgs", - "sha256": "1rpikl60v179gsshqfrr4xwz42db5g87scm2v2hk3v3jys9dqrgc", - "fetchSubmodules": false, - "deepClone": false, - "leaveDotGit": false -} diff --git a/.krops.json b/.krops.json deleted file mode 100644 index 03b044a..0000000 --- a/.krops.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "url": "https://git.ingolf-wagner.de/krebs/krops.git", - "rev": "2e93a93ac264a480b427acc2684993476732539d", - "date": "2018-09-19T19:57:26+02:00", - "sha256": "1s6b2cs60xa270ynhr32qj1rcy3prvf9pidap0qbbvgg008iafxk", - "fetchSubmodules": false -} diff --git a/.nix-writers.json b/.nix-writers.json deleted file mode 100644 index 5943e89..0000000 --- a/.nix-writers.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "url": "https://cgit.krebsco.de/nix-writers/", - "rev": "fc8a3802a0777a5f43a9a2fe0f5848ecaeb555a1", - "date": "2018-10-27T14:45:48+02:00", - "path": "/nix/store/81f2li00frwb29kzk7wjw7b87l65s8bg-nix-writers", - "sha256": "1iy207rcbz9nv9bf64025ypy38x8mwzl6snbmbrq347h6vvs0ksc", - "fetchSubmodules": false, - "deepClone": false, - "leaveDotGit": false -} diff --git a/.nixos-generators.json b/.nixos-generators.json deleted file mode 100644 index 904eef2..0000000 --- a/.nixos-generators.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "url": "https://github.com/nix-community/nixos-generators.git", - "rev": "ef1e4480cf8af45cfdeac597b2f1b1af33923e93", - "date": "2019-01-18T10:41:01+01:00", - "path": "/nix/store/61wmz4fvlyxnxhw9smkl897rhavj06ry-nixos-generators-ef1e448", - "sha256": "0ymzp4pmpkjjjg5h8d45gv8avy4wh1dj0v238i2cz3jp3j489ik9", - "fetchSubmodules": false, - "deepClone": false, - "leaveDotGit": false -} diff --git a/configs/workhorse/mattermost.nix b/configs/workhorse/mattermost.nix deleted file mode 100644 index 1b05e28..0000000 --- a/configs/workhorse/mattermost.nix +++ /dev/null @@ -1,135 +0,0 @@ -{ pkgs, lib, ... }: -let - - hostAddress = "192.168.100.20"; - containerAddress = "192.168.100.21"; - -in { - - # backup mattermost - backup.dirs = [ "/home/mattermost" ]; - - containers.mattermost = { - - # mount host folders - bindMounts = { - home = { - # make sure this folder exist on the host - hostPath = toString "/home/mattermost/home"; - mountPoint = "/var/lib/mattermost"; - isReadOnly = false; - }; - db = { - # make sure this folder exist on the host - hostPath = toString "/home/mattermost/db"; - mountPoint = "/var/lib/postgresql"; - isReadOnly = false; - }; - }; - - # container network setup - # see also nating on host system. - privateNetwork = true; - hostAddress = hostAddress; - localAddress = containerAddress; - - autoStart = true; - - config = { config, pkgs, lib, ... }: { - - imports = [ ]; - - services.nginx = { - - # Use recommended settings - recommendedGzipSettings = lib.mkDefault true; - recommendedOptimisation = lib.mkDefault true; - recommendedProxySettings = lib.mkDefault true; - recommendedTlsSettings = lib.mkDefault true; - - # for graylog logging - commonHttpConfig = let - access_log_sink = "${hostAddress}:12304"; - error_log_sink = "${hostAddress}:12305"; - in '' - log_format graylog2_json escape=json '{ "timestamp": "$time_iso8601", ' - '"facility": "nginx", ' - '"src_addr": "$remote_addr", ' - '"body_bytes_sent": $body_bytes_sent, ' - '"request_time": $request_time, ' - '"response_status": $status, ' - '"request": "$request", ' - '"request_method": "$request_method", ' - '"host": "$host",' - '"upstream_cache_status": "$upstream_cache_status",' - '"upstream_addr": "$upstream_addr",' - '"http_x_forwarded_for": "$http_x_forwarded_for",' - '"http_referrer": "$http_referer", ' - '"http_user_agent": "$http_user_agent" }'; - - access_log syslog:server=${access_log_sink} graylog2_json; - error_log syslog:server=${error_log_sink}; - ''; - }; - - networking.firewall.allowedTCPPorts = [ 8065 6667 ]; - networking.firewall.allowedUDPPorts = [ 8065 ]; - - # setup matter most - services.mattermost = { - enable = true; - siteUrl = "https://chat.ingolf-wagner.de"; - localDatabaseName = "chat"; - localDatabaseUser = "chatty"; - listenAddress = ":8065"; - - matterircd = { - enable = true; - parameters = [ - "-mmserver chat.ingolf-wagner.de" - "-restrict chat.ingolf-wagner.de" - "-bind [::]:6667" - ]; - }; - }; - - # send log to host systems graylog (use tinc or wireguard if host is not graylog) - services.SystemdJournal2Gelf.enable = true; - services.SystemdJournal2Gelf.graylogServer = "${hostAddress}:11201"; - - services.journald.extraConfig = "SystemMaxUse=1G"; - - }; - }; - - # give containers internet access - networking.nat.enable = true; - networking.nat.internalInterfaces = [ "ve-mattermost" ]; - networking.nat.externalInterface = "enp2s0f1"; - - # don't let networkmanager manger container network - networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; - - # open ports for logging - networking.firewall.interfaces."ve-mattermost".allowedTCPPorts = - [ 11201 12304 12305 ]; - networking.firewall.interfaces."ve-mattermost".allowedUDPPorts = - [ 11201 12304 12305 ]; - - # host nginx setup - services.nginx = { - enable = true; - recommendedProxySettings = true; - virtualHosts = { - "chat.workhorse.private" = { - serverAliases = [ "chat.ingolf-wagner.de" ]; - locations."/" = { - proxyWebsockets = true; - proxyPass = "http://${containerAddress}:8065"; - }; - }; - }; - }; - -} - diff --git a/configurations.nix b/configurations.nix deleted file mode 100644 index 65dcbb8..0000000 --- a/configurations.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ nixpkgs, home-manager, nixpkgs-unstable, sops-nix, doom-emacs-nix }: -let nixosSystem = nixpkgs.lib.nixosSystem; -in { - - sterni = nixosSystem { - system = "x86_64-linux"; - modules = [ - ./configs/sterni/configuration.nix - home-manager.nixosModules.home-manager - { - home-manager.users.mainUser = { - imports = [ doom-emacs-nix.hmModule ]; - }; - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - } - sops-nix.nixosModules.sops - { sops.defaultSopsFile = ./secrets/sterni.yaml; } - ({ pkgs, ... }: { - # defined overlays injected by the nixflake - nixpkgs.overlays = [ - (_self: _super: { - # we assign the overlay created before to the overlays of nixpkgs. - unstable = nixpkgs-unstable.legacyPackages.${pkgs.system}; - }) - ]; - - # overlay included (todo?) - # nixpkgs.overlays = [ (import ) ]; - - # imports of modules - # imports = [ ]; - }) - ]; - }; -} diff --git a/flake.lock b/flake.lock index 7d22ffe..59c1706 100644 --- a/flake.lock +++ b/flake.lock @@ -1,179 +1,12 @@ { "nodes": { - "doom-emacs": { - "flake": false, - "locked": { - "lastModified": 1626604817, - "narHash": "sha256-z+dvjB02cHU+VQ5EMkzqSdX817PZar9AkmmfK27q0vo=", - "owner": "hlissner", - "repo": "doom-emacs", - "rev": "46732c0adaef147144418f9f284ca6b1183ab96f", - "type": "github" - }, - "original": { - "owner": "hlissner", - "ref": "develop", - "repo": "doom-emacs", - "type": "github" - } - }, - "doom-emacs-nix": { - "inputs": { - "doom-emacs": "doom-emacs", - "doom-snippets": "doom-snippets", - "emacs-overlay": "emacs-overlay", - "emacs-so-long": "emacs-so-long", - "evil-markdown": "evil-markdown", - "evil-org-mode": "evil-org-mode", - "evil-quick-diff": "evil-quick-diff", - "explain-pause-mode": "explain-pause-mode", - "flake-utils": "flake-utils", - "nix-straight": "nix-straight", - "nixpkgs": [ - "nixpkgs" - ], - "nose": "nose", - "ob-racket": "ob-racket", - "org": "org", - "org-contrib": "org-contrib", - "org-yt": "org-yt", - "php-extras": "php-extras", - "revealjs": "revealjs", - "rotate-text": "rotate-text" - }, - "locked": { - "lastModified": 1627398156, - "narHash": "sha256-Ru1aV3NuIFXAsvUE3de8KR7xDZOo1GCBJdsWKJn+Ebw=", - "owner": "vlaci", - "repo": "nix-doom-emacs", - "rev": "fee14d217b7a911aad507679dafbeaa8c1ebf5ff", - "type": "github" - }, - "original": { - "owner": "vlaci", - "repo": "nix-doom-emacs", - "type": "github" - } - }, - "doom-snippets": { - "flake": false, - "locked": { - "lastModified": 1625547004, - "narHash": "sha256-V+ytAjB4ZZ+5dJJAu1OY7SbnqrokX5PVBWs0AsgQ8Vs=", - "owner": "hlissner", - "repo": "doom-snippets", - "rev": "5c0eb5bd70f035cefb981c2ce64f4367498bdda6", - "type": "github" - }, - "original": { - "owner": "hlissner", - "repo": "doom-snippets", - "type": "github" - } - }, - "emacs-overlay": { - "flake": false, - "locked": { - "lastModified": 1626972035, - "narHash": "sha256-YhBtnKmLDYiEzP5ZEMEQMg6oMP5EV+ToCkku7ZYfL+A=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "be04b45efb35db58e6ac6aa86b84f850c85b5dfe", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "type": "github" - } - }, - "emacs-so-long": { - "flake": false, - "locked": { - "lastModified": 1575031854, - "narHash": "sha256-xIa5zO0ZaToDrec1OFjBK6l39AbA4l/CE4LInVu2hi0=", - "owner": "hlissner", - "repo": "emacs-so-long", - "rev": "ed666b0716f60e8988c455804de24b55919e71ca", - "type": "github" - }, - "original": { - "owner": "hlissner", - "repo": "emacs-so-long", - "type": "github" - } - }, - "evil-markdown": { - "flake": false, - "locked": { - "lastModified": 1626852210, - "narHash": "sha256-HBBuZ1VWIn6kwK5CtGIvHM1+9eiNiKPH0GUsyvpUVN8=", - "owner": "Somelauw", - "repo": "evil-markdown", - "rev": "8e6cc68af83914b2fa9fd3a3b8472573dbcef477", - "type": "github" - }, - "original": { - "owner": "Somelauw", - "repo": "evil-markdown", - "type": "github" - } - }, - "evil-org-mode": { - "flake": false, - "locked": { - "lastModified": 1607203864, - "narHash": "sha256-JxwqVYDN6OIJEH15MVI6XOZAPtUWUhJQWHyzcrUvrFg=", - "owner": "hlissner", - "repo": "evil-org-mode", - "rev": "a9706da260c45b98601bcd72b1d2c0a24a017700", - "type": "github" - }, - "original": { - "owner": "hlissner", - "repo": "evil-org-mode", - "type": "github" - } - }, - "evil-quick-diff": { - "flake": false, - "locked": { - "lastModified": 1575189609, - "narHash": "sha256-oGzl1ayW9rIuq0haoiFS7RZsS8NFMdEA7K1BSozgnJU=", - "owner": "rgrinberg", - "repo": "evil-quick-diff", - "rev": "69c883720b30a892c63bc89f49d4f0e8b8028908", - "type": "github" - }, - "original": { - "owner": "rgrinberg", - "repo": "evil-quick-diff", - "type": "github" - } - }, - "explain-pause-mode": { - "flake": false, - "locked": { - "lastModified": 1595842060, - "narHash": "sha256-++znrjiDSx+cy4okFBBXUBkRFdtnE2x+trkmqjB3Njs=", - "owner": "lastquestion", - "repo": "explain-pause-mode", - "rev": "2356c8c3639cbeeb9751744dbe737267849b4b51", - "type": "github" - }, - "original": { - "owner": "lastquestion", - "repo": "explain-pause-mode", - "type": "github" - } - }, "flake-utils": { "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", + "lastModified": 1597053966, + "narHash": "sha256-f9lbPS/GJ1His8fsDqM6gfa8kSqREU4eKiMCS5hrKg4=", "owner": "numtide", "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "rev": "ec20f52e2ff61e9c36c2b894b62fc1b4bd04c71b", "type": "github" }, "original": { @@ -182,47 +15,9 @@ "type": "github" } }, - "flake-utils_2": { - "locked": { - "lastModified": 1631561581, - "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1631573611, - "narHash": "sha256-u2E/wstadWNcn6vOIoK1xY86QPOzzBZQfT1FbePfdaI=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "7d9ba15214004c979d2c8733f8be12ce6502cf8a", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-21.05", - "repo": "home-manager", - "type": "github" - } - }, "krops": { "inputs": { - "flake-utils": [ - "flake-utils" - ], + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] @@ -241,23 +36,6 @@ "type": "github" } }, - "nix-straight": { - "flake": false, - "locked": { - "lastModified": 1621543597, - "narHash": "sha256-E/m2Hrw2og//CfOCOWe2yapYC01Tqhozn4YMPYJsC3o=", - "owner": "vlaci", - "repo": "nix-straight.el", - "rev": "8e84d04f10b2298de856b2b8b9a0d13abc91b5ca", - "type": "github" - }, - "original": { - "owner": "vlaci", - "ref": "v2.2.0", - "repo": "nix-straight.el", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1632418649, @@ -274,176 +52,11 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1632411313, - "narHash": "sha256-lekODc44lVo9/0EwGiX6LoEt2KhiPdcfNopealMJ7n4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "51bcdc4cdaac48535dabf0ad4642a66774c609ed", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1625223284, - "narHash": "sha256-jjLcDSU1rRiJb+n3uez23XAa7kbnPcGZTa6jIKh1GMQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "357d2c8f6087685fe35cb1889a005a4dd4cce7b8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nose": { - "flake": false, - "locked": { - "lastModified": 1400604510, - "narHash": "sha256-daEi8Kta1oGaDEmUUDDQMahTTPOpvNpDKk22rlr7cB0=", - "owner": "emacsattic", - "repo": "nose", - "rev": "f8528297519eba911696c4e68fa88892de9a7b72", - "type": "github" - }, - "original": { - "owner": "emacsattic", - "repo": "nose", - "type": "github" - } - }, - "ob-racket": { - "flake": false, - "locked": { - "lastModified": 1584656173, - "narHash": "sha256-rBUYDDCXb+3D4xTPQo9UocbTPZ32kWV1Uya/1DmZknU=", - "owner": "xchrishawk", - "repo": "ob-racket", - "rev": "83457ec9e1e96a29fd2086ed19432b9d75787673", - "type": "github" - }, - "original": { - "owner": "xchrishawk", - "repo": "ob-racket", - "type": "github" - } - }, - "org": { - "flake": false, - "locked": { - "lastModified": 1627155762, - "narHash": "sha256-XS1eA6P0ePabdrnUNe5lN19EA9dfK615gMGObr9wfBQ=", - "owner": "emacs-straight", - "repo": "org-mode", - "rev": "c9dfed48a607c7f6524f1c6480f09cf61a5d6237", - "type": "github" - }, - "original": { - "owner": "emacs-straight", - "repo": "org-mode", - "type": "github" - } - }, - "org-contrib": { - "flake": false, - "locked": { - "lastModified": 1623339452, - "narHash": "sha256-E3pioqkmAKQm5N7YsgJZil0/ozkdRE7//tE9FGbrluM=", - "ref": "master", - "rev": "fc81309cf6756607a836f93049a9393c2967c4e0", - "revCount": 2599, - "type": "git", - "url": "https://git.sr.ht/~bzg/org-contrib" - }, - "original": { - "type": "git", - "url": "https://git.sr.ht/~bzg/org-contrib" - } - }, - "org-yt": { - "flake": false, - "locked": { - "lastModified": 1527381913, - "narHash": "sha256-dzQ6B7ryzatHCTLyEnRSbWO0VUiX/FHYnpHTs74aVUs=", - "owner": "TobiasZawada", - "repo": "org-yt", - "rev": "40cc1ac76d741055cbefa13860d9f070a7ade001", - "type": "github" - }, - "original": { - "owner": "TobiasZawada", - "repo": "org-yt", - "type": "github" - } - }, - "php-extras": { - "flake": false, - "locked": { - "lastModified": 1573312690, - "narHash": "sha256-r4WyVbzvT0ra4Z6JywNBOw5RxOEYd6Qe2IpebHXkj1U=", - "owner": "arnested", - "repo": "php-extras", - "rev": "d410c5af663c30c01d461ac476d1cbfbacb49367", - "type": "github" - }, - "original": { - "owner": "arnested", - "repo": "php-extras", - "type": "github" - } - }, - "revealjs": { - "flake": false, - "locked": { - "lastModified": 1625811744, - "narHash": "sha256-Y67nVqcovn2PbHXmWOFWMq10Qz2ZIRyyWEO6qsZLbIM=", - "owner": "hakimel", - "repo": "reveal.js", - "rev": "b18f12d964ef80bd9ffb061aae48ff4c15fb43ad", - "type": "github" - }, - "original": { - "owner": "hakimel", - "repo": "reveal.js", - "type": "github" - } - }, "root": { "inputs": { - "doom-emacs-nix": "doom-emacs-nix", - "flake-utils": "flake-utils_2", - "home-manager": "home-manager", "krops": "krops", "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable", - "secrets": "secrets", - "sops-nix": "sops-nix" - } - }, - "rotate-text": { - "flake": false, - "locked": { - "lastModified": 1322962747, - "narHash": "sha256-SOeOgSlcEIsKhUiYDJv0p+mLUb420s9E2BmvZQvZ0wk=", - "owner": "debug-ito", - "repo": "rotate-text.el", - "rev": "48f193697db996855aee1ad2bc99b38c6646fe76", - "type": "github" - }, - "original": { - "owner": "debug-ito", - "repo": "rotate-text.el", - "type": "github" + "secrets": "secrets" } }, "secrets": { @@ -457,24 +70,6 @@ "path": "/home/palo/dev/secrets", "type": "path" } - }, - "sops-nix": { - "inputs": { - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1632485730, - "narHash": "sha256-+anQTUUHxdpjLnTWqk9TJhWRYMI+1F2iVZKCq8SH4hg=", - "owner": "Mic92", - "repo": "sops-nix", - "rev": "64235a958b9ceedf98a3212c13b0dea3a504598f", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "sops-nix", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 1dcceac..fd12a15 100644 --- a/flake.nix +++ b/flake.nix @@ -7,47 +7,24 @@ url = "path:/home/palo/dev/secrets"; flake = false; }; - sops-nix.url = "github:Mic92/sops-nix"; - flake-utils.url = "github:numtide/flake-utils"; nixpkgs.url = "github:nixos/nixpkgs/nixos-21.05"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - doom-emacs-nix = { - url = "github:vlaci/nix-doom-emacs"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - home-manager = { - url = "github:nix-community/home-manager/release-21.05"; - inputs.nixpkgs.follows = "nixpkgs"; - }; krops = { url = "github:Mic92/krops"; - inputs.flake-utils.follows = "flake-utils"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { self, sops-nix, nixpkgs, home-manager, krops, flake-utils - , doom-emacs-nix, nixpkgs-unstable, secrets, ... }: - (flake-utils.lib.eachSystem [ "x86_64-linux" ] (system: - let - - pkgs = nixpkgs.legacyPackages.${system}; - writeCommand = krops.packages.${system}.writeCommand; - - in { - - # deploy like this: - # nix run ".#deploy.sterni" - apps.deploy = pkgs.callPackage ./krops.nix { - inherit writeCommand secrets; - lib = krops.lib; - }; - - })) // { - nixosConfigurations = import ./configurations.nix { - inherit nixpkgs home-manager nixpkgs-unstable sops-nix doom-emacs-nix; - }; - + outputs = { self, nixpkgs, krops, secrets, ... }: + let + system = "x86_64-linux"; + pkgs = nixpkgs.legacyPackages.${system}; + writeCommand = krops.packages.${system}.writeCommand; + in { + # deploy like this: + # nix run ".#deploy.sterni" + apps.${system}.deploy = pkgs.callPackage ./nixos/krops.nix { + inherit writeCommand secrets; + lib = krops.lib; }; - + }; } diff --git a/krops.nix b/krops.nix deleted file mode 100644 index 11c688f..0000000 --- a/krops.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ pkgs, writeCommand, lib, secrets }: -let - - # command that ensures we use flake.nix during switch - command = targetPath: - let - commandLine = - "TMPDIR=/tmp nixos-rebuild switch --flake ${targetPath} -L --keep-going"; - in '' - echo '${commandLine}' - nix-shell \ - -E "with import {}; mkShell { buildInputs = [ git (nixos { nix.package = nixFlakes; }).nixos-rebuild ]; }" \ - --run '${commandLine}' - ''; - - #secrets = name: { - # secrets.pass = { - # dir = toString ~/.password-store; - # name = "krops/${name}/secrets"; - # }; - # common_secrets.pass = { - # dir = toString ~/.password-store; - # name = "krops/common_secrets"; - # }; - #}; - - #desktopSecrets = { - # desktop_secrets.pass = { - # dir = toString ~/.password-store; - # name = "krops/desktop_secrets"; - # }; - #}; - - source = { - secrets.file = "${secrets}/secrets"; - assets.file = toString ./assets; - private_assets.pass = { - dir = toString ~/.password-store; - name = "krops/private_assets"; - }; - configs.file = toString ./configs; - library.file = toString ./library; - modules.file = toString ./modules; - pkgs.file = toString ./pkgs; - system.file = toString ./system; - "flake.nix".file = toString ./flake.nix; - "flake.lock".file = toString ./flake.lock; - "configurations.nix".file = toString ./configurations.nix; - #mqtt.file = toString ./mqtt; - - #backup-module.file = toString ~/dev/backup; - backup-module.git = { - url = "https://git.ingolf-wagner.de/nix-modules/backup.git"; - ref = "1.3.3"; - }; - - #kops-lib.file = toString ~/dev/krops-lib; - krops-lib.git = { - url = "https://git.ingolf-wagner.de/nix-modules/krops.git"; - ref = "1.0.3"; - }; - - #cluster-module.file = toString ~/dev/cluster-module; - cluster-module.git = { - url = "https://git.ingolf-wagner.de/nix-modules/cluster.git"; - ref = "1.2.0"; - }; - - }; - -in { - sterni = let - system = writeCommand "/bin/system" { - source = lib.evalSource [ source ]; - force = true; - target = lib.mkTarget "root@sterni.private/var/krops"; - inherit command; - }; - network = writeCommand "/bin/secrets" { - source = lib.evalSource [{ - system-connections.pass = { - dir = toString ~/.password-store; - name = "krops/desktop_secrets/network-manager/system-connections"; - }; - }]; - force = true; - target = lib.mkTarget "root@sterni.private/etc/NetworkManager"; - }; - in pkgs.writers.writeBash "/bin/sterni" '' - #echo "deploy network secerts" - #${network}/bin/secrets - - echo "deploy system" - ${system}/bin/system - ''; -} diff --git a/assets/jack.sh b/nixos/assets/jack.sh similarity index 100% rename from assets/jack.sh rename to nixos/assets/jack.sh diff --git a/assets/music-making.sh b/nixos/assets/music-making.sh similarity index 100% rename from assets/music-making.sh rename to nixos/assets/music-making.sh diff --git a/assets/nginx-show-config.sh b/nixos/assets/nginx-show-config.sh similarity index 100% rename from assets/nginx-show-config.sh rename to nixos/assets/nginx-show-config.sh diff --git a/assets/shrink_exports b/nixos/assets/shrink_exports similarity index 100% rename from assets/shrink_exports rename to nixos/assets/shrink_exports diff --git a/assets/sprueche-axel b/nixos/assets/sprueche-axel similarity index 100% rename from assets/sprueche-axel rename to nixos/assets/sprueche-axel diff --git a/assets/sprueche-siw b/nixos/assets/sprueche-siw similarity index 100% rename from assets/sprueche-siw rename to nixos/assets/sprueche-siw diff --git a/assets/ssh/borg_access.pub b/nixos/assets/ssh/borg_access.pub similarity index 100% rename from assets/ssh/borg_access.pub rename to nixos/assets/ssh/borg_access.pub diff --git a/assets/ssh/card_rsa.pub b/nixos/assets/ssh/card_rsa.pub similarity index 100% rename from assets/ssh/card_rsa.pub rename to nixos/assets/ssh/card_rsa.pub diff --git a/assets/tinc/mobi_host_file b/nixos/assets/tinc/mobi_host_file similarity index 100% rename from assets/tinc/mobi_host_file rename to nixos/assets/tinc/mobi_host_file diff --git a/assets/tinc/pepe_host_file b/nixos/assets/tinc/pepe_host_file similarity index 100% rename from assets/tinc/pepe_host_file rename to nixos/assets/tinc/pepe_host_file diff --git a/assets/tinc/porani_host_file b/nixos/assets/tinc/porani_host_file similarity index 100% rename from assets/tinc/porani_host_file rename to nixos/assets/tinc/porani_host_file diff --git a/assets/tinc/retiolum/host_file b/nixos/assets/tinc/retiolum/host_file similarity index 100% rename from assets/tinc/retiolum/host_file rename to nixos/assets/tinc/retiolum/host_file diff --git a/assets/tinc/sputnik_host_file b/nixos/assets/tinc/sputnik_host_file similarity index 100% rename from assets/tinc/sputnik_host_file rename to nixos/assets/tinc/sputnik_host_file diff --git a/assets/tinc/sternchen_host_file b/nixos/assets/tinc/sternchen_host_file similarity index 100% rename from assets/tinc/sternchen_host_file rename to nixos/assets/tinc/sternchen_host_file diff --git a/assets/tinc/sterni_host_file b/nixos/assets/tinc/sterni_host_file similarity index 100% rename from assets/tinc/sterni_host_file rename to nixos/assets/tinc/sterni_host_file diff --git a/assets/tinc/workhorse_host_file b/nixos/assets/tinc/workhorse_host_file similarity index 100% rename from assets/tinc/workhorse_host_file rename to nixos/assets/tinc/workhorse_host_file diff --git a/assets/tinc/workout_host_file b/nixos/assets/tinc/workout_host_file similarity index 100% rename from assets/tinc/workout_host_file rename to nixos/assets/tinc/workout_host_file diff --git a/configs/dummy/configuration.nix b/nixos/configs/dummy/configuration.nix similarity index 100% rename from configs/dummy/configuration.nix rename to nixos/configs/dummy/configuration.nix diff --git a/configs/dummy/hardware-configuration.nix b/nixos/configs/dummy/hardware-configuration.nix similarity index 100% rename from configs/dummy/hardware-configuration.nix rename to nixos/configs/dummy/hardware-configuration.nix diff --git a/configs/mobi/configuration.nix b/nixos/configs/mobi/configuration.nix similarity index 100% rename from configs/mobi/configuration.nix rename to nixos/configs/mobi/configuration.nix diff --git a/configs/mobi/hardware-configuration.nix b/nixos/configs/mobi/hardware-configuration.nix similarity index 100% rename from configs/mobi/hardware-configuration.nix rename to nixos/configs/mobi/hardware-configuration.nix diff --git a/configs/mobi/tinc.nix b/nixos/configs/mobi/tinc.nix similarity index 100% rename from configs/mobi/tinc.nix rename to nixos/configs/mobi/tinc.nix diff --git a/configs/pepe/borg.nix b/nixos/configs/pepe/borg.nix similarity index 100% rename from configs/pepe/borg.nix rename to nixos/configs/pepe/borg.nix diff --git a/configs/pepe/configuration.nix b/nixos/configs/pepe/configuration.nix similarity index 100% rename from configs/pepe/configuration.nix rename to nixos/configs/pepe/configuration.nix diff --git a/configs/pepe/dms.nix b/nixos/configs/pepe/dms.nix similarity index 100% rename from configs/pepe/dms.nix rename to nixos/configs/pepe/dms.nix diff --git a/configs/pepe/hardware-configuration.nix b/nixos/configs/pepe/hardware-configuration.nix similarity index 100% rename from configs/pepe/hardware-configuration.nix rename to nixos/configs/pepe/hardware-configuration.nix diff --git a/configs/pepe/home-assistant.nix b/nixos/configs/pepe/home-assistant.nix similarity index 100% rename from configs/pepe/home-assistant.nix rename to nixos/configs/pepe/home-assistant.nix diff --git a/configs/pepe/home-assistant/chaospott.nix b/nixos/configs/pepe/home-assistant/chaospott.nix similarity index 100% rename from configs/pepe/home-assistant/chaospott.nix rename to nixos/configs/pepe/home-assistant/chaospott.nix diff --git a/configs/pepe/home-assistant/iot-control.nix b/nixos/configs/pepe/home-assistant/iot-control.nix similarity index 100% rename from configs/pepe/home-assistant/iot-control.nix rename to nixos/configs/pepe/home-assistant/iot-control.nix diff --git a/configs/pepe/home-assistant/kodi.nix b/nixos/configs/pepe/home-assistant/kodi.nix similarity index 100% rename from configs/pepe/home-assistant/kodi.nix rename to nixos/configs/pepe/home-assistant/kodi.nix diff --git a/configs/pepe/home-assistant/light-control.nix b/nixos/configs/pepe/home-assistant/light-control.nix similarity index 100% rename from configs/pepe/home-assistant/light-control.nix rename to nixos/configs/pepe/home-assistant/light-control.nix diff --git a/configs/pepe/home-assistant/mpd.nix b/nixos/configs/pepe/home-assistant/mpd.nix similarity index 100% rename from configs/pepe/home-assistant/mpd.nix rename to nixos/configs/pepe/home-assistant/mpd.nix diff --git a/configs/pepe/home-assistant/mqtt.nix b/nixos/configs/pepe/home-assistant/mqtt.nix similarity index 100% rename from configs/pepe/home-assistant/mqtt.nix rename to nixos/configs/pepe/home-assistant/mqtt.nix diff --git a/configs/pepe/home-assistant/sonoff.nix b/nixos/configs/pepe/home-assistant/sonoff.nix similarity index 100% rename from configs/pepe/home-assistant/sonoff.nix rename to nixos/configs/pepe/home-assistant/sonoff.nix diff --git a/configs/pepe/home-assistant/stocks.nix b/nixos/configs/pepe/home-assistant/stocks.nix similarity index 100% rename from configs/pepe/home-assistant/stocks.nix rename to nixos/configs/pepe/home-assistant/stocks.nix diff --git a/configs/pepe/home-assistant/timer.nix b/nixos/configs/pepe/home-assistant/timer.nix similarity index 100% rename from configs/pepe/home-assistant/timer.nix rename to nixos/configs/pepe/home-assistant/timer.nix diff --git a/configs/pepe/home-assistant/weather.nix b/nixos/configs/pepe/home-assistant/weather.nix similarity index 100% rename from configs/pepe/home-assistant/weather.nix rename to nixos/configs/pepe/home-assistant/weather.nix diff --git a/configs/pepe/home-assistant/workday.nix b/nixos/configs/pepe/home-assistant/workday.nix similarity index 100% rename from configs/pepe/home-assistant/workday.nix rename to nixos/configs/pepe/home-assistant/workday.nix diff --git a/configs/pepe/home-assistant/zigbee2mqtt.nix b/nixos/configs/pepe/home-assistant/zigbee2mqtt.nix similarity index 100% rename from configs/pepe/home-assistant/zigbee2mqtt.nix rename to nixos/configs/pepe/home-assistant/zigbee2mqtt.nix diff --git a/configs/pepe/home-assistant/zigbee2mqtt/buttons.nix b/nixos/configs/pepe/home-assistant/zigbee2mqtt/buttons.nix similarity index 100% rename from configs/pepe/home-assistant/zigbee2mqtt/buttons.nix rename to nixos/configs/pepe/home-assistant/zigbee2mqtt/buttons.nix diff --git a/configs/pepe/home-assistant/zigbee2mqtt/configurationHelper.nix b/nixos/configs/pepe/home-assistant/zigbee2mqtt/configurationHelper.nix similarity index 100% rename from configs/pepe/home-assistant/zigbee2mqtt/configurationHelper.nix rename to nixos/configs/pepe/home-assistant/zigbee2mqtt/configurationHelper.nix diff --git a/configs/pepe/home-assistant/zigbee2mqtt/doors.nix b/nixos/configs/pepe/home-assistant/zigbee2mqtt/doors.nix similarity index 100% rename from configs/pepe/home-assistant/zigbee2mqtt/doors.nix rename to nixos/configs/pepe/home-assistant/zigbee2mqtt/doors.nix diff --git a/configs/pepe/home-assistant/zigbee2mqtt/fyrtur.nix b/nixos/configs/pepe/home-assistant/zigbee2mqtt/fyrtur.nix similarity index 100% rename from configs/pepe/home-assistant/zigbee2mqtt/fyrtur.nix rename to nixos/configs/pepe/home-assistant/zigbee2mqtt/fyrtur.nix diff --git a/configs/pepe/home-assistant/zigbee2mqtt/heater.nix b/nixos/configs/pepe/home-assistant/zigbee2mqtt/heater.nix similarity index 100% rename from configs/pepe/home-assistant/zigbee2mqtt/heater.nix rename to nixos/configs/pepe/home-assistant/zigbee2mqtt/heater.nix diff --git a/configs/pepe/home-assistant/zigbee2mqtt/leds.nix b/nixos/configs/pepe/home-assistant/zigbee2mqtt/leds.nix similarity index 100% rename from configs/pepe/home-assistant/zigbee2mqtt/leds.nix rename to nixos/configs/pepe/home-assistant/zigbee2mqtt/leds.nix diff --git a/configs/pepe/home-assistant/zigbee2mqtt/lights.nix b/nixos/configs/pepe/home-assistant/zigbee2mqtt/lights.nix similarity index 100% rename from configs/pepe/home-assistant/zigbee2mqtt/lights.nix rename to nixos/configs/pepe/home-assistant/zigbee2mqtt/lights.nix diff --git a/configs/pepe/home-assistant/zigbee2mqtt/motion.nix b/nixos/configs/pepe/home-assistant/zigbee2mqtt/motion.nix similarity index 100% rename from configs/pepe/home-assistant/zigbee2mqtt/motion.nix rename to nixos/configs/pepe/home-assistant/zigbee2mqtt/motion.nix diff --git a/configs/pepe/home-assistant/zigbee2mqtt/repeater.nix b/nixos/configs/pepe/home-assistant/zigbee2mqtt/repeater.nix similarity index 100% rename from configs/pepe/home-assistant/zigbee2mqtt/repeater.nix rename to nixos/configs/pepe/home-assistant/zigbee2mqtt/repeater.nix diff --git a/configs/pepe/home-assistant/zigbee2mqtt/service.nix b/nixos/configs/pepe/home-assistant/zigbee2mqtt/service.nix similarity index 100% rename from configs/pepe/home-assistant/zigbee2mqtt/service.nix rename to nixos/configs/pepe/home-assistant/zigbee2mqtt/service.nix diff --git a/configs/pepe/home-assistant/zigbee2mqtt/temperatur.nix b/nixos/configs/pepe/home-assistant/zigbee2mqtt/temperatur.nix similarity index 100% rename from configs/pepe/home-assistant/zigbee2mqtt/temperatur.nix rename to nixos/configs/pepe/home-assistant/zigbee2mqtt/temperatur.nix diff --git a/configs/pepe/kodi.nix b/nixos/configs/pepe/kodi.nix similarity index 100% rename from configs/pepe/kodi.nix rename to nixos/configs/pepe/kodi.nix diff --git a/configs/pepe/lan.nix b/nixos/configs/pepe/lan.nix similarity index 100% rename from configs/pepe/lan.nix rename to nixos/configs/pepe/lan.nix diff --git a/configs/pepe/syncthing.nix b/nixos/configs/pepe/syncthing.nix similarity index 100% rename from configs/pepe/syncthing.nix rename to nixos/configs/pepe/syncthing.nix diff --git a/configs/pepe/tinc.nix b/nixos/configs/pepe/tinc.nix similarity index 100% rename from configs/pepe/tinc.nix rename to nixos/configs/pepe/tinc.nix diff --git a/configs/pepe/wifi-access-point.nix b/nixos/configs/pepe/wifi-access-point.nix similarity index 100% rename from configs/pepe/wifi-access-point.nix rename to nixos/configs/pepe/wifi-access-point.nix diff --git a/configs/porani/configuration.nix b/nixos/configs/porani/configuration.nix similarity index 100% rename from configs/porani/configuration.nix rename to nixos/configs/porani/configuration.nix diff --git a/configs/porani/hardware-configuration.nix b/nixos/configs/porani/hardware-configuration.nix similarity index 100% rename from configs/porani/hardware-configuration.nix rename to nixos/configs/porani/hardware-configuration.nix diff --git a/configs/porani/kodi.nix b/nixos/configs/porani/kodi.nix similarity index 100% rename from configs/porani/kodi.nix rename to nixos/configs/porani/kodi.nix diff --git a/configs/porani/mpd.nix b/nixos/configs/porani/mpd.nix similarity index 100% rename from configs/porani/mpd.nix rename to nixos/configs/porani/mpd.nix diff --git a/configs/porani/packages.nix b/nixos/configs/porani/packages.nix similarity index 100% rename from configs/porani/packages.nix rename to nixos/configs/porani/packages.nix diff --git a/configs/porani/syncthing.nix b/nixos/configs/porani/syncthing.nix similarity index 100% rename from configs/porani/syncthing.nix rename to nixos/configs/porani/syncthing.nix diff --git a/configs/porani/tinc.nix b/nixos/configs/porani/tinc.nix similarity index 100% rename from configs/porani/tinc.nix rename to nixos/configs/porani/tinc.nix diff --git a/configs/porani/wifi-access-point.nix b/nixos/configs/porani/wifi-access-point.nix similarity index 100% rename from configs/porani/wifi-access-point.nix rename to nixos/configs/porani/wifi-access-point.nix diff --git a/configs/porani/wifi-networking.nix b/nixos/configs/porani/wifi-networking.nix similarity index 100% rename from configs/porani/wifi-networking.nix rename to nixos/configs/porani/wifi-networking.nix diff --git a/configs/sputnik/bitwarden.nix b/nixos/configs/sputnik/bitwarden.nix similarity index 100% rename from configs/sputnik/bitwarden.nix rename to nixos/configs/sputnik/bitwarden.nix diff --git a/configs/sputnik/codimd.nix b/nixos/configs/sputnik/codimd.nix similarity index 100% rename from configs/sputnik/codimd.nix rename to nixos/configs/sputnik/codimd.nix diff --git a/configs/sputnik/configuration.nix b/nixos/configs/sputnik/configuration.nix similarity index 100% rename from configs/sputnik/configuration.nix rename to nixos/configs/sputnik/configuration.nix diff --git a/configs/sputnik/hardware-configuration.nix b/nixos/configs/sputnik/hardware-configuration.nix similarity index 100% rename from configs/sputnik/hardware-configuration.nix rename to nixos/configs/sputnik/hardware-configuration.nix diff --git a/configs/sputnik/iodined.nix b/nixos/configs/sputnik/iodined.nix similarity index 100% rename from configs/sputnik/iodined.nix rename to nixos/configs/sputnik/iodined.nix diff --git a/configs/sputnik/nginx.nix b/nixos/configs/sputnik/nginx.nix similarity index 100% rename from configs/sputnik/nginx.nix rename to nixos/configs/sputnik/nginx.nix diff --git a/configs/sputnik/syncplay.nix b/nixos/configs/sputnik/syncplay.nix similarity index 100% rename from configs/sputnik/syncplay.nix rename to nixos/configs/sputnik/syncplay.nix diff --git a/configs/sputnik/tinc.nix b/nixos/configs/sputnik/tinc.nix similarity index 100% rename from configs/sputnik/tinc.nix rename to nixos/configs/sputnik/tinc.nix diff --git a/configs/sternchen/configuration.nix b/nixos/configs/sternchen/configuration.nix similarity index 100% rename from configs/sternchen/configuration.nix rename to nixos/configs/sternchen/configuration.nix diff --git a/configs/sternchen/hardware-configuration.nix b/nixos/configs/sternchen/hardware-configuration.nix similarity index 100% rename from configs/sternchen/hardware-configuration.nix rename to nixos/configs/sternchen/hardware-configuration.nix diff --git a/configs/sternchen/packages.nix b/nixos/configs/sternchen/packages.nix similarity index 100% rename from configs/sternchen/packages.nix rename to nixos/configs/sternchen/packages.nix diff --git a/configs/sternchen/syncthing.nix b/nixos/configs/sternchen/syncthing.nix similarity index 100% rename from configs/sternchen/syncthing.nix rename to nixos/configs/sternchen/syncthing.nix diff --git a/configs/sternchen/tinc.nix b/nixos/configs/sternchen/tinc.nix similarity index 100% rename from configs/sternchen/tinc.nix rename to nixos/configs/sternchen/tinc.nix diff --git a/configs/sternchen/wifi-access-point.nix b/nixos/configs/sternchen/wifi-access-point.nix similarity index 100% rename from configs/sternchen/wifi-access-point.nix rename to nixos/configs/sternchen/wifi-access-point.nix diff --git a/configs/sternchen/wireshark.nix b/nixos/configs/sternchen/wireshark.nix similarity index 100% rename from configs/sternchen/wireshark.nix rename to nixos/configs/sternchen/wireshark.nix diff --git a/configs/sterni/configuration.nix b/nixos/configs/sterni/configuration.nix similarity index 97% rename from configs/sterni/configuration.nix rename to nixos/configs/sterni/configuration.nix index d987d27..8621bde 100644 --- a/configs/sterni/configuration.nix +++ b/nixos/configs/sterni/configuration.nix @@ -14,6 +14,7 @@ ]; + sops.defaultSopsFile = ../../secrets/sterni.yaml; networking.hostName = "sterni"; system.custom.wifi.interfaces = [ "wlp3s0" ]; diff --git a/configs/sterni/hardware-configuration.nix b/nixos/configs/sterni/hardware-configuration.nix similarity index 100% rename from configs/sterni/hardware-configuration.nix rename to nixos/configs/sterni/hardware-configuration.nix diff --git a/configs/sterni/packages.nix b/nixos/configs/sterni/packages.nix similarity index 100% rename from configs/sterni/packages.nix rename to nixos/configs/sterni/packages.nix diff --git a/configs/sterni/syncthing.nix b/nixos/configs/sterni/syncthing.nix similarity index 100% rename from configs/sterni/syncthing.nix rename to nixos/configs/sterni/syncthing.nix diff --git a/configs/sterni/tinc.nix b/nixos/configs/sterni/tinc.nix similarity index 100% rename from configs/sterni/tinc.nix rename to nixos/configs/sterni/tinc.nix diff --git a/configs/sterni/wifi-access-point.nix b/nixos/configs/sterni/wifi-access-point.nix similarity index 100% rename from configs/sterni/wifi-access-point.nix rename to nixos/configs/sterni/wifi-access-point.nix diff --git a/configs/sterni/wireshark.nix b/nixos/configs/sterni/wireshark.nix similarity index 100% rename from configs/sterni/wireshark.nix rename to nixos/configs/sterni/wireshark.nix diff --git a/configs/workhorse/borg.nix b/nixos/configs/workhorse/borg.nix similarity index 100% rename from configs/workhorse/borg.nix rename to nixos/configs/workhorse/borg.nix diff --git a/configs/workhorse/castget.nix b/nixos/configs/workhorse/castget.nix similarity index 100% rename from configs/workhorse/castget.nix rename to nixos/configs/workhorse/castget.nix diff --git a/configs/workhorse/configuration.nix b/nixos/configs/workhorse/configuration.nix similarity index 100% rename from configs/workhorse/configuration.nix rename to nixos/configs/workhorse/configuration.nix diff --git a/configs/workhorse/finance.nix b/nixos/configs/workhorse/finance.nix similarity index 100% rename from configs/workhorse/finance.nix rename to nixos/configs/workhorse/finance.nix diff --git a/configs/workhorse/gogs.nix b/nixos/configs/workhorse/gogs.nix similarity index 100% rename from configs/workhorse/gogs.nix rename to nixos/configs/workhorse/gogs.nix diff --git a/configs/workhorse/grafana.nix b/nixos/configs/workhorse/grafana.nix similarity index 100% rename from configs/workhorse/grafana.nix rename to nixos/configs/workhorse/grafana.nix diff --git a/configs/workhorse/graylog.nix b/nixos/configs/workhorse/graylog.nix similarity index 100% rename from configs/workhorse/graylog.nix rename to nixos/configs/workhorse/graylog.nix diff --git a/configs/workhorse/hardware-configuration.nix b/nixos/configs/workhorse/hardware-configuration.nix similarity index 100% rename from configs/workhorse/hardware-configuration.nix rename to nixos/configs/workhorse/hardware-configuration.nix diff --git a/configs/workhorse/jenkins.nix b/nixos/configs/workhorse/jenkins.nix similarity index 100% rename from configs/workhorse/jenkins.nix rename to nixos/configs/workhorse/jenkins.nix diff --git a/configs/workhorse/jupyter.nix b/nixos/configs/workhorse/jupyter.nix similarity index 100% rename from configs/workhorse/jupyter.nix rename to nixos/configs/workhorse/jupyter.nix diff --git a/configs/workhorse/kibana.nix b/nixos/configs/workhorse/kibana.nix similarity index 100% rename from configs/workhorse/kibana.nix rename to nixos/configs/workhorse/kibana.nix diff --git a/configs/workhorse/mail-fetcher.nix b/nixos/configs/workhorse/mail-fetcher.nix similarity index 100% rename from configs/workhorse/mail-fetcher.nix rename to nixos/configs/workhorse/mail-fetcher.nix diff --git a/configs/workhorse/metabase.nix b/nixos/configs/workhorse/metabase.nix similarity index 100% rename from configs/workhorse/metabase.nix rename to nixos/configs/workhorse/metabase.nix diff --git a/configs/workhorse/mining.nix b/nixos/configs/workhorse/mining.nix similarity index 100% rename from configs/workhorse/mining.nix rename to nixos/configs/workhorse/mining.nix diff --git a/configs/workhorse/mysql.nix b/nixos/configs/workhorse/mysql.nix similarity index 100% rename from configs/workhorse/mysql.nix rename to nixos/configs/workhorse/mysql.nix diff --git a/configs/workhorse/nextcloud.nix b/nixos/configs/workhorse/nextcloud.nix similarity index 100% rename from configs/workhorse/nextcloud.nix rename to nixos/configs/workhorse/nextcloud.nix diff --git a/configs/workhorse/packages.nix b/nixos/configs/workhorse/packages.nix similarity index 100% rename from configs/workhorse/packages.nix rename to nixos/configs/workhorse/packages.nix diff --git a/configs/workhorse/prometheus.nix b/nixos/configs/workhorse/prometheus.nix similarity index 100% rename from configs/workhorse/prometheus.nix rename to nixos/configs/workhorse/prometheus.nix diff --git a/configs/workhorse/property.nix b/nixos/configs/workhorse/property.nix similarity index 100% rename from configs/workhorse/property.nix rename to nixos/configs/workhorse/property.nix diff --git a/configs/workhorse/syncthing.nix b/nixos/configs/workhorse/syncthing.nix similarity index 100% rename from configs/workhorse/syncthing.nix rename to nixos/configs/workhorse/syncthing.nix diff --git a/configs/workhorse/taskserver.nix b/nixos/configs/workhorse/taskserver.nix similarity index 100% rename from configs/workhorse/taskserver.nix rename to nixos/configs/workhorse/taskserver.nix diff --git a/configs/workhorse/tinc.nix b/nixos/configs/workhorse/tinc.nix similarity index 100% rename from configs/workhorse/tinc.nix rename to nixos/configs/workhorse/tinc.nix diff --git a/configs/workhorse/transmission.nix b/nixos/configs/workhorse/transmission.nix similarity index 100% rename from configs/workhorse/transmission.nix rename to nixos/configs/workhorse/transmission.nix diff --git a/configs/workhorse/weechat.nix b/nixos/configs/workhorse/weechat.nix similarity index 100% rename from configs/workhorse/weechat.nix rename to nixos/configs/workhorse/weechat.nix diff --git a/configs/workout/configuration.nix b/nixos/configs/workout/configuration.nix similarity index 100% rename from configs/workout/configuration.nix rename to nixos/configs/workout/configuration.nix diff --git a/configs/workout/hardware-configuration.nix b/nixos/configs/workout/hardware-configuration.nix similarity index 100% rename from configs/workout/hardware-configuration.nix rename to nixos/configs/workout/hardware-configuration.nix diff --git a/configs/workout/kibana.nix b/nixos/configs/workout/kibana.nix similarity index 100% rename from configs/workout/kibana.nix rename to nixos/configs/workout/kibana.nix diff --git a/configs/workout/lan.nix b/nixos/configs/workout/lan.nix similarity index 100% rename from configs/workout/lan.nix rename to nixos/configs/workout/lan.nix diff --git a/configs/workout/packages.nix b/nixos/configs/workout/packages.nix similarity index 100% rename from configs/workout/packages.nix rename to nixos/configs/workout/packages.nix diff --git a/configs/workout/slack.nix b/nixos/configs/workout/slack.nix similarity index 100% rename from configs/workout/slack.nix rename to nixos/configs/workout/slack.nix diff --git a/configs/workout/syncthing.nix b/nixos/configs/workout/syncthing.nix similarity index 100% rename from configs/workout/syncthing.nix rename to nixos/configs/workout/syncthing.nix diff --git a/configs/workout/tinc.nix b/nixos/configs/workout/tinc.nix similarity index 100% rename from configs/workout/tinc.nix rename to nixos/configs/workout/tinc.nix diff --git a/nixos/flake.lock b/nixos/flake.lock new file mode 100644 index 0000000..2b75a16 --- /dev/null +++ b/nixos/flake.lock @@ -0,0 +1,480 @@ +{ + "nodes": { + "backup-module": { + "flake": false, + "locked": { + "lastModified": 1580601325, + "narHash": "sha256-eCf6jDYKdW74j/bu3Ni1WtkqYT8t0vrQA84l5icGXNc=", + "ref": "master", + "rev": "0597529c20f04f57a6d031f7439560e87923f4ce", + "revCount": 24, + "type": "git", + "url": "https://git.ingolf-wagner.de/nix-modules/backup.git" + }, + "original": { + "type": "git", + "url": "https://git.ingolf-wagner.de/nix-modules/backup.git" + } + }, + "cluster-module": { + "flake": false, + "locked": { + "lastModified": 1537379100, + "narHash": "sha256-TcZfK3thYq65S7mHC0jyc2ELVq8Ue8Enuj4iU4L9fTI=", + "rev": "ef621797a30f8a57de16bf33672abdd411cbcece", + "revCount": 8, + "type": "git", + "url": "https://git.ingolf-wagner.de/nix-modules/cluster.git" + }, + "original": { + "rev": "ef621797a30f8a57de16bf33672abdd411cbcece", + "type": "git", + "url": "https://git.ingolf-wagner.de/nix-modules/cluster.git" + } + }, + "doom-emacs": { + "flake": false, + "locked": { + "lastModified": 1626604817, + "narHash": "sha256-z+dvjB02cHU+VQ5EMkzqSdX817PZar9AkmmfK27q0vo=", + "owner": "hlissner", + "repo": "doom-emacs", + "rev": "46732c0adaef147144418f9f284ca6b1183ab96f", + "type": "github" + }, + "original": { + "owner": "hlissner", + "ref": "develop", + "repo": "doom-emacs", + "type": "github" + } + }, + "doom-emacs-nix": { + "inputs": { + "doom-emacs": "doom-emacs", + "doom-snippets": "doom-snippets", + "emacs-overlay": "emacs-overlay", + "emacs-so-long": "emacs-so-long", + "evil-markdown": "evil-markdown", + "evil-org-mode": "evil-org-mode", + "evil-quick-diff": "evil-quick-diff", + "explain-pause-mode": "explain-pause-mode", + "flake-utils": "flake-utils", + "nix-straight": "nix-straight", + "nixpkgs": [ + "nixpkgs" + ], + "nose": "nose", + "ob-racket": "ob-racket", + "org": "org", + "org-contrib": "org-contrib", + "org-yt": "org-yt", + "php-extras": "php-extras", + "revealjs": "revealjs", + "rotate-text": "rotate-text" + }, + "locked": { + "lastModified": 1627398156, + "narHash": "sha256-Ru1aV3NuIFXAsvUE3de8KR7xDZOo1GCBJdsWKJn+Ebw=", + "owner": "vlaci", + "repo": "nix-doom-emacs", + "rev": "fee14d217b7a911aad507679dafbeaa8c1ebf5ff", + "type": "github" + }, + "original": { + "owner": "vlaci", + "repo": "nix-doom-emacs", + "type": "github" + } + }, + "doom-snippets": { + "flake": false, + "locked": { + "lastModified": 1625547004, + "narHash": "sha256-V+ytAjB4ZZ+5dJJAu1OY7SbnqrokX5PVBWs0AsgQ8Vs=", + "owner": "hlissner", + "repo": "doom-snippets", + "rev": "5c0eb5bd70f035cefb981c2ce64f4367498bdda6", + "type": "github" + }, + "original": { + "owner": "hlissner", + "repo": "doom-snippets", + "type": "github" + } + }, + "emacs-overlay": { + "flake": false, + "locked": { + "lastModified": 1626972035, + "narHash": "sha256-YhBtnKmLDYiEzP5ZEMEQMg6oMP5EV+ToCkku7ZYfL+A=", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "be04b45efb35db58e6ac6aa86b84f850c85b5dfe", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "emacs-overlay", + "type": "github" + } + }, + "emacs-so-long": { + "flake": false, + "locked": { + "lastModified": 1575031854, + "narHash": "sha256-xIa5zO0ZaToDrec1OFjBK6l39AbA4l/CE4LInVu2hi0=", + "owner": "hlissner", + "repo": "emacs-so-long", + "rev": "ed666b0716f60e8988c455804de24b55919e71ca", + "type": "github" + }, + "original": { + "owner": "hlissner", + "repo": "emacs-so-long", + "type": "github" + } + }, + "evil-markdown": { + "flake": false, + "locked": { + "lastModified": 1626852210, + "narHash": "sha256-HBBuZ1VWIn6kwK5CtGIvHM1+9eiNiKPH0GUsyvpUVN8=", + "owner": "Somelauw", + "repo": "evil-markdown", + "rev": "8e6cc68af83914b2fa9fd3a3b8472573dbcef477", + "type": "github" + }, + "original": { + "owner": "Somelauw", + "repo": "evil-markdown", + "type": "github" + } + }, + "evil-org-mode": { + "flake": false, + "locked": { + "lastModified": 1607203864, + "narHash": "sha256-JxwqVYDN6OIJEH15MVI6XOZAPtUWUhJQWHyzcrUvrFg=", + "owner": "hlissner", + "repo": "evil-org-mode", + "rev": "a9706da260c45b98601bcd72b1d2c0a24a017700", + "type": "github" + }, + "original": { + "owner": "hlissner", + "repo": "evil-org-mode", + "type": "github" + } + }, + "evil-quick-diff": { + "flake": false, + "locked": { + "lastModified": 1575189609, + "narHash": "sha256-oGzl1ayW9rIuq0haoiFS7RZsS8NFMdEA7K1BSozgnJU=", + "owner": "rgrinberg", + "repo": "evil-quick-diff", + "rev": "69c883720b30a892c63bc89f49d4f0e8b8028908", + "type": "github" + }, + "original": { + "owner": "rgrinberg", + "repo": "evil-quick-diff", + "type": "github" + } + }, + "explain-pause-mode": { + "flake": false, + "locked": { + "lastModified": 1595842060, + "narHash": "sha256-++znrjiDSx+cy4okFBBXUBkRFdtnE2x+trkmqjB3Njs=", + "owner": "lastquestion", + "repo": "explain-pause-mode", + "rev": "2356c8c3639cbeeb9751744dbe737267849b4b51", + "type": "github" + }, + "original": { + "owner": "lastquestion", + "repo": "explain-pause-mode", + "type": "github" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1623875721, + "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1631573611, + "narHash": "sha256-u2E/wstadWNcn6vOIoK1xY86QPOzzBZQfT1FbePfdaI=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "7d9ba15214004c979d2c8733f8be12ce6502cf8a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-21.05", + "repo": "home-manager", + "type": "github" + } + }, + "krops-lib": { + "flake": false, + "locked": { + "lastModified": 1568329403, + "narHash": "sha256-G5pdPNaXg9Hv9BX/E24udoRiFcSbjSGJwl3gB+p56j4=", + "ref": "master", + "rev": "c9adb18bcb0555573232c6a45be6800fc1350e9b", + "revCount": 14, + "type": "git", + "url": "https://git.ingolf-wagner.de/nix-modules/krops.git" + }, + "original": { + "type": "git", + "url": "https://git.ingolf-wagner.de/nix-modules/krops.git" + } + }, + "nix-straight": { + "flake": false, + "locked": { + "lastModified": 1621543597, + "narHash": "sha256-E/m2Hrw2og//CfOCOWe2yapYC01Tqhozn4YMPYJsC3o=", + "owner": "vlaci", + "repo": "nix-straight.el", + "rev": "8e84d04f10b2298de856b2b8b9a0d13abc91b5ca", + "type": "github" + }, + "original": { + "owner": "vlaci", + "ref": "v2.2.0", + "repo": "nix-straight.el", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1632418649, + "narHash": "sha256-4rZspkiQU7zbsuciRRMgoEPkAF/+FSv2jx/VIPxPVx4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "056a3c1fae30d06d14b171b9023743c21a23ec1a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-21.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1632411313, + "narHash": "sha256-lekODc44lVo9/0EwGiX6LoEt2KhiPdcfNopealMJ7n4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "51bcdc4cdaac48535dabf0ad4642a66774c609ed", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1625223284, + "narHash": "sha256-jjLcDSU1rRiJb+n3uez23XAa7kbnPcGZTa6jIKh1GMQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "357d2c8f6087685fe35cb1889a005a4dd4cce7b8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nose": { + "flake": false, + "locked": { + "lastModified": 1400604510, + "narHash": "sha256-daEi8Kta1oGaDEmUUDDQMahTTPOpvNpDKk22rlr7cB0=", + "owner": "emacsattic", + "repo": "nose", + "rev": "f8528297519eba911696c4e68fa88892de9a7b72", + "type": "github" + }, + "original": { + "owner": "emacsattic", + "repo": "nose", + "type": "github" + } + }, + "ob-racket": { + "flake": false, + "locked": { + "lastModified": 1584656173, + "narHash": "sha256-rBUYDDCXb+3D4xTPQo9UocbTPZ32kWV1Uya/1DmZknU=", + "owner": "xchrishawk", + "repo": "ob-racket", + "rev": "83457ec9e1e96a29fd2086ed19432b9d75787673", + "type": "github" + }, + "original": { + "owner": "xchrishawk", + "repo": "ob-racket", + "type": "github" + } + }, + "org": { + "flake": false, + "locked": { + "lastModified": 1627155762, + "narHash": "sha256-XS1eA6P0ePabdrnUNe5lN19EA9dfK615gMGObr9wfBQ=", + "owner": "emacs-straight", + "repo": "org-mode", + "rev": "c9dfed48a607c7f6524f1c6480f09cf61a5d6237", + "type": "github" + }, + "original": { + "owner": "emacs-straight", + "repo": "org-mode", + "type": "github" + } + }, + "org-contrib": { + "flake": false, + "locked": { + "lastModified": 1623339452, + "narHash": "sha256-E3pioqkmAKQm5N7YsgJZil0/ozkdRE7//tE9FGbrluM=", + "ref": "master", + "rev": "fc81309cf6756607a836f93049a9393c2967c4e0", + "revCount": 2599, + "type": "git", + "url": "https://git.sr.ht/~bzg/org-contrib" + }, + "original": { + "type": "git", + "url": "https://git.sr.ht/~bzg/org-contrib" + } + }, + "org-yt": { + "flake": false, + "locked": { + "lastModified": 1527381913, + "narHash": "sha256-dzQ6B7ryzatHCTLyEnRSbWO0VUiX/FHYnpHTs74aVUs=", + "owner": "TobiasZawada", + "repo": "org-yt", + "rev": "40cc1ac76d741055cbefa13860d9f070a7ade001", + "type": "github" + }, + "original": { + "owner": "TobiasZawada", + "repo": "org-yt", + "type": "github" + } + }, + "php-extras": { + "flake": false, + "locked": { + "lastModified": 1573312690, + "narHash": "sha256-r4WyVbzvT0ra4Z6JywNBOw5RxOEYd6Qe2IpebHXkj1U=", + "owner": "arnested", + "repo": "php-extras", + "rev": "d410c5af663c30c01d461ac476d1cbfbacb49367", + "type": "github" + }, + "original": { + "owner": "arnested", + "repo": "php-extras", + "type": "github" + } + }, + "revealjs": { + "flake": false, + "locked": { + "lastModified": 1625811744, + "narHash": "sha256-Y67nVqcovn2PbHXmWOFWMq10Qz2ZIRyyWEO6qsZLbIM=", + "owner": "hakimel", + "repo": "reveal.js", + "rev": "b18f12d964ef80bd9ffb061aae48ff4c15fb43ad", + "type": "github" + }, + "original": { + "owner": "hakimel", + "repo": "reveal.js", + "type": "github" + } + }, + "root": { + "inputs": { + "backup-module": "backup-module", + "cluster-module": "cluster-module", + "doom-emacs-nix": "doom-emacs-nix", + "home-manager": "home-manager", + "krops-lib": "krops-lib", + "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable", + "sops-nix": "sops-nix" + } + }, + "rotate-text": { + "flake": false, + "locked": { + "lastModified": 1322962747, + "narHash": "sha256-SOeOgSlcEIsKhUiYDJv0p+mLUb420s9E2BmvZQvZ0wk=", + "owner": "debug-ito", + "repo": "rotate-text.el", + "rev": "48f193697db996855aee1ad2bc99b38c6646fe76", + "type": "github" + }, + "original": { + "owner": "debug-ito", + "repo": "rotate-text.el", + "type": "github" + } + }, + "sops-nix": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1632485730, + "narHash": "sha256-+anQTUUHxdpjLnTWqk9TJhWRYMI+1F2iVZKCq8SH4hg=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "64235a958b9ceedf98a3212c13b0dea3a504598f", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/nixos/flake.nix b/nixos/flake.nix new file mode 100644 index 0000000..19b07fd --- /dev/null +++ b/nixos/flake.nix @@ -0,0 +1,77 @@ +{ + description = "system flake.nix"; + inputs = { + sops-nix.url = "github:Mic92/sops-nix"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-21.05"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + doom-emacs-nix = { + url = "github:vlaci/nix-doom-emacs"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + home-manager = { + url = "github:nix-community/home-manager/release-21.05"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + backup-module = { + url = "git+https://git.ingolf-wagner.de/nix-modules/backup.git"; + flake = false; + }; + krops-lib = { + url = "git+https://git.ingolf-wagner.de/nix-modules/krops.git"; + flake = false; + }; + cluster-module = { + url = + "git+https://git.ingolf-wagner.de/nix-modules/cluster.git?rev=ef621797a30f8a57de16bf33672abdd411cbcece"; + flake = false; + }; + }; + + outputs = { self, sops-nix, nixpkgs, home-manager, doom-emacs-nix + , backup-module, nixpkgs-unstable, krops-lib, cluster-module, ... }: + + let + nixosSystem = nixpkgs.lib.nixosSystem; + defaultModules = [ + sops-nix.nixosModules.sops + { imports = [ "${krops-lib}" "${cluster-module}" "${backup-module}" ]; } + ({ pkgs, ... }: { + # defined overlays injected by the nixflake + nixpkgs.overlays = [ + (_self: _super: { + # we assign the overlay created before to the overlays of nixpkgs. + unstable = nixpkgs-unstable.legacyPackages.${pkgs.system}; + }) + ]; + }) + ]; + desktopModules = [ + home-manager.nixosModules.home-manager + { + home-manager.users.mainUser = { + imports = [ doom-emacs-nix.hmModule ]; + }; + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + } + ]; + desktopConfiguration = initPath: + nixosSystem { + system = "x86_64-linux"; + modules = defaultModules ++ desktopModules ++ [ initPath ]; + }; + serverConfiguration = initPath: + nixosSystem { + system = "x86_64-linux"; + modules = defaultModules ++ [ initPath ]; + }; + in { + nixosConfigurations = { + sterni = desktopConfiguration ./configs/sterni/configuration.nix; + sternchen = desktopConfiguration ./configs/sternchien/configuration.nix; + pepe = serverConfiguration ./configs/pepe/configuration.nix; + workhorse = serverConfiguration ./configs/workhorse/configuration.nix; + sputnik = serverConfiguration ./configs/sputnik/configuration.nix; + }; + }; +} diff --git a/nixos/krops.nix b/nixos/krops.nix new file mode 100644 index 0000000..385e28d --- /dev/null +++ b/nixos/krops.nix @@ -0,0 +1,63 @@ +{ pkgs, writeCommand, lib, secrets }: +let + + # command that ensures we use flake.nix during switch + command = targetPath: + let + commandLine = + "TMPDIR=/tmp nixos-rebuild switch --flake ${targetPath} -L --keep-going"; + in '' + echo '${commandLine}' + nix-shell \ + -E "with import {}; mkShell { buildInputs = [ git (nixos { nix.package = nixFlakes; }).nixos-rebuild ]; }" \ + --run '${commandLine}' + ''; + + source = { + secrets.file = "${secrets}/secrets"; + assets.file = toString ./assets; + private_assets.pass = { + dir = toString ~/.password-store; + name = "krops/private_assets"; + }; + configs.file = toString ./configs; + library.file = toString ./library; + modules.file = toString ./modules; + pkgs.file = toString ./pkgs; + system.file = toString ./system; + "flake.nix".file = toString ./flake.nix; + "flake.lock".file = toString ./flake.lock; + }; + + desktop = { name, host }: + let + system = writeCommand "/bin/system" { + source = lib.evalSource [ source ]; + force = true; + target = lib.mkTarget "root@${host}/var/krops"; + inherit command; + }; + network = writeCommand "/bin/secrets" { + source = lib.evalSource [{ + system-connections.pass = { + dir = toString ~/.password-store; + name = "krops/desktop_secrets/network-manager/system-connections"; + }; + }]; + force = true; + target = lib.mkTarget "root@${host}/etc/NetworkManager"; + }; + in { + "${name}-all" = pkgs.writers.writeBashBin "${name}-all" '' + echo "deploy network secerts" + ${network}/bin/secrets + echo "deploy system" + ${system}/bin/system + ''; + "${name}" = pkgs.writers.writeBashBin name '' + echo "deploy system" + ${system}/bin/system + ''; + }; + +in (desktop { name = "sterni"; host = "sterni.private"; }) diff --git a/library/default.nix b/nixos/library/default.nix similarity index 100% rename from library/default.nix rename to nixos/library/default.nix diff --git a/library/jenkins.nix b/nixos/library/jenkins.nix similarity index 100% rename from library/jenkins.nix rename to nixos/library/jenkins.nix diff --git a/modules/default.nix b/nixos/modules/default.nix similarity index 100% rename from modules/default.nix rename to nixos/modules/default.nix diff --git a/modules/programs/browser.nix b/nixos/modules/programs/browser.nix similarity index 100% rename from modules/programs/browser.nix rename to nixos/modules/programs/browser.nix diff --git a/modules/programs/citate.nix b/nixos/modules/programs/citate.nix similarity index 100% rename from modules/programs/citate.nix rename to nixos/modules/programs/citate.nix diff --git a/modules/programs/curl-scripts.nix b/nixos/modules/programs/curl-scripts.nix similarity index 100% rename from modules/programs/curl-scripts.nix rename to nixos/modules/programs/curl-scripts.nix diff --git a/modules/programs/easytag.nix b/nixos/modules/programs/easytag.nix similarity index 100% rename from modules/programs/easytag.nix rename to nixos/modules/programs/easytag.nix diff --git a/modules/programs/elm.nix b/nixos/modules/programs/elm.nix similarity index 100% rename from modules/programs/elm.nix rename to nixos/modules/programs/elm.nix diff --git a/modules/programs/espeak.nix b/nixos/modules/programs/espeak.nix similarity index 100% rename from modules/programs/espeak.nix rename to nixos/modules/programs/espeak.nix diff --git a/modules/programs/ffmpeg.nix b/nixos/modules/programs/ffmpeg.nix similarity index 100% rename from modules/programs/ffmpeg.nix rename to nixos/modules/programs/ffmpeg.nix diff --git a/modules/programs/git.nix b/nixos/modules/programs/git.nix similarity index 100% rename from modules/programs/git.nix rename to nixos/modules/programs/git.nix diff --git a/modules/programs/shell-bash.nix b/nixos/modules/programs/shell-bash.nix similarity index 100% rename from modules/programs/shell-bash.nix rename to nixos/modules/programs/shell-bash.nix diff --git a/modules/programs/shell-tools.nix b/nixos/modules/programs/shell-tools.nix similarity index 100% rename from modules/programs/shell-tools.nix rename to nixos/modules/programs/shell-tools.nix diff --git a/modules/programs/shell-zsh.nix b/nixos/modules/programs/shell-zsh.nix similarity index 100% rename from modules/programs/shell-zsh.nix rename to nixos/modules/programs/shell-zsh.nix diff --git a/modules/programs/slack.nix b/nixos/modules/programs/slack.nix similarity index 100% rename from modules/programs/slack.nix rename to nixos/modules/programs/slack.nix diff --git a/modules/programs/steam.nix b/nixos/modules/programs/steam.nix similarity index 100% rename from modules/programs/steam.nix rename to nixos/modules/programs/steam.nix diff --git a/modules/programs/taskwarrior.nix b/nixos/modules/programs/taskwarrior.nix similarity index 100% rename from modules/programs/taskwarrior.nix rename to nixos/modules/programs/taskwarrior.nix diff --git a/modules/programs/urxvt.nix b/nixos/modules/programs/urxvt.nix similarity index 100% rename from modules/programs/urxvt.nix rename to nixos/modules/programs/urxvt.nix diff --git a/modules/programs/video.nix b/nixos/modules/programs/video.nix similarity index 100% rename from modules/programs/video.nix rename to nixos/modules/programs/video.nix diff --git a/modules/programs/vim.nix b/nixos/modules/programs/vim.nix similarity index 100% rename from modules/programs/vim.nix rename to nixos/modules/programs/vim.nix diff --git a/modules/programs/xterm.nix b/nixos/modules/programs/xterm.nix similarity index 100% rename from modules/programs/xterm.nix rename to nixos/modules/programs/xterm.nix diff --git a/modules/services/castget.nix b/nixos/modules/services/castget.nix similarity index 100% rename from modules/services/castget.nix rename to nixos/modules/services/castget.nix diff --git a/modules/services/home-assistant.nix b/nixos/modules/services/home-assistant.nix similarity index 100% rename from modules/services/home-assistant.nix rename to nixos/modules/services/home-assistant.nix diff --git a/modules/services/lektor.nix b/nixos/modules/services/lektor.nix similarity index 100% rename from modules/services/lektor.nix rename to nixos/modules/services/lektor.nix diff --git a/modules/services/light-control.nix b/nixos/modules/services/light-control.nix similarity index 100% rename from modules/services/light-control.nix rename to nixos/modules/services/light-control.nix diff --git a/modules/services/samba-share.nix b/nixos/modules/services/samba-share.nix similarity index 100% rename from modules/services/samba-share.nix rename to nixos/modules/services/samba-share.nix diff --git a/modules/services/sshd.nix b/nixos/modules/services/sshd.nix similarity index 100% rename from modules/services/sshd.nix rename to nixos/modules/services/sshd.nix diff --git a/modules/services/videoencoder.nix b/nixos/modules/services/videoencoder.nix similarity index 100% rename from modules/services/videoencoder.nix rename to nixos/modules/services/videoencoder.nix diff --git a/modules/system/audio.nix b/nixos/modules/system/audio.nix similarity index 100% rename from modules/system/audio.nix rename to nixos/modules/system/audio.nix diff --git a/modules/system/bluetooth.nix b/nixos/modules/system/bluetooth.nix similarity index 100% rename from modules/system/bluetooth.nix rename to nixos/modules/system/bluetooth.nix diff --git a/modules/system/font.nix b/nixos/modules/system/font.nix similarity index 100% rename from modules/system/font.nix rename to nixos/modules/system/font.nix diff --git a/modules/system/mainUser.nix b/nixos/modules/system/mainUser.nix similarity index 100% rename from modules/system/mainUser.nix rename to nixos/modules/system/mainUser.nix diff --git a/modules/system/on-failure.nix b/nixos/modules/system/on-failure.nix similarity index 100% rename from modules/system/on-failure.nix rename to nixos/modules/system/on-failure.nix diff --git a/modules/system/permown.nix b/nixos/modules/system/permown.nix similarity index 100% rename from modules/system/permown.nix rename to nixos/modules/system/permown.nix diff --git a/modules/system/wifi.nix b/nixos/modules/system/wifi.nix similarity index 100% rename from modules/system/wifi.nix rename to nixos/modules/system/wifi.nix diff --git a/modules/system/x11.nix b/nixos/modules/system/x11.nix similarity index 100% rename from modules/system/x11.nix rename to nixos/modules/system/x11.nix diff --git a/pkgs/bitwig-studio/bitwig-studio-environment.nix b/nixos/pkgs/bitwig-studio/bitwig-studio-environment.nix similarity index 100% rename from pkgs/bitwig-studio/bitwig-studio-environment.nix rename to nixos/pkgs/bitwig-studio/bitwig-studio-environment.nix diff --git a/pkgs/bitwig-studio/bitwig-studio1.nix b/nixos/pkgs/bitwig-studio/bitwig-studio1.nix similarity index 100% rename from pkgs/bitwig-studio/bitwig-studio1.nix rename to nixos/pkgs/bitwig-studio/bitwig-studio1.nix diff --git a/pkgs/bitwig-studio/bitwig-studio2.nix b/nixos/pkgs/bitwig-studio/bitwig-studio2.nix similarity index 100% rename from pkgs/bitwig-studio/bitwig-studio2.nix rename to nixos/pkgs/bitwig-studio/bitwig-studio2.nix diff --git a/pkgs/bitwig-studio/bitwig-studio3.nix b/nixos/pkgs/bitwig-studio/bitwig-studio3.nix similarity index 100% rename from pkgs/bitwig-studio/bitwig-studio3.nix rename to nixos/pkgs/bitwig-studio/bitwig-studio3.nix diff --git a/pkgs/default.nix b/nixos/pkgs/default.nix similarity index 100% rename from pkgs/default.nix rename to nixos/pkgs/default.nix diff --git a/pkgs/emoji/default.nix b/nixos/pkgs/emoji/default.nix similarity index 100% rename from pkgs/emoji/default.nix rename to nixos/pkgs/emoji/default.nix diff --git a/pkgs/gitlog2json/default.nix b/nixos/pkgs/gitlog2json/default.nix similarity index 100% rename from pkgs/gitlog2json/default.nix rename to nixos/pkgs/gitlog2json/default.nix diff --git a/pkgs/gitlog2json/gitlog2json.py b/nixos/pkgs/gitlog2json/gitlog2json.py similarity index 100% rename from pkgs/gitlog2json/gitlog2json.py rename to nixos/pkgs/gitlog2json/gitlog2json.py diff --git a/pkgs/gitlog2json/log.py b/nixos/pkgs/gitlog2json/log.py similarity index 100% rename from pkgs/gitlog2json/log.py rename to nixos/pkgs/gitlog2json/log.py diff --git a/pkgs/gitlog2json/shell.nix b/nixos/pkgs/gitlog2json/shell.nix similarity index 100% rename from pkgs/gitlog2json/shell.nix rename to nixos/pkgs/gitlog2json/shell.nix diff --git a/pkgs/landingpage/default.nix b/nixos/pkgs/landingpage/default.nix similarity index 100% rename from pkgs/landingpage/default.nix rename to nixos/pkgs/landingpage/default.nix diff --git a/pkgs/light-control/default.nix b/nixos/pkgs/light-control/default.nix similarity index 100% rename from pkgs/light-control/default.nix rename to nixos/pkgs/light-control/default.nix diff --git a/pkgs/otpmenu/default.nix b/nixos/pkgs/otpmenu/default.nix similarity index 100% rename from pkgs/otpmenu/default.nix rename to nixos/pkgs/otpmenu/default.nix diff --git a/pkgs/pixelnuke/default.nix b/nixos/pkgs/pixelnuke/default.nix similarity index 100% rename from pkgs/pixelnuke/default.nix rename to nixos/pkgs/pixelnuke/default.nix diff --git a/pkgs/polygon-art/default.nix b/nixos/pkgs/polygon-art/default.nix similarity index 100% rename from pkgs/polygon-art/default.nix rename to nixos/pkgs/polygon-art/default.nix diff --git a/pkgs/q/README.md b/nixos/pkgs/q/README.md similarity index 100% rename from pkgs/q/README.md rename to nixos/pkgs/q/README.md diff --git a/pkgs/q/default.nix b/nixos/pkgs/q/default.nix similarity index 100% rename from pkgs/q/default.nix rename to nixos/pkgs/q/default.nix diff --git a/pkgs/sononym-crawler/default.nix b/nixos/pkgs/sononym-crawler/default.nix similarity index 100% rename from pkgs/sononym-crawler/default.nix rename to nixos/pkgs/sononym-crawler/default.nix diff --git a/pkgs/sononym/default.nix b/nixos/pkgs/sononym/default.nix similarity index 100% rename from pkgs/sononym/default.nix rename to nixos/pkgs/sononym/default.nix diff --git a/pkgs/taskwarrior-hooks/default.nix b/nixos/pkgs/taskwarrior-hooks/default.nix similarity index 100% rename from pkgs/taskwarrior-hooks/default.nix rename to nixos/pkgs/taskwarrior-hooks/default.nix diff --git a/pkgs/terminal-tools/default.nix b/nixos/pkgs/terminal-tools/default.nix similarity index 100% rename from pkgs/terminal-tools/default.nix rename to nixos/pkgs/terminal-tools/default.nix diff --git a/system/all/borg-jobs.nix b/nixos/system/all/borg-jobs.nix similarity index 100% rename from system/all/borg-jobs.nix rename to nixos/system/all/borg-jobs.nix diff --git a/system/all/borg-scripts.nix b/nixos/system/all/borg-scripts.nix similarity index 100% rename from system/all/borg-scripts.nix rename to nixos/system/all/borg-scripts.nix diff --git a/system/all/default.nix b/nixos/system/all/default.nix similarity index 96% rename from system/all/default.nix rename to nixos/system/all/default.nix index ebc0e85..27f03f4 100644 --- a/system/all/default.nix +++ b/nixos/system/all/default.nix @@ -2,9 +2,6 @@ imports = [ - ../../backup-module - ../../krops-lib - ../../cluster-module ../../modules # needed diff --git a/system/all/grub.nix b/nixos/system/all/grub.nix similarity index 100% rename from system/all/grub.nix rename to nixos/system/all/grub.nix diff --git a/system/all/hosts.nix b/nixos/system/all/hosts.nix similarity index 100% rename from system/all/hosts.nix rename to nixos/system/all/hosts.nix diff --git a/system/all/networking-qos.nix b/nixos/system/all/networking-qos.nix similarity index 100% rename from system/all/networking-qos.nix rename to nixos/system/all/networking-qos.nix diff --git a/system/all/nginx-landingpage.nix b/nixos/system/all/nginx-landingpage.nix similarity index 100% rename from system/all/nginx-landingpage.nix rename to nixos/system/all/nginx-landingpage.nix diff --git a/system/all/nginx.nix b/nixos/system/all/nginx.nix similarity index 100% rename from system/all/nginx.nix rename to nixos/system/all/nginx.nix diff --git a/system/all/on-failure.nix b/nixos/system/all/on-failure.nix similarity index 100% rename from system/all/on-failure.nix rename to nixos/system/all/on-failure.nix diff --git a/system/all/packages.nix b/nixos/system/all/packages.nix similarity index 100% rename from system/all/packages.nix rename to nixos/system/all/packages.nix diff --git a/system/all/packages/llvm-config-dummy.nix b/nixos/system/all/packages/llvm-config-dummy.nix similarity index 100% rename from system/all/packages/llvm-config-dummy.nix rename to nixos/system/all/packages/llvm-config-dummy.nix diff --git a/system/all/shell.nix b/nixos/system/all/shell.nix similarity index 100% rename from system/all/shell.nix rename to nixos/system/all/shell.nix diff --git a/system/all/sshd-known-hosts-bootup.nix b/nixos/system/all/sshd-known-hosts-bootup.nix similarity index 100% rename from system/all/sshd-known-hosts-bootup.nix rename to nixos/system/all/sshd-known-hosts-bootup.nix diff --git a/system/all/sshd-known-hosts-private.nix b/nixos/system/all/sshd-known-hosts-private.nix similarity index 100% rename from system/all/sshd-known-hosts-private.nix rename to nixos/system/all/sshd-known-hosts-private.nix diff --git a/system/all/sshd-known-hosts-public.nix b/nixos/system/all/sshd-known-hosts-public.nix similarity index 100% rename from system/all/sshd-known-hosts-public.nix rename to nixos/system/all/sshd-known-hosts-public.nix diff --git a/system/all/sshd.nix b/nixos/system/all/sshd.nix similarity index 100% rename from system/all/sshd.nix rename to nixos/system/all/sshd.nix diff --git a/system/all/syncthing.nix b/nixos/system/all/syncthing.nix similarity index 100% rename from system/all/syncthing.nix rename to nixos/system/all/syncthing.nix diff --git a/system/all/tinc.nix b/nixos/system/all/tinc.nix similarity index 100% rename from system/all/tinc.nix rename to nixos/system/all/tinc.nix diff --git a/system/desktop/audio.nix b/nixos/system/desktop/audio.nix similarity index 100% rename from system/desktop/audio.nix rename to nixos/system/desktop/audio.nix diff --git a/system/desktop/browser.nix b/nixos/system/desktop/browser.nix similarity index 100% rename from system/desktop/browser.nix rename to nixos/system/desktop/browser.nix diff --git a/system/desktop/cachix.nix b/nixos/system/desktop/cachix.nix similarity index 100% rename from system/desktop/cachix.nix rename to nixos/system/desktop/cachix.nix diff --git a/system/desktop/cachix/all-hies.nix b/nixos/system/desktop/cachix/all-hies.nix similarity index 100% rename from system/desktop/cachix/all-hies.nix rename to nixos/system/desktop/cachix/all-hies.nix diff --git a/system/desktop/default.nix b/nixos/system/desktop/default.nix similarity index 100% rename from system/desktop/default.nix rename to nixos/system/desktop/default.nix diff --git a/system/desktop/direnv.nix b/nixos/system/desktop/direnv.nix similarity index 100% rename from system/desktop/direnv.nix rename to nixos/system/desktop/direnv.nix diff --git a/system/desktop/dnsmasq.nix b/nixos/system/desktop/dnsmasq.nix similarity index 100% rename from system/desktop/dnsmasq.nix rename to nixos/system/desktop/dnsmasq.nix diff --git a/system/desktop/home-manager.nix b/nixos/system/desktop/home-manager.nix similarity index 100% rename from system/desktop/home-manager.nix rename to nixos/system/desktop/home-manager.nix diff --git a/system/desktop/home-manager/doom-emacs.nix b/nixos/system/desktop/home-manager/doom-emacs.nix similarity index 100% rename from system/desktop/home-manager/doom-emacs.nix rename to nixos/system/desktop/home-manager/doom-emacs.nix diff --git a/system/desktop/home-manager/doom.d/config.el b/nixos/system/desktop/home-manager/doom.d/config.el similarity index 100% rename from system/desktop/home-manager/doom.d/config.el rename to nixos/system/desktop/home-manager/doom.d/config.el diff --git a/system/desktop/home-manager/doom.d/init.el b/nixos/system/desktop/home-manager/doom.d/init.el similarity index 100% rename from system/desktop/home-manager/doom.d/init.el rename to nixos/system/desktop/home-manager/doom.d/init.el diff --git a/system/desktop/home-manager/doom.d/packages.el b/nixos/system/desktop/home-manager/doom.d/packages.el similarity index 100% rename from system/desktop/home-manager/doom.d/packages.el rename to nixos/system/desktop/home-manager/doom.d/packages.el diff --git a/system/desktop/home-manager/dunst.nix b/nixos/system/desktop/home-manager/dunst.nix similarity index 100% rename from system/desktop/home-manager/dunst.nix rename to nixos/system/desktop/home-manager/dunst.nix diff --git a/system/desktop/home-manager/spacemacs.nix b/nixos/system/desktop/home-manager/spacemacs.nix similarity index 100% rename from system/desktop/home-manager/spacemacs.nix rename to nixos/system/desktop/home-manager/spacemacs.nix diff --git a/system/desktop/home-manager/spacevim.nix b/nixos/system/desktop/home-manager/spacevim.nix similarity index 100% rename from system/desktop/home-manager/spacevim.nix rename to nixos/system/desktop/home-manager/spacevim.nix diff --git a/system/desktop/home-manager/ssh.nix b/nixos/system/desktop/home-manager/ssh.nix similarity index 100% rename from system/desktop/home-manager/ssh.nix rename to nixos/system/desktop/home-manager/ssh.nix diff --git a/system/desktop/home-manager/xmonad.nix b/nixos/system/desktop/home-manager/xmonad.nix similarity index 100% rename from system/desktop/home-manager/xmonad.nix rename to nixos/system/desktop/home-manager/xmonad.nix diff --git a/system/desktop/home-manager/xmonad/.envrc b/nixos/system/desktop/home-manager/xmonad/.envrc similarity index 100% rename from system/desktop/home-manager/xmonad/.envrc rename to nixos/system/desktop/home-manager/xmonad/.envrc diff --git a/system/desktop/home-manager/xmonad/.gitignore b/nixos/system/desktop/home-manager/xmonad/.gitignore similarity index 100% rename from system/desktop/home-manager/xmonad/.gitignore rename to nixos/system/desktop/home-manager/xmonad/.gitignore diff --git a/system/desktop/home-manager/xmonad/BoringWindows.hs b/nixos/system/desktop/home-manager/xmonad/BoringWindows.hs similarity index 100% rename from system/desktop/home-manager/xmonad/BoringWindows.hs rename to nixos/system/desktop/home-manager/xmonad/BoringWindows.hs diff --git a/system/desktop/home-manager/xmonad/FloatKeys.hs b/nixos/system/desktop/home-manager/xmonad/FloatKeys.hs similarity index 100% rename from system/desktop/home-manager/xmonad/FloatKeys.hs rename to nixos/system/desktop/home-manager/xmonad/FloatKeys.hs diff --git a/system/desktop/home-manager/xmonad/LICENSE b/nixos/system/desktop/home-manager/xmonad/LICENSE similarity index 100% rename from system/desktop/home-manager/xmonad/LICENSE rename to nixos/system/desktop/home-manager/xmonad/LICENSE diff --git a/system/desktop/home-manager/xmonad/Main.hs b/nixos/system/desktop/home-manager/xmonad/Main.hs similarity index 100% rename from system/desktop/home-manager/xmonad/Main.hs rename to nixos/system/desktop/home-manager/xmonad/Main.hs diff --git a/system/desktop/home-manager/xmonad/Memo.hs b/nixos/system/desktop/home-manager/xmonad/Memo.hs similarity index 100% rename from system/desktop/home-manager/xmonad/Memo.hs rename to nixos/system/desktop/home-manager/xmonad/Memo.hs diff --git a/system/desktop/home-manager/xmonad/NixCommands.hs b/nixos/system/desktop/home-manager/xmonad/NixCommands.hs similarity index 100% rename from system/desktop/home-manager/xmonad/NixCommands.hs rename to nixos/system/desktop/home-manager/xmonad/NixCommands.hs diff --git a/system/desktop/home-manager/xmonad/Setup.hs b/nixos/system/desktop/home-manager/xmonad/Setup.hs similarity index 100% rename from system/desktop/home-manager/xmonad/Setup.hs rename to nixos/system/desktop/home-manager/xmonad/Setup.hs diff --git a/system/desktop/home-manager/xmonad/SolarizedDark.hs b/nixos/system/desktop/home-manager/xmonad/SolarizedDark.hs similarity index 100% rename from system/desktop/home-manager/xmonad/SolarizedDark.hs rename to nixos/system/desktop/home-manager/xmonad/SolarizedDark.hs diff --git a/system/desktop/home-manager/xmonad/SolarizedLight.hs b/nixos/system/desktop/home-manager/xmonad/SolarizedLight.hs similarity index 100% rename from system/desktop/home-manager/xmonad/SolarizedLight.hs rename to nixos/system/desktop/home-manager/xmonad/SolarizedLight.hs diff --git a/system/desktop/home-manager/xmonad/SubLayouts.hs b/nixos/system/desktop/home-manager/xmonad/SubLayouts.hs similarity index 100% rename from system/desktop/home-manager/xmonad/SubLayouts.hs rename to nixos/system/desktop/home-manager/xmonad/SubLayouts.hs diff --git a/system/desktop/home-manager/xmonad/TabbedFix.hs b/nixos/system/desktop/home-manager/xmonad/TabbedFix.hs similarity index 100% rename from system/desktop/home-manager/xmonad/TabbedFix.hs rename to nixos/system/desktop/home-manager/xmonad/TabbedFix.hs diff --git a/system/desktop/home-manager/xmonad/current-project.nix b/nixos/system/desktop/home-manager/xmonad/current-project.nix similarity index 100% rename from system/desktop/home-manager/xmonad/current-project.nix rename to nixos/system/desktop/home-manager/xmonad/current-project.nix diff --git a/system/desktop/home-manager/xmonad/env.nix b/nixos/system/desktop/home-manager/xmonad/env.nix similarity index 100% rename from system/desktop/home-manager/xmonad/env.nix rename to nixos/system/desktop/home-manager/xmonad/env.nix diff --git a/system/desktop/home-manager/xmonad/lsp.nix b/nixos/system/desktop/home-manager/xmonad/lsp.nix similarity index 100% rename from system/desktop/home-manager/xmonad/lsp.nix rename to nixos/system/desktop/home-manager/xmonad/lsp.nix diff --git a/system/desktop/home-manager/xmonad/palos-xmonad.cabal b/nixos/system/desktop/home-manager/xmonad/palos-xmonad.cabal similarity index 100% rename from system/desktop/home-manager/xmonad/palos-xmonad.cabal rename to nixos/system/desktop/home-manager/xmonad/palos-xmonad.cabal diff --git a/system/desktop/home-manager/xmonad/shell.nix b/nixos/system/desktop/home-manager/xmonad/shell.nix similarity index 100% rename from system/desktop/home-manager/xmonad/shell.nix rename to nixos/system/desktop/home-manager/xmonad/shell.nix diff --git a/system/desktop/icecast.nix b/nixos/system/desktop/icecast.nix similarity index 100% rename from system/desktop/icecast.nix rename to nixos/system/desktop/icecast.nix diff --git a/system/desktop/mail-stuff.nix b/nixos/system/desktop/mail-stuff.nix similarity index 100% rename from system/desktop/mail-stuff.nix rename to nixos/system/desktop/mail-stuff.nix diff --git a/system/desktop/mc.nix b/nixos/system/desktop/mc.nix similarity index 100% rename from system/desktop/mc.nix rename to nixos/system/desktop/mc.nix diff --git a/system/desktop/network.nix b/nixos/system/desktop/network.nix similarity index 100% rename from system/desktop/network.nix rename to nixos/system/desktop/network.nix diff --git a/system/desktop/packages.nix b/nixos/system/desktop/packages.nix similarity index 100% rename from system/desktop/packages.nix rename to nixos/system/desktop/packages.nix diff --git a/system/desktop/pass.nix b/nixos/system/desktop/pass.nix similarity index 100% rename from system/desktop/pass.nix rename to nixos/system/desktop/pass.nix diff --git a/system/desktop/remote-install.nix b/nixos/system/desktop/remote-install.nix similarity index 100% rename from system/desktop/remote-install.nix rename to nixos/system/desktop/remote-install.nix diff --git a/system/desktop/size.nix b/nixos/system/desktop/size.nix similarity index 100% rename from system/desktop/size.nix rename to nixos/system/desktop/size.nix diff --git a/system/desktop/sshd.nix b/nixos/system/desktop/sshd.nix similarity index 100% rename from system/desktop/sshd.nix rename to nixos/system/desktop/sshd.nix diff --git a/system/desktop/suspend.nix b/nixos/system/desktop/suspend.nix similarity index 100% rename from system/desktop/suspend.nix rename to nixos/system/desktop/suspend.nix diff --git a/system/desktop/user.nix b/nixos/system/desktop/user.nix similarity index 100% rename from system/desktop/user.nix rename to nixos/system/desktop/user.nix diff --git a/system/desktop/wtf.nix b/nixos/system/desktop/wtf.nix similarity index 100% rename from system/desktop/wtf.nix rename to nixos/system/desktop/wtf.nix diff --git a/system/desktop/x11.nix b/nixos/system/desktop/x11.nix similarity index 100% rename from system/desktop/x11.nix rename to nixos/system/desktop/x11.nix diff --git a/system/desktop/xlock.nix b/nixos/system/desktop/xlock.nix similarity index 100% rename from system/desktop/xlock.nix rename to nixos/system/desktop/xlock.nix diff --git a/system/desktop/yubikey.nix b/nixos/system/desktop/yubikey.nix similarity index 100% rename from system/desktop/yubikey.nix rename to nixos/system/desktop/yubikey.nix diff --git a/system/proxy/default.nix b/nixos/system/proxy/default.nix similarity index 100% rename from system/proxy/default.nix rename to nixos/system/proxy/default.nix diff --git a/system/server/default.nix b/nixos/system/server/default.nix similarity index 100% rename from system/server/default.nix rename to nixos/system/server/default.nix diff --git a/system/server/graylog-exporter.nix b/nixos/system/server/graylog-exporter.nix similarity index 100% rename from system/server/graylog-exporter.nix rename to nixos/system/server/graylog-exporter.nix diff --git a/system/server/initssh.nix b/nixos/system/server/initssh.nix similarity index 100% rename from system/server/initssh.nix rename to nixos/system/server/initssh.nix diff --git a/system/server/netdata.nix b/nixos/system/server/netdata.nix similarity index 100% rename from system/server/netdata.nix rename to nixos/system/server/netdata.nix diff --git a/system/server/packages.nix b/nixos/system/server/packages.nix similarity index 100% rename from system/server/packages.nix rename to nixos/system/server/packages.nix diff --git a/system/server/prometheus-exporters.nix b/nixos/system/server/prometheus-exporters.nix similarity index 100% rename from system/server/prometheus-exporters.nix rename to nixos/system/server/prometheus-exporters.nix