From 96361268667b7694c44178dce66816ee3f717b9d Mon Sep 17 00:00:00 2001 From: MichaelFisher1997 Date: Wed, 5 Jun 2024 23:04:40 +0100 Subject: [PATCH] pre hyprland.nix import --- configuration.nix | 26 +++++--------------------- docker.nix | 8 ++++++++ hyprland.nix | 8 ++++++++ mnt.nix | 13 +++++++++++++ 4 files changed, 34 insertions(+), 21 deletions(-) create mode 100644 docker.nix create mode 100644 hyprland.nix create mode 100644 mnt.nix diff --git a/configuration.nix b/configuration.nix index 8f891cf..1cc0233 100644 --- a/configuration.nix +++ b/configuration.nix @@ -9,6 +9,9 @@ [ # Include the results of the hardware scan. ./hardware-configuration.nix ./packages.nix + ./mnt.nix + ./docker.nix + ./hyprland.nix ]; # Bootloader. @@ -21,10 +24,6 @@ networking.hostName = "hypr-nix"; # 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; @@ -86,11 +85,7 @@ # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; - virtualisation.docker.enable = true; - virtualisation.docker.rootless = { - enable = true; - setSocketVariable = true; - }; + # Define a user account. Don't forget to set a password with ‘passwd’. users.users.micqdf = { isNormalUser = true; @@ -137,21 +132,10 @@ programs.steam.gamescopeSession.enable = true; programs.gamemode.enable = true; - - - fileSystems."/mnt/BigNAS" = { - device = "10.27.27.239:/BigNAS"; - fsType = "nfs"; - }; - - fileSystems."/mnt/NV1" = { - device = "/dev/nvme1n1p2"; - fsType = "btrfs"; - }; # List services that you want to enable: environment.sessionVariables = { - STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/user/.steam/root/compatibilitytools.d"; + STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/mciqdf/.steam/root/compatibilitytools.d"; hyprshot = "/home/micqdf/flakes/hyprshot/Hyprshot"; }; diff --git a/docker.nix b/docker.nix new file mode 100644 index 0000000..b156af1 --- /dev/null +++ b/docker.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: +{ + virtualisation.docker.enable = true; + virtualisation.docker.rootless = { + enable = true; + setSocketVariable = true; + }; +} \ No newline at end of file diff --git a/hyprland.nix b/hyprland.nix new file mode 100644 index 0000000..c68acf8 --- /dev/null +++ b/hyprland.nix @@ -0,0 +1,8 @@ +{ inputs, pkgs, config, username, ... }: +{ + programs.hyprland = { + enable = true; + package = inputs.hyprland.packages.${pkgs.system}.hyprland; + xwayland.enable = true; + }; +} \ No newline at end of file diff --git a/mnt.nix b/mnt.nix new file mode 100644 index 0000000..bf8d634 --- /dev/null +++ b/mnt.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: + +{ + fileSystems."/mnt/BigNAS" = { + device = "10.27.27.239:/BigNAS"; + fsType = "nfs"; + }; + + fileSystems."/mnt/NV1" = { + device = "/dev/nvme1n1p2"; + fsType = "btrfs"; + }; +} \ No newline at end of file