PapaTutuWawa/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

programs: Remove nonvm

Browse Source
This commit is contained in:
PapaTutuWawa 2021-08-31 18:25:24 +02:00
parent 3a4a16bf20
commit f3be63569d
4 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/ayame.nix
View File

@ -13,7 +13,7 @@ in mkHost {
overlays = [ "nur" "unstable" ]; overlays = [ "nur" "unstable" ];
hardwareImports = [ "intel" "wifi" "mobile" ]; hardwareImports = [ "intel" "wifi" "mobile" ];
programImports = [ programImports = [
"zsh" "mpv" "git" "tmux" "firefox" "gnome-terminal" "gnome" "nonvm" "zsh" "mpv" "git" "tmux" "firefox" "gnome-terminal" "gnome"
]; ];
extraImports = [ "distributed-build/offload.nix" ]; extraImports = [ "distributed-build/offload.nix" ];
extraPackages = pkgs: with pkgs; [ extraPackages = pkgs: with pkgs; [

2
hosts/miku.nix
View File

@ -12,7 +12,7 @@ in mkHost {
overlays = [ "nur" "steam" "unstable" "simple" "custom" "emacs" ]; overlays = [ "nur" "steam" "unstable" "simple" "custom" "emacs" ];
hardwareImports = [ "amdgpu" "amd" ]; hardwareImports = [ "amdgpu" "amd" ];
programImports = [ programImports = [
"zsh" "git" "mpv" "tmux" "emacs" "firefox" "gnome-terminal" "gnome" "i18n" "gamemode" "nonvm" "zsh" "git" "mpv" "tmux" "emacs" "firefox" "gnome-terminal" "gnome" "i18n" "gamemode"
"distributed-build/builder.nix" "distributed-build/builder.nix"
"music" "music"
]; ];

14
modules/host.nix
View File

@ -8,6 +8,7 @@
, hardwareImports ? [ "generic" ] , hardwareImports ? [ "generic" ]
, programImports ? [] , programImports ? []
, extraImports ? [] , extraImports ? []
, isVM ? false
, fileSystems , fileSystems
, swapDevices ? [] , swapDevices ? []
, extraPackages ? pkgs: [] , extraPackages ? pkgs: []
@ -16,6 +17,7 @@
let let
overlaysSet = import ../overlays { pkgs = pkgs; lib = lib; }; overlaysSet = import ../overlays { pkgs = pkgs; lib = lib; };
network = import ./network.nix;
home-manager = builtins.fetchGit { home-manager = builtins.fetchGit {
url = "https://github.com/nix-community/home-manager.git"; url = "https://github.com/nix-community/home-manager.git";
rev = "35a24648d155843a4d162de98c17b1afd5db51e4"; rev = "35a24648d155843a4d162de98c17b1afd5db51e4";
@ -43,6 +45,13 @@ let
hostName = hostName; hostName = hostName;
wireless.enable = (if wireless then true else lib.mkForce false); wireless.enable = (if wireless then true else lib.mkForce false);
hosts = lib.mkIf (!isVM) {
"${network.miku}" = [ "miku.local" ];
"${network.nishimiya}" = [ "nishimiya.local" ];
"${network.ayame}" = [ "ayame.local" ];
"${network.tamaki}" = [ "tamaki.local" ];
};
}; };
i18n.defaultLocale = "en_GB.UTF-8"; i18n.defaultLocale = "en_GB.UTF-8";
@ -73,10 +82,11 @@ let
# CJK fonts # CJK fonts
source-han-sans source-han-serif source-han-sans source-han-serif
# RT scheduling # RT scheduling
rtkit rtkit
] ++ extraPackages pkgs; ] ++ extraPackages pkgs
++ lib.optionals (!isVM) (with pkgs; [ gopass ]);
sessionVariables = { sessionVariables = {
# Prevent us from having to always type it out # Prevent us from having to always type it out

24
modules/programs/nonvm/default.nix
View File

@ -1,24 +0,0 @@
{ pkgs, ... }:
let
network = import ../../network.nix;
in {
environment = {
systemPackages = with pkgs; [ gopass home-manager ];
sessionVariables = {
# Prevent us from having to always type it out
#NIXOS_CONFIG = "\${HOME}/Development/Personal/nixos-config/mikulinux.nix";
};
shells = [ pkgs.zsh ];
pathsToLink = [ "/share/zsh" ];
};
networking.hosts = {
"${network.miku}" = [ "miku.local" ];
"${network.nishimiya}" = [ "nishimiya.local" ];
"${network.ayame}" = [ "ayame.local" ];
"${network.tamaki}" = [ "tamaki.local" ];
};
}