diff --git a/flake.lock b/flake.lock index 8453aa8..37b3d53 100644 --- a/flake.lock +++ b/flake.lock @@ -442,11 +442,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -457,7 +457,7 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils" + "flake-utils": "flake-utils_2" }, "locked": { "lastModified": 1715533576, @@ -474,6 +474,24 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { @@ -910,6 +928,27 @@ "type": "github" } }, + "ovos": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1766165400, + "narHash": "sha256-T86no1MvUHVpC6xyrOJGB9VY4taj2fhJtcBEN+uhV60=", + "ref": "refs/heads/main", + "rev": "0344ae6de17572639359fe7ca35b3b2e703d3852", + "revCount": 5, + "type": "git", + "url": "file:///home/christopher/workspaces/ovos-flake" + }, + "original": { + "type": "git", + "url": "file:///home/christopher/workspaces/ovos-flake" + } + }, "plugin-loader": { "flake": false, "locked": { @@ -973,6 +1012,7 @@ "niri": "niri", "nixpkgs": "nixpkgs_7", "nur": "nur", + "ovos": "ovos", "quadlet": "quadlet", "snowfall": "snowfall", "stylix": "stylix", @@ -1035,7 +1075,7 @@ "nixpkgs" ], "nur": "nur_2", - "systems": "systems_3", + "systems": "systems_4", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1101,6 +1141,21 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 9463d93..f49a03d 100644 --- a/flake.nix +++ b/flake.nix @@ -31,8 +31,9 @@ systems.hosts = with inputs; { cobalt.modules = [ niri.nixosModules.niri - musnix.nixosModules.default stylix.nixosModules.stylix + musnix.nixosModules.default + ovos.nixosModules.default ]; beryllium.modules = [ quadlet.nixosModules.quadlet @@ -77,6 +78,9 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + ovos.url = "git+file:///home/christopher/workspaces/ovos-flake"; + ovos.inputs.nixpkgs.follows = "nixpkgs"; + # Opinionated flake library for better organization without much boilerplate snowfall = { url = "github:snowfallorg/lib"; @@ -117,6 +121,5 @@ url = "github:nix-community/NUR"; inputs.nixpkgs.follows = "nixpkgs"; }; - }; } diff --git a/homes/x86_64-linux/christopher@cobalt/config/dev.nix b/homes/x86_64-linux/christopher@cobalt/config/dev.nix index b49ae30..2d2df1a 100644 --- a/homes/x86_64-linux/christopher@cobalt/config/dev.nix +++ b/homes/x86_64-linux/christopher@cobalt/config/dev.nix @@ -1,4 +1,9 @@ -{pkgs, ...}: { +{ + pkgs, + inputs, + system, + ... +}: { home.packages = with pkgs; [ # Editors jetbrains-toolbox # Installer for JetBrains IDEs @@ -24,6 +29,7 @@ just # Just a command runner claude-monitor devenv + _elements.oryx # TUI for sniffing network traffic using eBPF # Build tools cargo @@ -50,6 +56,8 @@ claude-code = { enable = true; + # package = inputs.unstable.${system}.claude-code; + commands = { fix-github-issue = '' Please analyze and fix the GitHub issue $ARGUMENTS. diff --git a/homes/x86_64-linux/christopher@cobalt/config/git.nix b/homes/x86_64-linux/christopher@cobalt/config/git.nix index 3e15ea3..5bf6675 100644 --- a/homes/x86_64-linux/christopher@cobalt/config/git.nix +++ b/homes/x86_64-linux/christopher@cobalt/config/git.nix @@ -15,13 +15,13 @@ signing = { signByDefault = true; - key = "E919B0F59E14FD47"; + key = "925AC7D69955293F"; }; settings = { user = { name = "Christopher Mühl"; - email = "christopher@muehl.dev"; + email = "toki@toph.so"; }; push = { default = "current"; diff --git a/homes/x86_64-linux/christopher@cobalt/misc/creativity.nix b/homes/x86_64-linux/christopher@cobalt/misc/creativity.nix index 4be11ca..9cdb225 100644 --- a/homes/x86_64-linux/christopher@cobalt/misc/creativity.nix +++ b/homes/x86_64-linux/christopher@cobalt/misc/creativity.nix @@ -14,5 +14,6 @@ # Audio vcv-rack + supercollider ]; } diff --git a/homes/x86_64-linux/christopher@cobalt/misc/everything.nix b/homes/x86_64-linux/christopher@cobalt/misc/everything.nix index c0b25f9..0f2d84e 100644 --- a/homes/x86_64-linux/christopher@cobalt/misc/everything.nix +++ b/homes/x86_64-linux/christopher@cobalt/misc/everything.nix @@ -31,6 +31,9 @@ zathura # Document viewer evince # Document viewer + # element-desktop + fractal # Matrix client + gomuks # Matrix client TUI telegram-desktop vesktop # Discord client filezilla # FTP Client diff --git a/homes/x86_64-linux/christopher@cobalt/misc/recording.nix b/homes/x86_64-linux/christopher@cobalt/misc/recording.nix index 283154d..6e264da 100644 --- a/homes/x86_64-linux/christopher@cobalt/misc/recording.nix +++ b/homes/x86_64-linux/christopher@cobalt/misc/recording.nix @@ -9,6 +9,8 @@ ffmpeg ]; + services.easyeffects.enable = true; + programs.firefox.profiles."streaming" = { id = 2; settings = {}; diff --git a/modules/common/nix.nix b/modules/common/nix.nix index 4ab54f9..5c4de08 100644 --- a/modules/common/nix.nix +++ b/modules/common/nix.nix @@ -27,9 +27,9 @@ config.allowUnfree = true; config.permittedInsecurePackages = [ "nixos-config" - "electron-27.3.11" "electron-36.9.5" "dotnet-sdk-6.0.428" + "olm-3.2.16" ]; }; diff --git a/packages/oryx/default.nix b/packages/oryx/default.nix new file mode 100644 index 0000000..7d966ba --- /dev/null +++ b/packages/oryx/default.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + fetchurl, +}: + +stdenv.mkDerivation rec { + pname = "oryx"; + version = "0.7.2"; + + src = fetchurl { + url = "https://github.com/pythops/oryx/releases/download/v${version}/oryx-x86_64-unknown-linux-musl"; + hash = "sha256-qvgdaFs21nDePKSYYWChdknbrWlmZheGLsmv/STnVuk="; + }; + + dontUnpack = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp $src $out/bin/oryx + chmod +x $out/bin/oryx + runHook postInstall + ''; + + meta = with lib; { + description = "TUI for sniffing network traffic using eBPF"; + homepage = "https://github.com/pythops/oryx"; + license = licenses.gpl3Only; + maintainers = []; + mainProgram = "oryx"; + platforms = ["x86_64-linux"]; + }; +} diff --git a/systems/x86_64-linux/cobalt/default.nix b/systems/x86_64-linux/cobalt/default.nix index aecdd2c..0259f92 100644 --- a/systems/x86_64-linux/cobalt/default.nix +++ b/systems/x86_64-linux/cobalt/default.nix @@ -83,6 +83,8 @@ with lib._elements; { }; services = { + # elements.ovos.enable = true; + openssh.enable = true; openssh.settings.PasswordAuthentication = false; @@ -253,5 +255,4 @@ with lib._elements; { boot.extraModprobeConfig = '' options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1 ''; - security.polkit.enable = true; }