Update fg42 to use master
This commit is contained in:
parent
207a9afc1c
commit
9793e532a9
37
flake.lock
37
flake.lock
|
@ -197,11 +197,11 @@
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1712765858,
|
"lastModified": 1712798444,
|
||||||
"narHash": "sha256-gWRdIXmNsgOKFNiFOAzo4hleJsl03vu9nLPrkmwmTwY=",
|
"narHash": "sha256-aAksVB7zMfBQTz0q2Lw3o78HM3Bg2FRziX2D6qnh+sk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "53c4cc48b71bbd98d65fb4c7bc0e2ea22d9a6672",
|
"rev": "a297cb1cb0337ee10a7a0f9517954501d8f6f74d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -260,11 +260,11 @@
|
||||||
"noether": "noether"
|
"noether": "noether"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1712786536,
|
"lastModified": 1712913470,
|
||||||
"narHash": "sha256-nQJRWtZk/TkusN8l2pjo5VcO2oEXjASCT0UH5f83APE=",
|
"narHash": "sha256-4k0NGJ4b/sd7IU/4Pth6uDBWO6R8fZwFTPnG3BlUOWA=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "dc949d26c47a65aff48ea43ab841005fb43a494e",
|
"rev": "26c1a6074dd9f9e08ee5f54af6766e43d1c2956d",
|
||||||
"revCount": 1089,
|
"revCount": 1098,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://devheroes.codes/FG42/FG42"
|
"url": "https://devheroes.codes/FG42/FG42"
|
||||||
},
|
},
|
||||||
|
@ -495,11 +495,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1712760404,
|
"lastModified": 1712909959,
|
||||||
"narHash": "sha256-4zhaEW1nB+nGbCNMjOggWeY5nXs/H0Y71q0+h+jdxoU=",
|
"narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "e1c4bac14beb8c409d0534382cf967171706b9d9",
|
"rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -510,11 +510,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1711715736,
|
"lastModified": 1712757991,
|
||||||
"narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=",
|
"narHash": "sha256-kR7C7Fqt3JP40h0mzmSZeWI5pk1iwqj4CSeGjnUbVHc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "807c549feabce7eddbf259dbdcec9e0600a0660d",
|
"rev": "d6b3ddd253c578a7ab98f8011e59990f21dc3932",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -695,15 +695,16 @@
|
||||||
"nixpkgs": "nixpkgs_5"
|
"nixpkgs": "nixpkgs_5"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1712776989,
|
"lastModified": 1712846008,
|
||||||
"narHash": "sha256-DiZoTYM8FptB4DkyrzdFDMDIMECNCdYpnthjhi0NaRs=",
|
"narHash": "sha256-0739q1QSpprLrlqdmQeSM9ynqmuqHagmRLnyMEy47Xc=",
|
||||||
"rev": "5241f9f243cb6099a185db12552a32f70509ada6",
|
"ref": "refs/tags/v0.1.8",
|
||||||
"revCount": 48,
|
"rev": "e53688bcc79e5e3142bb2c912d59965c086dafe4",
|
||||||
|
"revCount": 49,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://devheroes.codes/lxsameer/noether"
|
"url": "https://devheroes.codes/lxsameer/noether"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"rev": "5241f9f243cb6099a185db12552a32f70509ada6",
|
"ref": "refs/tags/v0.1.8",
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://devheroes.codes/lxsameer/noether"
|
"url": "https://devheroes.codes/lxsameer/noether"
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,7 +16,8 @@
|
||||||
{ lib, pkgs, inputs, ... }@params:
|
{ lib, pkgs, inputs, ... }@params:
|
||||||
let
|
let
|
||||||
modules = import ../../modules params;
|
modules = import ../../modules params;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
(modules.git {
|
(modules.git {
|
||||||
|
@ -68,7 +69,7 @@ in {
|
||||||
home.extraOutputsToInstall = [ "man" ];
|
home.extraOutputsToInstall = [ "man" ];
|
||||||
# Packages that should be installed to the user profile.
|
# Packages that should be installed to the user profile.
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
params.fg42
|
params.fg42.none
|
||||||
# archives
|
# archives
|
||||||
zip
|
zip
|
||||||
xz
|
xz
|
||||||
|
@ -254,7 +255,7 @@ in {
|
||||||
|
|
||||||
"yubi_switch" = ''gpg-connect-agent "scd serialno" "learn --force" /bye'';
|
"yubi_switch" = ''gpg-connect-agent "scd serialno" "learn --force" /bye'';
|
||||||
|
|
||||||
maryland = ''ssh -t -L 5900:localhost:5900 mary 'x11vnc -localhost -display :0'';
|
maryland = ''ssh -t -v -L 5900:localhost:5900 mary@mary'';
|
||||||
};
|
};
|
||||||
|
|
||||||
initExtra = ''
|
initExtra = ''
|
||||||
|
@ -373,7 +374,7 @@ in {
|
||||||
systemctl --user import-environment XMODIFIERS GTK_IM_MODULE QT_IM_MODULE CLUTTER_IM_MODULE
|
systemctl --user import-environment XMODIFIERS GTK_IM_MODULE QT_IM_MODULE CLUTTER_IM_MODULE
|
||||||
'';
|
'';
|
||||||
xsession.scriptPath = ".fg42-xsession";
|
xsession.scriptPath = ".fg42-xsession";
|
||||||
xsession.windowManager.command = "${params.fg42}/bin/fg42-wm";
|
xsession.windowManager.command = "/etc/profiles/per-user/lxsameer/bin/fg42-wm"; # "${params.fg42}/bin/fg42-wm";
|
||||||
|
|
||||||
services.dunst.enable = true;
|
services.dunst.enable = true;
|
||||||
services.pasystray.enable = true;
|
services.pasystray.enable = true;
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
|
|
||||||
(setq fg42/font '("Fira Code" 10))
|
(setq fg42/font '("Fira Code" 10))
|
||||||
(when-wm
|
(when-wm
|
||||||
(setq fg42/font '("Fira Code" 8)))
|
(setq fg42/font '("Fira Code" 10)))
|
||||||
|
|
||||||
|
|
||||||
(provide '.fg42)
|
(provide '.fg42)
|
||||||
|
|
|
@ -17,18 +17,18 @@
|
||||||
rec {
|
rec {
|
||||||
# Add a command to the shell to create the disk
|
# Add a command to the shell to create the disk
|
||||||
create-disk = writeScriptBin "create-disk" ''
|
create-disk = writeScriptBin "create-disk" ''
|
||||||
#!${stdenv.shell}
|
#!${stdenv.shell}
|
||||||
|
|
||||||
qemu-img create -f qcow2 vdisk1 40G
|
qemu-img create -f qcow2 vdisk1 40G
|
||||||
'';
|
'';
|
||||||
|
|
||||||
bootImage = image: (writeScriptBin "boot-${image.name}" ''
|
bootImage = image: (writeScriptBin "boot-${image.name}" ''
|
||||||
#!${stdenv.shell}
|
#!${stdenv.shell}
|
||||||
|
|
||||||
SLIRP=yes ${qemu}/bin/qemu-system-x86_64 -enable-kvm -m 2048 -boot d \
|
SLIRP=yes ${qemu}/bin/qemu-system-x86_64 -enable-kvm -m 2048 -boot d \
|
||||||
-cdrom ${image} -hda vdisk1 -vga std \
|
-cdrom ${image} -hda vdisk1 -vga std \
|
||||||
-net user,hostfwd=tcp::10022-:22 \
|
-net user,hostfwd=tcp::10022-:22 \
|
||||||
-netdev user,id=eth -device e1000,netdev=eth
|
-netdev user,id=eth -device e1000,netdev=eth
|
||||||
|
|
||||||
'');
|
'');
|
||||||
|
|
||||||
|
|
|
@ -69,7 +69,7 @@ let
|
||||||
|
|
||||||
lxsameer = pkgs.callPackage ../users/lxsameer/default.nix {};
|
lxsameer = pkgs.callPackage ../users/lxsameer/default.nix {};
|
||||||
|
|
||||||
fg42 = inputs.fg42.packages.${system}.default;
|
fg42 = inputs.fg42.packages.${system};
|
||||||
inVM = (utils.sanitizeBuilderConfig hostBuilderConfig).inVM;
|
inVM = (utils.sanitizeBuilderConfig hostBuilderConfig).inVM;
|
||||||
host = if inVM then "majinVM" else "majin";
|
host = if inVM then "majinVM" else "majin";
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue