From 22589f24c05fe9ee18f8079444ab8121fc34b1a1 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 2 Feb 2024 23:44:43 +0100 Subject: [PATCH] Make 32bit installer --- flake.lock | 60 +++++++++++++++++----------------- systems/kamimusubi/default.nix | 47 +++++++------------------- 2 files changed, 42 insertions(+), 65 deletions(-) diff --git a/flake.lock b/flake.lock index 934046b..6867d47 100644 --- a/flake.lock +++ b/flake.lock @@ -31,11 +31,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1706306805, - "narHash": "sha256-BWJdcDmpqZuxCStx4RUl5SD6uELy8hRa5YzwFTdWrts=", + "lastModified": 1706862672, + "narHash": "sha256-rrMGIt9Xc4k+VnCsWGhw6avmfSCDIGjYXSv9TyoelFI=", "owner": "rycee", "repo": "nur-expressions", - "rev": "24985136f4a5f98254e88c26d428114d206c2565", + "rev": "11897e488b25e4237a14fa569b5c80c61b46eac7", "type": "gitlab" }, "original": { @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1706569497, - "narHash": "sha256-oixb0IDb5eZYw6BaVr/R/1pSoMh4rfJHkVnlgeRIeZs=", + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "60c614008eed1d0383d21daac177a3e036192ed8", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", "type": "github" }, "original": { @@ -184,11 +184,11 @@ ] }, "locked": { - "lastModified": 1706473109, - "narHash": "sha256-iyuAvpKTsq2u23Cr07RcV5XlfKExrG8gRpF75hf1uVc=", + "lastModified": 1706798041, + "narHash": "sha256-BbvuF4CsVRBGRP8P+R+JUilojk0M60D7hzqE0bEvJBQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "d634c3abafa454551f2083b054cd95c3f287be61", + "rev": "4d53427bce7bf3d17e699252fd84dc7468afc46e", "type": "github" }, "original": { @@ -227,11 +227,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1706534110, - "narHash": "sha256-S5AjJF5I8qw53ITkbv5ka3PJSwhocc5aDkP1GGtmqFA=", + "lastModified": 1706910972, + "narHash": "sha256-yGYNqVceiHl6OdK56EsjSXQua5zrF04/2vNhmJ9cruY=", "owner": "nix-community", "repo": "kde2nix", - "rev": "d21e366a426b0f5b51f454a662e2ef18f810b2a6", + "rev": "44fb0b182e694579b53d7fed27a81fc98ccbe66f", "type": "github" }, "original": { @@ -318,11 +318,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1706182238, - "narHash": "sha256-Ti7CerGydU7xyrP/ow85lHsOpf+XMx98kQnPoQCSi1g=", + "lastModified": 1706834982, + "narHash": "sha256-3CfxA7gZ+DVv/N9Pvw61bV5Oe/mWfxYPyVQGqp9TMJA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f84eaffc35d1a655e84749228cde19922fcf55f1", + "rev": "83e571bb291161682b9c3ccd48318f115143a550", "type": "github" }, "original": { @@ -333,11 +333,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706371002, - "narHash": "sha256-dwuorKimqSYgyu8Cw6ncKhyQjUDOyuXoxDTVmAXq88s=", + "lastModified": 1706732774, + "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c002c6aa977ad22c60398daaa9be52f2203d0006", + "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d", "type": "github" }, "original": { @@ -350,11 +350,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1706371002, - "narHash": "sha256-dwuorKimqSYgyu8Cw6ncKhyQjUDOyuXoxDTVmAXq88s=", + "lastModified": 1706732774, + "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c002c6aa977ad22c60398daaa9be52f2203d0006", + "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d", "type": "github" }, "original": { @@ -384,11 +384,11 @@ "openrgb": { "flake": false, "locked": { - "lastModified": 1706493105, - "narHash": "sha256-l/Bpp2UlJinLYvXRmIn+/I7AdmKOku5TBzsK96Gs778=", + "lastModified": 1706909429, + "narHash": "sha256-zCtQlWaoJerild5i2mzlVlQXzOlcONHrOna5NvprW2E=", "owner": "CalcProgrammer1", "repo": "OpenRGB", - "rev": "af049e234f2bf4f503087820f27d9a65ebf1fad6", + "rev": "a13a528117180e0bf3e35e5f6f68cdfc1782fa36", "type": "gitlab" }, "original": { @@ -412,11 +412,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1705757126, - "narHash": "sha256-Eksr+n4Q8EYZKAN0Scef5JK4H6FcHc+TKNHb95CWm+c=", + "lastModified": 1706424699, + "narHash": "sha256-Q3RBuOpZNH2eFA1e+IHgZLAOqDD9SKhJ/sszrL8bQD4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f56597d53fd174f796b5a7d3ee0b494f9e2285cc", + "rev": "7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf", "type": "github" }, "original": { @@ -476,11 +476,11 @@ ] }, "locked": { - "lastModified": 1706416452, - "narHash": "sha256-Ar9ugEGTxwIpOs7NgGRQu9/lvjWaos6QRrYq5WGSbJg=", + "lastModified": 1706807774, + "narHash": "sha256-buTFjfWcApTXxoSbfTKgrvDBsAI9MQ6dmARcFnapPXA=", "owner": "PrismLauncher", "repo": "PrismLauncher", - "rev": "b0a473a5cecf8ad84c5669bf433f5d88e23f7202", + "rev": "5d223f6f9359c7b9017583c13c5f538032380b73", "type": "github" }, "original": { diff --git a/systems/kamimusubi/default.nix b/systems/kamimusubi/default.nix index c51fa9c..93b44aa 100644 --- a/systems/kamimusubi/default.nix +++ b/systems/kamimusubi/default.nix @@ -2,51 +2,28 @@ { jopejoe1 = { - audio = { - enable = true; - }; local.enable = true; nix.enable = true; - plasma6.enable = true; - overlays.enable = true; user = { - jopejoe1.enable = true; root.enable = true; }; ssh.enable = true; }; - networking = { - wireless.enable = lib.mkForce false; - }; time.timeZone = "Europe/Berlin"; - - - environment.systemPackages = with pkgs; [ - # Calamares for graphical installation - libsForQt5.kpmcore - calamares-nixos - (pkgs.makeAutostartItem { name = "io.calamares.calamares"; package = pkgs.calamares-nixos; }) - calamares-nixos-extensions - # Get list of locales - glibcLocales - # Theming - catppuccin-kvantum - catppuccin-kde - catppuccin-gtk - tela-icon-theme - ]; - - i18n.supportedLocales = [ "all" ]; - + services.openssh.settings.PermitRootLogin = lib.mkForce "yes"; - - programs = { - xwayland.enable = true; - kdeconnect.enable = true; - }; - console = { - enable = true; + + boot.loader = { + efi = { + canTouchEfiVariables = false; + }; + grub = { + efiSupport = true; + efiInstallAsRemovable = true; + device = "nodev"; + forcei686 = true; + }; }; }