diff options
| -rw-r--r-- | flake.lock | 41 | ||||
| -rw-r--r-- | flake.nix | 7 | ||||
| -rw-r--r-- | system/settings/configuration/nix.nix | 10 | ||||
| -rw-r--r-- | system/settings/services/virtualisation.nix | 2 | ||||
| -rw-r--r-- | system/settings/services/xserver.nix | 2 | ||||
| -rw-r--r-- | user/prefect.nix | 3 |
6 files changed, 43 insertions, 22 deletions
diff --git a/flake.lock b/flake.lock index d76385d0..8c6e18ca 100644 --- a/flake.lock +++ b/flake.lock @@ -1,12 +1,28 @@ { "nodes": { + "nixos": { + "locked": { + "lastModified": 1664883812, + "narHash": "sha256-wqBAcVRBxls2nVaNeQaOy9SRg/bvEUiD26TQDprIg8U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fe76645aaf2fac3baaa2813fd0089930689c53b5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixos-hardware": { "locked": { - "lastModified": 1664628729, - "narHash": "sha256-A1J0ZPhBfZZiWI6ipjKJ8+RpMllzOMu/An/8Tk3t4oo=", + "lastModified": 1665040200, + "narHash": "sha256-glqL6yj3aUm40y92inzRmowGt9aIrUrpBX7eBAMic4I=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3024c67a2e9a35450558426c42e7419ab37efd95", + "rev": "47fd70289491c1f0c0d9a1f44fb5a9e2801120c9", "type": "github" }, "original": { @@ -15,29 +31,29 @@ "type": "github" } }, - "nixpkgs": { + "nixos-unstable": { "locked": { - "lastModified": 1664594436, - "narHash": "sha256-YHowMADGzdi7fKnGlg47qe0PIljq+11VqLarmXDuKxQ=", + "lastModified": 1664989420, + "narHash": "sha256-Q8IxomUjjmewsoJgO3htkXLfCckQ7HkDJ/ZhdYVf/fA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9cac45850280978a21a3eb67b15a18f34cbffa2d", + "rev": "37bd39839acf99c5b738319f42478296f827f274", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1664715849, - "narHash": "sha256-02TH70CJ6tWnqNRkwFUvfAWLge60r2NUroV7hYku2So=", + "lastModified": 1665088587, + "narHash": "sha256-6FSRuzx4ztMt859CT7WCKQR/TdsTziw1zAse3QfC1Ps=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "61f62685ee8175188230d25ecc5c3340545d49eb", + "rev": "2d387fb2e3fbda450f66cbb01e421dd9045043ef", "type": "github" }, "original": { @@ -48,8 +64,9 @@ }, "root": { "inputs": { + "nixos": "nixos", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixos-unstable": "nixos-unstable", "nixpkgs-unstable": "nixpkgs-unstable" } } diff --git a/flake.nix b/flake.nix index 1249f2a9..2de8b6cf 100644 --- a/flake.nix +++ b/flake.nix @@ -1,12 +1,13 @@ { inputs = { - nixpkgs.url = github:NixOS/nixpkgs/nixos-22.05; + nixos.url = github:NixOS/nixpkgs/nixos-22.05; + nixos-unstable.url = github:NixOS/nixpkgs/nixos-unstable; nixpkgs-unstable.url = github:NixOS/nixpkgs; nixos-hardware.url = github:NixOS/nixos-hardware; }; - outputs = { self, nixpkgs, ... }@attrs: { - nixosConfigurations.prefect = nixpkgs.lib.nixosSystem { + outputs = { self, nixos-unstable, ... }@attrs: { + nixosConfigurations.prefect = nixos-unstable.lib.nixosSystem { system = "x86_64-linux"; specialArgs = attrs; modules = [ ./system/prefect.nix ]; diff --git a/system/settings/configuration/nix.nix b/system/settings/configuration/nix.nix index f4756d58..f152ac27 100644 --- a/system/settings/configuration/nix.nix +++ b/system/settings/configuration/nix.nix @@ -1,21 +1,21 @@ { config, pkgs, ... }: { nix = { - buildCores = 0; + settings = { + cores = 0; + auto-optimise-store = true; + trusted-users = [ "@wheel" ]; + }; daemonCPUSchedPolicy = "idle"; daemonIOSchedClass = "idle"; - trustedUsers = [ "@wheel" ]; - - package = pkgs.nixFlakes; extraOptions = '' keep-outputs = true keep-derivations = true experimental-features = nix-command flakes ''; - autoOptimiseStore = true; gc = { automatic = true; options = "--delete-older-than 14d"; diff --git a/system/settings/services/virtualisation.nix b/system/settings/services/virtualisation.nix index 828c70eb..200ffa62 100644 --- a/system/settings/services/virtualisation.nix +++ b/system/settings/services/virtualisation.nix @@ -13,7 +13,7 @@ }; environment.systemPackages = with pkgs; [ - virtmanager + virt-manager OVMF ]; } diff --git a/system/settings/services/xserver.nix b/system/settings/services/xserver.nix index b6a6a567..6ac5e0ed 100644 --- a/system/settings/services/xserver.nix +++ b/system/settings/services/xserver.nix @@ -61,7 +61,7 @@ with lib; }; fonts = with pkgs; [ gohufont - dina-font-pcf + dina-font terminus_font corefonts diff --git a/user/prefect.nix b/user/prefect.nix index e98c1eb4..eb90a9f3 100644 --- a/user/prefect.nix +++ b/user/prefect.nix @@ -31,6 +31,8 @@ ./settings/zsh.nix ]; + home.username = "alan"; + home.homeDirectory = "/home/alan"; home.packages = with pkgs; [ transgui ]; @@ -38,4 +40,5 @@ xsession.windowManager.i3.config.startup = [ ]; + home.stateVersion = "22.11"; } |