hunner/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add plover/beads, remove flatpak zoom

Browse source
This commit is contained in:
Hunter Haugen 2025-11-05 16:41:07 -08:00
parent fcc26153df
commit 20dc381aa3
Signed by: hunner
GPG key ID: EF99694AA599DDAD
3 changed files with 253 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

27
framework/configuration.nix
View file

@ -1,5 +1,5 @@
# Config for framework16 # Config for framework16
{ config, pkgs, lib, nixos-hardware, impermanence, talon-nix, ... }: { config, pkgs, lib, nixos-hardware, impermanence, talon-nix, plover-flake, beads-flake, ... }:
{ {
imports = imports =
[ [
@ -11,6 +11,7 @@
boot = { boot = {
loader.systemd-boot.enable = true; loader.systemd-boot.enable = true;
loader.systemd-boot.configurationLimit = 100;
loader.efi.canTouchEfiVariables = true; loader.efi.canTouchEfiVariables = true;
#initrd.luks.devices."cryptroot".device = "/dev/disk/by-partlabel/disk-nvme0n1-cryptroot"; #initrd.luks.devices."cryptroot".device = "/dev/disk/by-partlabel/disk-nvme0n1-cryptroot";
initrd.luks.devices."cryptswap".device = "/dev/disk/by-partlabel/disk-nvme0n1-swap"; initrd.luks.devices."cryptswap".device = "/dev/disk/by-partlabel/disk-nvme0n1-swap";
@ -192,7 +193,7 @@
users.users.hunner = { users.users.hunner = {
isNormalUser = true; isNormalUser = true;
description = "Hunter Haugen"; 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"; hashedPassword = "$y$j9T$hLqdzlz7dbJZgUnKs.eo3/$25s/2X18vGtDKj53qD1sn/.Omp/6CBJWbn7d9KAiOK7";
shell = pkgs.zsh; shell = pkgs.zsh;
packages = with pkgs; [ packages = with pkgs; [
@ -200,8 +201,8 @@
neovim neovim
asdf-vm asdf-vm
pinentry-gtk2 pinentry-gtk2
pinentry-gnome3
gnupg gnupg
#unstable.zoom-us
firefox-devedition firefox-devedition
nodejs nodejs
slack slack
@ -210,7 +211,6 @@
jetbrains-toolbox jetbrains-toolbox
pass pass
diff-so-fancy diff-so-fancy
webex
pkgs.unstable.zed-editor pkgs.unstable.zed-editor
pkgs.unstable.package-version-server pkgs.unstable.package-version-server
amdgpu_top amdgpu_top
@ -222,7 +222,6 @@
gcc # for zed gcc # for zed
#ruff # for zed #ruff # for zed
goose-cli goose-cli
teams-for-linux
claude-code claude-code
neofetch neofetch
eww eww
@ -245,6 +244,10 @@
pyright pyright
just just
yt-dlp yt-dlp
socat
plover-flake.packages.${pkgs.system}.plover-full
pkgs.unstable.zoom-us
beads-flake.packages.${pkgs.system}.default
]; ];
}; };
systemd.user.services = { systemd.user.services = {
@ -312,7 +315,6 @@
xorg.xev xorg.xev
hsetroot hsetroot
redshift redshift
flameshot
pkgs.unstable.code-cursor pkgs.unstable.code-cursor
pwvucontrol pwvucontrol
pamixer pamixer
@ -333,6 +335,11 @@
btrbk btrbk
devenv devenv
lsof lsof
#(pkgs.unstable.flameshot.override { enableWlrSupport = true; })
hyprshot
hyprpicker
flameshot
chromium
]; ];
services.clipmenu.enable = true; services.clipmenu.enable = true;
@ -427,14 +434,6 @@
}; };
programs.dconf.enable = true; programs.dconf.enable = true;
security.polkit.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"; systemd.services."user@".serviceConfig.Delegate = "cpu io memory pids cpuset";
services.fprintd.enable = true; services.fprintd.enable = true;

248
framework/flake.lock generated
View file

@ -1,5 +1,42 @@
{ {
"nodes": { "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": { "impermanence": {
"locked": { "locked": {
"lastModified": 1737831083, "lastModified": 1737831083,
@ -38,11 +75,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1757943327, "lastModified": 1760106635,
"narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -53,27 +90,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1758346548, "lastModified": 1760284886,
"narHash": "sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E=", "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20", "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-25.05", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1758277210, "lastModified": 1760284886,
"narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8eaee110344796db060382e15d3af0a9fc396e0e", "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -84,6 +121,38 @@
} }
}, },
"nixpkgs_2": { "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": { "locked": {
"lastModified": 1698318101, "lastModified": 1698318101,
"narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=",
@ -99,19 +168,174 @@
"type": "github" "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": { "root": {
"inputs": { "inputs": {
"beads-flake": "beads-flake",
"impermanence": "impermanence", "impermanence": "impermanence",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"plover-flake": "plover-flake",
"talon-nix": "talon-nix" "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": { "talon-nix": {
"inputs": { "inputs": {
"nix-github-actions": "nix-github-actions", "nix-github-actions": "nix-github-actions",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1746431176, "lastModified": 1746431176,

6
framework/flake.nix
View file

@ -8,9 +8,11 @@
nixos-hardware.url = "github:NixOS/nixos-hardware"; nixos-hardware.url = "github:NixOS/nixos-hardware";
impermanence.url = "github:nix-community/impermanence"; impermanence.url = "github:nix-community/impermanence";
talon-nix.url = "github:nix-community/talon-nix"; 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 let
system = "x86_64-linux"; system = "x86_64-linux";
@ -27,7 +29,7 @@
inherit system; inherit system;
specialArgs = { specialArgs = {
inherit nixos-hardware impermanence talon-nix; inherit nixos-hardware impermanence talon-nix plover-flake beads-flake;
}; };
modules = [ modules = [