diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..637a18f --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/mobile02.qcow2 +/.session +/result diff --git a/.session b/.session deleted file mode 100644 index 80b1858..0000000 --- a/.session +++ /dev/null @@ -1,61 +0,0 @@ -let SessionLoad = 1 -let s:so_save = &g:so | let s:siso_save = &g:siso | setg so=0 siso=0 | setl so=-1 siso=-1 -let v:this_session=expand(":p") -doautoall SessionLoadPre -silent only -silent tabonly -cd ~/Projects/nix-server -if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == '' - let s:wipebuf = bufnr('%') -endif -let s:shortmess_save = &shortmess -set shortmess+=aoO -badd +6 flake.nix -badd +21 modules/default.nix -badd +10 modules/parts.nix -badd +12 modules/hosts/server02/default.nix -badd +6 modules/hosts/server02/server02Configuration.nix -badd +20 modules/system/core/default.nix -badd +6 ~/Projects/nix-server/modules/system/core/bootloader.nix -badd +32 modules/system/core/locale.nix -badd +35 modules/system/core/nix-settings.nix -badd +7 modules/system/core/user.nix -badd +9 modules/hosts/server02/hardware-configuration.nix -argglobal -%argdel -$argadd modules/hosts/server02/server02Configuration.nix -edit modules/hosts/server02/server02Configuration.nix -argglobal -balt modules/hosts/server02/hardware-configuration.nix -setlocal foldmethod=manual -setlocal foldexpr=0 -setlocal foldmarker={{{,}}} -setlocal foldignore=# -setlocal foldlevel=0 -setlocal foldminlines=1 -setlocal foldnestmax=20 -setlocal foldenable -silent! normal! zE -let &fdl = &fdl -let s:l = 6 - ((5 * winheight(0) + 27) / 55) -if s:l < 1 | let s:l = 1 | endif -keepjumps exe s:l -normal! zt -keepjumps 6 -normal! 043| -tabnext 1 -if exists('s:wipebuf') && len(win_findbuf(s:wipebuf)) == 0 && getbufvar(s:wipebuf, '&buftype') isnot# 'terminal' - silent exe 'bwipe ' . s:wipebuf -endif -unlet! s:wipebuf -set winheight=1 winwidth=20 -let &shortmess = s:shortmess_save -let s:sx = expand(":p:r")."x.vim" -if filereadable(s:sx) - exe "source " . fnameescape(s:sx) -endif -let &g:so = s:so_save | let &g:siso = s:siso_save -nohlsearch -doautoall SessionLoadPost -unlet SessionLoad -" vim: set ft=vim : diff --git a/flake.lock b/flake.lock index d0ecc0f..6ab2b16 100644 --- a/flake.lock +++ b/flake.lock @@ -912,16 +912,16 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1785090369, - "narHash": "sha256-m0pDuRJG7EDo9ri+4Ksu83VsI+PlxNC9lNBfydejce4=", + "lastModified": 1785133411, + "narHash": "sha256-Yjv0WEg39KRYS0rBdTbu6Fc/or/ihAKk13W9sQ6VWd0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "624af665418d3c65d544145b4d34ad696439570e", + "rev": "2f5a153c270b70cb0f8c11f46d96d6d3bc39f4e3", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index b8e19d1..c393b32 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "nix flake config for server02"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; nix-config.url = "git+https://git.voidarc.co.uk/voidarc/nixos.git?ref=dendritic"; # flake parts diff --git a/modules/hosts/server02/hardware-configuration.nix b/modules/hosts/server02/_hardware-configuration.nix similarity index 100% rename from modules/hosts/server02/hardware-configuration.nix rename to modules/hosts/server02/_hardware-configuration.nix diff --git a/modules/hosts/server02/server02Configuration.nix b/modules/hosts/server02/server02Configuration.nix index 317e852..703529b 100644 --- a/modules/hosts/server02/server02Configuration.nix +++ b/modules/hosts/server02/server02Configuration.nix @@ -3,6 +3,6 @@ networking = { hostName = "mobile02"; }; - imports = [./hardware-configuration.nix]; + imports = [./_hardware-configuration.nix]; }; } diff --git a/modules/system/core/nix-settings.nix b/modules/system/core/nix-settings.nix index 008c5cc..2f6fce1 100644 --- a/modules/system/core/nix-settings.nix +++ b/modules/system/core/nix-settings.nix @@ -21,7 +21,6 @@ }; settings = { cores = 2; - trusted-users = ["root"]; download-buffer-size = 524288000; experimental-features = [ "nix-command" @@ -39,13 +38,6 @@ nixpkgs = { config = { allowUnfree = true; - packageOverrides = pkgs: { - unstable = import inputs.nixpkgs-unstable { - config = { - allowUnfree = true; - }; - }; - }; }; }; }; diff --git a/modules/system/core/user.nix b/modules/system/core/user.nix index 0cfe012..eeb5e32 100644 --- a/modules/system/core/user.nix +++ b/modules/system/core/user.nix @@ -1,14 +1,10 @@ { self, inputs, + moduleWithSystem, ... }: { - flake.nixosModules.user = { - pkgs, - lib, - inputs', - ... - }: let + flake.nixosModules.user = moduleWithSystem ({inputs', ...}: let in { users.users.user01 = { isNormalUser = true; @@ -20,5 +16,5 @@ "wheel" ]; }; - }; + }); }