From 917bfa3763e1d5d63ba883f9a5a72e05578b4f23 Mon Sep 17 00:00:00 2001 From: blacknull Date: Fri, 18 Oct 2024 16:01:09 -0500 Subject: [PATCH] homebox first attempt --- flake.lock | 30 +++++++++++++++--------------- flake.nix | 4 ++-- home/packages/default.nix | 1 - home/packages/scripts/default.nix | 10 ---------- home/services/custom/default.nix | 1 + system/first_boot/default.nix | 20 +++++++++++++++++--- 6 files changed, 35 insertions(+), 31 deletions(-) create mode 100644 home/services/custom/default.nix diff --git a/flake.lock b/flake.lock index 6312514..2d5c0c1 100644 --- a/flake.lock +++ b/flake.lock @@ -1058,12 +1058,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LjD9yXfA6p1taR5om300iZM94CchfGawQpnjvcXEmy8=", - "path": "/nix/store/jnbkzza2pc2g7f7hp7pb8imng5is45vs-source/home", + "narHash": "sha256-KuYJVHBPd19dFs46looBWJwQ3Geuwh5BIxOs/CWogqg=", + "path": "/nix/store/i6in1dyv7jcicbwkvwwp06mghfmr83fx-source/home", "type": "path" }, "original": { - "path": "/nix/store/jnbkzza2pc2g7f7hp7pb8imng5is45vs-source/home", + "path": "/nix/store/i6in1dyv7jcicbwkvwwp06mghfmr83fx-source/home", "type": "path" } }, @@ -1153,11 +1153,11 @@ }, "nixpkgs-us": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1729070438, + "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "5785b6bb5eaae44e627d541023034e1601455827", "type": "github" }, "original": { @@ -1169,11 +1169,11 @@ }, "nixpkgs-us_2": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1729070438, + "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "5785b6bb5eaae44e627d541023034e1601455827", "type": "github" }, "original": { @@ -1434,11 +1434,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-B01IL6PFTcOaiaVsj3GnvmKb1Mc+PsajyoBSU7UE9zU=", - "path": "/nix/store/mwdrgwdgp9027mmrzx6nnqr663ps6h50-source/packages", + "path": "/nix/store/5qrl7vilxyxq0cbgajv1zh1bqdfkm6bf-source/packages", "type": "path" }, "original": { - "path": "/nix/store/mwdrgwdgp9027mmrzx6nnqr663ps6h50-source/packages", + "path": "/nix/store/5qrl7vilxyxq0cbgajv1zh1bqdfkm6bf-source/packages", "type": "path" } }, @@ -1523,11 +1523,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-h4bogpjTrrTzzj/EOatFp3eCjwrXgttguJLx7tHCEeo=", - "path": "/nix/store/mwdrgwdgp9027mmrzx6nnqr663ps6h50-source/programs", + "path": "/nix/store/5qrl7vilxyxq0cbgajv1zh1bqdfkm6bf-source/programs", "type": "path" }, "original": { - "path": "/nix/store/mwdrgwdgp9027mmrzx6nnqr663ps6h50-source/programs", + "path": "/nix/store/5qrl7vilxyxq0cbgajv1zh1bqdfkm6bf-source/programs", "type": "path" } }, @@ -1689,11 +1689,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-FtmMe4X6qOHE4q8v4bwsHIvhA3Ll1T96UhkYuWF+dlQ=", - "path": "/nix/store/jnbkzza2pc2g7f7hp7pb8imng5is45vs-source/system", + "path": "/nix/store/i6in1dyv7jcicbwkvwwp06mghfmr83fx-source/system", "type": "path" }, "original": { - "path": "/nix/store/jnbkzza2pc2g7f7hp7pb8imng5is45vs-source/system", + "path": "/nix/store/i6in1dyv7jcicbwkvwwp06mghfmr83fx-source/system", "type": "path" } }, diff --git a/flake.nix b/flake.nix index bf18a65..45f0ba4 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,7 @@ system = "x86_64-linux"; iso_system = "x86_64-linux"; - host = "laptop"; + host = "homebox"; username = "nathan"; devices = { @@ -55,7 +55,7 @@ git.enable = true; ags.enable = true; nh.enable = true; - steam.enable = true; + steam.enable = false; }; }; #disko.enable = lib.mkForce false; diff --git a/home/packages/default.nix b/home/packages/default.nix index 7fe8a48..bbfa8dc 100644 --- a/home/packages/default.nix +++ b/home/packages/default.nix @@ -34,7 +34,6 @@ zulu lmms killall - youtube-music #unfree { geogebra #} diff --git a/home/packages/scripts/default.nix b/home/packages/scripts/default.nix index 9578a58..3c2d9b7 100644 --- a/home/packages/scripts/default.nix +++ b/home/packages/scripts/default.nix @@ -12,25 +12,15 @@ #scripts (pkgs.writeShellScriptBin "_systemRebuild" '' - sudo nix flake lock /home/nathan/Projects/System --update-input nathan --update-input root --update-input system ${pkgs.nh}/bin/nh os switch --ask /home/nathan/Projects/System echo //////Enter to close////// read '') (pkgs.writeShellScriptBin "_homeRebuild" '' - sudo nix flake lock /home/nathan/Projects/System --update-input nathan ${pkgs.nh}/bin/nh home switch --ask /home/nathan/Projects/System echo //////Enter to close////// read '') - (pkgs.writeShellScriptBin "addCoverArtMP3" '' - if [[ $# != 2 ]] - then echo "usage: addCoverArtMP3 song.mp3 image.jpg" - exit - fi - mv $1 copyof$1 - ffmpeg -i copyof$1 -i $2 -map_metadata 0 -map 0 -map 1 -acodec copy $1 - '') (pkgs.writeShellScriptBin "randWallpaper" '' file=$(ls /home/nathan/Pictures/Wallpaper/ | shuf -n 1) diff --git a/home/services/custom/default.nix b/home/services/custom/default.nix new file mode 100644 index 0000000..92e1d82 --- /dev/null +++ b/home/services/custom/default.nix @@ -0,0 +1 @@ +{}: {} diff --git a/system/first_boot/default.nix b/system/first_boot/default.nix index 16def6c..038f486 100644 --- a/system/first_boot/default.nix +++ b/system/first_boot/default.nix @@ -7,16 +7,30 @@ config = lib.mkIf config.sysconfig.opts.firstBoot { - users.users.${core_inputs.user} = { + users.users.${config.sysconfig.opts.username} = { initialPassword = "7567"; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsU69CxfQk58CvItPN426h5Alnpb60SH37wet97Vb57 nathan@laptop" ]; }; - home-manager.users.${core_inputs.user} = core_inputs.${core_inputs.user}.homeManagerModule; + home-manager.users.${config.sysconfig.opts.username} = core_inputs.${config.sysconfig.opts.username}.homeManagerModule; - systemd.services.sshd.wantedBy = lib.mkForce [ "mulit-user.target" ]; + systemd.services.sshd.wantedBy = lib.mkForce [ "multi-user.target" ]; + + systemd.serivces.onFirstBoot = { + name = "first-boot.service"; + + description = "actions to perform on the very first boot of the system"; + + enable = true; + + wantedBy = [ "multi-user.target" ]; + + script = '' + setWallpaper /home/nathan/Pictures/Wallpaper/orangescape.jpg 70 + ''; + }; sysconfig.opts.openssh.enable = lib.mkForce true; };