diff options
Diffstat (limited to 'nix/modules')
| -rw-r--r-- | nix/modules/home/default.nix | 6 | ||||
| -rw-r--r-- | nix/modules/home/user.nix | 9 | ||||
| -rw-r--r-- | nix/modules/home/zsh.nix | 2 | ||||
| -rw-r--r-- | nix/modules/vars.nix | 12 |
4 files changed, 20 insertions, 9 deletions
diff --git a/nix/modules/home/default.nix b/nix/modules/home/default.nix index 52174a9..7bfee42 100644 --- a/nix/modules/home/default.nix +++ b/nix/modules/home/default.nix @@ -145,7 +145,7 @@ ++ (if config.monorepo.profiles.art.enable then (with pkgs; [ inkscape - krita + # krita ]) else []) ++ (if config.monorepo.profiles.music.enable then (with pkgs; [ @@ -158,7 +158,7 @@ alsa-scarlett-gui ardour audacity - blender + # blender foxdot fluidsynth qjackctl @@ -168,7 +168,7 @@ supercollider inkscape kdePackages.kdenlive - kicad + # kicad murmur silver-searcher ]) else []); diff --git a/nix/modules/home/user.nix b/nix/modules/home/user.nix index 1e88b75..12bba2e 100644 --- a/nix/modules/home/user.nix +++ b/nix/modules/home/user.nix @@ -25,7 +25,7 @@ packages = with pkgs; (if config.monorepo.profiles.graphics.enable then [ # wikipedia - kiwix kiwix-tools + # kiwix kiwix-tools # passwords age sops @@ -37,7 +37,7 @@ graphviz jq # Apps - octaveFull + # octaveFull vesktop grim swww vim telegram-desktop # Sound/media @@ -65,14 +65,13 @@ (writeShellScriptBin "remote-build" '' #!/bin/bash -cd ~/monorepo/nix -nixos-rebuild --use-remote-sudo --target-host "$1" switch --flake .#spontaneity +nixos-rebuild --sudo --ask-sudo-password --target-host "$1" switch --flake $HOME/monorepo/nix#spontaneity '' ) (writeShellScriptBin "install-vps" '' #!/bin/bash -nix run github:nix-community/nixos-anywhere -- --generate-hardware-config nixos-generate-config ./systems/spontaneity/hardware-configuration.nix --flake .#spontaneity --target-host "$1" +nix run github:nix-community/nixos-anywhere -- --generate-hardware-config nixos-generate-config $HOME/monorepo/nix/systems/spontaneity/hardware-configuration.nix --flake $HOME/monorepo/nix#spontaneity --target-host "$1" '') ] else [ pfetch diff --git a/nix/modules/home/zsh.nix b/nix/modules/home/zsh.nix index 9f848bc..e12a2d8 100644 --- a/nix/modules/home/zsh.nix +++ b/nix/modules/home/zsh.nix @@ -25,7 +25,7 @@ g = "git"; v = "vim"; py = "python3"; - rb = "sudo nixos-rebuild switch --flake .#${systemHostName}"; + rb = "sudo nixos-rebuild switch --flake $HOME/monorepo/nix#${systemHostName}"; nfu = "cd ~/monorepo/nix && git add . && git commit -m \"new flake lock\" && nix flake update"; usync = "rsync -azvP --chmod=\"Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r\" ~/website_html/ root@${config.monorepo.vars.remoteHost}:/var/www/ret2pop-website/"; usite diff --git a/nix/modules/vars.nix b/nix/modules/vars.nix index 6ee1cc0..48da971 100644 --- a/nix/modules/vars.nix +++ b/nix/modules/vars.nix @@ -1,6 +1,18 @@ { lib, ... }: { options.monorepo.vars = { + device = lib.mkOption { + type = lib.types.str; + default = "/dev/sda"; + example = "/dev/nvme0n1"; + description = "device that NixOS is installed to"; + }; + + myDiskoSpec = lib.mkOption { + type = lib.types.attrs; + description = "retains a copy of the disko spec for reflection"; + }; + userName = lib.mkOption { type = lib.types.str; default = "preston"; |