From b32af9ddda7d46eb5f550644687a5ad921203392 Mon Sep 17 00:00:00 2001 From: pupbrained Date: Wed, 30 Oct 2024 12:04:46 -0400 Subject: [PATCH] suckle --- .gitignore | 1 + _sources/generated.json | 182 -- _sources/generated.nix | 110 - flake.in.nix | 8 + flake.lock | 638 ++++-- flake.nix | 2 + .../marshall@polaris-nix/default.nix | 3 +- modules/home/shell/git.nix | 2 +- systems/x86_64-linux/polaris-nix/default.nix | 267 ++- systems/x86_64-linux/polaris-nix/facter.json | 2010 +++++++++++++++++ systems/x86_64-linux/polaris-nix/hardware.nix | 34 - 11 files changed, 2754 insertions(+), 503 deletions(-) delete mode 100644 _sources/generated.json delete mode 100644 _sources/generated.nix create mode 100644 systems/x86_64-linux/polaris-nix/facter.json delete mode 100644 systems/x86_64-linux/polaris-nix/hardware.nix diff --git a/.gitignore b/.gitignore index 6d85985..a9501ed 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .direnv/ +.DS_Store/ .flake_in_nix_hash .luarc.json sys.nix diff --git a/_sources/generated.json b/_sources/generated.json deleted file mode 100644 index 257518a..0000000 --- a/_sources/generated.json +++ /dev/null @@ -1,182 +0,0 @@ -{ - "bang-bang": { - "cargoLocks": null, - "date": "2023-07-23", - "extract": null, - "name": "bang-bang", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "owner": "oh-my-fish", - "repo": "plugin-bang-bang", - "rev": "ec991b80ba7d4dda7a962167b036efc5c2d79419", - "sha256": "sha256-oPPCtFN2DPuM//c48SXb4TrFRjJtccg0YPXcAo0Lxq0=", - "type": "github" - }, - "version": "ec991b80ba7d4dda7a962167b036efc5c2d79419" - }, - "fix-window-role": { - "cargoLocks": null, - "date": null, - "extract": null, - "name": "fix-window-role", - "passthru": null, - "pinned": false, - "src": { - "name": null, - "sha256": "sha256-H4Qj6n5uZsmsbdjjexGZctqhJk3gAXKiSnmnEO/LgTA=", - "type": "url", - "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-28/fix-window-role.patch" - }, - "version": "latest" - }, - "git-abbr": { - "cargoLocks": null, - "date": "2023-06-19", - "extract": null, - "name": "git-abbr", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "owner": "pupbrained", - "repo": "fish-git-abbr", - "rev": "dc590a5b9d9d2095f95f7d90608b48e55bea0b0e", - "sha256": "sha256-6z3Wr2t8CP85xVEp6UCYaM2KC9PX4MDyx19f/wjHkb0=", - "type": "github" - }, - "version": "dc590a5b9d9d2095f95f7d90608b48e55bea0b0e" - }, - "gityaw": { - "cargoLocks": null, - "date": "2019-01-07", - "extract": null, - "name": "gityaw", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "owner": "oh-my-fish", - "repo": "plugin-gityaw", - "rev": "59196560e0f4520db63fb8cab645510377bb8b13", - "sha256": "sha256-STXNxSsjSopB+lbB4hEYdhJifRfsImRwbZ1SxwEhkuM=", - "type": "github" - }, - "version": "59196560e0f4520db63fb8cab645510377bb8b13" - }, - "license": { - "cargoLocks": null, - "date": "2018-10-22", - "extract": null, - "name": "license", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "owner": "oh-my-fish", - "repo": "plugin-license", - "rev": "0155b16f102957ec0c734a90979245dc1073f979", - "sha256": "sha256-Bi9Q5rekZoyXYbRV+U4SmwCdqCl0pFupzm5si7SxFns=", - "type": "github" - }, - "version": "0155b16f102957ec0c734a90979245dc1073f979" - }, - "poll": { - "cargoLocks": null, - "date": null, - "extract": null, - "name": "poll", - "passthru": null, - "pinned": false, - "src": { - "name": null, - "sha256": "sha256-Weh2+C5v2ORYO8JFYzntpPmJyGseFqArByZwLpX2CCU=", - "type": "url", - "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/poll.patch" - }, - "version": "latest" - }, - "replay-fish": { - "cargoLocks": null, - "date": "2024-07-01", - "extract": null, - "name": "replay-fish", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "owner": "jorgebucaran", - "repo": "replay.fish", - "rev": "d2ecacd3fe7126e822ce8918389f3ad93b14c86c", - "sha256": "sha256-TzQ97h9tBRUg+A7DSKeTBWLQuThicbu19DHMwkmUXdg=", - "type": "github" - }, - "version": "d2ecacd3fe7126e822ce8918389f3ad93b14c86c" - }, - "round-undecorated-frame": { - "cargoLocks": null, - "date": null, - "extract": null, - "name": "round-undecorated-frame", - "passthru": null, - "pinned": false, - "src": { - "name": null, - "sha256": "sha256-dFH4D1WYQOVOagUuVdEQB3irxV+Y8dDAOKJOJXc/KHQ=", - "type": "url", - "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/round-undecorated-frame.patch" - }, - "version": "latest" - }, - "system-appearance": { - "cargoLocks": null, - "date": null, - "extract": null, - "name": "system-appearance", - "passthru": null, - "pinned": false, - "src": { - "name": null, - "sha256": "sha256-nrPOgGQAJb/5brrrWJNDARY2jWNJ9OsMtO+LPVhHfbY=", - "type": "url", - "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/system-appearance.patch" - }, - "version": "latest" - }, - "wttr": { - "cargoLocks": null, - "date": "2016-05-23", - "extract": null, - "name": "wttr", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "owner": "oh-my-fish", - "repo": "plugin-wttr", - "rev": "7500e382e6b29a463edc57598217ce0cfaf8c90c", - "sha256": "sha256-k3FrRPxKCiObO6HgtDx8ORbcLmfSYQsQeq5SAoNfZbE=", - "type": "github" - }, - "version": "7500e382e6b29a463edc57598217ce0cfaf8c90c" - } -} \ No newline at end of file diff --git a/_sources/generated.nix b/_sources/generated.nix deleted file mode 100644 index 5a66199..0000000 --- a/_sources/generated.nix +++ /dev/null @@ -1,110 +0,0 @@ -# This file was generated by nvfetcher, please do not modify it manually. -{ - fetchurl, - fetchFromGitHub, -}: { - bang-bang = { - pname = "bang-bang"; - version = "ec991b80ba7d4dda7a962167b036efc5c2d79419"; - src = fetchFromGitHub { - owner = "oh-my-fish"; - repo = "plugin-bang-bang"; - rev = "ec991b80ba7d4dda7a962167b036efc5c2d79419"; - fetchSubmodules = false; - sha256 = "sha256-oPPCtFN2DPuM//c48SXb4TrFRjJtccg0YPXcAo0Lxq0="; - }; - date = "2023-07-23"; - }; - fix-window-role = { - pname = "fix-window-role"; - version = "latest"; - src = fetchurl { - url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-28/fix-window-role.patch"; - sha256 = "sha256-H4Qj6n5uZsmsbdjjexGZctqhJk3gAXKiSnmnEO/LgTA="; - }; - }; - git-abbr = { - pname = "git-abbr"; - version = "dc590a5b9d9d2095f95f7d90608b48e55bea0b0e"; - src = fetchFromGitHub { - owner = "pupbrained"; - repo = "fish-git-abbr"; - rev = "dc590a5b9d9d2095f95f7d90608b48e55bea0b0e"; - fetchSubmodules = false; - sha256 = "sha256-6z3Wr2t8CP85xVEp6UCYaM2KC9PX4MDyx19f/wjHkb0="; - }; - date = "2023-06-19"; - }; - gityaw = { - pname = "gityaw"; - version = "59196560e0f4520db63fb8cab645510377bb8b13"; - src = fetchFromGitHub { - owner = "oh-my-fish"; - repo = "plugin-gityaw"; - rev = "59196560e0f4520db63fb8cab645510377bb8b13"; - fetchSubmodules = false; - sha256 = "sha256-STXNxSsjSopB+lbB4hEYdhJifRfsImRwbZ1SxwEhkuM="; - }; - date = "2019-01-07"; - }; - license = { - pname = "license"; - version = "0155b16f102957ec0c734a90979245dc1073f979"; - src = fetchFromGitHub { - owner = "oh-my-fish"; - repo = "plugin-license"; - rev = "0155b16f102957ec0c734a90979245dc1073f979"; - fetchSubmodules = false; - sha256 = "sha256-Bi9Q5rekZoyXYbRV+U4SmwCdqCl0pFupzm5si7SxFns="; - }; - date = "2018-10-22"; - }; - poll = { - pname = "poll"; - version = "latest"; - src = fetchurl { - url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/poll.patch"; - sha256 = "sha256-Weh2+C5v2ORYO8JFYzntpPmJyGseFqArByZwLpX2CCU="; - }; - }; - replay-fish = { - pname = "replay-fish"; - version = "d2ecacd3fe7126e822ce8918389f3ad93b14c86c"; - src = fetchFromGitHub { - owner = "jorgebucaran"; - repo = "replay.fish"; - rev = "d2ecacd3fe7126e822ce8918389f3ad93b14c86c"; - fetchSubmodules = false; - sha256 = "sha256-TzQ97h9tBRUg+A7DSKeTBWLQuThicbu19DHMwkmUXdg="; - }; - date = "2024-07-01"; - }; - round-undecorated-frame = { - pname = "round-undecorated-frame"; - version = "latest"; - src = fetchurl { - url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/round-undecorated-frame.patch"; - sha256 = "sha256-dFH4D1WYQOVOagUuVdEQB3irxV+Y8dDAOKJOJXc/KHQ="; - }; - }; - system-appearance = { - pname = "system-appearance"; - version = "latest"; - src = fetchurl { - url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/system-appearance.patch"; - sha256 = "sha256-nrPOgGQAJb/5brrrWJNDARY2jWNJ9OsMtO+LPVhHfbY="; - }; - }; - wttr = { - pname = "wttr"; - version = "7500e382e6b29a463edc57598217ce0cfaf8c90c"; - src = fetchFromGitHub { - owner = "oh-my-fish"; - repo = "plugin-wttr"; - rev = "7500e382e6b29a463edc57598217ce0cfaf8c90c"; - fetchSubmodules = false; - sha256 = "sha256-k3FrRPxKCiObO6HgtDx8ORbcLmfSYQsQeq5SAoNfZbE="; - }; - date = "2016-05-23"; - }; -} diff --git a/flake.in.nix b/flake.in.nix index 71b9e8a..b131d72 100644 --- a/flake.in.nix +++ b/flake.in.nix @@ -20,6 +20,7 @@ type = "git"; }; in { + determinate = mkCustomUrl "https://flakehub.com/f/DeterminateSystems/determinate/0.1"; agenix = mkInput "ryantm/agenix"; catppuccin = mkInput "catppuccin/nix"; chaotic = mkInput "chaotic-cx/nyx/nyxpkgs-unstable"; @@ -28,6 +29,7 @@ hyprland-plugins = mkFollowing "hyprwm/hyprland-plugins" "hyprland"; impermanence = mkInput "nix-community/impermanence"; nix-colors = mkInput "Misterio77/nix-colors"; + nixos-facter-modules = mkInput "numtide/nixos-facter-modules"; nixpkgs = mkInput "NixOS/nixpkgs/nixos-unstable"; nix-super = mkCustomUrl "git+https://git.privatevoid.net/max/nix-super.git"; nixvim = mkInput "pupbrained/nvim-config"; @@ -68,10 +70,16 @@ catppuccin.nixosModules.catppuccin chaotic.nixosModules.default cosmic.nixosModules.default + determinate.nixosModules.default impermanence.nixosModules.impermanence ] ++ xmonad-contrib.nixosModules; + systems.hosts.polaris-nix.modules = [ + nixos-facter-modules.nixosModules.facter + {config.facter.reportPath = ./systems/x86_64-linux/polaris-nix/facter.json;} + ]; + systems.modules.darwin = [ "${home-manager}/nix-darwin" ]; diff --git a/flake.lock b/flake.lock index 3b3162c..906bbf6 100644 --- a/flake.lock +++ b/flake.lock @@ -110,7 +110,7 @@ "codeium": { "inputs": { "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1727497393, @@ -192,6 +192,67 @@ "type": "github" } }, + "determinate": { + "inputs": { + "determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin", + "determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux", + "determinate-nixd-x86_64-darwin": [ + "determinate", + "determinate-nixd-aarch64-darwin" + ], + "determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux", + "nix": "nix", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1729548094, + "narHash": "sha256-+jP+Zlg0prpcmBy5s7cPUa7nJr90Zm2m933aibrHBYw=", + "rev": "5babe9d6a9eb52ee001bf70ad607fd66522f781b", + "revCount": 145, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.145%2Brev-5babe9d6a9eb52ee001bf70ad607fd66522f781b/0192b11b-c96e-7199-ba89-8c923541fcce/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/determinate/0.1" + } + }, + "determinate-nixd-aarch64-darwin": { + "flake": false, + "locked": { + "narHash": "sha256-OhG8joS/uN3Kdw4h9w8F/6ZIVTFZ8J9Fb4NGn/KK5/s=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/rev/51ecec5a3148baef87c2015536aa12dd18e4c4ad/macOS" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/rev/51ecec5a3148baef87c2015536aa12dd18e4c4ad/macOS" + } + }, + "determinate-nixd-aarch64-linux": { + "flake": false, + "locked": { + "narHash": "sha256-AGcHQSIdb+KEJlhJzMB4YyFxbjdLZEDDf6bv6Zi3wqM=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/rev/51ecec5a3148baef87c2015536aa12dd18e4c4ad/aarch64-linux" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/rev/51ecec5a3148baef87c2015536aa12dd18e4c4ad/aarch64-linux" + } + }, + "determinate-nixd-x86_64-linux": { + "flake": false, + "locked": { + "narHash": "sha256-kU4dqHoYe3sFf4LDAUj4fyl9uGV8IHtE22+DdMeRN0s=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/rev/51ecec5a3148baef87c2015536aa12dd18e4c4ad/x86_64-linux" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/rev/51ecec5a3148baef87c2015536aa12dd18e4c4ad/x86_64-linux" + } + }, "devshell": { "inputs": { "nixpkgs": [ @@ -218,7 +279,7 @@ "inputs": { "emacs-overlay": "emacs-overlay", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_7", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -238,7 +299,7 @@ "emacs-overlay": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_6", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { @@ -288,6 +349,22 @@ } }, "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1673956053, @@ -303,7 +380,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_5": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -317,7 +394,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_5": { + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1696426674, @@ -334,22 +411,6 @@ "type": "github" } }, - "flake-compat_6": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-compat_7": { "flake": false, "locked": { @@ -366,7 +427,46 @@ "type": "github" } }, + "flake-compat_8": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "determinate", + "nix", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nix-super", @@ -387,7 +487,7 @@ "type": "github" } }, - "flake-parts_2": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -686,9 +786,48 @@ "type": "github" } }, + "git-hooks-nix": { + "inputs": { + "flake-compat": [ + "determinate", + "nix", + "nix" + ], + "gitignore": [ + "determinate", + "nix", + "nix" + ], + "nixpkgs": [ + "determinate", + "nix", + "nix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "determinate", + "nix", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1721042469, + "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "git-ignore-nix": { "inputs": { - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_17" }, "locked": { "lastModified": 1709087332, @@ -707,7 +846,7 @@ }, "git-ignore-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_16" + "nixpkgs": "nixpkgs_19" }, "locked": { "lastModified": 1709087332, @@ -890,7 +1029,7 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_9", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_5", "xdph": "xdph" @@ -1083,6 +1222,23 @@ } }, "libgit2": { + "flake": false, + "locked": { + "lastModified": 1715853528, + "narHash": "sha256-J2rCxTecyLbbDdsyBWn9w7r3pbKRMkI9E7RvRgAqBdY=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "36f7e21ad757a3dacc58cf7944329da6bc1d6e96", + "type": "github" + }, + "original": { + "owner": "libgit2", + "ref": "v1.8.1", + "repo": "libgit2", + "type": "github" + } + }, + "libgit2_2": { "flake": false, "locked": { "lastModified": 1697646580, @@ -1098,6 +1254,24 @@ "type": "github" } }, + "nix": { + "inputs": { + "nix": "nix_2", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1727475172, + "narHash": "sha256-1mUkLxoyG/rgceHeJTXcKcySvw5dSzIvAtqd1vaoa1g=", + "rev": "285ce476e9b7e59c853e9a39945b6a3622d35a7e", + "revCount": 101, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix/2.24.9/0192358e-86eb-7a95-8161-99d09d9a6a06/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/nix/2.0" + } + }, "nix-colors": { "inputs": { "base16-schemes": "base16-schemes", @@ -1184,11 +1358,11 @@ }, "nix-super": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts", - "libgit2": "libgit2", - "nixpkgs": "nixpkgs_7", - "nixpkgs-regression": "nixpkgs-regression", + "flake-compat": "flake-compat_4", + "flake-parts": "flake-parts_2", + "libgit2": "libgit2_2", + "nixpkgs": "nixpkgs_10", + "nixpkgs-regression": "nixpkgs-regression_2", "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { @@ -1205,6 +1379,44 @@ "url": "https://git.privatevoid.net/max/nix-super.git" } }, + "nix_2": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts", + "git-hooks-nix": "git-hooks-nix", + "libgit2": "libgit2", + "nixpkgs": "nixpkgs_3", + "nixpkgs-23-11": "nixpkgs-23-11", + "nixpkgs-regression": "nixpkgs-regression" + }, + "locked": { + "lastModified": 1727436381, + "narHash": "sha256-OwJByTdCz1t91ysBqynK+ifszkoIGEXUn6HE2t82+c8=", + "rev": "048cfe51c9a4ae0722440ab5337626370c82a787", + "revCount": 18156, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nix/2.24.9/01923584-fceb-7a8c-bef7-f6d1eb9a0916/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nix/%3D2.24.9" + } + }, + "nixos-facter-modules": { + "locked": { + "lastModified": 1730026316, + "narHash": "sha256-AzP+trH/ykBJGTx3twkpuwbkhFSmsY1PJDQtRmK4k4c=", + "owner": "numtide", + "repo": "nixos-facter-modules", + "rev": "15b6531d44aa6f0bbd2fd8309cd2a6d7f183ba32", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nixos-facter-modules", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1703013332, @@ -1221,6 +1433,22 @@ "type": "github" } }, + "nixpkgs-23-11": { + "locked": { + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + } + }, "nixpkgs-lib": { "locked": { "lastModified": 1697935651, @@ -1252,6 +1480,22 @@ "type": "github" } }, + "nixpkgs-regression_2": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1730137625, @@ -1301,6 +1545,54 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1709083642, + "narHash": "sha256-7kkJQd4rZ+vFrzWu8sTRtta5D1kBG0LSRYAfhtmMlSo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b550fe4b4776908ac2a861124307045f8e717c8e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { + "locked": { + "lastModified": 1702346276, + "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_13": { "locked": { "lastModified": 1727742380, "narHash": "sha256-5lFzlmiwrl3OHrw7QhZn/ZpZtygzx1UspKOaZqpxXSQ=", @@ -1315,7 +1607,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_14": { "locked": { "lastModified": 1727348695, "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", @@ -1331,66 +1623,39 @@ "type": "github" } }, - "nixpkgs_12": { - "locked": { - "lastModified": 1726871744, - "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_13": { - "locked": { - "lastModified": 1726871744, - "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_14": { - "locked": { - "lastModified": 1666603677, - "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "074da18a72269cc5a6cf444dce42daea5649b2fe", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_15": { "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", - "path": "/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", - "type": "path" + "lastModified": 1726871744, + "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_16": { + "locked": { + "lastModified": 1726871744, + "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_17": { "locked": { "lastModified": 1666603677, "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=", @@ -1404,33 +1669,31 @@ "type": "indirect" } }, - "nixpkgs_17": { - "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", - "path": "/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_18": { "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", - "owner": "nixos", + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", + "path": "/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_19": { + "locked": { + "lastModified": 1666603677, + "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "rev": "074da18a72269cc5a6cf444dce42daea5649b2fe", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs_2": { @@ -1449,23 +1712,80 @@ "type": "github" } }, + "nixpkgs_20": { + "locked": { + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", + "path": "/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_21": { + "locked": { + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_3": { "locked": { - "lastModified": 1723175592, - "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", + "lastModified": 1723688146, + "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", + "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_4": { + "locked": { + "lastModified": 1727264057, + "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=", + "rev": "759537f06e6999e141588ff1c9be7f3a5c060106", + "revCount": 635457, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2405.635457%2Brev-759537f06e6999e141588ff1c9be7f3a5c060106/01922cec-c9c8-788e-8861-26f19bd8d7aa/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1726871744, + "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", + "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2", + "revCount": 683804, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.683804%2Brev-a1d92660c6b3b7c26fb883500a80ea9d33321be2/01922288-464f-75e2-abd5-54e5b92789a1/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/nixpkgs-weekly/0.1.tar.gz" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1723175592, "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", @@ -1481,7 +1801,23 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_7": { + "locked": { + "lastModified": 1723175592, + "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { "locked": { "lastModified": 1720957393, "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", @@ -1497,7 +1833,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_9": { "locked": { "lastModified": 1729413321, "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", @@ -1513,59 +1849,11 @@ "type": "github" } }, - "nixpkgs_7": { - "locked": { - "lastModified": 1709083642, - "narHash": "sha256-7kkJQd4rZ+vFrzWu8sTRtta5D1kBG0LSRYAfhtmMlSo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b550fe4b4776908ac2a861124307045f8e717c8e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { - "locked": { - "lastModified": 1702346276, - "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "codeium": "codeium", "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_13", "nixvim": "nixvim_2", "treefmt-nix": "treefmt-nix_3" }, @@ -1586,12 +1874,12 @@ "nixvim_2": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_4", - "flake-parts": "flake-parts_2", + "flake-compat": "flake-compat_5", + "flake-parts": "flake-parts_3", "git-hooks": "git-hooks", "home-manager": "home-manager_4", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_14", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix_2" }, @@ -1634,7 +1922,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "gitignore": "gitignore", "nixpkgs": [ "hyprland", @@ -1695,6 +1983,7 @@ "chaotic": "chaotic", "cosmic": "cosmic", "darwin": "darwin_2", + "determinate": "determinate", "emacs": "emacs", "flakegen": "flakegen", "home-manager": "home-manager_3", @@ -1704,7 +1993,8 @@ "nix-colors": "nix-colors", "nix-index-database": "nix-index-database", "nix-super": "nix-super", - "nixpkgs": "nixpkgs_8", + "nixos-facter-modules": "nixos-facter-modules", + "nixpkgs": "nixpkgs_11", "nixvim": "nixvim", "snowfall-flake": "snowfall-flake", "snowfall-lib": "snowfall-lib_2", @@ -1736,7 +2026,7 @@ }, "snowfall-flake": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_6", "nixpkgs": [ "nixpkgs" ], @@ -1758,7 +2048,7 @@ }, "snowfall-lib": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_7", "flake-utils-plus": "flake-utils-plus", "nixpkgs": [ "snowfall-flake", @@ -1782,7 +2072,7 @@ }, "snowfall-lib_2": { "inputs": { - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_8", "flake-utils-plus": "flake-utils-plus_2", "nixpkgs": [ "nixpkgs" @@ -1970,7 +2260,7 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1723454642, @@ -2010,7 +2300,7 @@ }, "treefmt-nix_3": { "inputs": { - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_15" }, "locked": { "lastModified": 1727431250, @@ -2028,7 +2318,7 @@ }, "treefmt-nix_4": { "inputs": { - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_16" }, "locked": { "lastModified": 1730120726, @@ -2105,7 +2395,7 @@ "inputs": { "flake-utils": "flake-utils_10", "git-ignore-nix": "git-ignore-nix_2", - "nixpkgs": "nixpkgs_17", + "nixpkgs": "nixpkgs_20", "unstable": "unstable" }, "locked": { @@ -2126,7 +2416,7 @@ "inputs": { "flake-utils": "flake-utils_9", "git-ignore-nix": "git-ignore-nix", - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_18", "xmonad": "xmonad" }, "locked": { @@ -2145,7 +2435,7 @@ }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_18" + "nixpkgs": "nixpkgs_21" }, "locked": { "lastModified": 1730078377, diff --git a/flake.nix b/flake.nix index 29f0403..46c5b80 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,7 @@ inputs.nixpkgs.follows = "nixpkgs"; url = "github:LnL7/nix-darwin/master"; }; + determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/0.1"; emacs.url = "git+https://git.pupbrained.xyz/pupbrained/nixmacs.git"; flakegen.url = "github:jorsn/flakegen"; home-manager = { @@ -34,6 +35,7 @@ url = "github:nix-community/nix-index-database"; }; nix-super.url = "git+https://git.privatevoid.net/max/nix-super.git"; + nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixvim.url = "github:pupbrained/nvim-config"; snowfall-flake = { diff --git a/homes/x86_64-linux/marshall@polaris-nix/default.nix b/homes/x86_64-linux/marshall@polaris-nix/default.nix index 9cab133..b64c27d 100644 --- a/homes/x86_64-linux/marshall@polaris-nix/default.nix +++ b/homes/x86_64-linux/marshall@polaris-nix/default.nix @@ -1,6 +1,7 @@ { inputs, pkgs, + lib, ... }: with pkgs; { @@ -22,7 +23,6 @@ with pkgs; { alejandra bun grc - kitty macchina wl-clipboard xclip @@ -37,6 +37,7 @@ with pkgs; { gpg.enable = true; skim.enable = true; tealdeer.enable = true; + wezterm.enable = lib.mkForce false; atuin = { enable = true; diff --git a/modules/home/shell/git.nix b/modules/home/shell/git.nix index 5ec8c59..1feecff 100644 --- a/modules/home/shell/git.nix +++ b/modules/home/shell/git.nix @@ -7,7 +7,7 @@ with pkgs; { userName = "pupbrained"; userEmail = "mars@pupbrained.xyz"; aliases.pushall = "!git remote | xargs -L1 git push"; - delta.enable = true; + delta.enable = false; signing.signByDefault = true; lfs.enable = true; diff --git a/systems/x86_64-linux/polaris-nix/default.nix b/systems/x86_64-linux/polaris-nix/default.nix index 6234362..a169826 100644 --- a/systems/x86_64-linux/polaris-nix/default.nix +++ b/systems/x86_64-linux/polaris-nix/default.nix @@ -6,7 +6,19 @@ system, ... }: { - imports = [./hardware.nix]; + fileSystems = { + "/" = { + device = "/dev/disk/by-uuid/64079eb2-d3e3-47b7-a889-d5b2fee4fa82"; + fsType = "ext4"; + }; + + "/boot" = { + device = "/dev/disk/by-uuid/BC12-6397"; + fsType = "vfat"; + }; + }; + + swapDevices = [{device = "/dev/disk/by-uuid/d36507db-7392-4852-9b2a-12d2a476cd31";}]; nixpkgs.config.allowUnfree = true; system.stateVersion = "23.11"; @@ -63,6 +75,7 @@ systemPackages = [ pkgs.miniupnpc inputs.agenix.packages.${system}.default + pkgs.codeium ]; etc = @@ -140,6 +153,126 @@ fish.enable = true; gnupg.agent.enable = true; ssh.startAgent = true; + + nix-ld = { + enable = true; + libraries = with pkgs; [ + SDL + SDL2 + SDL2_image + SDL2_mixer + SDL2_ttf + SDL_image + SDL_mixer + SDL_ttf + alsa-lib + at-spi2-atk + at-spi2-core + atk + bzip2 + cairo + cups + curlWithGnuTls + dbus + dbus-glib + desktop-file-utils + e2fsprogs + expat + flac + fontconfig + freeglut + freetype + fribidi + fuse + fuse3 + gdk-pixbuf + glew110 + glib + gmp + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-ugly + gst_all_1.gstreamer + gtk2 + harfbuzz + icu + keyutils.lib + libgcc + libGL + libGLU + libappindicator-gtk2 + libcaca + libcanberra + libcap + libclang.lib + libdbusmenu + libdrm + libgcrypt + libgpg-error + libidn + libjack2 + libjpeg + libmikmod + libogg + libpng12 + libpulseaudio + librsvg + libsamplerate + libthai + libtheora + libtiff + libudev0-shim + libusb1 + libuuid + libvdpau + libvorbis + libvpx + libxcrypt-legacy + libxkbcommon + libxml2 + mesa + nspr + nss + openssl + p11-kit + pango + pixman + python3 + speex + stdenv.cc.cc + tbb + udev + vulkan-loader + wayland + xorg.libICE + xorg.libSM + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXft + xorg.libXi + xorg.libXinerama + xorg.libXmu + xorg.libXrandr + xorg.libXrender + xorg.libXt + xorg.libXtst + xorg.libXxf86vm + xorg.libpciaccess + xorg.libxcb + xorg.xcbutil + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.xcbutilrenderutil + xorg.xcbutilwm + xorg.xkeyboardconfig + xz + zlib + ]; + }; }; services = { @@ -147,6 +280,138 @@ tailscale.enable = true; xe-guest-utilities.enable = true; + code-server = { + enable = true; + disableTelemetry = true; + disableUpdateCheck = true; + disableWorkspaceTrust = true; + host = "0.0.0.0"; + port = 8080; + hashedPassword = "$argon2i$v=19$m=16,t=2,p=1$alg3SXBFSkhzbDRhZXlCRw$2COxhvVifNMmIIozs14AkQ"; + user = "marshall"; + group = "users"; + extraEnvironment = { + NIX_LD = lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker"; + NIX_LD_LIBRARY_PATH = with pkgs; + lib.makeLibraryPath [ + SDL + SDL2 + SDL2_image + SDL2_mixer + SDL2_ttf + SDL_image + SDL_mixer + SDL_ttf + alsa-lib + at-spi2-atk + at-spi2-core + atk + bzip2 + cairo + cups + curlWithGnuTls + dbus + dbus-glib + desktop-file-utils + e2fsprogs + expat + flac + fontconfig + freeglut + freetype + fribidi + fuse + fuse3 + gdk-pixbuf + glew110 + glib + gmp + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-ugly + gst_all_1.gstreamer + gtk2 + harfbuzz + icu + keyutils.lib + libgcc + libGL + libGLU + libappindicator-gtk2 + libcaca + libcanberra + libcap + libclang.lib + libdbusmenu + libdrm + libgcrypt + libgpg-error + libidn + libjack2 + libjpeg + libmikmod + libogg + libpng12 + libpulseaudio + librsvg + libsamplerate + libthai + libtheora + libtiff + libudev0-shim + libusb1 + libuuid + libvdpau + libvorbis + libvpx + libxcrypt-legacy + libxkbcommon + libxml2 + mesa + nspr + nss + openssl + p11-kit + pango + pixman + python3 + speex + stdenv.cc.cc + tbb + udev + vulkan-loader + wayland + xorg.libICE + xorg.libSM + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXft + xorg.libXi + xorg.libXinerama + xorg.libXmu + xorg.libXrandr + xorg.libXrender + xorg.libXt + xorg.libXtst + xorg.libXxf86vm + xorg.libpciaccess + xorg.libxcb + xorg.xcbutil + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.xcbutilrenderutil + xorg.xcbutilwm + xorg.xkeyboardconfig + xz + zlib + ]; + }; + }; + forgejo = let forgejoDomain = "git.pupbrained.xyz"; in { diff --git a/systems/x86_64-linux/polaris-nix/facter.json b/systems/x86_64-linux/polaris-nix/facter.json new file mode 100644 index 0000000..b60231c --- /dev/null +++ b/systems/x86_64-linux/polaris-nix/facter.json @@ -0,0 +1,2010 @@ +{ + "version": 1, + "system": "x86_64-linux", + "virtualisation": "xen", + "hardware": { + "bios": { + "apm_info": { + "supported": false, + "enabled": false, + "version": 0, + "sub_version": 0, + "bios_flags": 0 + }, + "vbe_info": { + "version": 0, + "video_memory": 0 + }, + "pnp": false, + "pnp_id": 0, + "lba_support": false, + "low_memory_size": 0, + "smbios_version": 520 + }, + "bridge": [ + { + "index": 13, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 1 + }, + "base_class": { + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "name": "ISA bridge", + "value": 1 + }, + "vendor": { + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "value": 6900 + }, + "device": { + "value": 28672 + }, + "sub_device": { + "value": 4352 + }, + "model": "Intel ISA bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:01.0", + "sysfs_bus_id": "0000:00:01.0", + "detail": { + "function": 0, + "command": 7, + "header_type": 0, + "secondary_bus": 0, + "irq": 0, + "prog_if": 0 + }, + "module_alias": "pci:v00008086d00007000sv00001AF4sd00001100bc06sc01i00" + }, + { + "index": 14, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "name": "Host bridge", + "value": 0 + }, + "vendor": { + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "value": 6900 + }, + "device": { + "value": 4663 + }, + "sub_device": { + "value": 4352 + }, + "revision": { + "value": 2 + }, + "model": "Intel Host bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:00.0", + "sysfs_bus_id": "0000:00:00.0", + "detail": { + "function": 0, + "command": 7, + "header_type": 0, + "secondary_bus": 0, + "irq": 0, + "prog_if": 0 + }, + "module_alias": "pci:v00008086d00001237sv00001AF4sd00001100bc06sc00i00" + }, + { + "index": 15, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 1 + }, + "base_class": { + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "name": "Bridge", + "value": 128 + }, + "vendor": { + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "value": 6900 + }, + "device": { + "value": 28947 + }, + "sub_device": { + "value": 4352 + }, + "revision": { + "value": 3 + }, + "model": "Intel Bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:01.3", + "sysfs_bus_id": "0000:00:01.3", + "resources": [ + { + "type": "irq", + "base": 9, + "triggered": 0, + "enabled": true + } + ], + "detail": { + "function": 3, + "command": 7, + "header_type": 0, + "secondary_bus": 0, + "irq": 9, + "prog_if": 0 + }, + "module_alias": "pci:v00008086d00007113sv00001AF4sd00001100bc06sc80i00" + } + ], + "cdrom": [ + { + "index": 25, + "attached_to": 17, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 1, + "number": 1 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "CD-ROM", + "value": 2 + }, + "pci_interface": { + "name": "DVD", + "value": 3 + }, + "vendor": { + "name": "QEMU", + "value": 0 + }, + "device": { + "name": "QEMU DVD-ROM", + "value": 0 + }, + "revision": { + "name": "2.5+", + "value": 0 + }, + "model": "QEMU DVD-ROM", + "sysfs_id": "/class/block/sr0", + "sysfs_bus_id": "1:0:1:0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:01.1/ata2/host1/target1:0:1/1:0:1:0", + "unix_device_name": "/dev/sr0", + "unix_device_number": { + "type": 98, + "major": 11, + "minor": 0, + "range": 1 + }, + "unix_device_names": [ + "/dev/cdrom", + "/dev/disk/by-diskseq/21", + "/dev/disk/by-id/ata-QEMU_DVD-ROM_QM00004", + "/dev/disk/by-path/pci-0000:00:01.1-ata-2", + "/dev/disk/by-path/pci-0000:00:01.1-ata-2.1", + "/dev/sr0" + ], + "unix_device_name2": "/dev/sg0", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 0, + "range": 1 + }, + "driver": "ata_piix", + "driver_module": "ata_piix", + "drivers": [ + "ata_piix", + "sr" + ], + "driver_modules": [ + "ata_piix", + "sr_mod" + ] + } + ], + "cpu": [ + { + "architecture": "x86_64", + "vendor_name": "GenuineIntel", + "family": 6, + "model": 158, + "stepping": 13, + "features": [ + "fpu", + "vme", + "de", + "pse", + "tsc", + "msr", + "pae", + "mce", + "cx8", + "apic", + "sep", + "mtrr", + "pge", + "mca", + "cmov", + "pat", + "pse36", + "clflush", + "acpi", + "mmx", + "fxsr", + "sse", + "sse2", + "ss", + "ht", + "syscall", + "nx", + "pdpe1gb", + "rdtscp", + "lm", + "constant_tsc", + "rep_good", + "nopl", + "nonstop_tsc", + "cpuid", + "tsc_known_freq", + "pni", + "pclmulqdq", + "ssse3", + "fma", + "cx16", + "pcid", + "sse4_1", + "sse4_2", + "x2apic", + "movbe", + "popcnt", + "tsc_deadline_timer", + "aes", + "xsave", + "avx", + "f16c", + "rdrand", + "hypervisor", + "lahf_lm", + "abm", + "3dnowprefetch", + "cpuid_fault", + "ssbd", + "ibrs", + "ibpb", + "stibp", + "ibrs_enhanced", + "fsgsbase", + "tsc_adjust", + "bmi1", + "avx2", + "smep", + "bmi2", + "erms", + "invpcid", + "rdseed", + "adx", + "smap", + "clflushopt", + "xsaveopt", + "xsavec", + "xgetbv1", + "xsaves", + "md_clear", + "flush_l1d", + "arch_capabilities" + ], + "bugs": [ + "spectre_v1", + "spectre_v2", + "spec_store_bypass", + "swapgs", + "itlb_multihit", + "srbds", + "mmio_stale_data", + "retbleed", + "eibrs_pbrsb", + "bhi" + ], + "bogo": 3983.99, + "cache": 12288, + "units": 4, + "physical_id": 0, + "siblings": 2, + "cores": 2, + "fpu": true, + "fpu_exception": true, + "cpuid_level": 13, + "write_protect": false, + "clflush_size": 64, + "cache_alignment": 64, + "address_sizes": { + "physical": 39, + "virtual": 48 + } + }, + { + "architecture": "x86_64", + "vendor_name": "GenuineIntel", + "family": 6, + "model": 158, + "stepping": 13, + "features": [ + "fpu", + "vme", + "de", + "pse", + "tsc", + "msr", + "pae", + "mce", + "cx8", + "apic", + "sep", + "mtrr", + "pge", + "mca", + "cmov", + "pat", + "pse36", + "clflush", + "acpi", + "mmx", + "fxsr", + "sse", + "sse2", + "ss", + "ht", + "syscall", + "nx", + "pdpe1gb", + "rdtscp", + "lm", + "constant_tsc", + "rep_good", + "nopl", + "nonstop_tsc", + "cpuid", + "tsc_known_freq", + "pni", + "pclmulqdq", + "ssse3", + "fma", + "cx16", + "pcid", + "sse4_1", + "sse4_2", + "x2apic", + "movbe", + "popcnt", + "tsc_deadline_timer", + "aes", + "xsave", + "avx", + "f16c", + "rdrand", + "hypervisor", + "lahf_lm", + "abm", + "3dnowprefetch", + "cpuid_fault", + "ssbd", + "ibrs", + "ibpb", + "stibp", + "ibrs_enhanced", + "fsgsbase", + "tsc_adjust", + "bmi1", + "avx2", + "smep", + "bmi2", + "erms", + "invpcid", + "rdseed", + "adx", + "smap", + "clflushopt", + "xsaveopt", + "xsavec", + "xgetbv1", + "xsaves", + "md_clear", + "flush_l1d", + "arch_capabilities" + ], + "bugs": [ + "spectre_v1", + "spectre_v2", + "spec_store_bypass", + "swapgs", + "itlb_multihit", + "srbds", + "mmio_stale_data", + "retbleed", + "eibrs_pbrsb", + "bhi" + ], + "bogo": 3983.99, + "cache": 12288, + "units": 4, + "physical_id": 1, + "siblings": 2, + "cores": 2, + "fpu": true, + "fpu_exception": true, + "cpuid_level": 13, + "write_protect": false, + "clflush_size": 64, + "cache_alignment": 64, + "address_sizes": { + "physical": 39, + "virtual": 48 + } + }, + { + "architecture": "x86_64", + "vendor_name": "GenuineIntel", + "family": 6, + "model": 158, + "stepping": 13, + "features": [ + "fpu", + "vme", + "de", + "pse", + "tsc", + "msr", + "pae", + "mce", + "cx8", + "apic", + "sep", + "mtrr", + "pge", + "mca", + "cmov", + "pat", + "pse36", + "clflush", + "acpi", + "mmx", + "fxsr", + "sse", + "sse2", + "ss", + "ht", + "syscall", + "nx", + "pdpe1gb", + "rdtscp", + "lm", + "constant_tsc", + "rep_good", + "nopl", + "nonstop_tsc", + "cpuid", + "tsc_known_freq", + "pni", + "pclmulqdq", + "ssse3", + "fma", + "cx16", + "pcid", + "sse4_1", + "sse4_2", + "x2apic", + "movbe", + "popcnt", + "tsc_deadline_timer", + "aes", + "xsave", + "avx", + "f16c", + "rdrand", + "hypervisor", + "lahf_lm", + "abm", + "3dnowprefetch", + "cpuid_fault", + "ssbd", + "ibrs", + "ibpb", + "stibp", + "ibrs_enhanced", + "fsgsbase", + "tsc_adjust", + "bmi1", + "avx2", + "smep", + "bmi2", + "erms", + "invpcid", + "rdseed", + "adx", + "smap", + "clflushopt", + "xsaveopt", + "xsavec", + "xgetbv1", + "xsaves", + "md_clear", + "flush_l1d", + "arch_capabilities" + ], + "bugs": [ + "spectre_v1", + "spectre_v2", + "spec_store_bypass", + "swapgs", + "itlb_multihit", + "srbds", + "mmio_stale_data", + "retbleed", + "eibrs_pbrsb", + "bhi" + ], + "bogo": 3983.99, + "cache": 12288, + "units": 4, + "physical_id": 2, + "siblings": 2, + "cores": 2, + "fpu": true, + "fpu_exception": true, + "cpuid_level": 13, + "write_protect": false, + "clflush_size": 64, + "cache_alignment": 64, + "address_sizes": { + "physical": 39, + "virtual": 48 + } + }, + { + "architecture": "x86_64", + "vendor_name": "GenuineIntel", + "family": 6, + "model": 158, + "stepping": 13, + "features": [ + "fpu", + "vme", + "de", + "pse", + "tsc", + "msr", + "pae", + "mce", + "cx8", + "apic", + "sep", + "mtrr", + "pge", + "mca", + "cmov", + "pat", + "pse36", + "clflush", + "acpi", + "mmx", + "fxsr", + "sse", + "sse2", + "ss", + "ht", + "syscall", + "nx", + "pdpe1gb", + "rdtscp", + "lm", + "constant_tsc", + "rep_good", + "nopl", + "nonstop_tsc", + "cpuid", + "tsc_known_freq", + "pni", + "pclmulqdq", + "ssse3", + "fma", + "cx16", + "pcid", + "sse4_1", + "sse4_2", + "x2apic", + "movbe", + "popcnt", + "tsc_deadline_timer", + "aes", + "xsave", + "avx", + "f16c", + "rdrand", + "hypervisor", + "lahf_lm", + "abm", + "3dnowprefetch", + "cpuid_fault", + "ssbd", + "ibrs", + "ibpb", + "stibp", + "ibrs_enhanced", + "fsgsbase", + "tsc_adjust", + "bmi1", + "avx2", + "smep", + "bmi2", + "erms", + "invpcid", + "rdseed", + "adx", + "smap", + "clflushopt", + "xsaveopt", + "xsavec", + "xgetbv1", + "xsaves", + "md_clear", + "flush_l1d", + "arch_capabilities" + ], + "bugs": [ + "spectre_v1", + "spectre_v2", + "spec_store_bypass", + "swapgs", + "itlb_multihit", + "srbds", + "mmio_stale_data", + "retbleed", + "eibrs_pbrsb", + "bhi" + ], + "bogo": 3983.99, + "cache": 12288, + "units": 4, + "physical_id": 3, + "siblings": 2, + "cores": 2, + "fpu": true, + "fpu_exception": true, + "cpuid_level": 13, + "write_protect": false, + "clflush_size": 64, + "cache_alignment": 64, + "address_sizes": { + "physical": 39, + "virtual": 48 + } + } + ], + "disk": [ + { + "index": 24, + "attached_to": 20, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/xvda", + "sysfs_bus_id": "vbd-768", + "sysfs_device_link": "/devices/vbd-768", + "unix_device_name": "/dev/xvda", + "unix_device_number": { + "type": 98, + "major": 202, + "minor": 0, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/1", + "/dev/xvda" + ], + "resources": [ + { + "type": "disk_geo", + "cylinders": 23497, + "heads": 255, + "sectors": 63, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 377487360, + "value_2": 512 + } + ], + "driver": "vbd", + "driver_module": "xen_blkfront", + "drivers": [ + "vbd" + ], + "driver_modules": [ + "xen_blkfront" + ] + }, + { + "index": 26, + "attached_to": 21, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/xvdb", + "sysfs_bus_id": "vbd-832", + "sysfs_device_link": "/devices/vbd-832", + "unix_device_name": "/dev/xvdb", + "unix_device_number": { + "type": 98, + "major": 202, + "minor": 16, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/2", + "/dev/xvdb" + ], + "resources": [ + { + "type": "disk_geo", + "cylinders": 104433, + "heads": 255, + "sectors": 63, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 1677721600, + "value_2": 512 + } + ], + "driver": "vbd", + "driver_module": "xen_blkfront", + "drivers": [ + "vbd" + ], + "driver_modules": [ + "xen_blkfront" + ] + } + ], + "graphics_card": [ + { + "index": 18, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 2 + }, + "base_class": { + "name": "Display controller", + "value": 3 + }, + "sub_class": { + "name": "VGA compatible controller", + "value": 0 + }, + "pci_interface": { + "name": "VGA", + "value": 0 + }, + "vendor": { + "name": "Cirrus Logic", + "value": 4115 + }, + "sub_vendor": { + "value": 6900 + }, + "device": { + "name": "GD 5446", + "value": 184 + }, + "sub_device": { + "value": 4352 + }, + "model": "Cirrus Logic GD 5446", + "sysfs_id": "/devices/pci0000:00/0000:00:02.0", + "sysfs_bus_id": "0000:00:02.0", + "resources": [ + { + "type": "mem", + "base": 4026531840, + "range": 33554432, + "enabled": true, + "access": "read_only", + "prefetch": "no" + }, + { + "type": "mem", + "base": 4077002752, + "range": 4096, + "enabled": true, + "access": "read_write", + "prefetch": "no" + }, + { + "type": "mem", + "base": 786432, + "range": 131072, + "enabled": false, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 7, + "header_type": 0, + "secondary_bus": 0, + "irq": 0, + "prog_if": 0 + }, + "driver": "cirrus", + "driver_module": "cirrus", + "drivers": [ + "cirrus" + ], + "driver_modules": [ + "cirrus" + ], + "driver_info": { + "type": "x11", + "db_entry_0": [ + "4", + "cirrus" + ], + "server": "cirrus", + "xf86_version": "4", + "supports_3d": false, + "Colors": { + "all": 0, + "c8": 0, + "c15": 0, + "c16": 0, + "c24": 0, + "c32": 0 + }, + "dac_speed": 0, + "script": "" + }, + "module_alias": "pci:v00001013d000000B8sv00001AF4sd00001100bc03sc00i00" + } + ], + "hub": [ + { + "index": 28, + "attached_to": 12, + "bus_type": { + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Hub", + "value": 266 + }, + "vendor": { + "name": "Linux 6.10.4-xanmod1 uhci_hcd", + "value": 7531 + }, + "device": { + "name": "UHCI Host Controller", + "value": 1 + }, + "revision": { + "name": "6.10", + "value": 0 + }, + "serial": "0000:00:01.2", + "model": "Linux 6.10.4-xanmod1 uhci_hcd UHCI Host Controller", + "sysfs_id": "/devices/pci0000:00/0000:00:01.2/usb1/1-0:1.0", + "sysfs_bus_id": "1-0:1.0", + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "name": "hub", + "value": 9 + }, + "device_subclass": { + "name": "per_interface", + "value": 0 + }, + "device_protocol": 0, + "interface_class": { + "name": "hub", + "value": 9 + }, + "interface_subclass": { + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "hub", + "drivers": [ + "hub" + ], + "module_alias": "usb:v1D6Bp0001d0610dc09dsc00dp00ic09isc00ip00in00" + } + ], + "memory": [ + { + "index": 11, + "attached_to": 0, + "base_class": { + "name": "Internally Used Class", + "value": 257 + }, + "sub_class": { + "name": "Main Memory", + "value": 2 + }, + "model": "Main Memory", + "resources": [ + { + "type": "mem", + "base": 0, + "range": 33655767040, + "enabled": true, + "access": "read_write", + "prefetch": "unknown" + }, + { + "type": "phys_mem", + "range": 34359738368 + } + ] + } + ], + "mouse": [ + { + "index": 27, + "attached_to": 28, + "bus_type": { + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Mouse", + "value": 261 + }, + "sub_class": { + "name": "USB Mouse", + "value": 3 + }, + "vendor": { + "name": "QEMU", + "value": 1575 + }, + "device": { + "name": "QEMU USB Tablet", + "value": 1 + }, + "serial": "42", + "compat_vendor": "Unknown", + "compat_device": "Generic USB Mouse", + "model": "QEMU USB Tablet", + "sysfs_id": "/devices/pci0000:00/0000:00:01.2/usb1/1-2/1-2:1.0", + "sysfs_bus_id": "1-2:1.0", + "unix_device_name": "/dev/input/mice", + "unix_device_number": { + "type": 99, + "major": 13, + "minor": 63, + "range": 1 + }, + "unix_device_names": [ + "/dev/input/mice" + ], + "unix_device_name2": "/dev/input/mouse0", + "unix_device_number2": { + "type": 99, + "major": 13, + "minor": 32, + "range": 1 + }, + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "name": "per_interface", + "value": 0 + }, + "device_subclass": { + "name": "per_interface", + "value": 0 + }, + "device_protocol": 0, + "interface_class": { + "name": "hid", + "value": 3 + }, + "interface_subclass": { + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "usbhid", + "driver_module": "usbhid", + "drivers": [ + "usbhid" + ], + "driver_modules": [ + "usbhid" + ], + "driver_info": { + "type": "mouse", + "db_entry_0": [ + "explorerps/2", + "exps2" + ], + "xf86": "explorerps/2", + "gpm": "exps2", + "buttons": -1, + "wheels": -1 + }, + "module_alias": "usb:v0627p0001d0000dc00dsc00dp00ic03isc00ip00in00" + } + ], + "network_controller": [ + { + "index": 22, + "attached_to": 0, + "base_class": { + "name": "Network controller", + "value": 2 + }, + "sub_class": { + "name": "Ethernet controller", + "value": 0 + }, + "vendor": "Xen", + "device": "Virtual Ethernet Card 0", + "model": "Xen Virtual Ethernet Card 0", + "sysfs_id": "/devices/vif-0", + "sysfs_bus_id": "vif-0", + "unix_device_name": "enX0", + "unix_device_names": [ + "enX0" + ], + "rom_id": "device/vif/0", + "resources": [ + { + "type": "hwaddr", + "address": 49 + }, + { + "type": "phwaddr", + "address": 49 + } + ], + "driver": "vif", + "driver_module": "xen_netfront", + "drivers": [ + "vif" + ], + "driver_modules": [ + "xen_netfront" + ] + } + ], + "network_interface": [ + { + "index": 30, + "attached_to": 0, + "base_class": { + "name": "Network Interface", + "value": 263 + }, + "sub_class": { + "name": "Loopback", + "value": 0 + }, + "model": "Loopback network interface", + "sysfs_id": "/class/net/lo", + "unix_device_name": "lo", + "unix_device_names": [ + "lo" + ] + }, + { + "index": 31, + "attached_to": 22, + "base_class": { + "name": "Network Interface", + "value": 263 + }, + "sub_class": { + "name": "Ethernet", + "value": 1 + }, + "model": "Ethernet network interface", + "sysfs_id": "/class/net/enX0", + "sysfs_device_link": "/devices/vif-0", + "unix_device_name": "enX0", + "unix_device_names": [ + "enX0" + ], + "resources": [ + { + "type": "hwaddr", + "address": 49 + }, + { + "type": "phwaddr", + "address": 49 + } + ], + "driver": "vif", + "driver_module": "xen_netfront", + "drivers": [ + "vif" + ], + "driver_modules": [ + "xen_netfront" + ] + } + ], + "storage_controller": [ + { + "index": 17, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 1 + }, + "base_class": { + "name": "Mass storage controller", + "value": 1 + }, + "sub_class": { + "name": "IDE interface", + "value": 1 + }, + "pci_interface": { + "value": 128 + }, + "vendor": { + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "value": 6900 + }, + "device": { + "value": 28688 + }, + "sub_device": { + "value": 4352 + }, + "model": "Intel IDE interface", + "sysfs_id": "/devices/pci0000:00/0000:00:01.1", + "sysfs_bus_id": "0000:00:01.1", + "resources": [ + { + "type": "io", + "base": 1014, + "range": 1, + "enabled": true, + "access": "read_write" + }, + { + "type": "io", + "base": 368, + "range": 8, + "enabled": true, + "access": "read_write" + }, + { + "type": "io", + "base": 49408, + "range": 16, + "enabled": true, + "access": "read_write" + }, + { + "type": "io", + "base": 496, + "range": 8, + "enabled": true, + "access": "read_write" + }, + { + "type": "io", + "base": 886, + "range": 1, + "enabled": true, + "access": "read_write" + } + ], + "detail": { + "function": 1, + "command": 5, + "header_type": 0, + "secondary_bus": 0, + "irq": 0, + "prog_if": 128 + }, + "driver": "ata_piix", + "driver_module": "ata_piix", + "drivers": [ + "ata_piix" + ], + "driver_modules": [ + "ata_piix" + ], + "module_alias": "pci:v00008086d00007010sv00001AF4sd00001100bc01sc01i80" + }, + { + "index": 19, + "attached_to": 0, + "base_class": { + "name": "Mass storage controller", + "value": 1 + }, + "sub_class": { + "name": "Storage controller", + "value": 128 + }, + "vendor": "Xen", + "device": "Virtual Storage 0", + "model": "Xen Virtual Storage 0", + "sysfs_id": "/devices/vbd-5696", + "sysfs_bus_id": "vbd-5696", + "rom_id": "device/vbd/5696" + }, + { + "index": 20, + "attached_to": 0, + "base_class": { + "name": "Mass storage controller", + "value": 1 + }, + "sub_class": { + "name": "Storage controller", + "value": 128 + }, + "vendor": "Xen", + "device": "Virtual Storage 1", + "model": "Xen Virtual Storage 1", + "sysfs_id": "/devices/vbd-768", + "sysfs_bus_id": "vbd-768", + "rom_id": "device/vbd/768", + "driver": "vbd", + "driver_module": "xen_blkfront", + "drivers": [ + "vbd" + ], + "driver_modules": [ + "xen_blkfront" + ] + }, + { + "index": 21, + "attached_to": 0, + "base_class": { + "name": "Mass storage controller", + "value": 1 + }, + "sub_class": { + "name": "Storage controller", + "value": 128 + }, + "vendor": "Xen", + "device": "Virtual Storage 2", + "model": "Xen Virtual Storage 2", + "sysfs_id": "/devices/vbd-832", + "sysfs_bus_id": "vbd-832", + "rom_id": "device/vbd/832", + "driver": "vbd", + "driver_module": "xen_blkfront", + "drivers": [ + "vbd" + ], + "driver_modules": [ + "xen_blkfront" + ] + } + ], + "system": { + "form_factor": "desktop" + }, + "unknown": [ + { + "index": 16, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 3 + }, + "base_class": { + "name": "Unclassified device", + "value": 255 + }, + "sub_class": { + "value": 128 + }, + "vendor": { + "value": 22611 + }, + "sub_vendor": { + "value": 22611 + }, + "device": { + "value": 1 + }, + "sub_device": { + "value": 1 + }, + "revision": { + "value": 1 + }, + "model": "Unclassified device", + "sysfs_id": "/devices/pci0000:00/0000:00:03.0", + "sysfs_bus_id": "0000:00:03.0", + "resources": [ + { + "type": "io", + "base": 49152, + "range": 256, + "enabled": true, + "access": "read_write" + }, + { + "type": "irq", + "base": 28, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 4060086272, + "range": 16777216, + "enabled": true, + "access": "read_only", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 7, + "header_type": 0, + "secondary_bus": 0, + "irq": 28, + "prog_if": 0 + }, + "driver": "xen-platform-pci", + "drivers": [ + "xen-platform-pci" + ], + "module_alias": "pci:v00005853d00000001sv00005853sd00000001bcFFsc80i00" + }, + { + "index": 23, + "attached_to": 0, + "base_class": { + "name": "Communication controller", + "value": 7 + }, + "sub_class": { + "name": "Serial controller", + "value": 0 + }, + "pci_interface": { + "name": "16550", + "value": 2 + }, + "device": { + "name": "16550A", + "value": 0 + }, + "model": "16550A", + "unix_device_name": "/dev/ttyS0", + "unix_device_names": [ + "/dev/ttyS0" + ], + "resources": [ + { + "type": "io", + "base": 1016, + "range": 0, + "enabled": true, + "access": "read_write" + }, + { + "type": "irq", + "base": 4, + "triggered": 0, + "enabled": true + } + ] + } + ], + "usb_controller": [ + { + "index": 12, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 1 + }, + "base_class": { + "name": "Serial bus controller", + "value": 12 + }, + "sub_class": { + "name": "USB Controller", + "value": 3 + }, + "pci_interface": { + "name": "UHCI", + "value": 0 + }, + "vendor": { + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "value": 6900 + }, + "device": { + "value": 28704 + }, + "sub_device": { + "value": 4352 + }, + "revision": { + "value": 1 + }, + "model": "Intel USB Controller", + "sysfs_id": "/devices/pci0000:00/0000:00:01.2", + "sysfs_bus_id": "0000:00:01.2", + "resources": [ + { + "type": "io", + "base": 49472, + "range": 32, + "enabled": true, + "access": "read_write" + }, + { + "type": "irq", + "base": 23, + "triggered": 0, + "enabled": true + } + ], + "detail": { + "function": 2, + "command": 7, + "header_type": 0, + "secondary_bus": 0, + "irq": 23, + "prog_if": 0 + }, + "driver": "uhci_hcd", + "driver_module": "uhci_hcd", + "drivers": [ + "uhci_hcd" + ], + "driver_modules": [ + "uhci_hcd" + ], + "driver_info": { + "type": "module", + "db_entry_0": [ + "uhci-hcd" + ], + "active": true, + "modprobe": true, + "names": [ + "uhci-hcd" + ], + "module_args": [ + "" + ], + "conf": "" + }, + "module_alias": "pci:v00008086d00007020sv00001AF4sd00001100bc0Csc03i00" + } + ] + }, + "smbios": { + "bios": { + "handle": 0, + "vendor": "Xen", + "version": "4.17", + "date": "04/16/2024", + "features": [ + "PCI supported", + "EDD spec supported" + ], + "start_address": "0xe8000", + "rom_size": 65536 + }, + "chassis": { + "handle": 768, + "manufacturer": "Xen", + "version": "", + "chassis_type": { + "name": "Other", + "value": 1 + }, + "lock_present": false, + "bootup_state": { + "name": "Safe", + "value": 3 + }, + "power_state": { + "name": "Safe", + "value": 3 + }, + "thermal_state": { + "name": "Safe", + "value": 3 + }, + "security_state": { + "name": "Unknown", + "value": 2 + }, + "oem": "0x0" + }, + "memory_array": [ + { + "handle": 4096, + "location": { + "name": "Other", + "value": 1 + }, + "usage": { + "name": "System memory", + "value": 3 + }, + "ecc": { + "name": "Multi-bit", + "value": 6 + }, + "max_size": 33550336, + "error_handle": 65534, + "slots": 2 + } + ], + "memory_array_mapped_address": [ + { + "handle": 4864, + "array_handle": 4096, + "start_address": 0, + "end_address": 17179869184, + "part_width": 1 + }, + { + "handle": 4865, + "array_handle": 4096, + "start_address": 17179869184, + "end_address": 34355544064, + "part_width": 1 + } + ], + "memory_device": [ + { + "handle": 4352, + "location": "DIMM 0", + "bank_location": "", + "manufacturer": "", + "part_number": "", + "array_handle": 4096, + "error_handle": 0, + "width": 64, + "ecc_bits": 0, + "size": 16777216, + "form_factor": { + "name": "DIMM", + "value": 9 + }, + "set": 0, + "memory_type": { + "name": "RAM", + "value": 7 + }, + "memory_type_details": null, + "speed": 0 + }, + { + "handle": 4353, + "location": "DIMM 1", + "bank_location": "", + "manufacturer": "", + "part_number": "", + "array_handle": 4096, + "error_handle": 0, + "width": 64, + "ecc_bits": 0, + "size": 16773120, + "form_factor": { + "name": "DIMM", + "value": 9 + }, + "set": 0, + "memory_type": { + "name": "RAM", + "value": 7 + }, + "memory_type_details": null, + "speed": 0 + } + ], + "memory_device_mapped_address": [ + { + "handle": 5120, + "memory_device_handle": 4352, + "array_map_handle": 4864, + "start_address": 0, + "end_address": 17179869184, + "row_position": 1, + "interleave_position": 0, + "interleave_depth": 0 + }, + { + "handle": 5121, + "memory_device_handle": 4353, + "array_map_handle": 4865, + "start_address": 17179869184, + "end_address": 34355544064, + "row_position": 1, + "interleave_position": 0, + "interleave_depth": 0 + } + ], + "processor": [ + { + "handle": 1025, + "socket": "CPU 1", + "socket_type": { + "name": "Other", + "value": 1 + }, + "socket_populated": true, + "manufacturer": "Intel", + "version": "", + "part": "", + "processor_type": { + "name": "CPU", + "value": 3 + }, + "processor_family": { + "name": "Other", + "value": 1 + }, + "processor_status": { + "name": "Enabled", + "value": 1 + }, + "clock_ext": 0, + "clock_max": 1992, + "cache_handle_l1": 0, + "cache_handle_l2": 0, + "cache_handle_l3": 0 + }, + { + "handle": 1026, + "socket": "CPU 2", + "socket_type": { + "name": "Other", + "value": 1 + }, + "socket_populated": true, + "manufacturer": "Intel", + "version": "", + "part": "", + "processor_type": { + "name": "CPU", + "value": 3 + }, + "processor_family": { + "name": "Other", + "value": 1 + }, + "processor_status": { + "name": "Enabled", + "value": 1 + }, + "clock_ext": 0, + "clock_max": 1992, + "cache_handle_l1": 0, + "cache_handle_l2": 0, + "cache_handle_l3": 0 + }, + { + "handle": 1027, + "socket": "CPU 3", + "socket_type": { + "name": "Other", + "value": 1 + }, + "socket_populated": true, + "manufacturer": "Intel", + "version": "", + "part": "", + "processor_type": { + "name": "CPU", + "value": 3 + }, + "processor_family": { + "name": "Other", + "value": 1 + }, + "processor_status": { + "name": "Enabled", + "value": 1 + }, + "clock_ext": 0, + "clock_max": 1992, + "cache_handle_l1": 0, + "cache_handle_l2": 0, + "cache_handle_l3": 0 + }, + { + "handle": 1028, + "socket": "CPU 4", + "socket_type": { + "name": "Other", + "value": 1 + }, + "socket_populated": true, + "manufacturer": "Intel", + "version": "", + "part": "", + "processor_type": { + "name": "CPU", + "value": 3 + }, + "processor_family": { + "name": "Other", + "value": 1 + }, + "processor_status": { + "name": "Enabled", + "value": 1 + }, + "clock_ext": 0, + "clock_max": 1992, + "cache_handle_l1": 0, + "cache_handle_l2": 0, + "cache_handle_l3": 0 + }, + { + "handle": 1029, + "socket": "CPU 5", + "socket_type": { + "name": "Other", + "value": 1 + }, + "socket_populated": true, + "manufacturer": "Intel", + "version": "", + "part": "", + "processor_type": { + "name": "CPU", + "value": 3 + }, + "processor_family": { + "name": "Other", + "value": 1 + }, + "processor_status": { + "name": "Enabled", + "value": 1 + }, + "clock_ext": 0, + "clock_max": 1992, + "cache_handle_l1": 0, + "cache_handle_l2": 0, + "cache_handle_l3": 0 + }, + { + "handle": 1030, + "socket": "CPU 6", + "socket_type": { + "name": "Other", + "value": 1 + }, + "socket_populated": true, + "manufacturer": "Intel", + "version": "", + "part": "", + "processor_type": { + "name": "CPU", + "value": 3 + }, + "processor_family": { + "name": "Other", + "value": 1 + }, + "processor_status": { + "name": "Enabled", + "value": 1 + }, + "clock_ext": 0, + "clock_max": 1992, + "cache_handle_l1": 0, + "cache_handle_l2": 0, + "cache_handle_l3": 0 + }, + { + "handle": 1031, + "socket": "CPU 7", + "socket_type": { + "name": "Other", + "value": 1 + }, + "socket_populated": true, + "manufacturer": "Intel", + "version": "", + "part": "", + "processor_type": { + "name": "CPU", + "value": 3 + }, + "processor_family": { + "name": "Other", + "value": 1 + }, + "processor_status": { + "name": "Enabled", + "value": 1 + }, + "clock_ext": 0, + "clock_max": 1992, + "cache_handle_l1": 0, + "cache_handle_l2": 0, + "cache_handle_l3": 0 + }, + { + "handle": 1032, + "socket": "CPU 8", + "socket_type": { + "name": "Other", + "value": 1 + }, + "socket_populated": true, + "manufacturer": "Intel", + "version": "", + "part": "", + "processor_type": { + "name": "CPU", + "value": 3 + }, + "processor_family": { + "name": "Other", + "value": 1 + }, + "processor_status": { + "name": "Enabled", + "value": 1 + }, + "clock_ext": 0, + "clock_max": 1992, + "cache_handle_l1": 0, + "cache_handle_l2": 0, + "cache_handle_l3": 0 + } + ], + "system": { + "handle": 256, + "manufacturer": "Xen", + "product": "HVM domU", + "version": "4.17", + "wake_up": { + "name": "Power Switch", + "value": 6 + } + } + } +} \ No newline at end of file diff --git a/systems/x86_64-linux/polaris-nix/hardware.nix b/systems/x86_64-linux/polaris-nix/hardware.nix deleted file mode 100644 index bb640e4..0000000 --- a/systems/x86_64-linux/polaris-nix/hardware.nix +++ /dev/null @@ -1,34 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{lib, ...}: { - imports = []; - - boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "sr_mod" "xen_blkfront"]; - boot.initrd.kernelModules = []; - boot.kernelModules = []; - boot.extraModulePackages = []; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/64079eb2-d3e3-47b7-a889-d5b2fee4fa82"; - fsType = "ext4"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/BC12-6397"; - fsType = "vfat"; - }; - - swapDevices = [ - {device = "/dev/disk/by-uuid/d36507db-7392-4852-9b2a-12d2a476cd31";} - ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enX0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -}