diff --git a/nixos/flake.lock b/nixos/flake.lock index 80ae514..fdf4d2d 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -2,19 +2,17 @@ "nodes": { "devshell": { "inputs": { - "flake-utils": [ - "flake-utils" - ], "nixpkgs": [ "nixpkgs" - ] + ], + "systems": "systems" }, "locked": { - "lastModified": 1678957337, - "narHash": "sha256-Gw4nVbuKRdTwPngeOZQOzH/IFowmz4LryMPDiJN/ah4=", + "lastModified": 1683635384, + "narHash": "sha256-9goJTd05yOyD/McaMqZ4BUB8JW+mZMnZQJZ7VQ6C/Lw=", "owner": "numtide", "repo": "devshell", - "rev": "3e0e60ab37cd0bf7ab59888f5c32499d851edb47", + "rev": "5143ea68647c4cf5227e4ad2100db6671fc4c369", "type": "github" }, "original": { @@ -24,12 +22,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -48,11 +49,11 @@ ] }, "locked": { - "lastModified": 1680555990, - "narHash": "sha256-Tu/i5sd0hk4c4VtWO8XpY3c9KmHDcOWF5Y2GSCh3LXA=", + "lastModified": 1681092193, + "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=", "owner": "nix-community", "repo": "home-manager", - "rev": "d6f3ba090ed090ae664ab5bac329654093aae725", + "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af", "type": "github" }, "original": { @@ -64,11 +65,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1680498889, - "narHash": "sha256-4nGFBm+oILOO6DPoKTPxVlfkZSxCOY4W25zSRHESK48=", + "lastModified": 1684858140, + "narHash": "sha256-dQStox5GYrVlVNMvxxXs3xX9bXG7J7ttSjqUcVm8EaA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "799d153e4f316143a9db0eb869ecf44d8d4c0356", + "rev": "a17f99dfcb9643200b3884ca195c69ae41d7f059", "type": "github" }, "original": { @@ -77,15 +78,83 @@ "type": "indirect" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1684632198, + "narHash": "sha256-SdxMPd0WmU9MnDBuuy7ouR++GftrThmSGL7PCQj/uVI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d0dade110dc7072d67ce27826cfe9ab2ab0cf247", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "devshell": "devshell", "flake-utils": "flake-utils", "home-manager": "home-manager", "nixpkgs": "nixpkgs", + "sops-nix": "sops-nix", "utils": "utils" } }, + "sops-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1684637723, + "narHash": "sha256-0vAxL7MVMhGbTkAyvzLvleELHjVsaS43p+PR1h9gzNQ=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "4ccdfb573f323a108a44c13bb7730e42baf962a9", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "inputs": { "flake-utils": [ diff --git a/nixos/hosts/Tibo-NixDesk/default.nix b/nixos/hosts/Tibo-NixDesk/default.nix index 26871ff..aefbb8d 100644 --- a/nixos/hosts/Tibo-NixDesk/default.nix +++ b/nixos/hosts/Tibo-NixDesk/default.nix @@ -1,20 +1,10 @@ -<<<<<<< HEAD -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - -======= ->>>>>>> 63c6be3 (Add desktop) { config, pkgs, ... }: { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix -<<<<<<< HEAD -======= - ../../modules/hardware/nvidia ->>>>>>> 63c6be3 (Add desktop) + ../../modules/hardware/nvidia.nix ../../modules/apps/virtualbox ../../modules/des/gnome @@ -25,22 +15,10 @@ boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.efiSysMountPoint = "/boot/efi"; -<<<<<<< HEAD - networking.hostName = "Tibo-NixDesk"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Enable networking - networking.networkmanager.enable = true; -======= # Enable networking networking.hostName = "Tibo-NixDesk"; # Define your hostname. networking.networkmanager.enable = true; # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. ->>>>>>> 63c6be3 (Add desktop) # Set your time zone. time.timeZone = "Europe/Brussels"; @@ -48,28 +26,12 @@ # Select internationalisation properties. i18n.defaultLocale = "en_GB.utf8"; -<<<<<<< HEAD - # Enable the X11 windowing system. - services.xserver.enable = true; - - # Enable the GNOME Desktop Environment. - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; - -======= ->>>>>>> 63c6be3 (Add desktop) # Configure keymap in X11 services.xserver = { layout = "us"; xkbVariant = ""; }; -<<<<<<< HEAD - # Enable CUPS to print documents. - services.printing.enable = true; - -======= ->>>>>>> 63c6be3 (Add desktop) # Enable sound with pipewire. sound.enable = true; hardware.pulseaudio.enable = false; @@ -87,12 +49,6 @@ #media-session.enable = true; }; -<<<<<<< HEAD - # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; - -======= ->>>>>>> 63c6be3 (Add desktop) # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true; @@ -119,5 +75,4 @@ # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "22.11"; # Did you read the comment? - } diff --git a/nixos/hosts/Tibo-NixDesk/hardware-configuration.nix b/nixos/hosts/Tibo-NixDesk/hardware-configuration.nix index 97a2c5c..826c7bc 100644 --- a/nixos/hosts/Tibo-NixDesk/hardware-configuration.nix +++ b/nixos/hosts/Tibo-NixDesk/hardware-configuration.nix @@ -14,20 +14,12 @@ boot.extraModulePackages = [ ]; fileSystems."/" = -<<<<<<< HEAD { device = "/dev/disk/by-label/NIXROOT"; -======= - { device = "/dev/disk/by-uuid/5e4bacff-07fb-4d3a-8ac6-d535c913659b"; ->>>>>>> 63c6be3 (Add desktop) fsType = "ext4"; }; fileSystems."/boot/efi" = -<<<<<<< HEAD { device = "/dev/disk/by-label/NIXBOOT"; -======= - { device = "/dev/disk/by-uuid/4D30-B01D"; ->>>>>>> 63c6be3 (Add desktop) fsType = "vfat"; };