From 96153dbd1afbbaff5b7d4a4f99a3edd90303fe46 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 18 Dec 2024 17:24:20 +0100 Subject: [PATCH] flake.nix: add brockman, brother_ql_web --- 2configs/bam/brother-ql-web.nix | 4 +- 2configs/bam/default.nix | 127 --------------------- 2configs/zsh/atuin.nix | 16 +++ 2configs/{zsh-user.nix => zsh/default.nix} | 0 flake.nix | 20 +++- 5 files changed, 33 insertions(+), 134 deletions(-) create mode 100644 2configs/zsh/atuin.nix rename 2configs/{zsh-user.nix => zsh/default.nix} (100%) diff --git a/2configs/bam/brother-ql-web.nix b/2configs/bam/brother-ql-web.nix index 26887db..2d4d84c 100644 --- a/2configs/bam/brother-ql-web.nix +++ b/2configs/bam/brother-ql-web.nix @@ -1,6 +1,6 @@ - {pkgs, ... }: + {pkgs, inputs, ... }: let - pkg = pkgs.brother_ql_web; + pkg = inputs.brother_ql_web.packages.${pkgs.system}.default; in { systemd.services.brother-ql-web = { after = [ "network.target" ]; diff --git a/2configs/bam/default.nix b/2configs/bam/default.nix index 40adc4c..e8abd75 100644 --- a/2configs/bam/default.nix +++ b/2configs/bam/default.nix @@ -77,131 +77,4 @@ in { #"f ${confdir}/docker-run 0770 kiosk kiosk - -" "d ${confdir} 0770 kiosk kiosk - -" ]; - #services.home-assistant = { - # enable = true; - # package = (unstable.home-assistant.overrideAttrs (old: { - # doInstallCheck = false; - # })).override { - # extraPackages = p: [ - # # TODO: put somewhere else - # (p.callPackage {}) - # # (p.callPackage {}) - # p.APScheduler ]; - # }; - # autoExtraComponents = true; - # config = { - # config = {}; - # discovery = {}; - # homeassistant = { - # name = "Bureautomation"; - # time_zone = "Europe/Berlin"; - # latitude = "48.8265"; - # longitude = "9.0676"; - # elevation = 303; - # auth_providers = [ - # { type = "homeassistant";} - # { type = "legacy_api_password"; - # api_password = "sistemas"; - # } - # { type = "trusted_networks"; - # trusted_networks = [ - # "127.0.0.1/32" - # "192.168.8.0/24" - # "::1/128" - # "fd00::/8" - # ]; - # # allow_bypass_login = true; - # } - # ]; - # }; - # # https://www.home-assistant.io/components/influxdb/ - # influxdb = { - # database = "hass"; - # tags = { - # instance = "wbob"; - # source = "hass"; - # }; - # }; - # mqtt = { - # discovery = true; - # discovery_prefix = "homeassistant"; - # broker = "localhost"; - # port = 1883; - # client_id = "home-assistant"; - # keepalive = 60; - # protocol = 3.1; - # birth_message = { - # topic = "/bam/hass/tele/LWT"; - # payload = "Online"; - # qos = 1; - # retain = true; - # }; - # will_message = { - # topic = "/bam/hass/tele/LWT"; - # payload = "Offline"; - # qos = 1; - # retain = true; - # }; - # }; - # notify = [ - # { - # platform = "kodi"; - # name = "wbob-kodi"; - # host = kodi-host; - # } - # #{ - # # platform = "telegram"; - # # name = "telegrambot"; - # # chat_id = builtins.elemAt - # # (builtins.fromJSON (builtins.readFile - # # )).allowed_chat_ids 0; - # #} - # ]; - # media_player = [ - # { platform = "kodi"; - # host = kodi-host; - # } - # { platform = "mpd"; - # host = "127.0.0.1"; - # } - # ]; - - # # sensor = [{ platform = "version"; }]; # pyhaversion - - - - # frontend = { }; - # http = { - # # TODO: https://github.com/home-assistant/home-assistant/issues/16149 - # # base_url = "http://192.168.8.11:8123"; - # }; - # conversation = {}; - # history = {}; - # logbook = {}; - # tts = [ - # { platform = "google_translate"; - # language = "de"; - # time_memory = 57600; - # service_name = "google_say"; - # } - # { platform = "voicerss"; - # api_key = builtins.readFile ; - # language = "de-de"; - # } - # #{ platform = "picotts"; - # # language = "de-DE"; - # #} - # ]; - # recorder = {}; - # sun = {}; - # #telegram_bot = [ - # # (builtins.fromJSON - # # (builtins.readFile )) - # #]; - # # only for automation - # # feedreader.urls = [ "http://www.heise.de/security/rss/news-atom.xml" ]; - # # we don't use imports because the expressions do not merge in - # # home-assistant - # }; - #}; } diff --git a/2configs/zsh/atuin.nix b/2configs/zsh/atuin.nix new file mode 100644 index 0000000..5b6705c --- /dev/null +++ b/2configs/zsh/atuin.nix @@ -0,0 +1,16 @@ +{ + home-manager.users.makefu.programs.atuin = { + enable = true; + settings = { + auto_sync = true; + sync_address = "https://atuin.euer.krebsco.de"; + search_mode = "prefix"; + # fuzzy,fulltext + update_check = false; + # filter_mode = "host"; + filter_mode = "global"; + # workspaces = true; + style = "compact"; + }; + }; +} diff --git a/2configs/zsh-user.nix b/2configs/zsh/default.nix similarity index 100% rename from 2configs/zsh-user.nix rename to 2configs/zsh/default.nix diff --git a/flake.nix b/flake.nix index d8302f3..7aa3edd 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,10 @@ inputs = { # nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + brockman = { + url = "github:kmein/brockman"; + inputs.nixpkgs.follows = "nixpkgs"; + }; clan-core = { url = "git+https://git.clan.lol/clan/clan-core"; @@ -22,11 +26,14 @@ nix-ld.url = "github:Mic92/nix-ld"; nix-ld.inputs.nixpkgs.follows = "nixpkgs"; - stockholm.url = "git+https://cgit.euer.krebsco.de/stockholm"; - #stockholm.url = "path:///home/makefu/stockholm-flakes"; + stockholm.url = "git+https://cgit.euer.krebsco.de/makefu/stockholm.git"; + #stockholm.url = "path:///home/makefu/r/stockholm"; stockholm.inputs.nixpkgs.follows = "nixpkgs"; stockholm.inputs.nix-writers.follows = "nix-writers"; + brother_ql_web.url = "github:makefu/brother_ql_web"; + brother_ql_web.inputs.nixpkgs.follows = "nixpkgs"; + nix-writers.url = "git+https://cgit.krebsco.de/nix-writers"; nix-writers.inputs.nixpkgs.follows = "nixpkgs"; poetry2nix = { @@ -103,7 +110,7 @@ inherit (inputs) nixos-hardware self stockholm nixpkgs; inherit inputs; }; - machines = lib.genAttrs [ "filepimp" "x" "cake" "tsp" "wbob" "omo" "gum" "savarcast" ] (host: rec { + machines = lib.genAttrs [ "liveiso" "filepimp" "x" "cake" "tsp" "wbob" "omo" "gum" "savarcast" ] (host: rec { # TODO inject the system somewhere else nixpkgs.hostPlatform = if host == "cake" then "aarch64-linux" else "x86_64-linux"; # nixpkgs.pkgs = if host == "cake" then pkgsForSystem "aarch64-linux" else pkgsForSystem "x86_64-linux"; @@ -114,7 +121,8 @@ home-manager.nixosModules.default lanzaboote.nixosModules.lanzaboote - inputs.stockholm.nixosModules.brockman + #inputs.stockholm.nixosModules.brockman + inputs.brockman.nixosModule inputs.stockholm.nixosModules.exim-retiolum inputs.stockholm.nixosModules.exim inputs.stockholm.nixosModules.krebs @@ -161,7 +169,9 @@ (name: !lib.hasPrefix "." name) (lib.attrNames (builtins.readDir ./3modules)))); - overlays.default = import ./5pkgs/default.nix; + overlays.default = import ./5pkgs/default.nix; + packages.x86_64-linux.liveiso = self.nixosConfigurations.liveiso.config.system.build.isoImage; + packages.x86_64-linux.default = self.packages.x86_64-linux.liveiso; devShells.x86_64-linux.default = let pkgs = nixpkgs.legacyPackages.x86_64-linux; in pkgs.mkShell {