From cbb415fd66016dfc6975e652cc6551bfc2e5a28b Mon Sep 17 00:00:00 2001 From: ooks-io Date: Thu, 15 Feb 2024 20:32:23 +1300 Subject: [PATCH 1/9] feat: steam gamescope packages --- system/profiles/gaming/default.nix | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/system/profiles/gaming/default.nix b/system/profiles/gaming/default.nix index 3e73fd5..e61654b 100644 --- a/system/profiles/gaming/default.nix +++ b/system/profiles/gaming/default.nix @@ -2,6 +2,23 @@ let cfg = config.systemProfile.gaming; + steamFix = pkgs.steam.override { + extraPkgs = pkgs: with pkgs; [ + xorg.libXcursor + xorg.libXi + xorg.libXinerama + xorg.libXScrnSaver + libpng + libpulseaudio + libvorbis + stdenv.cc.cc.lib + libkrb5 + keyutils + mangohud + winetricks + protontricks + ]; + }; in { @@ -12,7 +29,10 @@ in config = lib.mkIf cfg.enable { hardware.opengl.extraPackages = [ pkgs.gamescope ]; programs = { - steam.enable = true; + steam = { + enable = true; + package = steamFix; + }; gamescope = { enable = true; capSysNice = true; From 170cfe7f3cefc4bb4ce9285ac4eb7c19df6e1411 Mon Sep 17 00:00:00 2001 From: ooks-io Date: Fri, 16 Feb 2024 01:15:44 +1300 Subject: [PATCH 2/9] feat: slippi init config --- flake.lock | 90 ++++++++++++++++++- flake.nix | 5 ++ home/modules/desktop/default.nix | 2 +- home/modules/desktop/gaming/default.nix | 14 +++ .../modules/desktop/gaming/slippi/default.nix | 18 ++++ home/profile/default.nix | 3 + home/profile/gaming/default.nix | 18 ++++ home/user/ooks/ooksdesk/default.nix | 2 +- 8 files changed, 149 insertions(+), 3 deletions(-) create mode 100644 home/modules/desktop/gaming/slippi/default.nix diff --git a/flake.lock b/flake.lock index d9fb3d6..66b83fe 100644 --- a/flake.lock +++ b/flake.lock @@ -454,6 +454,22 @@ "type": "github" } }, + "lowdown-src": { + "flake": false, + "locked": { + "lastModified": 1598695561, + "narHash": "sha256-gyH/5j+h/nWw0W8AcR2WKvNBUsiQ7QuxqSJNXAwV+8E=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "1705b4a26fbf065d9574dce47a94e8c7c79e052f", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, "nh": { "inputs": { "nixpkgs": [ @@ -474,6 +490,24 @@ "type": "github" } }, + "nix": { + "inputs": { + "lowdown-src": "lowdown-src", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1609520816, + "narHash": "sha256-IGO7tfJXsv9u2wpW76VCzOsHYapRZqH9pHGVsoffPrI=", + "owner": "NixOS", + "repo": "nix", + "rev": "8a2ce0f455da32bc20978e68c0aad9efb4560abc", + "type": "github" + }, + "original": { + "id": "nix", + "type": "indirect" + } + }, "nix-colors": { "inputs": { "base16-schemes": "base16-schemes", @@ -647,6 +681,21 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1602702596, + "narHash": "sha256-fqJ4UgOb4ZUnCDIapDb4gCrtAah5Rnr2/At3IzMitig=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ad0d20345219790533ebe06571f82ed6b034db31", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-20.09-small", + "type": "indirect" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1706925685, "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=", @@ -730,6 +779,7 @@ "nixpkgs": "nixpkgs_4", "nixvim": "nixvim", "sops-nix": "sops-nix", + "ssbm-nix": "ssbm-nix", "zjstatus": "zjstatus" } }, @@ -783,6 +833,22 @@ "type": "github" } }, + "slippi-desktop": { + "flake": false, + "locked": { + "lastModified": 1607036060, + "narHash": "sha256-TUYsiVvKAws3N3roZYDwkLB0obyl6zwvh8CAk2RwHrY=", + "owner": "project-slippi", + "repo": "slippi-desktop-app", + "rev": "3ca39ba6bbd02157515b12a79aa01e5d669ad1b1", + "type": "github" + }, + "original": { + "owner": "project-slippi", + "repo": "slippi-desktop-app", + "type": "github" + } + }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -804,6 +870,28 @@ "type": "github" } }, + "ssbm-nix": { + "inputs": { + "nix": "nix", + "nixpkgs": [ + "nixpkgs" + ], + "slippi-desktop": "slippi-desktop" + }, + "locked": { + "lastModified": 1696638790, + "narHash": "sha256-fmpFkchuAyQfaSOWqEMnw4wRxWFkD7LqBwjKcVog8xQ=", + "owner": "djanatyn", + "repo": "ssbm-nix", + "rev": "cfeb1874b437e5883272c522234d1d15cb3d3ebd", + "type": "github" + }, + "original": { + "owner": "djanatyn", + "repo": "ssbm-nix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -917,7 +1005,7 @@ "inputs": { "crane": "crane_2", "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "rust-overlay": "rust-overlay_2" }, "locked": { diff --git a/flake.nix b/flake.nix index 17a0b6b..c40c61c 100644 --- a/flake.nix +++ b/flake.nix @@ -54,6 +54,11 @@ nix-gaming.url = "github:fufexan/nix-gaming"; + ssbm-nix = { + url = "github:djanatyn/ssbm-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + zjstatus.url = "github:dj95/zjstatus"; }; diff --git a/home/modules/desktop/default.nix b/home/modules/desktop/default.nix index 52c1c0c..b2bb405 100644 --- a/home/modules/desktop/default.nix +++ b/home/modules/desktop/default.nix @@ -10,6 +10,6 @@ #./utility -- still needs to be implemented ./wayland # -- almost done, need to implement eww #./productivity -- still needs to be implemented - # ./gaming + ./gaming ]; } diff --git a/home/modules/desktop/gaming/default.nix b/home/modules/desktop/gaming/default.nix index 8b13789..1d9f803 100644 --- a/home/modules/desktop/gaming/default.nix +++ b/home/modules/desktop/gaming/default.nix @@ -1 +1,15 @@ +{ lib, ... }: +{ + + imports = [ + ./slippi + ]; + + options.homeModules.desktop.gaming = { + slippi = { + enable = lib.mkEnableOption "Enable Slippi home module"; + }; + }; + +} diff --git a/home/modules/desktop/gaming/slippi/default.nix b/home/modules/desktop/gaming/slippi/default.nix new file mode 100644 index 0000000..c2eb669 --- /dev/null +++ b/home/modules/desktop/gaming/slippi/default.nix @@ -0,0 +1,18 @@ +{ inputs, config, lib, ... }: + +let + cfg = config.homeModules.desktop.gaming.slippi; +in + +{ + +imports = [ + inputs.ssbm-nix.homeManagerModule +]; + + config = lib.mkIf cfg.enable { + ssbm = { + slippi-launcher.enable = true; + }; + }; +} diff --git a/home/profile/default.nix b/home/profile/default.nix index 325cda8..a7dd43a 100644 --- a/home/profile/default.nix +++ b/home/profile/default.nix @@ -26,6 +26,9 @@ in hyprland = { enable = lib.mkEnableOption "Enable the hyprland profile"; }; + gaming = { + enable = lib.mkEnableOption "Enable the gaming profile"; + }; }; }; diff --git a/home/profile/gaming/default.nix b/home/profile/gaming/default.nix index e69de29..5a55bef 100644 --- a/home/profile/gaming/default.nix +++ b/home/profile/gaming/default.nix @@ -0,0 +1,18 @@ +{ config, lib, ... }: +let + cfg = config.profiles.gaming; +in +{ + + imports = [ + ../../modules + ]; + + config = lib.mkIf cfg.enable { + homeModules.desktop = { + gaming = { + slippi.enable = true; + }; + }; + }; +} diff --git a/home/user/ooks/ooksdesk/default.nix b/home/user/ooks/ooksdesk/default.nix index 1ccb13a..09ac931 100644 --- a/home/user/ooks/ooksdesk/default.nix +++ b/home/user/ooks/ooksdesk/default.nix @@ -5,7 +5,7 @@ ../../../profile ]; - activeProfiles = ["base" "hyprland"]; + activeProfiles = ["base" "hyprland" "gaming"]; home.sessionVariables.HN = "ooksdesk"; From f569b473476f63f9a19264d0f4a5b7a540de70c0 Mon Sep 17 00:00:00 2001 From: ooks-io Date: Fri, 16 Feb 2024 12:15:03 +1300 Subject: [PATCH 3/9] refactor: jellyfin module > all in one mediaServer Module --- system/modules/services/default.nix | 10 ++-- system/modules/services/deluge/default.nix | 22 --------- system/modules/services/jellyfin/default.nix | 32 ------------ .../modules/services/mediaServer/default.nix | 49 +++++++++++++++++++ system/profiles/mediaServer/default.nix | 3 +- 5 files changed, 53 insertions(+), 63 deletions(-) delete mode 100644 system/modules/services/deluge/default.nix delete mode 100644 system/modules/services/jellyfin/default.nix create mode 100644 system/modules/services/mediaServer/default.nix diff --git a/system/modules/services/default.nix b/system/modules/services/default.nix index 533f21c..fc2b073 100644 --- a/system/modules/services/default.nix +++ b/system/modules/services/default.nix @@ -2,16 +2,12 @@ { imports = [ - ./jellyfin - ./deluge + ./mediaServer ]; options.systemModules.services = { - jellyfin = { - enable = lib.mkEnableOption "Enable jellyfin service module"; - }; - deluge = { - enable = lib.mkEnableOption "Enable deluge service module"; + mediaServer = { + enable = lib.mkEnableOption "Enable mediaserver service module"; }; }; diff --git a/system/modules/services/deluge/default.nix b/system/modules/services/deluge/default.nix deleted file mode 100644 index 43dbcbe..0000000 --- a/system/modules/services/deluge/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - cfg = config.systemModules.services.deluge; -in - -{ - config = lib.mkIf cfg.enable { - services.deluge = { - user = "deluge"; - group = "deluge"; - enable = true; - web.enable = true; - }; - - # fileSystems."/media/Downloads" = { - # device = "/dev/disk/by-label/torrents"; - # fsType = "ext4"; - # options = [ "rw" "uid=1000" "gid=991" "umask=002" ]; - # }; - }; -} diff --git a/system/modules/services/jellyfin/default.nix b/system/modules/services/jellyfin/default.nix deleted file mode 100644 index 810f8a0..0000000 --- a/system/modules/services/jellyfin/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - cfg = config.systemModules.services.jellyfin; -in - -{ - config = lib.mkIf cfg.enable { - environment.systemPackages = with pkgs; [ - jellyfin - jellyfin-web - jellyfin-ffmpeg - ]; - services.jellyfin = { - user = "jellyfin"; - group = "media"; - enable = true; - openFirewall = true; - }; - users.users.jellyfin = { - isSystemUser = true; - group = "media"; - }; - users.groups.media = {}; - - # fileSystems."/media" = { - # device = "/dev/disk/by-label/ooksmedia"; - # fsType = "ntfs"; - # options = [ "rw" "uid=1000" "gid=991" "umask=002" ]; - # }; - }; -} diff --git a/system/modules/services/mediaServer/default.nix b/system/modules/services/mediaServer/default.nix new file mode 100644 index 0000000..a2de9b0 --- /dev/null +++ b/system/modules/services/mediaServer/default.nix @@ -0,0 +1,49 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.systemModules.services.mediaServer; +in + +{ + config = lib.mkIf cfg.enable { + + users.groups.media = { }; + + environment.systemPackages = with pkgs; [ + jellyfin + jellyfin-web + jellyfin-ffmpeg + ]; + + services = { + jellyfin = { + group = "media"; + enable = true; + openFirewall = true; + }; + deluge = { + group = "media"; + enable = true; + web.enable = true; + }; + radarr = { + group = "media"; + enable = true; + }; + sonarr = { + group = "media"; + enable = true; + }; + prowlarr.enable = true; + }; + + systemd.tmpfiles.rules = [ + "d /jellyfin 0770 - media - -" + ]; + + fileSystems."/jellyfin" = { + device = "/dev/disk/by-label/jellyfin"; + fsType = "btrfs"; + }; + }; +} diff --git a/system/profiles/mediaServer/default.nix b/system/profiles/mediaServer/default.nix index abb9a72..38559e5 100644 --- a/system/profiles/mediaServer/default.nix +++ b/system/profiles/mediaServer/default.nix @@ -10,8 +10,7 @@ in config = lib.mkIf cfg.enable { systemModules = { services = { - jellyfin.enable = true; - deluge.enable = true; + mediaServer.enable = true; }; }; }; From 6af6edf81979a4d9a9eb172be9a8f490abe752ce Mon Sep 17 00:00:00 2001 From: ooks-io Date: Fri, 16 Feb 2024 12:15:40 +1300 Subject: [PATCH 4/9] fix: removing gaming profile till slippi flake fixed --- home/modules/desktop/default.nix | 2 +- home/user/ooks/ooksdesk/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home/modules/desktop/default.nix b/home/modules/desktop/default.nix index b2bb405..52c1c0c 100644 --- a/home/modules/desktop/default.nix +++ b/home/modules/desktop/default.nix @@ -10,6 +10,6 @@ #./utility -- still needs to be implemented ./wayland # -- almost done, need to implement eww #./productivity -- still needs to be implemented - ./gaming + # ./gaming ]; } diff --git a/home/user/ooks/ooksdesk/default.nix b/home/user/ooks/ooksdesk/default.nix index 09ac931..092b465 100644 --- a/home/user/ooks/ooksdesk/default.nix +++ b/home/user/ooks/ooksdesk/default.nix @@ -5,7 +5,7 @@ ../../../profile ]; - activeProfiles = ["base" "hyprland" "gaming"]; + activeProfiles = ["base" "hyprland" ]; home.sessionVariables.HN = "ooksdesk"; From e1b874c563dd30b45fbb81a84c39d07703db8b0e Mon Sep 17 00:00:00 2001 From: ooks-io Date: Fri, 16 Feb 2024 13:47:38 +1300 Subject: [PATCH 5/9] feat: ooksmicro host added to system & home --- flake.nix | 11 ++ home/user/ooks/ooksmicro/default.nix | 23 ++++ system/hosts/ooks-micro/default.nix | 116 ------------------ system/hosts/ooksmicro/default.nix | 26 ++++ .../hardware-configuration.nix | 0 5 files changed, 60 insertions(+), 116 deletions(-) create mode 100644 home/user/ooks/ooksmicro/default.nix delete mode 100644 system/hosts/ooks-micro/default.nix create mode 100644 system/hosts/ooksmicro/default.nix rename system/hosts/{ooks-micro => ooksmicro}/hardware-configuration.nix (100%) diff --git a/flake.nix b/flake.nix index c40c61c..e8e1a29 100644 --- a/flake.nix +++ b/flake.nix @@ -97,6 +97,11 @@ modules = [ ./system/hosts/ooksdesk ]; specialArgs = { inherit inputs outputs; }; }; + # GPD Micro-PC + ooksmicro = lib.nixosSystem { + modules = [ ./system/hosts/ooksmicro ]; + specialArgs = { inherit inputs outputs; }; + }; }; homeConfigurations = { # T480s @@ -111,6 +116,12 @@ pkgs = pkgsFor.x86_64-linux; extraSpecialArgs = { inherit inputs outputs; }; }; + # Main Desktop + "ooks@ooksmicro" = lib.homeManagerConfiguration { + modules = [ ./home/user/ooks/ooksmicro ]; + pkgs = pkgsFor.x86_64-linux; + extraSpecialArgs = { inherit inputs outputs; }; + }; }; }; } diff --git a/home/user/ooks/ooksmicro/default.nix b/home/user/ooks/ooksmicro/default.nix new file mode 100644 index 0000000..fb6b7e1 --- /dev/null +++ b/home/user/ooks/ooksmicro/default.nix @@ -0,0 +1,23 @@ +{ inputs, outputs, config, ... }: + +{ + imports = [ + ../../../profile + ]; + + activeProfiles = ["base" "hyprland"]; + + home.sessionVariables.HN = "ooksmicro"; + + monitors = [{ + name = "DSI-1"; + width = 720; + height = 1280; + workspace = "1"; + primary = true; + transform = 3; + }]; + + colorscheme = inputs.nix-colors.colorSchemes.gruvbox-material-dark-soft; +} + diff --git a/system/hosts/ooks-micro/default.nix b/system/hosts/ooks-micro/default.nix deleted file mode 100644 index 344674c..0000000 --- a/system/hosts/ooks-micro/default.nix +++ /dev/null @@ -1,116 +0,0 @@ - - - - -{ config, inputs, pkgs, ... }: - -# Imports -# ------------------------------------------------------------------------------------------------- - -{ - imports = [ - inputs.hardware.nixosModules.gpd-micropc - - ./hardware-configuration.nix - - ../common/user/ooks - ../common/base - ../common/features/bluetooth.nix - ../common/features/vm.nix - ../common/features/greetd.nix - - ]; - -# Hostname and networking -# ------------------------------------------------------------------------------------------------- - - networking = { - hostName = "ooksmicro"; - networkmanager.enable = true; - }; - - -# Printing -# ------------------------------------------------------------------------------------------------- - - services.printing.enable = true; - -# Kernel -# ------------------------------------------------------------------------------------------------ - - boot = { - kernelPackages = pkgs.linuxKernel.packages.linux_zen; - kernelParams = [ "fbcon=rotate:1" ]; - }; - - -# Laptop Programs -# ------------------------------------------------------------------------------------------------- - - powerManagement.powertop.enable = true; - - programs = { - light.enable = true; - dconf.enable = true; - kdeconnect.enable = true; - }; - -# XDG Portal -# ------------------------------------------------------------------------------------------------ - - xdg.portal = { - enable = true; - wlr.enable = true; - }; - - hardware = { - opengl = { - enable = true; - }; - }; - -# gnupg -# ------------------------------------------------------------------------------------------------- - - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - -# Services -# ------------------------------------------------------------------------------------------------- - - services = { - thermald = { - enable = true; - }; - logind = { - lidSwitch = "suspend"; - }; - dbus = { - enable = true; - packages = [ pkgs.gcr ]; - }; - auto-cpufreq = { - enable = true; - settings = { - battery = { - governor = "powersave"; - turbo = "never"; - }; - charger = { - governor = "performance"; - turbo = "auto"; - }; - }; - }; - }; - - -# System Version -# ------------------------------------------------------------------------------------------------- - - system = { - stateVersion = "22.05"; - }; -} diff --git a/system/hosts/ooksmicro/default.nix b/system/hosts/ooksmicro/default.nix new file mode 100644 index 0000000..0475323 --- /dev/null +++ b/system/hosts/ooksmicro/default.nix @@ -0,0 +1,26 @@ +{ config, inputs, pkgs, ... }: + +{ + imports = [ + inputs.hardware.nixosModules.gpd-micropc + ./hardware-configuration.nix + ../../profiles + ]; + + activeProfiles = ["base" "laptop"]; + + systemModules.user = { + ooks.enable = true; + shell.fish.enable = true; + }; + + networking = { + hostName = "ooksmicro"; + }; + + boot = { + kernelPackages = pkgs.linuxKernel.packages.linux_zen; + kernelParams = [ "fbcon=rotate:1" ]; + + }; +} diff --git a/system/hosts/ooks-micro/hardware-configuration.nix b/system/hosts/ooksmicro/hardware-configuration.nix similarity index 100% rename from system/hosts/ooks-micro/hardware-configuration.nix rename to system/hosts/ooksmicro/hardware-configuration.nix From 90e288954d1b6460ef34b73f05f7ffb9ea0bc10a Mon Sep 17 00:00:00 2001 From: ooks-io Date: Mon, 19 Feb 2024 21:49:04 +1300 Subject: [PATCH 6/9] refactor: change desktop kernal zen -> xanmod --- system/hosts/ooksdesk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/hosts/ooksdesk/default.nix b/system/hosts/ooksdesk/default.nix index 0e33c5c..d2f9df6 100644 --- a/system/hosts/ooksdesk/default.nix +++ b/system/hosts/ooksdesk/default.nix @@ -18,6 +18,6 @@ # useDHCP = true; }; boot = { - kernelPackages = pkgs.linuxKernel.packages.linux_zen; + kernelPackages = pkgs.linuxPackages_xanmod_latest; }; } From eb7eed26be7705c0b8e99ee861a93c9cee384bc2 Mon Sep 17 00:00:00 2001 From: ooks-io Date: Mon, 19 Feb 2024 21:49:24 +1300 Subject: [PATCH 7/9] feat: proton-ge and wine-ge --- system/profiles/gaming/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/system/profiles/gaming/default.nix b/system/profiles/gaming/default.nix index e61654b..0e8a0d0 100644 --- a/system/profiles/gaming/default.nix +++ b/system/profiles/gaming/default.nix @@ -16,6 +16,7 @@ let keyutils mangohud winetricks + inputs.nix-gaming.packages.${pkgs.system}.wine-ge protontricks ]; }; @@ -52,5 +53,13 @@ in }; }; services.pipewire.lowLatency.enable = true; + + nixpkgs.overlays = [ + (_: prev: { + steam = prev.steam.override { + extraProfile = "export STEAM_EXTRA_COMPAT_TOOLS_PATHS='${inputs.nix-gaming.packages.${pkgs.system}.proton-ge}'"; + }; + }) + ]; }; } From 5f6c142e3cba61dad1a40bb08c6337abd2d7d2a9 Mon Sep 17 00:00:00 2001 From: ooks-io Date: Mon, 19 Feb 2024 23:09:59 +1300 Subject: [PATCH 8/9] feat: 1password ssh agent --- home/modules/console/utility/default.nix | 4 ++++ home/modules/console/utility/git/default.nix | 2 +- home/modules/console/utility/ssh/default.nix | 20 ++++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 home/modules/console/utility/ssh/default.nix diff --git a/home/modules/console/utility/default.nix b/home/modules/console/utility/default.nix index 29ce931..a33d46e 100644 --- a/home/modules/console/utility/default.nix +++ b/home/modules/console/utility/default.nix @@ -4,6 +4,7 @@ ./nixIndex ./git ./tools + ./ssh ]; options.homeModules.console.utility = { @@ -13,6 +14,9 @@ git = { enable = lib.mkEnableOption "Enable git + tools"; }; + sshssh= { + enable = lib.mkEnableOption "Enable various console sshssh; + }; tools = { enable = lib.mkEnableOption "Enable various console tools"; }; diff --git a/home/modules/console/utility/git/default.nix b/home/modules/console/utility/git/default.nix index ca1b519..5dc1b1c 100644 --- a/home/modules/console/utility/git/default.nix +++ b/home/modules/console/utility/git/default.nix @@ -19,7 +19,7 @@ home.packages = with pkgs; [ git-credential-1password lazygit - ]; + ]; }; } diff --git a/home/modules/console/utility/ssh/default.nix b/home/modules/console/utility/ssh/default.nix new file mode 100644 index 0000000..5fd3430 --- /dev/null +++ b/home/modules/console/utility/ssh/default.nix @@ -0,0 +1,20 @@ +{ lib, config, ... }: + +let + cfg = config.homeModules.console.utility.ssh; +in + +{ + + config = lib.mkIf cfg.enable { + programs.ssh = { + enable = true; + extraConfig = /* config */'' + Host * + IdentitiesOnly=yes + IdentityAgent "~/.1password/agent.sock" + ''; + }; + }; + +} From 9f1bc3bc279a1e885af2846bdeab824a3c2851eb Mon Sep 17 00:00:00 2001 From: ooks-io Date: Mon, 19 Feb 2024 23:20:04 +1300 Subject: [PATCH 9/9] fix: console/utility/default syntax --- home/modules/console/utility/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/modules/console/utility/default.nix b/home/modules/console/utility/default.nix index a33d46e..b878df2 100644 --- a/home/modules/console/utility/default.nix +++ b/home/modules/console/utility/default.nix @@ -14,8 +14,8 @@ git = { enable = lib.mkEnableOption "Enable git + tools"; }; - sshssh= { - enable = lib.mkEnableOption "Enable various console sshssh; + ssh = { + enable = lib.mkEnableOption "Enable various console ssh"; }; tools = { enable = lib.mkEnableOption "Enable various console tools";