Compare commits

..

No commits in common. "a00655b02ffd4c61cb3700ce7575b2c36baaa26d" and "4068f391f2d0b0857ac624fe8087a6a76f6b9c50" have entirely different histories.

14 changed files with 193 additions and 89 deletions

View file

@ -8,11 +8,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1719400670, "lastModified": 1714877287,
"narHash": "sha256-TnTKhDBHX2J/ISs6sKcSF4P09I4k0aabisUvd/oYpDo=", "narHash": "sha256-mf1/RfkyhzwLLeqU8AdosbBfRQuQzuVMX7XL7GejoRI=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "arion", "repo": "arion",
"rev": "555e7ba634cf2564737dfc18ad607134e39f52a6", "rev": "e9945eb6cdaf5c946bacd5a330e7b5ac7b3b2fdd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -31,11 +31,11 @@
"pre-commit": "pre-commit" "pre-commit": "pre-commit"
}, },
"locked": { "locked": {
"lastModified": 1718613978, "lastModified": 1708283120,
"narHash": "sha256-iXzxAcovEZHHYUYIWtIJYMpQf96MwasMirMxMKJL5Aw=", "narHash": "sha256-IgJe5xhssW199zGQq4Q81stGdVDJH7nFHm3yu62I75E=",
"owner": "dwarfmaster", "owner": "dwarfmaster",
"repo": "arkenfox-nixos", "repo": "arkenfox-nixos",
"rev": "35e803fa44abfd438c65b64ff2691f3f608cd2d3", "rev": "05e7e0996493f47bbc15228895c4e31ce24616f0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -83,7 +83,7 @@
}, },
"devshell": { "devshell": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_10" "nixpkgs": "nixpkgs_10"
}, },
"locked": { "locked": {
@ -107,11 +107,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719640067, "lastModified": 1717032306,
"narHash": "sha256-ZEJFGHnElbMH3JgnFANxOlJgniFamu9MemvHCMQZtpA=", "narHash": "sha256-s3Sis+M1qTSVIehHrEKBzHBpqprIFJli5V6WojkJnYE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "423b86a7f756421325e71663ada79a199bf13408", "rev": "8ea5bcccc03111bdedaeaae9380dfab61e9deb33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -122,18 +122,18 @@
}, },
"firefox-addons": { "firefox-addons": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1719644951, "lastModified": 1717050378,
"narHash": "sha256-MTF+/uUIdFNeyzEFirWyza43AFfr3Syld7aPw2CSCkI=", "narHash": "sha256-H+3Eqj+BQbqStGMFVFrcmfK0c+ocLqMOxYBghPghaZI=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "590551ba0bb0f960c7fcd37d6ff3a429f7cc9dd1", "rev": "984d03b48bff391f054e1676a97181d79ae309db",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -183,11 +183,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717285511, "lastModified": 1714641030,
"narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -276,11 +276,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1705309234,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -290,6 +290,24 @@
} }
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"locked": { "locked": {
"lastModified": 1629284811, "lastModified": 1629284811,
"narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
@ -304,9 +322,9 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": { "flake-utils_4": {
"inputs": { "inputs": {
"systems": "systems_5" "systems": "systems_6"
}, },
"locked": { "locked": {
"lastModified": 1701680307, "lastModified": 1701680307,
@ -351,11 +369,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709087332, "lastModified": 1703887061,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "gitignore.nix", "repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -366,11 +384,11 @@
}, },
"hardware": { "hardware": {
"locked": { "locked": {
"lastModified": 1719647737, "lastModified": 1716987116,
"narHash": "sha256-OvX/qQQ33zyB5ReRzm+U5+9Hh6EeYxHdd21tXL3p/eY=", "narHash": "sha256-uuEkErFVsFdg2K0cKbNQ9JlFSAm/xYqPr4rbPLI91Y8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "231274268ff2250d4730e274b808f66ef91b6381", "rev": "8251761f93d6f5b91cee45ac09edb6e382641009",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -399,7 +417,7 @@
"inputs": { "inputs": {
"flake-parts": "flake-parts_3", "flake-parts": "flake-parts_3",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"systems": "systems_3", "systems": "systems_4",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
@ -446,16 +464,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718530513, "lastModified": 1716729592,
"narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", "narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a1fddf0967c33754271761d91a3d921772b30d0e", "rev": "2c78a57c544dd19b07442350727ced097e1aa6e6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.05", "ref": "release-23.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -516,7 +534,7 @@
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
"hyprwayland-scanner": "hyprwayland-scanner", "hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs_12", "nixpkgs": "nixpkgs_12",
"systems": "systems_6", "systems": "systems_7",
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
@ -623,11 +641,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718355099, "lastModified": 1714905986,
"narHash": "sha256-o4K6QHBjXrmcYkX9MIw9gZ+DHM3OaEVswswHRX9h8Is=", "narHash": "sha256-Vj7iFkLrd7MDeeMVVol5uHTcaLwDq4a3vNx+6Sy1FLU=",
"owner": "viperml", "owner": "viperml",
"repo": "nh", "repo": "nh",
"rev": "6fb30a4d490a98d08628ed93a90a9d23820ef9c8", "rev": "127a23c82aa41091e97466092d2547c08c2a9a9d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -657,11 +675,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1717196966, "lastModified": 1714635257,
"narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -736,11 +754,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1710695816, "lastModified": 1704874635,
"narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "614b4613980a522ba49f0d194531beddbb7220d3", "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -752,11 +770,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1719099622, "lastModified": 1716655032,
"narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=", "narHash": "sha256-kQ25DAiCGigsNR/Quxm3v+JGXAEXZ8I7RAF4U94bGzE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e8e3b89adbd0be63192f6e645e0a54080004924", "rev": "59a450646ec8ee0397f5fa54a08573e8240eb91f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -768,11 +786,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1719254875, "lastModified": 1716769173,
"narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -864,11 +882,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1710765496, "lastModified": 1704842529,
"narHash": "sha256-p7ryWEeQfMwTB6E0wIUd5V2cFTgq+DRRBz2hYGnJZyA=", "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e367f7a1fb93137af22a3908f00b9a35e2d286a7", "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -928,16 +946,16 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1719426051, "lastModified": 1716633019,
"narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=", "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "89c49874fb15f4124bf71ca5f42a04f2ee5825fd", "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-24.05", "ref": "nixos-23.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -976,11 +994,11 @@
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1718983919, "lastModified": 1716651315,
"narHash": "sha256-+1xgeIow4gJeiwo4ETvMRvWoircnvb0JOt7NS9kUhoM=", "narHash": "sha256-iMgzIeedMqf30TXZ439zW3Yvng1Xm9QTGO+ZwG1IWSw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "90338afd6177fc683a04d934199d693708c85a3b", "rev": "c5187508b11177ef4278edf19616f44f21cc8c69",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -994,7 +1012,7 @@
"inputs": { "inputs": {
"flake-parts": "flake-parts_4", "flake-parts": "flake-parts_4",
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_7",
"systems": "systems_4", "systems": "systems_5",
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
@ -1014,16 +1032,17 @@
"pre-commit": { "pre-commit": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_2",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1717664902, "lastModified": 1708018599,
"narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1057,11 +1076,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1719268571, "lastModified": 1716692524,
"narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=", "narHash": "sha256-sALodaA7Zkp/JD6ehgwc0UCBrSBfB4cX66uFGTsqeFU=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3", "rev": "962797a8d7f15ed7033031731d0bb77244839960",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1146,6 +1165,21 @@
} }
}, },
"systems_6": { "systems_6": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_7": {
"locked": { "locked": {
"lastModified": 1689347949, "lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@ -1216,7 +1250,7 @@
}, },
"utils": { "utils": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1705309234,

View file

@ -3,14 +3,14 @@
inputs = { inputs = {
# Nixpkgs # Nixpkgs
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
# You can access packages and modules from different nixpkgs revs # You can access packages and modules from different nixpkgs revs
# at the same time. Here's an working example: # at the same time. Here's an working example:
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
# Also see the 'unstable-packages' overlay at 'overlays/default.nix'. # Also see the 'unstable-packages' overlay at 'overlays/default.nix'.
# Home manager # Home manager
home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.url = "github:nix-community/home-manager/release-23.11";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
hardware.url = "github:nixos/nixos-hardware"; hardware.url = "github:nixos/nixos-hardware";

View file

@ -16,10 +16,7 @@ in {
colorScheme = inputs.nix-colors.colorSchemes.catppuccin-mocha; colorScheme = inputs.nix-colors.colorSchemes.catppuccin-mocha;
home.packages = [ home.packages = [inputs.picokontroller.packages.x86_64-linux.default pkgs.citrix_workspace];
inputs.picokontroller.packages.x86_64-linux.default
# pkgs.citrix_workspace
];
nixpkgs = { nixpkgs = {
config = { config = {
permittedInsecurePackages = [ permittedInsecurePackages = [

View file

@ -11,7 +11,7 @@
enableSshSupport = true; enableSshSupport = true;
enableFishIntegration = true; enableFishIntegration = true;
enableZshIntegration = true; enableZshIntegration = true;
pinentryPackage = pkgs.pinentry-gnome3; pinentryFlavor = "gnome3";
}; };
# Prevent clobbering SSH_AUTH_SOCK # Prevent clobbering SSH_AUTH_SOCK

View file

@ -10,6 +10,7 @@
stableExtraPkgs = with pkgs; [ stableExtraPkgs = with pkgs; [
# LSP # LSP
lua-language-server lua-language-server
lua
pkgs.nodePackages.typescript-language-server pkgs.nodePackages.typescript-language-server
# Formatters # Formatters
@ -32,9 +33,6 @@
wl-clipboard wl-clipboard
fzf fzf
gcc gcc
# idk?
lua
]; ];
unstableExtraPkgs = with pkgs.unstable; [ unstableExtraPkgs = with pkgs.unstable; [
# LSP # LSP
@ -134,7 +132,7 @@ in {
vim-nix vim-nix
{ {
plugin = base16-nvim; plugin = nvim-base16;
config = '' config = ''
require('base16-colorscheme').setup({ require('base16-colorscheme').setup({
base00 = '#${colors.base00}', base01 = '#${colors.base01}', base02 = '#${colors.base02}', base03 = '#${colors.base03}', base00 = '#${colors.base00}', base01 = '#${colors.base01}', base02 = '#${colors.base02}', base03 = '#${colors.base03}',

View file

@ -7,16 +7,16 @@ local opts = {
null_ls.builtins.formatting.stylua, null_ls.builtins.formatting.stylua,
-- Python -- Python
null_ls.builtins.formatting.black, null_ls.builtins.formatting.black,
-- null_ls.builtins.diagnostics.ruff, null_ls.builtins.diagnostics.ruff,
-- Javascript -- Javascript
-- null_ls.builtins.diagnostics.eslint_d, null_ls.builtins.diagnostics.eslint_d,
-- null_ls.builtins.diagnostics.jsonlint, null_ls.builtins.diagnostics.jsonlint,
-- C/C++ -- C/C++
null_ls.builtins.formatting.clang_format, null_ls.builtins.formatting.clang_format,
-- Nix -- Nix
null_ls.builtins.formatting.alejandra, null_ls.builtins.formatting.alejandra,
-- Rust -- Rust
-- null_ls.builtins.formatting.rustfmt, null_ls.builtins.formatting.rustfmt,
-- YAML -- YAML
null_ls.builtins.formatting.yamlfmt, null_ls.builtins.formatting.yamlfmt,
-- Typescript -- Typescript

View file

@ -1,3 +1,3 @@
{pkgs, ...}: { {pkgs, ...}: {
home.packages = with pkgs; [freecad cura]; home.packages = with pkgs; [freecad cura super-slicer];
} }

View file

@ -32,6 +32,7 @@
../common/optional/docker.nix ../common/optional/docker.nix
../common/optional/gaming/gamemode.nix ../common/optional/gaming/gamemode.nix
../common/optional/gaming/steam.nix ../common/optional/gaming/steam.nix
../common/optional/gaming/vr.nix
../common/optional/desktop/japanese.nix ../common/optional/desktop/japanese.nix
../common/optional/udisks.nix ../common/optional/udisks.nix
]; ];
@ -67,16 +68,11 @@
services.udev.packages = [inputs.heliox-cli.packages.x86_64-linux.default]; services.udev.packages = [inputs.heliox-cli.packages.x86_64-linux.default];
environment.systemPackages = [inputs.heliox-cli.packages.x86_64-linux.default]; environment.systemPackages = [inputs.heliox-cli.packages.x86_64-linux.default];
# services.xserver.displayManager.sddm.enable = true; services.xserver.displayManager.sddm.enable = true;
services.xserver.displayManager.gdm.enable = true;
# Force disable Nvidia PRIME, needed by nix-hardware # Force disable Nvidia PRIME, needed by nix-hardware
hardware.nvidia.prime.offload.enable = false; hardware.nvidia.prime.offload.enable = false;
programs.coolercontrol={
enable = true;
nvidiaSupport = true;
};
boot.binfmt.emulatedSystems = [ boot.binfmt.emulatedSystems = [
"aarch64-linux" "aarch64-linux"
"riscv64-linux" "riscv64-linux"

View file

@ -2,6 +2,7 @@
{ {
inputs, inputs,
outputs, outputs,
config,
... ...
}: { }: {
imports = imports =

View file

@ -0,0 +1,6 @@
{
programs.alvr = {
enable = true;
openFirewall = true;
};
}

34
modules/nixos/alvr.nix Normal file
View file

@ -0,0 +1,34 @@
{
config,
pkgs,
lib,
...
}:
with lib; let
cfg = config.programs.alvr;
in {
options = {
programs.alvr = {
enable = mkEnableOption (lib.mdDoc "ALVR");
package = mkPackageOption pkgs "alvr" {};
openFirewall = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Open the default ports in the firewall for the ALVR server.
'';
};
};
};
config = mkIf cfg.enable {
environment.systemPackages = [cfg.package];
networking.firewall = mkIf cfg.openFirewall {
allowedTCPPorts = [9943 9944];
allowedUDPPorts = [9943 9944];
};
};
}

View file

@ -2,4 +2,5 @@
# These should be stuff you would like to share with others, not your personal configurations. # These should be stuff you would like to share with others, not your personal configurations.
{ {
# List your module files here # List your module files here
alvr = import ./alvr.nix;
} }

36
pkgs/alvr/default.nix Normal file
View file

@ -0,0 +1,36 @@
{
lib,
appimageTools,
fetchurl,
}: let
pname = "alvr";
version = "v21.0.0-dev00+nightly.2024.03.03";
src = fetchurl {
url = "https://github.com/alvr-org/ALVR-nightly/releases/download/v21.0.0-dev00%2Bnightly.2024.03.03/ALVR-x86_64.AppImage";
hash = "sha256-DCkx8MHcFEkK/IlxIplOYKEzcBM90GQcuqwaftrEdOs=";
};
appimageContents = appimageTools.extractType2 {inherit pname version src;};
in
appimageTools.wrapType2 {
inherit pname version src;
extraInstallCommands = ''
mv $out/bin/${pname}-${version} $out/bin/${pname}
install -Dm444 ${appimageContents}/alvr.desktop -t $out/share/applications
substituteInPlace $out/share/applications/alvr.desktop \
--replace 'Exec=alvr_dashboard' 'Exec=${pname}'
cp -r ${appimageContents}/usr/share/icons $out/share
'';
meta = with lib; {
description = "Stream VR games from your PC to your headset via Wi-Fi";
homepage = "https://github.com/alvr-org/ALVR/";
changelog = "https://github.com/alvr-org/ALVR/releases/tag/v${version}";
license = licenses.mit;
mainProgram = "alvr";
maintainers = with maintainers; [passivelemon];
platforms = ["x86_64-linux"];
};
}

View file

@ -2,6 +2,7 @@
# You can build them using 'nix build .#example' # You can build them using 'nix build .#example'
{pkgs, ...}: { {pkgs, ...}: {
# example = pkgs.callPackage ./example { }; # example = pkgs.callPackage ./example { };
alvr = pkgs.callPackage ./alvr {};
feishin-appimage = pkgs.callPackage ./feishin {}; feishin-appimage = pkgs.callPackage ./feishin {};
protonup-rs = pkgs.callPackage ./protonup-rs {}; protonup-rs = pkgs.callPackage ./protonup-rs {};
rofi-audio-switcher = pkgs.callPackage ./rofi-audio-switcher {}; rofi-audio-switcher = pkgs.callPackage ./rofi-audio-switcher {};