diff --git a/SwarselSystems.org b/SwarselSystems.org index e527e35..d4bb1c4 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -394,6 +394,7 @@ Mind the comma at the end. You need this because the =...= is being passed as th nix-gaming, nixos-hardware, nix-alien, + nswitch-rcm-nix, #+end_src @@ -428,65 +429,70 @@ A short overview over each input and what it does: #+begin_src nix :tangle no :noweb-ref flakeinputs - nixpkgs.url = github:nixos/nixpkgs/nixos-unstable; + nixpkgs.url = github:nixos/nixpkgs/nixos-unstable; - nixpkgs-stable.url = github:NixOS/nixpkgs/nixos-24.05; + nixpkgs-stable.url = github:NixOS/nixpkgs/nixos-24.05; - # user-level configuration - home-manager = { - url = github:nix-community/home-manager; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # user-level configuration + home-manager = { + url = github:nix-community/home-manager; + inputs.nixpkgs.follows = "nixpkgs"; + }; - # overlay to access bleeding edge emacs - emacs-overlay = { - url = github:nix-community/emacs-overlay; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # overlay to access bleeding edge emacs + emacs-overlay = { + url = github:nix-community/emacs-overlay; + inputs.nixpkgs.follows = "nixpkgs"; + }; - # nix user repository - # i use this mainly to not have to build all firefox extensions - # myself as well as for the emacs-init package (tbd) - nur.url = github:nix-community/NUR; + # nix user repository + # i use this mainly to not have to build all firefox extensions + # myself as well as for the emacs-init package (tbd) + nur.url = github:nix-community/NUR; - # provides GL to non-NixOS hosts - nixgl.url = github:guibou/nixGL; + # provides GL to non-NixOS hosts + nixgl.url = github:guibou/nixGL; - # manages all theming using Home-Manager - stylix.url = github:danth/stylix; + # manages all theming using Home-Manager + stylix.url = github:danth/stylix; - # nix secrets management - sops-nix.url = github:Mic92/sops-nix; + # nix secrets management + sops-nix.url = github:Mic92/sops-nix; - # enable secure boot on NixOS - lanzaboote.url = github:nix-community/lanzaboote; + # enable secure boot on NixOS + lanzaboote.url = github:nix-community/lanzaboote; - # nix for android - nix-on-droid = { - url = github:t184256/nix-on-droid/release-23.05; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # nix for android + nix-on-droid = { + url = github:t184256/nix-on-droid/release-23.05; + inputs.nixpkgs.follows = "nixpkgs"; + }; - # generate NixOS images - nixos-generators = { - url = github:nix-community/nixos-generators; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # generate NixOS images + nixos-generators = { + url = github:nix-community/nixos-generators; + inputs.nixpkgs.follows = "nixpkgs"; + }; - # patches for gaming on nix - nix-gaming = { - url = github:fufexan/nix-gaming; - }; + # patches for gaming on nix + nix-gaming = { + url = github:fufexan/nix-gaming; + }; - # hardware quirks on nix - nixos-hardware = { - url = github:NixOS/nixos-hardware/master; - }; + # hardware quirks on nix + nixos-hardware = { + url = github:NixOS/nixos-hardware/master; + }; - # dynamic library loading - nix-alien = { - url = github:thiagokokada/nix-alien; - }; + # dynamic library loading + nix-alien = { + url = github:thiagokokada/nix-alien; + }; + + # automatic nintendo switch payload injection + nswitch-rcm-nix = { + url = github:Swarsel/nswitch-rcm-nix; + }; #+end_src *** let @@ -529,6 +535,7 @@ Lastly I define some common module lists that I can simply load depending on the # NixOS modules that can only be used on NixOS systems nixModules = [ stylix.nixosModules.stylix sops-nix.nixosModules.sops + nswitch-rcm-nix.nixosModules.nswitch-rcm ./profiles/common/nixos.nix # dynamic library loading ({ self, system, ... }: { @@ -2109,6 +2116,14 @@ Mostly just sets some opened ports for several games, enables virtualbox (which services.power-profiles-daemon.enable = true; services.fprintd.enable = true; + services.nswitch-rcm = { + enable = true; + package = (pkgs.fetchurl { + url = "https://github.com/Atmosphere-NX/Atmosphere/releases/download/1.3.2/fusee.bin"; + hash = "sha256-5AXzNsny45SPLIrvWJA9/JlOCal5l6Y++Cm+RtlJppI="; + }); + }; + users.users.swarsel = { isNormalUser = true; description = "Leon S"; @@ -5299,6 +5314,7 @@ Programming languages and default lsp's are defined here: [[#h:0e7e8bea-ec58-499 gamescope vulkan-tools moonlight-qt + ns-usbloader # firefox related tridactyl-native diff --git a/flake.lock b/flake.lock index ec16f0b..7311653 100644 --- a/flake.lock +++ b/flake.lock @@ -243,6 +243,23 @@ "type": "github" } }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -695,6 +712,18 @@ "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" } }, + "nixpkgs-lib_2": { + "locked": { + "lastModified": 1719876945, + "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1720954236, @@ -823,6 +852,22 @@ } }, "nixpkgs_6": { + "locked": { + "lastModified": 1720957393, + "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1720781449, "narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=", @@ -838,7 +883,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1714912032, "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", @@ -902,6 +947,25 @@ "type": "gitlab" } }, + "nswitch-rcm-nix": { + "inputs": { + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1721302286, + "narHash": "sha256-U/6iULCDW7YskAQVU+bFE16R3wXMceBB2Jj+9bE3K0c=", + "owner": "Swarsel", + "repo": "nswitch-rcm-nix", + "rev": "f14feb140e057770ce58d20b756c8ac2fb172398", + "type": "github" + }, + "original": { + "owner": "Swarsel", + "repo": "nswitch-rcm-nix", + "type": "github" + } + }, "nur": { "locked": { "lastModified": 1721205995, @@ -957,6 +1021,7 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable_3", + "nswitch-rcm-nix": "nswitch-rcm-nix", "nur": "nur", "sops-nix": "sops-nix", "stylix": "stylix" @@ -989,7 +1054,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { @@ -1018,7 +1083,7 @@ "flake-compat": "flake-compat_3", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1720818679, diff --git a/flake.nix b/flake.nix index 06d1f6b..c66425c 100644 --- a/flake.nix +++ b/flake.nix @@ -63,6 +63,11 @@ url = github:thiagokokada/nix-alien; }; + # automatic nintendo switch payload injection + nswitch-rcm-nix = { + url = github:Swarsel/nswitch-rcm-nix; + }; + }; outputs = inputs@{ @@ -82,6 +87,7 @@ nix-gaming, nixos-hardware, nix-alien, + nswitch-rcm-nix, ... }: let @@ -113,6 +119,7 @@ # NixOS modules that can only be used on NixOS systems nixModules = [ stylix.nixosModules.stylix sops-nix.nixosModules.sops + nswitch-rcm-nix.nixosModules.nswitch-rcm ./profiles/common/nixos.nix # dynamic library loading ({ self, system, ... }: { diff --git a/index.html b/index.html index 52c9cd0..62beaa3 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + SwarselSystems: NixOS + Emacs Configuration @@ -387,7 +387,7 @@

-This file has 42346 words spanning 11029 lines and was last revised on 2024-07-17 12:44:13 +0200. +This file has 42399 words spanning 11045 lines and was last revised on 2024-07-18 14:56:09 +0200.

@@ -437,7 +437,7 @@ This section defines my Emacs configuration. For a while, I considered to use ry

-My emacs is built using the emacs-overlay nix flake, which builds a bleeding edge emacs on wayland (pgtk) with utilities like treesitter support. By executing the below source block, the current build setting can be updated at any time, and you can see my most up-to-date build options (last updated: 2024-07-17 12:44:13 +0200) +My emacs is built using the emacs-overlay nix flake, which builds a bleeding edge emacs on wayland (pgtk) with utilities like treesitter support. By executing the below source block, the current build setting can be updated at any time, and you can see my most up-to-date build options (last updated: 2024-07-18 14:56:09 +0200)

@@ -449,7 +449,7 @@ system-configuration-options
---prefix=/nix/store/y5vn4lfxjh26r0pglhq102zg6gzx1hwm-emacs-pgtk-20240711.0 --disable-build-details --with-modules --with-pgtk --with-compress-install --with-toolkit-scroll-bars --with-native-compilation --without-imagemagick --with-mailutils --without-small-ja-dic --with-tree-sitter --without-xinput2 --with-xwidgets --with-dbus --with-selinux
+--prefix=/nix/store/6y05k2rmg7xfinnaglr0js84qi0cl7lv-emacs-pgtk-20240717.0 --disable-build-details --with-modules --with-pgtk --with-compress-install --with-toolkit-scroll-bars --with-native-compilation --without-imagemagick --with-mailutils --without-small-ja-dic --with-tree-sitter --without-xinput2 --with-xwidgets --with-dbus --with-selinux
 
@@ -880,6 +880,7 @@ lanzaboote, nix-gaming, nixos-hardware, nix-alien, +nswitch-rcm-nix, @@ -979,6 +980,11 @@ nix-alien = { url = github:thiagokokada/nix-alien; }; +# automatic nintendo switch payload injection +nswitch-rcm-nix = { + url = github:Swarsel/nswitch-rcm-nix; +}; + @@ -1027,6 +1033,7 @@ armpkgs = import nixpkgs { system = "aarch64-linux"; # NixOS modules that can only be used on NixOS systems nixModules = [ stylix.nixosModules.stylix sops-nix.nixosModules.sops + nswitch-rcm-nix.nixosModules.nswitch-rcm ./profiles/common/nixos.nix # dynamic library loading ({ self, system, ... }: { @@ -2890,6 +2897,14 @@ Mostly just sets some opened ports for several games, enables virtualbox (which services.power-profiles-daemon.enable = true; services.fprintd.enable = true; + services.nswitch-rcm = { + enable = true; + package = (pkgs.fetchurl { + url = "https://github.com/Atmosphere-NX/Atmosphere/releases/download/1.3.2/fusee.bin"; + hash = "sha256-5AXzNsny45SPLIrvWJA9/JlOCal5l6Y++Cm+RtlJppI="; + }); + }; + users.users.swarsel = { isNormalUser = true; description = "Leon S"; @@ -6446,6 +6461,7 @@ Programming languages and default lsp's are defined here:

Author: Leon Schwarzäugl

-

Created: 2024-07-17 Mi 12:44

+

Created: 2024-07-18 Do 14:56

Validate

diff --git a/profiles/common/home.nix b/profiles/common/home.nix index 92ec300..3031548 100644 --- a/profiles/common/home.nix +++ b/profiles/common/home.nix @@ -66,6 +66,7 @@ gamescope vulkan-tools moonlight-qt + ns-usbloader # firefox related tridactyl-native diff --git a/profiles/fourside/nixos.nix b/profiles/fourside/nixos.nix index c8aef4c..1910d26 100644 --- a/profiles/fourside/nixos.nix +++ b/profiles/fourside/nixos.nix @@ -140,6 +140,14 @@ services.power-profiles-daemon.enable = true; services.fprintd.enable = true; + services.nswitch-rcm = { + enable = true; + package = (pkgs.fetchurl { + url = "https://github.com/Atmosphere-NX/Atmosphere/releases/download/1.3.2/fusee.bin"; + hash = "sha256-5AXzNsny45SPLIrvWJA9/JlOCal5l6Y++Cm+RtlJppI="; + }); + }; + users.users.swarsel = { isNormalUser = true; description = "Leon S";