Merge pull request #582 from genebean/bigboy

Bigboy fixes and flake update
This commit is contained in:
Gene Liverman 2025-12-30 16:49:38 -05:00 committed by GitHub
commit 33c09e6790
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 27 additions and 19 deletions

36
flake.lock generated
View file

@ -290,11 +290,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1766292113, "lastModified": 1767024057,
"narHash": "sha256-sWTtmkQujRpjWYCnZc8LWdDiCzrRlSBPrGovkZpLkBI=", "narHash": "sha256-B1aycRjMRvb6QOGbnqDhiDzZwMebj5jxZ5qyJzaKvpI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "fdec8815a86db36f42fc9c8cb2931cd8485f5aed", "rev": "34578a2fdfce4257ce5f5baf6e7efbd4e4e252b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -424,11 +424,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1764440730, "lastModified": 1767070591,
"narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "narHash": "sha256-b0aM3221Pw6vbACFqZrVzZjMNqXVPi1dvgLr8QTbajc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "rev": "9b3c38bf6c260d0e88154ef07fa833fa845bfd14",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -456,11 +456,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1766410818, "lastModified": 1767026758,
"narHash": "sha256-ruVneSx6wFy5PMw1ow3BE+znl653TJ6+eeNUj4B/9y8=", "narHash": "sha256-7fsac/f7nh/VaKJ/qm3I338+wAJa/3J57cOGpXi0Sbg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3a7affa77a5a539afa1c7859e2c31abdb1aeadf3", "rev": "346dd96ad74dc4457a9db9de4f4f57dab2e5731d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -472,11 +472,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1766201043, "lastModified": 1766885793,
"narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=", "narHash": "sha256-P6RVkrM9JLCW6xBjSwHfgTOQ1JwBUma5xe5LI8xAPC0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b3aad468604d3e488d627c0b43984eb60e75e782", "rev": "9ef261221d1e72399f2036786498d78c38185c46",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -597,11 +597,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764185122, "lastModified": 1766537863,
"narHash": "sha256-+HUOwSIFLoyett2cvRjuFIbhobpHallfP9J2cia1apo=", "narHash": "sha256-HEt+wbazRgJYeY+lgj65bxhPyVc4x7NEB2bs5NU6DF8=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "a14fe3b293ec2720e5b7fc72ad136d22967e12ba", "rev": "23f0a53ca6e58e61e1ea2b86791c69b79c91656d",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -618,11 +618,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1766289575, "lastModified": 1766894905,
"narHash": "sha256-BOKCwOQQIP4p9z8DasT5r+qjri3x7sPCOq+FTjY8Z+o=", "narHash": "sha256-pn8AxxfajqyR/Dmr1wnZYdUXHgM3u6z9x0Z1Ijmz2UQ=",
"owner": "mic92", "owner": "mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "9836912e37aef546029e48c8749834735a6b9dad", "rev": "61b39c7b657081c2adc91b75dd3ad8a91d6f07a7",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -3,6 +3,7 @@
libbluray = pkgs.libbluray.override { libbluray = pkgs.libbluray.override {
withAACS = true; withAACS = true;
withBDplus = true; withBDplus = true;
withJava = true;
}; };
vlc-with-decoding = pkgs.vlc.override { inherit libbluray; }; vlc-with-decoding = pkgs.vlc.override { inherit libbluray; };
in in
@ -23,7 +24,7 @@
environment.sessionVariables.NIXOS_OZONE_WL = "1"; environment.sessionVariables.NIXOS_OZONE_WL = "1";
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
angryipscanner #angryipscanner
displaylink displaylink
filezilla filezilla
gitkraken gitkraken
@ -56,6 +57,13 @@
firefox.enable = true; firefox.enable = true;
java = {
enable = true; # Needed for some Blu-ray disk menus
package = pkgs.jdk17;
};
kdeconnect.enable = true;
ssh.askPassword = "ssh-askpass"; ssh.askPassword = "ssh-askpass";
# common programs that really should be in another file # common programs that really should be in another file