diff options
Diffstat (limited to 'configuration/tarrel')
| -rw-r--r-- | configuration/tarrel/default.nix | 61 | ||||
| -rw-r--r-- | configuration/tarrel/home-manager.nix | 42 |
2 files changed, 51 insertions, 52 deletions
diff --git a/configuration/tarrel/default.nix b/configuration/tarrel/default.nix index f92285b..f8519a7 100644 --- a/configuration/tarrel/default.nix +++ b/configuration/tarrel/default.nix @@ -1,25 +1,23 @@ -{ pkgs, inputs, config, ... }: +{ config, ... }: { imports = [ ./hardware-configuration.nix + ./home-manager.nix - ../packages.nix - ../services.nix - ../users + ../core ../hyprland.nix - ../nix-settings.nix ]; - nixpkgs.config.allowUnfree = true; + system.stateVersion = "24.05"; + + networking.hostName = "tarrel"; + networking.networkmanager.enable = true; + + users.users.jras.extraGroups = [ "networkmanager" ]; boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - environment.systemPackages = with pkgs; [ - zola - discord - ]; - hardware.graphics.enable = true; services.xserver.videoDrivers = ["nvidia"]; hardware.nvidia = { @@ -33,35 +31,6 @@ security.rtkit.enable = true; - time.timeZone = "Europe/Amsterdam"; - - i18n.defaultLocale = "en_US.UTF-8"; - i18n.extraLocaleSettings = { - LC_ADDRESS = "nl_NL.UTF-8"; - LC_IDENTIFICATION = "nl_NL.UTF-8"; - LC_MEASUREMENT = "nl_NL.UTF-8"; - LC_MONETARY = "nl_NL.UTF-8"; - LC_NAME = "nl_NL.UTF-8"; - LC_NUMERIC = "nl_NL.UTF-8"; - LC_PAPER = "nl_NL.UTF-8"; - LC_TELEPHONE = "nl_NL.UTF-8"; - LC_TIME = "nl_NL.UTF-8"; - }; - - console.keyMap = "us-acentos"; - - programs.zsh.enable = true; - - users.users.jras = { - isNormalUser = true; - description = "Jasper"; - extraGroups = [ "networkmanager" "wheel" "audio" ]; - shell = pkgs.zsh; - }; - - security.sudo.execWheelOnly = true; - security.sudo.wheelNeedsPassword = false; - environment.sessionVariables = { TERMINAL = "alacritty"; EDITOR = "helix"; @@ -69,18 +38,6 @@ environment.pathsToLink = [ "/libexec" ]; - networking.hostName = "tarrel"; - networking.networkmanager.enable = true; - - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - users.jras = import ../../home-manager/entrypoints/personal.nix; - extraSpecialArgs = { inherit inputs; monitor-names = ["DP-2" "HDMI-A-1"]; }; - }; - - system.stateVersion = "24.05"; # Did you read the comment? - services.sunshine = { enable = true; autoStart = true; diff --git a/configuration/tarrel/home-manager.nix b/configuration/tarrel/home-manager.nix new file mode 100644 index 0000000..9709129 --- /dev/null +++ b/configuration/tarrel/home-manager.nix @@ -0,0 +1,42 @@ +{ pkgs, inputs, ... }: +{ + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.extraSpecialArgs = { inherit inputs; }; + home-manager.users.jras = { + imports = [ + ../home-manager/core + ../home-manager/hyprland.nix + ]; + + home.username = "jras"; + home.homeDirectory = "/home/jras"; + home.stateVersion = "23.11"; + + programs.git = { + userName = "Jasper Ras"; + userEmail = "jaspert.ras@gmail.com"; + }; + + home.file = { + gamestream-start = { + text = '' + #!${pkgs.zsh}/bin/zsh + ${pkgs.hyprland}/bin/hyprctl keyword monitor HDMI-A-1,1920x1080@59.94,auto,2 + ''; + target = "bin/gamestream-start"; + executable = true; + }; + gamestream-end = { + text = '' + #!${pkgs.zsh}/bin/zsh + ${pkgs.hyprland}/bin/hyprctl keyword monitor HDMI-A-1,preferred,auto,1 + ''; + target = "bin/gamestream-end"; + executable = true; + }; + }; + + programs.zsh.envExtra = "export PATH=$HOME/bin:$PATH"; + }; +} |