add SLSsteam, switch zen browser flake and run nixfmt
This commit is contained in:
+18
-2
@@ -1,4 +1,9 @@
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports = [
|
||||
@@ -112,7 +117,6 @@
|
||||
};
|
||||
|
||||
services.goxlr-utility.enable = true;
|
||||
programs.steam.enable = true;
|
||||
programs.neovim.enable = true;
|
||||
programs.tmux.enable = true;
|
||||
programs.bat.enable = true;
|
||||
@@ -131,6 +135,18 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
package = pkgs.steam.override {
|
||||
extraEnv = {
|
||||
LD_AUDIT = "${
|
||||
inputs.sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam
|
||||
}/library-inject.so:${
|
||||
inputs.sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam
|
||||
}/SLSsteam.so";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
security.rtkit.enable = true;
|
||||
systemd.services."rtkit-daemon".enable = true;
|
||||
|
||||
Generated
+65
-8
@@ -104,6 +104,27 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"zen-browser",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1782839684,
|
||||
"narHash": "sha256-vzs4SBgPsK4aNzlJR2PpFwtARazXMOxZonQnDz0YHxk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "2a37d71bbe69e1522ddabf03a4cea0374958bdbe",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1778869304,
|
||||
@@ -166,16 +187,53 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1782723713,
|
||||
"narHash": "sha256-oPXCU/SSUokcGaJREHibG1CBX3+s/W7orDWQOZDsEeQ=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b5aa0fbd538984f6e3d201be0005b4463d8b09f8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"discord-music-presence": "discord-music-presence",
|
||||
"dms": "dms",
|
||||
"home-manager": "home-manager",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"sls-steam": "sls-steam",
|
||||
"xremap-flake": "xremap-flake",
|
||||
"zen-browser": "zen-browser"
|
||||
}
|
||||
},
|
||||
"sls-steam": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1783322884,
|
||||
"narHash": "sha256-BmYEQewp9fCTP6KFGnYh2dh6EjMj62FfJQTrksSSN3c=",
|
||||
"owner": "AceSLS",
|
||||
"repo": "SLSsteam",
|
||||
"rev": "8ef40a2bdc662331f215775e525e1b010a2ffba3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "AceSLS",
|
||||
"repo": "SLSsteam",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"xremap": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
@@ -216,20 +274,19 @@
|
||||
},
|
||||
"zen-browser": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
"home-manager": "home-manager_2",
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1781847955,
|
||||
"narHash": "sha256-1OSYOGuJp/NoODmSHjsz+6TB/kSilJ+BsFihjY7TTnc=",
|
||||
"owner": "youwen5",
|
||||
"lastModified": 1783190846,
|
||||
"narHash": "sha256-UcdKHKcDxLxBon0HsOjDRRA7l1vVT28R83LkCIAlYYc=",
|
||||
"owner": "0xc000022070",
|
||||
"repo": "zen-browser-flake",
|
||||
"rev": "4bca251cd556677f7b765ff324d1638ae215be13",
|
||||
"rev": "0758bc86f7a55bbe002f0cede9e1a49e5a6e34d9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "youwen5",
|
||||
"owner": "0xc000022070",
|
||||
"repo": "zen-browser-flake",
|
||||
"type": "github"
|
||||
}
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
{
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs";
|
||||
zen-browser = {
|
||||
url = "github:youwen5/zen-browser-flake";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
zen-browser.url = "github:0xc000022070/zen-browser-flake";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
@@ -17,10 +14,21 @@
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
xremap-flake.url = "github:xremap/nix-flake";
|
||||
sls-steam = {
|
||||
url = "github:AceSLS/SLSsteam";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs =
|
||||
{ self, zen-browser, discord-music-presence, xremap-flake, ... }@inputs:
|
||||
{
|
||||
self,
|
||||
zen-browser,
|
||||
discord-music-presence,
|
||||
xremap-flake,
|
||||
sls-steam,
|
||||
...
|
||||
}@inputs:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
inherit (inputs) nixpkgs;
|
||||
@@ -30,6 +38,9 @@
|
||||
{
|
||||
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs = {
|
||||
inherit inputs;
|
||||
};
|
||||
modules = [
|
||||
./configuration.nix
|
||||
./hardware-configuration.nix
|
||||
@@ -39,7 +50,10 @@
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
|
||||
home-manager.extraSpecialArgs = { inherit self; inherit inputs; };
|
||||
home-manager.extraSpecialArgs = {
|
||||
inherit self;
|
||||
inherit inputs;
|
||||
};
|
||||
|
||||
home-manager.users.user = import ./home-manager/home.nix;
|
||||
|
||||
@@ -52,17 +66,27 @@
|
||||
services.xremap.config.modmap = [
|
||||
{
|
||||
name = "Global";
|
||||
remap = { "CapsLock" = "Esc"; };
|
||||
remap = {
|
||||
"CapsLock" = "Esc";
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
services.xremap.config.keymap = [
|
||||
{
|
||||
name = "curly braces";
|
||||
remap = { "KEY_SEMICOLON" = "RIGHTALT-KEY_7"; }; # ä -> }
|
||||
remap = { "KEY_APOSTROPHE" = "RIGHTALT-KEY_0"; }; # ö -> {
|
||||
remap = { "RIGHTALT-KEY_A" = "KEY_APOSTROPHE"; }; # altgr + a -> ä
|
||||
remap = { "RIGHTALT-KEY_W" = "KEY_SEMICOLON"; }; # altgr + w -> ö
|
||||
remap = {
|
||||
"KEY_SEMICOLON" = "RIGHTALT-KEY_7";
|
||||
}; # ä -> }
|
||||
remap = {
|
||||
"KEY_APOSTROPHE" = "RIGHTALT-KEY_0";
|
||||
}; # ö -> {
|
||||
remap = {
|
||||
"RIGHTALT-KEY_A" = "KEY_APOSTROPHE";
|
||||
}; # altgr + a -> ä
|
||||
remap = {
|
||||
"RIGHTALT-KEY_W" = "KEY_SEMICOLON";
|
||||
}; # altgr + w -> ö
|
||||
}
|
||||
];
|
||||
}
|
||||
|
||||
+52
-37
@@ -1,52 +1,67 @@
|
||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
"usbhid"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/ddabcce9-86a5-4dd8-84f1-3afa99a83752";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/ddabcce9-86a5-4dd8-84f1-3afa99a83752";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/16F5-2D1A";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
|
||||
fileSystems."/media/gamedisk4" =
|
||||
{ device = "/dev/disk/by-uuid/D290EB87C8A1E82A";
|
||||
fsType = "ntfs3";
|
||||
};
|
||||
|
||||
fileSystems."/media/music" =
|
||||
{ device = "192.168.132.149:/media/music";
|
||||
fsType = "nfs4";
|
||||
};
|
||||
|
||||
fileSystems."/media/arch" =
|
||||
{ device = "/dev/disk/by-uuid/8873d98f-c461-4d34-8867-f4ebd5c205d2";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/media/gamedisk" =
|
||||
{ device = "/dev/disk/by-uuid/5C7C14707C1446E4";
|
||||
fsType = "ntfs3";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/5949c73f-30eb-4956-9e93-70301c88fad8"; }
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/16F5-2D1A";
|
||||
fsType = "vfat";
|
||||
options = [
|
||||
"fmask=0077"
|
||||
"dmask=0077"
|
||||
];
|
||||
};
|
||||
|
||||
fileSystems."/media/gamedisk4" = {
|
||||
device = "/dev/disk/by-uuid/D290EB87C8A1E82A";
|
||||
fsType = "ntfs3";
|
||||
};
|
||||
|
||||
fileSystems."/media/music" = {
|
||||
device = "192.168.132.149:/media/music";
|
||||
fsType = "nfs4";
|
||||
};
|
||||
|
||||
fileSystems."/media/arch" = {
|
||||
device = "/dev/disk/by-uuid/8873d98f-c461-4d34-8867-f4ebd5c205d2";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/media/gamedisk" = {
|
||||
device = "/dev/disk/by-uuid/5C7C14707C1446E4";
|
||||
fsType = "ntfs3";
|
||||
};
|
||||
|
||||
swapDevices = [
|
||||
{ device = "/dev/disk/by-uuid/5949c73f-30eb-4956-9e93-70301c88fad8"; }
|
||||
];
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
|
||||
Reference in New Issue
Block a user