Add niri/sops, rm obs

This commit is contained in:
Hunter Haugen 2026-02-06 13:44:42 -08:00
parent d1a237689c
commit 6db1abec1b
Signed by: hunner
GPG key ID: EF99694AA599DDAD
4 changed files with 212 additions and 68 deletions

View file

@ -1,5 +1,16 @@
# Config for framework16 # Config for framework16
{ config, pkgs, lib, nixos-hardware, impermanence, talon-nix, plover-flake, beads-flake, ... }: {
config,
pkgs,
lib,
nixos-hardware,
impermanence,
talon-nix,
plover-flake,
beads-flake,
awww,
niri,
... }:
{ {
nix.settings = { nix.settings = {
download-buffer-size = 524288000; # 500 MiB download-buffer-size = 524288000; # 500 MiB
@ -116,14 +127,19 @@
virtualisation.docker = { virtualisation.docker = {
enable = true; enable = true;
extraOptions = "--storage-driver=overlay2"; extraOptions = "--storage-driver=overlay2";
extraPackages = [
pkgs.docker-buildx
pkgs.docker-compose
];
}; };
programs.niri.enable = true; programs.niri.enable = true;
programs.niri.package = niri.packages.${pkgs.stdenv.hostPlatform.system}.default;
programs.hyprland.enable = true; programs.hyprland.enable = true;
programs.hyprland.xwayland.enable = false; programs.hyprland.xwayland.enable = false;
programs.hyprland.withUWSM = true; programs.hyprland.withUWSM = true;
programs.hyprlock.enable = true; programs.hyprlock.enable = true;
services.hypridle.enable = true; services.hypridle.enable = true;
programs.waybar.enable = true; programs.waybar.enable = false;
environment.sessionVariables.NIXOS_OZONE_WL = "1"; # hint electron apps to use wayland environment.sessionVariables.NIXOS_OZONE_WL = "1"; # hint electron apps to use wayland
programs.zsh.enable = true; programs.zsh.enable = true;
services.openssh.enable = true; services.openssh.enable = true;
@ -164,6 +180,7 @@
extraPortals = [ extraPortals = [
pkgs.xdg-desktop-portal-wlr pkgs.xdg-desktop-portal-wlr
pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-gtk
pkgs.xdg-desktop-portal-gnome
#pkgs.xdg-desktop-portal-hyprland #pkgs.xdg-desktop-portal-hyprland
]; ];
}; };
@ -232,6 +249,7 @@
slack slack
mplayer mplayer
ffmpeg ffmpeg
docker-credential-helpers
jetbrains-toolbox jetbrains-toolbox
pass pass
dua dua
@ -251,6 +269,9 @@
pkgs.unstable.codex pkgs.unstable.codex
neofetch neofetch
eww eww
quickshell
fuzzel
xwayland-satellite
hyprpaper # for hyprland hyprpaper # for hyprland
hyprcursor # for hyprland hyprcursor # for hyprland
nordzy-icon-theme nordzy-icon-theme
@ -270,10 +291,12 @@
pyright pyright
just just
yt-dlp yt-dlp
ledger-live-desktop
socat socat
plover-flake.packages.${pkgs.stdenv.hostPlatform.system}.plover-full plover-flake.packages.${pkgs.stdenv.hostPlatform.system}.plover-full
pkgs.unstable.zoom-us pkgs.unstable.zoom-us
beads-flake.packages.${pkgs.stdenv.hostPlatform.system}.default # beads-flake.packages.${pkgs.stdenv.hostPlatform.system}.default
awww.packages.${pkgs.stdenv.hostPlatform.system}.awww
nix-index # for nix-locate nix-index # for nix-locate
sops sops
]; ];
@ -333,8 +356,6 @@
tmux tmux
file file
ripgrep ripgrep
docker-compose
docker-credential-helpers
powertop powertop
alacritty alacritty
rofi rofi
@ -371,7 +392,7 @@
zip zip
scarlett2 scarlett2
alsa-scarlett-gui alsa-scarlett-gui
pkgs.unstable.ndi-6 #pkgs.unstable.ndi-6
xdg-utils xdg-utils
btrbk btrbk
devenv devenv
@ -408,18 +429,18 @@
enable = true; enable = true;
polkitPolicyOwners = [ "hunner" ]; polkitPolicyOwners = [ "hunner" ];
}; };
programs.obs-studio = { #programs.obs-studio = {
enable = true; # enable = true;
package = pkgs.unstable.obs-studio; # package = pkgs.unstable.obs-studio;
enableVirtualCamera = true; # enableVirtualCamera = true;
plugins = with pkgs.unstable.obs-studio-plugins; [ # plugins = with pkgs.unstable.obs-studio-plugins; [
wlrobs # wlrobs
obs-backgroundremoval # obs-backgroundremoval
obs-pipewire-audio-capture # obs-pipewire-audio-capture
#obs-ndi # #obs-ndi
distroav # distroav
]; # ];
}; #};
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
nerd-fonts.droid-sans-mono nerd-fonts.droid-sans-mono

210
hosts/liminal/flake.lock generated
View file

@ -1,16 +1,36 @@
{ {
"nodes": { "nodes": {
"awww": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1766518114,
"narHash": "sha256-3zIOjIidbrHXTxEzjPVrwSd19Mwdfw58VvSnTWtlunc=",
"ref": "refs/heads/main",
"rev": "138c4ebdbe0c3eead5656373ea8837a5bd49c40b",
"revCount": 1329,
"type": "git",
"url": "https://codeberg.org/LGFae/awww"
},
"original": {
"type": "git",
"url": "https://codeberg.org/LGFae/awww"
}
},
"beads-flake": { "beads-flake": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1769745953, "lastModified": 1770403663,
"narHash": "sha256-MaXonP3cKzhIudOwyHThSiKVWpH5cm4HKhBgw69P6Q0=", "narHash": "sha256-d8rkeRKa2H1nXFIFgtaFS0B5RslL5aLDM1J1yCI7tac=",
"owner": "steveyegge", "owner": "steveyegge",
"repo": "beads", "repo": "beads",
"rev": "761d2e76379a03c7fe0efc2157ac23e8a52217df", "rev": "eb1049baf371de3988123244bacac01b1a62ef67",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -19,6 +39,22 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1761588595,
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
@ -61,7 +97,7 @@
"impermanence": { "impermanence": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1769548169, "lastModified": 1769548169,
@ -77,6 +113,28 @@
"type": "github" "type": "github"
} }
}, },
"niri": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1769884849,
"narHash": "sha256-prt52Vr9/Wb1bBwR9O4o99UXKhaYuqWSESW3HlaHCPQ=",
"owner": "hunner",
"repo": "niri",
"rev": "366f6859c167bb24ffe2ff87e9a379d7cc5b26c8",
"type": "github"
},
"original": {
"owner": "hunner",
"ref": "hunner/focus-to-workspace",
"repo": "niri",
"type": "github"
}
},
"nix-github-actions": { "nix-github-actions": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -114,6 +172,38 @@
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": {
"lastModified": 1763934636,
"narHash": "sha256-9glbI7f1uU+yzQCq5LwLgdZqx6svOhZWkd4JRY265fc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ee09932cedcef15aaf476f9343d1dea2cb77e261",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1770197578,
"narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1760284886, "lastModified": 1760284886,
"narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=",
@ -129,23 +219,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs_3": {
"locked": {
"lastModified": 1769461804,
"narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1768564909, "lastModified": 1768564909,
"narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
@ -161,13 +235,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1769598131, "lastModified": 1770136044,
"narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=", "narHash": "sha256-tlFqNG/uzz2++aAmn4v8J0vAkV3z7XngeIIB3rM3650=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211", "rev": "e576e3c9cf9bad747afcddd9e34f51d18c855b4e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -177,13 +251,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1769461804, "lastModified": 1770197578,
"narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -193,7 +267,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1698318101, "lastModified": 1698318101,
"narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=",
@ -212,11 +286,11 @@
"plover": { "plover": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1769494862, "lastModified": 1770363408,
"narHash": "sha256-vHsGisi53KFYzbE+GFtF1kQWShqlUxnL4791v4Amsqw=", "narHash": "sha256-5VlX3rdLBp6in2MNZpf69KDi5wqsmJcv+3klFz1MGFE=",
"owner": "openstenoproject", "owner": "openstenoproject",
"repo": "plover", "repo": "plover",
"rev": "78064997b471cd9a02308f5a7bb524e19eb1e522", "rev": "a04f2c8d1a60c275a20b907b147c803932ed35bc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -227,7 +301,7 @@
}, },
"plover-flake": { "plover-flake": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_5",
"plover": "plover", "plover": "plover",
"plover-stroke": "plover-stroke", "plover-stroke": "plover-stroke",
"plover2cat": "plover2cat", "plover2cat": "plover2cat",
@ -235,11 +309,11 @@
"rtf-tokenize": "rtf-tokenize" "rtf-tokenize": "rtf-tokenize"
}, },
"locked": { "locked": {
"lastModified": 1769717881, "lastModified": 1770371166,
"narHash": "sha256-KujC4L53jzIJUPkP0VW4+423V4EhWfhApHHobOAUkmo=", "narHash": "sha256-yCP26dPlyE/cB+HpiPmRYDqexDPnyKXnKEb60telt1Q=",
"owner": "openstenoproject", "owner": "openstenoproject",
"repo": "plover-flake", "repo": "plover-flake",
"rev": "c0dabbdff79f8d8096ad4a45afb9b2c65eee5fd5", "rev": "604a11a80433ea52f8f411b3b8cfcdc5ae36be01",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -267,11 +341,11 @@
"plover2cat": { "plover2cat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1769293912, "lastModified": 1770344683,
"narHash": "sha256-nxyNTYZ/8VqxPa2d2pHeaTRae1J4zu5h29lDGzA/C/U=", "narHash": "sha256-CSydXof9n5zWL7rT2cI+a81N+fxYDOIF9FRgaEk0XFo=",
"owner": "greenwyrt", "owner": "greenwyrt",
"repo": "plover2CAT", "repo": "plover2CAT",
"rev": "f6c788c5e343ada345a787579b5561c7255d4277", "rev": "2f7028415b1eaffd3122b9947a9b929b8612bdf5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -298,10 +372,12 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"awww": "awww",
"beads-flake": "beads-flake", "beads-flake": "beads-flake",
"impermanence": "impermanence", "impermanence": "impermanence",
"niri": "niri",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_4",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"plover-flake": "plover-flake", "plover-flake": "plover-flake",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
@ -324,6 +400,48 @@
"type": "github" "type": "github"
} }
}, },
"rust-overlay": {
"inputs": {
"nixpkgs": [
"awww",
"nixpkgs"
]
},
"locked": {
"lastModified": 1764038373,
"narHash": "sha256-M6w2wNBRelcavoDAyFL2iO4NeWknD40ASkH1S3C0YGM=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "ab3536fe850211a96673c6ffb2cb88aab8071cc9",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-overlay_2": {
"inputs": {
"nixpkgs": [
"niri",
"nixpkgs"
]
},
"locked": {
"lastModified": 1757989933,
"narHash": "sha256-9cpKYWWPCFhgwQTww8S94rTXgg8Q8ydFv9fXM6I8xQM=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "8249aa3442fb9b45e615a35f39eca2fe5510d7c3",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -331,11 +449,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1769469829, "lastModified": 1770145881,
"narHash": "sha256-wFcr32ZqspCxk4+FvIxIL0AZktRs6DuF8oOsLt59YBU=", "narHash": "sha256-ktjWTq+D5MTXQcL9N6cDZXUf9kX8JBLLBLT0ZyOTSYY=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c5eebd4eb2e3372fe12a8d70a248a6ee9dd02eff", "rev": "17eea6f3816ba6568b8c81db8a4e6ca438b30b7c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -362,7 +480,7 @@
"talon-nix": { "talon-nix": {
"inputs": { "inputs": {
"nix-github-actions": "nix-github-actions", "nix-github-actions": "nix-github-actions",
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1746431176, "lastModified": 1746431176,

View file

@ -10,8 +10,11 @@
talon-nix.url = "github:nix-community/talon-nix"; talon-nix.url = "github:nix-community/talon-nix";
plover-flake.url = "github:openstenoproject/plover-flake"; plover-flake.url = "github:openstenoproject/plover-flake";
beads-flake.url = "github:steveyegge/beads"; beads-flake.url = "github:steveyegge/beads";
awww.url = "git+https://codeberg.org/LGFae/awww";
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
sops-nix.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.inputs.nixpkgs.follows = "nixpkgs";
niri.url = "github:hunner/niri/hunner/focus-to-workspace";
niri.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = { outputs = {
@ -23,7 +26,9 @@
talon-nix, talon-nix,
plover-flake, plover-flake,
beads-flake, beads-flake,
awww,
sops-nix, sops-nix,
niri,
... ...
}: }:
let let
@ -42,7 +47,7 @@
inherit system; inherit system;
specialArgs = { specialArgs = {
inherit nixos-hardware impermanence talon-nix plover-flake beads-flake; inherit nixos-hardware impermanence talon-nix plover-flake beads-flake awww niri;
}; };
modules = [ modules = [

View file

@ -1,4 +1,4 @@
hashedPassword: ENC[AES256_GCM,data:FvSo0j1H/FpP8ljQTYNSRvAPDvvXi1TcIJnIY+WgTRiHZ0vb426+Pp8FNCqA06Rr/a+5T23ni2s1gOgX143LA4rI9xo9CgLxyw==,iv:QlenOW5mUdbS9+mnpoHfmVG/qnKLETuyVn8zOatTY98=,tag:6jslZ2Lth512XioIgHL92Q==,type:str] hashedPassword: ENC[AES256_GCM,data:g4PjoNHYxicKcAbsCjecIfwSZunj0uqyxKi2RbyRuFa0T2s+VdgvCxygVVj8LDTVX37YO6cRe1ZDQs0fzNSwy/OhVvrpVaocXw==,iv:1oMZGtMhfRWp1nr1Td1Yv7gnFZxjHkxnb+idLbTh4Nc=,tag:arOcPlX3vhvuASu5U6py+g==,type:str]
sops: sops:
age: age:
- recipient: age17sdp0gguexd88qel74fa4zeckxh93gqpkayz366fz6yvjauw7vcq7w6y45 - recipient: age17sdp0gguexd88qel74fa4zeckxh93gqpkayz366fz6yvjauw7vcq7w6y45
@ -19,7 +19,7 @@ sops:
WHVZYkQvN1MxaEV4NElLcHFPZmNjZVkKbUHXfK4Wt7MRS2XYBy9v/SQ3a6T4V5FK WHVZYkQvN1MxaEV4NElLcHFPZmNjZVkKbUHXfK4Wt7MRS2XYBy9v/SQ3a6T4V5FK
bjd0nVVTJeMnE6V9avjNuOCVUkug4PylIzSMSohfpR6AmSy68jYElw== bjd0nVVTJeMnE6V9avjNuOCVUkug4PylIzSMSohfpR6AmSy68jYElw==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2025-12-29T21:00:07Z" lastmodified: "2026-01-31T02:40:58Z"
mac: ENC[AES256_GCM,data:IEWEy84qU3Lzq4tuNITS1JjxfNSNMksQMVTJbDHNyaN+gpVhjgS/SIX3ESU36S+CcgR/iczRvUvURA+s0csiMXCKfx2IwVuTIKqtTArDubjlqivr7fhY94VTkFz2e3ohfcHiJt6uzhzxHNDAAE5Ju9TzIAVyf+FRFZFUMRQwddc=,iv:oqnvxQg7mN7yWYoIahdJnKUestSeIMKvawt7+fDC38o=,tag:fcpPcvy+HTFSPTUM2GZ+0w==,type:str] mac: ENC[AES256_GCM,data:ZO+UGKpTWl2WTMQb5nCcqrC/T/Yls4EnpvF58Gt46nXRtEEwlkmG4lvQNOUP2t4fsyJ2fVSfbWlnPAOCO8kzcK5831bMblSonH52qXhLg26fdtvsGwYz1oReKtwXx20OK/lM9+nABBZFEKpqEtuvi3vLCpOANNdDkF3Cg8VYwu4=,iv:Wx2YEpXpZX0MKlL0zvrPLcgdmRCshdlEQokMmQe2gBM=,tag:0lPwq2LYM1dWYolBoEA5SQ==,type:str]
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.11.0 version: 3.11.0