From f71051f47158f57091306e269352d7579522e426 Mon Sep 17 00:00:00 2001 From: Jasper Ras Date: Thu, 6 Feb 2025 22:03:10 +0000 Subject: bluurb --- configuration/work/default.nix | 54 ++++-------------------- configuration/work/home-manager.nix | 83 +++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 47 deletions(-) create mode 100644 configuration/work/home-manager.nix (limited to 'configuration/work') diff --git a/configuration/work/default.nix b/configuration/work/default.nix index 5bc9958..f17ac74 100644 --- a/configuration/work/default.nix +++ b/configuration/work/default.nix @@ -1,15 +1,17 @@ -{ config, pkgs, inputs, ... }: +{ config, pkgs, ... }: { imports = [ ./hardware-configuration.nix + ./home-manager.nix - ../packages.nix - ../services.nix - ../users + ../core ../hyprland.nix - ../nix-settings.nix ]; + system.stateVersion = "24.05"; # Do NOT change before reading configuration.nix + + users.users.jras.extraGroups = [ "networkmanager" "docker" ]; + age.secrets.ghostnet-cert.file = ../../secrets/ghostnet-cert.age; age.secrets.ghostnet-key.file = ../../secrets/ghostnet-key.age; age.secrets.ghostnet-ca.file = ../../secrets/ghostnet-ca.age; @@ -21,19 +23,6 @@ age.secrets.systems-ca.file = ../../secrets/systems-ca.age; age.secrets.systems-tls-auth.file = ../../secrets/systems-tls-auth.age; - environment.systemPackages = with pkgs; [ - slack - git-review - hexchat - apacheHttpd - moonlight-qt - brightnessctl - hugo - google-chrome - ]; - - nixpkgs.config.allowUnfree = true; - virtualisation.docker = { enable = true; enableOnBoot = true; @@ -51,21 +40,6 @@ networking.nameservers = [ "1.1.1.1" ]; networking.firewall.allowedTCPPorts = []; - 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"; - }; - services.libinput.mouse.accelProfile = "flat"; services.libinput.mouse.accelSpeed = "-5"; services.upower.enable = true; @@ -151,20 +125,6 @@ variant = ""; }; - users.users.jras = { - isNormalUser = true; - description = "Jasper Ras"; - extraGroups = [ "networkmanager" "wheel" "docker" ]; - packages = with pkgs; [ git ]; - }; - - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.jras = import ../../home-manager/entrypoints/work.nix; - home-manager.extraSpecialArgs = { inherit inputs; monitor-names = ["eDP-1" "HDMI-A-1" "DP-10"]; }; - programs.gnupg.agent.enable = true; programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gnome3; - - system.stateVersion = "24.05"; # Do NOT change before reading configuration.nix } diff --git a/configuration/work/home-manager.nix b/configuration/work/home-manager.nix new file mode 100644 index 0000000..bbfb0a9 --- /dev/null +++ b/configuration/work/home-manager.nix @@ -0,0 +1,83 @@ +{ 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-manager/hostnet.nix + ../home-manager/php.nix + ../home-manager/ansible.nix + ../home-manager/python.nix + ]; + + home.username = "jras"; + home.homeDirectory = "/home/jras"; + home.stateVersion = "22.11"; + home.sessionPath = [ "$HOME/.local/bin" "$HOME/.plenv/bin" ]; + + home.packages = with pkgs; [ + slack + moonlight-qt + brightnessctl + google-chrome + ]; + + programs.git = { + userName = "Jasper Ras"; + userEmail = "jras@hostnet.nl"; + extraConfig = { gitreview.username = "jrasper"; }; + ignores = [ + ".direnv" + ".envrc" + ".project" + ".settings/" + ".buildpath" + "tags" + ".hhconfig" + ".DS_Store" + ".idea/" + ".vagrant/" + "*.swp" + "clover.xml" + "yarn-error.log" + "gsuite-auth.json" + "venv/" + "shell.nix" + + ".devenv*" + "devenv*" + ".pre-commit-config.yaml" + ]; + }; + + programs.zsh.envExtra = "export PATH=$HOME/.plenv/bin:$PATH"; + programs.zsh.initExtra = '' + eval "$(plenv init -)" + eval "$(dircolors)" + ''; + programs.zsh.shellAliases = { + ssh = "TERM=xterm-256color ssh"; + }; + + programs.pyenv.enable = true; + programs.pyenv.enableZshIntegration = true; + programs.ssh = { + controlMaster = "auto"; + controlPersist = "12h"; + serverAliveInterval = 11; + matchBlocks = { + "*.g1i.one".user = "jasras"; + "*.os1.openstack.group.one".user = "jasras"; + "*.one.com".user = "jasras"; + "91.184.16.185".port = 12345; + "*.compute.prv.vps1-testpod-cph3.one.com".forwardAgent = true; + "access.*.one.com".forwardAgent = true; + "access.*.g1i.one".forwardAgent = true; + }; + }; + }; +} -- cgit v1.2.3