diff --git a/common/hardware.nix b/common/hardware.nix index e0dc596..c351994 100644 --- a/common/hardware.nix +++ b/common/hardware.nix @@ -2,6 +2,7 @@ services.fwupd.enable = true; hardware = { + bluetooth.enable = true; steam-hardware.enable = true; xone.enable = true; xpadneo.enable = true; diff --git a/flake.lock b/flake.lock index 711e5ad..b72943e 100644 --- a/flake.lock +++ b/flake.lock @@ -175,11 +175,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -286,11 +286,11 @@ "nixpkgs-lib": "nixpkgs-lib_6" }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -452,11 +452,11 @@ }, "hardware": { "locked": { - "lastModified": 1751379130, - "narHash": "sha256-TObxiGbuX/4FbOnzDRvznfMUjIgS+d71+BetT35EOB8=", + "lastModified": 1751432711, + "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8b1f894089789eb39eacf0d6891d1e17cc3a84ab", + "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f", "type": "github" }, "original": { @@ -650,11 +650,11 @@ "phps": "phps" }, "locked": { - "lastModified": 1746369841, - "narHash": "sha256-/k3MQPXdsXJ0FDEsT1YvBG9ugRXk1nuE9MCb1wAMGQc=", + "lastModified": 1751398370, + "narHash": "sha256-7TSTVtdZz2nhO5Gn/U3pjvENvQAKJWFJ799EWtx/O/s=", "ref": "refs/heads/main", - "rev": "dbe35541ef6923f411685434cc535d0854b55b6a", - "revCount": 5, + "rev": "18cc2db6cc507ff0123a7e7fc6936f9ea52dbc66", + "revCount": 7, "type": "git", "url": "https://codeberg.org/helvetica/myphps.git" }, @@ -669,11 +669,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1747493683, - "narHash": "sha256-SEszNrbvTzxjFM7apKnL8LaarvDAzcuuQXj8r+ikJdk=", + "lastModified": 1751397212, + "narHash": "sha256-G9pjUEsde8bJl7TbTqTW2dADhI3FXLfb3Cvq8S1WTdo=", "ref": "refs/heads/main", - "rev": "a61825fc51a2b52cebd01ce58910707383e08b02", - "revCount": 2, + "rev": "a41850db1bb1d4f31a828cecf9387601b3f208c8", + "revCount": 3, "type": "git", "url": "https://codeberg.org/helvetica/nini.git" }, @@ -741,11 +741,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1748740939, - "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", + "lastModified": 1751159883, + "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "656a64127e9d791a334452c6b6606d17539476e2", + "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", "type": "github" }, "original": { @@ -816,11 +816,11 @@ }, "nixpkgs-lib_6": { "locked": { - "lastModified": 1743296961, - "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", + "lastModified": 1748740939, + "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", + "rev": "656a64127e9d791a334452c6b6606d17539476e2", "type": "github" }, "original": { @@ -958,11 +958,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1743964447, - "narHash": "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "063dece00c5a77e4a0ea24e5e5a5bd75232806f8", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { diff --git a/hosts/insomniac/profiles.nix b/hosts/insomniac/profiles.nix index b0ec401..36ae810 100644 --- a/hosts/insomniac/profiles.nix +++ b/hosts/insomniac/profiles.nix @@ -1,5 +1,7 @@ { profiles = { desktop.enable = true; + headful.enable = true; + dynamic.enable = true; }; } diff --git a/hosts/insomniac/retroarch.nix b/hosts/insomniac/retroarch.nix new file mode 100644 index 0000000..8f06295 --- /dev/null +++ b/hosts/insomniac/retroarch.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: +{ + environment.systemPackages = + let + retroarch = pkgs.retroarch.withCores (cores: [ + cores.parallel-n64 + cores.dolphin + ]); + in + [ + retroarch + ]; +} diff --git a/hosts/work/mattermost.nix b/hosts/work/mattermost.nix new file mode 100644 index 0000000..9706837 --- /dev/null +++ b/hosts/work/mattermost.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: +{ + environment.systemPackages = [ + pkgs.mattermost-desktop + ]; +} diff --git a/hosts/work/networking.nix b/hosts/work/networking.nix new file mode 100644 index 0000000..3ada38d --- /dev/null +++ b/hosts/work/networking.nix @@ -0,0 +1,3 @@ +{ + networking.networkmanager.enableStrongSwan = true; +} diff --git a/hosts/work/profiles.nix b/hosts/work/profiles.nix index c901b18..130f555 100644 --- a/hosts/work/profiles.nix +++ b/hosts/work/profiles.nix @@ -1,6 +1,8 @@ { profiles = { desktop.enable = true; + dynamic.enable = true; + headful.enable = true; productivity.enable = true; }; } diff --git a/hosts/work/tools.nix b/hosts/work/tools.nix index 2dca47b..db6c616 100644 --- a/hosts/work/tools.nix +++ b/hosts/work/tools.nix @@ -7,5 +7,7 @@ pkgs.jq pkgs.mariadb pkgs.openssl + pkgs.kubectl + pkgs.awscli2 ]; } diff --git a/modules/gcadapter.nix b/modules/gcadapter.nix index 3d3bba8..1c8c123 100644 --- a/modules/gcadapter.nix +++ b/modules/gcadapter.nix @@ -1,6 +1,7 @@ { config, lib, + pkgs, ... }: let @@ -10,9 +11,9 @@ in options.hardware.gcadapter.enable = lib.mkEnableOption "GameCube Adapter support"; config = lib.mkIf cfg.enable { - services.udev.extraRules = '' - ATTRS{idVendor}=="057e", ATTRS{idProduct}=="0337", MODE="666", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device" TAG+="uaccess" - ''; + services.udev.packages = [ + pkgs.dolphin-emu + ]; boot = { extraModulePackages = [ diff --git a/profiles/desktop/spotify.nix b/profiles/desktop/spotify.nix new file mode 100644 index 0000000..fe6ef29 --- /dev/null +++ b/profiles/desktop/spotify.nix @@ -0,0 +1,16 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.profiles.desktop; +in +{ + config = lib.mkIf cfg.enable { + environment.systemPackages = [ + pkgs.spotify + ]; + }; +} diff --git a/profiles/dynamic/bluetooth.nix b/profiles/dynamic/bluetooth.nix deleted file mode 100644 index 07a12d3..0000000 --- a/profiles/dynamic/bluetooth.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - config, - lib, - ... -}: -let - cfg = config.profiles.dynamic; -in -{ - config = lib.mkIf cfg.enable { - hardware.bluetooth.enable = true; - }; -} diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 2251d3e..5567544 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -21,4 +21,5 @@ in "secure-boot/abacus.tar.age".publicKeys = (builtins.attrValues users) ++ [ hosts.abacus ]; "secure-boot/flamingo.tar.age".publicKeys = (builtins.attrValues users) ++ [ hosts.flamingo ]; "secure-boot/vessel.tar.age".publicKeys = (builtins.attrValues users) ++ [ hosts.vessel ]; + "secure-boot/work.tar.age".publicKeys = (builtins.attrValues users) ++ [ hosts.work ]; } diff --git a/secrets/secure-boot/work.tar.age b/secrets/secure-boot/work.tar.age new file mode 100644 index 0000000..b76af37 Binary files /dev/null and b/secrets/secure-boot/work.tar.age differ