diff --git a/base/gui-programs.nix b/base/gui-programs.nix deleted file mode 100644 index 40aabd7..0000000 --- a/base/gui-programs.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ - firefox - flameshot - alacritty - slack - discord - ]; - - networking.networkmanager.enable = true; - programs.nm-applet.enable = true; -} diff --git a/base/nix.nix b/base/nix.nix index 825843f..fe539b1 100644 --- a/base/nix.nix +++ b/base/nix.nix @@ -1,7 +1,5 @@ { pkgs, ... }: { - nixpkgs.config.allowUnfree = true; - nix = { package = pkgs.nixUnstable; extraOptions = '' diff --git a/base/programs.nix b/base/programs.nix index 90d11b6..514026c 100644 --- a/base/programs.nix +++ b/base/programs.nix @@ -23,13 +23,11 @@ environment.systemPackages = with pkgs; [ # shell usage bat - fd ripgrep wget # development git - git-crypt gnupg pinentry-curses vim diff --git a/base/users.nix b/base/users.nix index 318a4ec..9eaf453 100644 --- a/base/users.nix +++ b/base/users.nix @@ -12,7 +12,6 @@ in isNormalUser = true; extraGroups = [ "media" - "networkmanager" "wheel" # Enable ‘sudo’ for the user. ]; shell = pkgs.fish; diff --git a/boreal.nix b/boreal.nix deleted file mode 100644 index 174e1d9..0000000 --- a/boreal.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ ... }: - -{ - imports = [ - # Default configuration - ./base - ./base/gui-programs.nix - - # Service definitions - ./services - - # Configuration secrets - ./secrets - - # Host-specific config - ./hosts/boreal - ]; - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # 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 = "20.09"; # Did you read the comment? -} diff --git a/flake.nix b/flake.nix index 9c774b2..4b9a432 100644 --- a/flake.nix +++ b/flake.nix @@ -30,12 +30,5 @@ } ]; }; - nixosConfigurations.boreal = nixpkgs-unstable.lib.nixosSystem rec { - system = "x86_64-linux"; - modules = - [ - ./boreal.nix - ]; - }; }; } diff --git a/hosts/boreal/default.nix b/hosts/boreal/default.nix deleted file mode 100644 index 6b11686..0000000 --- a/hosts/boreal/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -# 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’). - -{ config, lib, pkgs, ... }: -let - secrets = config.my.secrets; -in -{ - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; - - # Use the systemd-boot EFI boot loader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - services.btrfs = { - autoScrub = { - enable = true; - fileSystems = [ "/" ]; - }; - }; - - networking.hostName = "boreal"; # Define your hostname. - networking.domain = "alarsyo.net"; - - # Set your time zone. - time.timeZone = "Europe/Paris"; - - # The global useDHCP flag is deprecated, therefore explicitly set to false here. - # Per-interface useDHCP will be mandatory in the future, so this generated config - # replicates the default behaviour. - networking.interfaces.enp7s0.useDHCP = true; - networking.interfaces.wlp3s0.useDHCP = true; - - # List services that you want to enable: - my.services = { - }; - - services = { - openssh = { - enable = true; - permitRootLogin = "no"; - passwordAuthentication = false; - }; - - xserver = { - enable = true; - videoDrivers = [ "nouveau" ]; - windowManager.i3.enable = true; - layout = "fr"; - xkbVariant = "us"; - }; - }; - - sound.enable = true; - hardware.pulseaudio.enable = true; -} diff --git a/hosts/boreal/hardware-configuration.nix b/hosts/boreal/hardware-configuration.nix deleted file mode 100644 index 0caffca..0000000 --- a/hosts/boreal/hardware-configuration.nix +++ /dev/null @@ -1,29 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/1a942915-c1ae-4058-b99d-09d12d40dbd3"; - fsType = "btrfs"; - options = [ "subvol=nixos" "compress=zstd" "noatime" ]; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/17C7-368D"; - fsType = "vfat"; - }; - - swapDevices = [ ]; - -} diff --git a/secrets/wireguard.nix b/secrets/wireguard.nix index 3a19c05..7becb96 100644 Binary files a/secrets/wireguard.nix and b/secrets/wireguard.nix differ