diff options
author | Minijackson <minijackson@riseup.net> | 2021-06-02 15:28:48 +0200 |
---|---|---|
committer | Minijackson <minijackson@riseup.net> | 2021-06-02 15:28:48 +0200 |
commit | 70cc223444059ea2885275dac9ef55f970b92281 (patch) | |
tree | 84fbba6a6092d3b7da1d91ab66c2375e1034ece5 /flake.nix | |
parent | aab7b75826a1fafa3d2e3547c9c43d1745d73de9 (diff) | |
download | nixos-config-reborn-70cc223444059ea2885275dac9ef55f970b92281.tar.gz nixos-config-reborn-70cc223444059ea2885275dac9ef55f970b92281.zip |
treewide: NixOS 20.09 -> NixOS 21.05
Diffstat (limited to 'flake.nix')
-rw-r--r-- | flake.nix | 28 |
1 files changed, 22 insertions, 6 deletions
@@ -1,11 +1,11 @@ | |||
1 | { | 1 | { |
2 | description = "My NixOS configurations"; | 2 | description = "My NixOS configurations"; |
3 | 3 | ||
4 | inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-20.09"; | 4 | inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.05"; |
5 | inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; | 5 | inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; |
6 | inputs.flake-utils.url = "github:numtide/flake-utils"; | 6 | inputs.flake-utils.url = "github:numtide/flake-utils"; |
7 | inputs.home-manager = { | 7 | inputs.home-manager = { |
8 | url = "github:nix-community/home-manager/release-20.09"; | 8 | url = "github:nix-community/home-manager/release-21.05"; |
9 | inputs.nixpkgs.follows = "nixpkgs"; | 9 | inputs.nixpkgs.follows = "nixpkgs"; |
10 | }; | 10 | }; |
11 | inputs.neovim-master = { | 11 | inputs.neovim-master = { |
@@ -26,8 +26,8 @@ | |||
26 | test = { config, ... }: { | 26 | test = { config, ... }: { |
27 | imports = [ self.nixosModules.default ]; | 27 | imports = [ self.nixosModules.default ]; |
28 | 28 | ||
29 | home-manager.users.minijackson.home.stateVersion = "20.09"; | 29 | home-manager.users.minijackson.home.stateVersion = "21.05"; |
30 | home-manager.users.root.home.stateVersion = "20.09"; | 30 | home-manager.users.root.home.stateVersion = "21.05"; |
31 | 31 | ||
32 | users.users.minijackson.initialHashedPassword = ""; | 32 | users.users.minijackson.initialHashedPassword = ""; |
33 | users.users.root.initialHashedPassword = ""; | 33 | users.users.root.initialHashedPassword = ""; |
@@ -109,6 +109,15 @@ | |||
109 | modules = [ | 109 | modules = [ |
110 | self.nixosModules.test | 110 | self.nixosModules.test |
111 | self.nixosModules.profiles.desktop | 111 | self.nixosModules.profiles.desktop |
112 | |||
113 | ({ modulesPath, ... }: { | ||
114 | imports = [ | ||
115 | (modulesPath + "/virtualisation/qemu-vm.nix") | ||
116 | ]; | ||
117 | |||
118 | virtualisation.memorySize = 1024; | ||
119 | virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ]; | ||
120 | }) | ||
112 | ]; | 121 | ]; |
113 | }; | 122 | }; |
114 | 123 | ||
@@ -118,6 +127,15 @@ | |||
118 | self.nixosModules.test | 127 | self.nixosModules.test |
119 | self.nixosModules.profiles.desktop | 128 | self.nixosModules.profiles.desktop |
120 | self.nixosModules.usecases.desktop.development | 129 | self.nixosModules.usecases.desktop.development |
130 | |||
131 | ({ modulesPath, ... }: { | ||
132 | imports = [ | ||
133 | (modulesPath + "/virtualisation/qemu-vm.nix") | ||
134 | ]; | ||
135 | |||
136 | virtualisation.memorySize = 1024; | ||
137 | virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ]; | ||
138 | }) | ||
121 | ]; | 139 | ]; |
122 | }; | 140 | }; |
123 | 141 | ||
@@ -201,8 +219,6 @@ | |||
201 | networking.hostId = "4e98920d"; | 219 | networking.hostId = "4e98920d"; |
202 | 220 | ||
203 | services.hydra = { | 221 | services.hydra = { |
204 | hydraURL = "localhost:3000"; | ||
205 | notificationSender = "hydra@localhost"; | ||
206 | secretKeyLocation = builtins.toFile | 222 | secretKeyLocation = builtins.toFile |
207 | "store-secret-key" | 223 | "store-secret-key" |
208 | "testServer:0d5jJjOxIoe6sTr2YKWkQxsM3ZcW+9GAk52yYNVxfYBUxS2nUfzfQk5Jo0OwHnT95bTLXCVNQETGV4m6KHsVCA=="; | 224 | "testServer:0d5jJjOxIoe6sTr2YKWkQxsM3ZcW+9GAk52yYNVxfYBUxS2nUfzfQk5Jo0OwHnT95bTLXCVNQETGV4m6KHsVCA=="; |