diff --git a/framework/configuration.nix b/framework/configuration.nix index 5097e25..b2ddd88 100644 --- a/framework/configuration.nix +++ b/framework/configuration.nix @@ -1,5 +1,5 @@ # Config for framework16 -{ config, pkgs, lib, nixos-hardware, impermanence, talon-nix, ... }: +{ config, pkgs, lib, nixos-hardware, impermanence, talon-nix, plover-flake, beads-flake, ... }: { imports = [ @@ -11,6 +11,7 @@ boot = { loader.systemd-boot.enable = true; + loader.systemd-boot.configurationLimit = 100; loader.efi.canTouchEfiVariables = true; #initrd.luks.devices."cryptroot".device = "/dev/disk/by-partlabel/disk-nvme0n1-cryptroot"; initrd.luks.devices."cryptswap".device = "/dev/disk/by-partlabel/disk-nvme0n1-swap"; @@ -192,7 +193,7 @@ users.users.hunner = { isNormalUser = true; description = "Hunter Haugen"; - extraGroups = [ "docker" "networkmanager" "wheel" "audio" "video" ]; + extraGroups = [ "docker" "networkmanager" "wheel" "audio" "video" "dialout" ]; hashedPassword = "$y$j9T$hLqdzlz7dbJZgUnKs.eo3/$25s/2X18vGtDKj53qD1sn/.Omp/6CBJWbn7d9KAiOK7"; shell = pkgs.zsh; packages = with pkgs; [ @@ -200,8 +201,8 @@ neovim asdf-vm pinentry-gtk2 + pinentry-gnome3 gnupg - #unstable.zoom-us firefox-devedition nodejs slack @@ -210,7 +211,6 @@ jetbrains-toolbox pass diff-so-fancy - webex pkgs.unstable.zed-editor pkgs.unstable.package-version-server amdgpu_top @@ -222,7 +222,6 @@ gcc # for zed #ruff # for zed goose-cli - teams-for-linux claude-code neofetch eww @@ -245,6 +244,10 @@ pyright just yt-dlp + socat + plover-flake.packages.${pkgs.system}.plover-full + pkgs.unstable.zoom-us + beads-flake.packages.${pkgs.system}.default ]; }; systemd.user.services = { @@ -312,7 +315,6 @@ xorg.xev hsetroot redshift - flameshot pkgs.unstable.code-cursor pwvucontrol pamixer @@ -333,6 +335,11 @@ btrbk devenv lsof + #(pkgs.unstable.flameshot.override { enableWlrSupport = true; }) + hyprshot + hyprpicker + flameshot + chromium ]; services.clipmenu.enable = true; @@ -427,14 +434,6 @@ }; programs.dconf.enable = true; security.polkit.enable = true; - services.flatpak.enable = true; - systemd.services.flatpak-repo = { - wantedBy = [ "multi-user.target" ]; - path = [ pkgs.flatpak ]; - script = '' - flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - ''; - }; systemd.services."user@".serviceConfig.Delegate = "cpu io memory pids cpuset"; services.fprintd.enable = true; diff --git a/framework/flake.lock b/framework/flake.lock index 8cf424c..d05fe7e 100644 --- a/framework/flake.lock +++ b/framework/flake.lock @@ -1,5 +1,42 @@ { "nodes": { + "beads-flake": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1762194927, + "narHash": "sha256-nBhdgDiRBQuW467wo8qZSboI8iWACRgb0d5TOhGWEFI=", + "owner": "steveyegge", + "repo": "beads", + "rev": "add5599d7e47d2f708240ec7b8d82ca8766d5502", + "type": "github" + }, + "original": { + "owner": "steveyegge", + "repo": "beads", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "impermanence": { "locked": { "lastModified": 1737831083, @@ -38,11 +75,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1757943327, - "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", + "lastModified": 1760106635, + "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", + "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903", "type": "github" }, "original": { @@ -53,27 +90,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1758346548, - "narHash": "sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E=", + "lastModified": 1760284886, + "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20", + "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1758277210, - "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", + "lastModified": 1760284886, + "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", + "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", "type": "github" }, "original": { @@ -84,6 +121,38 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1760139962, + "narHash": "sha256-4xggC56Rub3WInz5eD7EZWXuLXpNvJiUPahGtMkwtuc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7e297ddff44a3cc93673bb38d0374df8d0ad73e4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1760284886, + "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1698318101, "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", @@ -99,19 +168,174 @@ "type": "github" } }, + "plover": { + "flake": false, + "locked": { + "lastModified": 1760128166, + "narHash": "sha256-I6AgXs8nL5Abn96dWQcyKplmK/gRzr95Txv0GKzHGaA=", + "owner": "openstenoproject", + "repo": "plover", + "rev": "751f94b3777b5262c2bdad4c25814a58c27d4080", + "type": "github" + }, + "original": { + "owner": "openstenoproject", + "repo": "plover", + "type": "github" + } + }, + "plover-flake": { + "inputs": { + "nixpkgs": "nixpkgs_3", + "plover": "plover", + "plover-machine-hid": "plover-machine-hid", + "plover-stroke": "plover-stroke", + "plover2cat": "plover2cat", + "plover_plugins_registry": "plover_plugins_registry", + "pyobjc": "pyobjc", + "rtf-tokenize": "rtf-tokenize" + }, + "locked": { + "lastModified": 1760413607, + "narHash": "sha256-4c5UPQCVSLKAOrSEImlaHr4drdWz0K/J/fNjSav1jrs=", + "owner": "openstenoproject", + "repo": "plover-flake", + "rev": "1f840e4a424fb15ebfff528c1f2afe7e8550797e", + "type": "github" + }, + "original": { + "owner": "openstenoproject", + "repo": "plover-flake", + "type": "github" + } + }, + "plover-machine-hid": { + "flake": false, + "locked": { + "lastModified": 1757266704, + "narHash": "sha256-S+NBVnLjWdINTRpNIZvGotNGiMVSnvq1NZRPnKCmZyM=", + "owner": "dnaq", + "repo": "plover-machine-hid", + "rev": "db917f8b2545964fdaa2f664d1d1e2afafae96a1", + "type": "github" + }, + "original": { + "owner": "dnaq", + "repo": "plover-machine-hid", + "type": "github" + } + }, + "plover-stroke": { + "flake": false, + "locked": { + "lastModified": 1652559629, + "narHash": "sha256-A75OMzmEn0VmDAvmQCp6/7uptxzwWJTwsih3kWlYioA=", + "owner": "openstenoproject", + "repo": "plover_stroke", + "rev": "e717a1983b58dcba644153a542dbf8514425a39b", + "type": "github" + }, + "original": { + "owner": "openstenoproject", + "repo": "plover_stroke", + "type": "github" + } + }, + "plover2cat": { + "flake": false, + "locked": { + "lastModified": 1757574932, + "narHash": "sha256-kIDuIezGN+n3RDWMOlR6eFlQlQDp6okKgQCk71AgUDs=", + "owner": "greenwyrt", + "repo": "plover2CAT", + "rev": "477163958b1a9e6fc48337be137173570fa7350a", + "type": "github" + }, + "original": { + "owner": "greenwyrt", + "repo": "plover2CAT", + "type": "github" + } + }, + "plover_plugins_registry": { + "flake": false, + "locked": { + "lastModified": 1760159297, + "narHash": "sha256-gtW+m72znb8pk2JgeV40ZoGHR2wd8X5F9W/CAJm1Rws=", + "owner": "openstenoproject", + "repo": "plover_plugins_registry", + "rev": "70b35b1a8d150375d05affb85c734cd87799ab68", + "type": "github" + }, + "original": { + "owner": "openstenoproject", + "repo": "plover_plugins_registry", + "type": "github" + } + }, + "pyobjc": { + "flake": false, + "locked": { + "lastModified": 1736669867, + "narHash": "sha256-Kj1CH1+RYTFszao9G7P3fnsgBjTcvsq4ZpxdjHzQ520=", + "owner": "ronaldoussoren", + "repo": "pyobjc", + "rev": "e29d3a0c80b5bb852e4311ce10827efab9844c6c", + "type": "github" + }, + "original": { + "owner": "ronaldoussoren", + "ref": "v11.0", + "repo": "pyobjc", + "type": "github" + } + }, "root": { "inputs": { + "beads-flake": "beads-flake", "impermanence": "impermanence", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", + "plover-flake": "plover-flake", "talon-nix": "talon-nix" } }, + "rtf-tokenize": { + "flake": false, + "locked": { + "lastModified": 1751102035, + "narHash": "sha256-bM/DFl1mpHgeBItdyA5Tt+Eo9u82Gz+6qwft2h0bM94=", + "owner": "openstenoproject", + "repo": "rtf_tokenize", + "rev": "5c4ad772f4b45ceb35b60584e22a171e90526916", + "type": "github" + }, + "original": { + "owner": "openstenoproject", + "repo": "rtf_tokenize", + "type": "github" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "talon-nix": { "inputs": { "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1746431176, diff --git a/framework/flake.nix b/framework/flake.nix index 3fcffce..8bcc7cf 100644 --- a/framework/flake.nix +++ b/framework/flake.nix @@ -8,9 +8,11 @@ nixos-hardware.url = "github:NixOS/nixos-hardware"; impermanence.url = "github:nix-community/impermanence"; talon-nix.url = "github:nix-community/talon-nix"; + plover-flake.url = "github:openstenoproject/plover-flake"; + beads-flake.url = "github:steveyegge/beads"; }; - outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, impermanence, talon-nix, ... }: + outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, impermanence, talon-nix, plover-flake, beads-flake, ... }: let system = "x86_64-linux"; @@ -27,7 +29,7 @@ inherit system; specialArgs = { - inherit nixos-hardware impermanence talon-nix; + inherit nixos-hardware impermanence talon-nix plover-flake beads-flake; }; modules = [