sstent/vmimages
1
0
Fork 0
mirror of https://github.com/sstent/vmimages.git synced 2026-02-04 11:32:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed _nomad completes, update to latest, added 'rebuild test' to jsutfiles

Browse Source
This commit is contained in:
sstent
2024-01-26 21:06:12 +00:00
parent 409f8a758f
commit dbd492bd10
4 changed files with 40 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dotfiles/sstent/justfile
View File

@@ -1,8 +1,6 @@
bootstrap-repos: bootstrap-repos:
mr --trust-all bootstrap /run/user/1000/secrets/mrconfig mr --trust-all bootstrap /run/user/1000/secrets/mrconfig
update-secret-mr: update-secret-mr:
#!/usr/bin/env bash #!/usr/bin/env bash
cd ~/vmimages cd ~/vmimages
@@ -31,6 +29,16 @@ rebuild_home:
home-manager switch --flake /home/sstent/vmimages/. home-manager switch --flake /home/sstent/vmimages/.
systemctl --user restart sops-nix systemctl --user restart sops-nix
rebuild_host_test:
sudo nixos-rebuild test --flake /home/sstent/vmimages/.#${HOSTNAME}
rebuild_home_test:
home-manager test --flake /home/sstent/vmimages/.
systemctl --user restart sops-nix
nix_list_generations:
sudo nix-env --list-generations -p /nix/var/nix/profiles/system
nomad_run SERVICE: nomad_run SERVICE:
nomad run ~/projects/nomad/nomad_jobs/enabled/{{SERVICE}}.nomad nomad run ~/projects/nomad/nomad_jobs/enabled/{{SERVICE}}.nomad
nomad_purge SERVICE: nomad_purge SERVICE:
@@ -44,6 +52,8 @@ nomad_exec_bash SERVICE:
nomad_exec_sh SERVICE: nomad_exec_sh SERVICE:
ID=$(nomad status {{SERVICE}} | grep "running" | grep "{{SERVICE}}" | head -n 1| awk '{print $1}'); nomad alloc exec -task {{SERVICE}} -t ${ID} /bin/sh ID=$(nomad status {{SERVICE}} | grep "running" | grep "{{SERVICE}}" | head -n 1| awk '{print $1}'); nomad alloc exec -task {{SERVICE}} -t ${ID} /bin/sh
run_nicotine: run_nicotine:
mullvad connect mullvad connect
nix-shell -p nicotine-plus --command nicotine-plus nix-shell -p nicotine-plus --command nicotine-plus

48
flake.lock generated
View File

@@ -88,11 +88,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1701680307, "lastModified": 1705309234,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -126,11 +126,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1705273357, "lastModified": 1705659542,
"narHash": "sha256-JAlkxgJbWh7+auiT0rJL3IUXXtkULRqygfxQA6mvLgc=", "narHash": "sha256-WA3xVfAk1AYmFdwghT7mt/erYpsU6JPu9mdTEP/e9HQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "924d91e1e4c802fd8e60279a022dbae5acb36f2d", "rev": "10cd9c53115061aa6a0a90aad0b0dde6a999cdb9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -201,11 +201,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1705312285, "lastModified": 1706182238,
"narHash": "sha256-rd+dY+v61Y8w3u9bukO/hB55Xl4wXv4/yC8rCGVnK5U=", "narHash": "sha256-Ti7CerGydU7xyrP/ow85lHsOpf+XMx98kQnPoQCSi1g=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "bee2202bec57e521e3bd8acd526884b9767d7fa0", "rev": "f84eaffc35d1a655e84749228cde19922fcf55f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -223,11 +223,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1705315256, "lastModified": 1706071294,
"narHash": "sha256-WZsP/+HKz0hc0JHc8gR3E+/SRdaNOsuVr0VzjKpBqm4=", "narHash": "sha256-mpt86O5GQxKQoIg4nzKz810PeXjGSEFb4rW+shXbRco=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-wsl", "repo": "nixos-wsl",
"rev": "7ec7609b16ced598e30b6a4c85aa40254c92967f", "rev": "31346e340e828f79be23d9c83ec1674b152f17bc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -238,11 +238,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1705346841, "lastModified": 1706287586,
"narHash": "sha256-eN0J4Ohnwpt2LAp1jRfJOLFXAN3Azf0Qnv9VI2Qb2/Y=", "narHash": "sha256-Hf3QdV2ZeI9MgDNGY3dulFXIU3G+OKp5hL71gQb/nQA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fc392ddd75f20810cdf9cb6149d8283d4604d10a", "rev": "205d4e308a7257e3004e384ac9006f1df003a95e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -270,11 +270,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1705133751, "lastModified": 1705856552,
"narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -286,11 +286,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1704842529, "lastModified": 1705697961,
"narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", "narHash": "sha256-XepT3WS516evSFYkme3GrcI3+7uwXHqtHbip+t24J7E=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", "rev": "e5d1c87f5813afde2dda384ac807c57a105721cc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -322,11 +322,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1705201153, "lastModified": 1706130372,
"narHash": "sha256-y0/a4IMDZrc7lAkR7Gcm5R3W2iCBiARHnYZe6vkmiNE=", "narHash": "sha256-fHZxKH1DhsXPP36a2vJ91Zy6S+q6+QRIFlpLr9fZHU8=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "70dd0d521f7849338e487a219c1a07c429a66d77", "rev": "4606d9b1595e42ffd9b75b9e69667708c70b1d68",
"type": "github" "type": "github"
}, },
"original": { "original": {

60
home-manager/users/sstent/default.nix
View File

@@ -27,12 +27,10 @@
}; };
}; };
#home.file."/home/sstent/.config/bash-completions/mr.bash".source = ./mr_completion.bash;
# home.file."/home/sstent/justfile".source = ./justfile;
home.file."/home/sstent/justfile".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/vmimages/dotfiles/${config.home.username}/justfile"; home.file."/home/sstent/justfile".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/vmimages/dotfiles/${config.home.username}/justfile";
home.file.".bash_completion".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/vmimages/dotfiles/${config.home.username}/nomad_.bash"; home.file.".config/bash_completion/_nomad.bash".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/vmimages/dotfiles/${config.home.username}/nomad_.bash";
#home.file."/home/sstent/.config/bash-completions/mr.bash".source = ./mr_completion.bash;
# home.file."/home/sstent/.config/beets/test".source = config.lib.file.mkOutOfStoreSymlink /run/user/1000/secrets/test;
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.
programs.home-manager.enable = true; programs.home-manager.enable = true;
@@ -110,7 +108,7 @@
do do
alias $command="just $command" alias $command="just $command"
done done
''; '';
}; };
@@ -181,55 +179,3 @@
}; };
}; };
} }
#######If Gnome
# config = lib.mkIf config.mymods.gnome.enable {
# programs.bash.enable = true;
# programs.firefox.enable = true;
# programs.gnome-terminal.enable = true;
# programs.gnome-terminal.profile = {
# "f2afd3c7-cb35-4d08-b6c2-523b444be64d" = {
# visibleName = "Stu";
# showScrollbar = true;
# default = true;
# font = "DejaVu Sans Mono 12";
# colors = {
# backgroundColor = "rgb(23,20,33)";
# foregroundColor = "rgb(208,207,204)";
# palette = [
# "#272224"
# "#FF473D"
# "#3DCCB2"
# "#FF9600"
# "#3B7ECB"
# "#F74C6D"
# "#00B5FC"
# "#3E3E3E"
# "#52494C"
# "#FF6961"
# "#85E6D4"
# "#FFB347"
# "#779ECB"
# "#F7A8B8"
# "#55CDFC"
# "#EEEEEC"
# ];
# };
# };
# };
# xdg.configFile."gnome-initial-setup-done".text = "yes";
# xdg.configFile."gtk-3.0/bookmarks".text = ''
# file:///mnt/Public Public
# '';
# dconf.settings = {
# # ...
# "org/gnome/shell" = {
# favorite-apps = [
# "firefox.desktop"
# "org.gnome.Terminal.desktop"
# "org.gnome.Nautilus.desktop"
# ];
# };
# "org/gnome/desktop/interface" = { color-scheme = "prefer-dark"; };
# };
# };

2
hosts/common.nix
View File

@@ -94,7 +94,7 @@
nix.gc = { nix.gc = {
automatic = true; # Enable the automatic garbage collector automatic = true; # Enable the automatic garbage collector
dates = "03:15"; # When to run the garbage collector dates = "03:15"; # When to run the garbage collector
options = "-d"; # Arguments to pass to nix-collect-garbage options = "--delete-older-than 10"; # Arguments to pass to nix-collect-garbage
}; };
}; };
} }