Compare commits
No commits in common. "32c395c33aae1a12390f8a6db0ad6c237b97c958" and "b881c964c1f827285ef47a005d584274acd8a481" have entirely different histories.
32c395c33a
...
b881c964c1
56
flake.lock
56
flake.lock
@ -20,11 +20,11 @@
|
|||||||
},
|
},
|
||||||
"emacs": {
|
"emacs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1647508010,
|
"lastModified": 1645674787,
|
||||||
"narHash": "sha256-0Yi3oC2PHk6sbKU0VHfa3DxaM9O5no/MgbQjW5tWVes=",
|
"narHash": "sha256-AhmEvep9SKfuMAobV2wELXoff7DQY7EjyDa8y3gtCgk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "711a3567a484a750017df905b0063a0ad0ed3434",
|
"rev": "47052c17338916be9177893dd3c3b64f1a7a4bcb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -98,11 +98,11 @@
|
|||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1647521104,
|
"lastModified": 1645628011,
|
||||||
"narHash": "sha256-H9D0fxuwsXNmN3AXCH2EmhcVvOqhVb49TUP3AVpDdCk=",
|
"narHash": "sha256-iNZCTjJ63TN5oM6rx2f4H0zaCbXM/iup7UWtQuCuyTM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "970b57fd3c93f6c76d5cdfb4da23a5b4010b9e8b",
|
"rev": "0b1745b4ef4c35ec5d554b176539730fcb5ec141",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -169,11 +169,11 @@
|
|||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1647447644,
|
"lastModified": 1645346782,
|
||||||
"narHash": "sha256-Di7ZCXjQKEys+jxgl8Mp7a8nowRSeAbzH8c9QNYkw2k=",
|
"narHash": "sha256-3qd0cu+2kapIP7cdHW9n8zh1wCvRGg83K7/cCj5Xv+A=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "32f61571b486efc987baca553fb35df22532ba63",
|
"rev": "1ccfe243aa6e94bf80f2a66f6be41d086d37fc87",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -201,8 +201,8 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"narHash": "sha256-bxOjVqcsccCNm+jSmEh/bm0tqfE3SdjwS+p+FZja3ho=",
|
"narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=",
|
||||||
"path": "/nix/store/g7alaqippgw6d0v7x68kx3vwv80pwwz0-source",
|
"path": "/nix/store/96y8li2047jfsg5b6zasdaz9gvdw5ywg-source",
|
||||||
"type": "path"
|
"type": "path"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -228,11 +228,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1647297614,
|
"lastModified": 1645433236,
|
||||||
"narHash": "sha256-ulGq3W5XsrBMU/u5k9d4oPy65pQTkunR4HKKtTq0RwY=",
|
"narHash": "sha256-4va4MvJ076XyPp5h8sm5eMQvCrJ6yZAbBmyw95dGyw4=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "73ad5f9e147c0d2a2061f1d4bd91e05078dc0b58",
|
"rev": "7f9b6e2babf232412682c09e57ed666d8f84ac2d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -318,11 +318,11 @@
|
|||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1647500177,
|
"lastModified": 1645675667,
|
||||||
"narHash": "sha256-Wk1rXgjacD+NmBoEOfkfwFNdr2bEJAP9P5IGnZw4D4w=",
|
"narHash": "sha256-ZCRO9zrswTlH8Oa+4VnaDYSb4XfRJt7mGizZ51QvDLM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nur",
|
"repo": "nur",
|
||||||
"rev": "253dc0300f0f82bc2b8c0413710239570bc73e6d",
|
"rev": "56d2eccbdd80d84139e35f48f9b272e7c704f8cc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -344,11 +344,11 @@
|
|||||||
"tablet-mode": "tablet-mode"
|
"tablet-mode": "tablet-mode"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1645975968,
|
"lastModified": 1645661585,
|
||||||
"narHash": "sha256-4OzqrhFNO+xDVfBEVflOq0V4/tclyZjASuwjoUN5G04=",
|
"narHash": "sha256-wuEbw7nlOn0scaju/5KIHoEJKHxLQhEvR/J1Ozilavw=",
|
||||||
"ref": "master",
|
"ref": "master",
|
||||||
"rev": "a1d35e75bf019737281854551d8e5c4aff76e6f7",
|
"rev": "6de27f9c39e7aa1afd7e36489316f85fce5e8e79",
|
||||||
"revCount": 167,
|
"revCount": 166,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://dev.ostylk.de/NixDistro/Config"
|
"url": "https://dev.ostylk.de/NixDistro/Config"
|
||||||
},
|
},
|
||||||
@ -396,11 +396,11 @@
|
|||||||
},
|
},
|
||||||
"stable": {
|
"stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1645296114,
|
"lastModified": 1642244250,
|
||||||
"narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=",
|
"narHash": "sha256-vWpUEqQdVP4srj+/YLJRTN9vjpTs4je0cdWKXPbDItc=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1",
|
"rev": "0fd9ee1aa36ce865ad273f4f07fdc093adeb5c00",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -435,11 +435,11 @@
|
|||||||
"nixpkgs": "nixpkgs_7"
|
"nixpkgs": "nixpkgs_7"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1645816436,
|
"lastModified": 1645657720,
|
||||||
"narHash": "sha256-lK69qpgDWE92aQgvG502bU+pGMaHI+y7O3A/AgsUfxI=",
|
"narHash": "sha256-qzUhfvNASfW9McIeV1UkKhkN39mDVmtDBHSLLoxTGJY=",
|
||||||
"ref": "master",
|
"ref": "master",
|
||||||
"rev": "eeafcf0d0cc3713727697f6a2badc5eea706c81c",
|
"rev": "9c4cfa67d08acd5bcacffa95e122da136d2b78e1",
|
||||||
"revCount": 19,
|
"revCount": 13,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://dev.ostylk.de/NixDistro/tablet-mode.git"
|
"url": "https://dev.ostylk.de/NixDistro/tablet-mode.git"
|
||||||
},
|
},
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
virt-manager qemu scream
|
virt-manager qemu scream
|
||||||
replaysorcery # Custom package
|
replaysorcery # Custom package
|
||||||
vfio-isolate # Custom Package
|
vfio-isolate # Custom Package
|
||||||
discord-wrapped # Custom package
|
steam-wrapped discord-wrapped # Custom package
|
||||||
mumble
|
mumble
|
||||||
piper trackma # Custom package
|
piper trackma # Custom package
|
||||||
anime-dl # Custom package
|
anime-dl # Custom package
|
||||||
@ -50,7 +50,7 @@
|
|||||||
primaryScreen = "C27F398";
|
primaryScreen = "C27F398";
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
#sway.enable = true;
|
sway.enable = true;
|
||||||
alacritty.enable = true;
|
alacritty.enable = true;
|
||||||
emacs.enable = true;
|
emacs.enable = true;
|
||||||
firefox.enable = true;
|
firefox.enable = true;
|
||||||
@ -62,7 +62,7 @@
|
|||||||
};
|
};
|
||||||
#xournalpp.enable = true;
|
#xournalpp.enable = true;
|
||||||
zsh.enable = true;
|
zsh.enable = true;
|
||||||
office.enable = true;
|
#office.enable = true;
|
||||||
plasma.enable = true;
|
plasma.enable = true;
|
||||||
gaming.enable = true;
|
gaming.enable = true;
|
||||||
};
|
};
|
||||||
@ -70,7 +70,7 @@
|
|||||||
gamemode.enable = true;
|
gamemode.enable = true;
|
||||||
#gnome.enable = true;
|
#gnome.enable = true;
|
||||||
input-remapper = {
|
input-remapper = {
|
||||||
enable = false;
|
enable = true;
|
||||||
postStartCommand = "${pkgs.input-remapper}/bin/input-remapper-control --command start --preset NOOP --device \"Razer Razer Tartarus V2\"";
|
postStartCommand = "${pkgs.input-remapper}/bin/input-remapper-control --command start --preset NOOP --device \"Razer Razer Tartarus V2\"";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@ -128,12 +128,13 @@
|
|||||||
"pci=noaer"
|
"pci=noaer"
|
||||||
];
|
];
|
||||||
|
|
||||||
extraModulePackages = [ pkgs.linuxPackages_xanmod.vendor-reset ];
|
extraModulePackages = [ pkgs.linuxPackages_zen.vendor-reset ];
|
||||||
|
|
||||||
|
#extraModulePackages = [ pkgs.linuxPackages.vendor-reset ];
|
||||||
# NOTE: A regression appears to have happend between 5.10 and 5.12
|
# NOTE: A regression appears to have happend between 5.10 and 5.12
|
||||||
# which leads to the RX590 to have the fence fallback timer on
|
# which leads to the RX590 to have the fence fallback timer on
|
||||||
# sdma0 time out (whatever this means). Maybe bisect?
|
# sdma0 time out (whatever this means). Maybe bisect?
|
||||||
kernelPackages = pkgs.linuxPackages_xanmod;
|
kernelPackages = pkgs.linuxPackages_zen;
|
||||||
};
|
};
|
||||||
services = {
|
services = {
|
||||||
ratbagd.enable = true;
|
ratbagd.enable = true;
|
||||||
|
@ -9,7 +9,7 @@ in {
|
|||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
environment = {
|
environment = {
|
||||||
systemPackages = with pkgs; [ firefox-wayland tor-browser-bundle-bin ];
|
systemPackages = with pkgs; [ firefox-wayland /*tor-browser-bundle-bin*/ ];
|
||||||
|
|
||||||
# Deploy a Firefox policy to set the search engine and do some other things
|
# Deploy a Firefox policy to set the search engine and do some other things
|
||||||
etc."firefox/policies/policies.json".source = ./policies.json;
|
etc."firefox/policies/policies.json".source = ./policies.json;
|
||||||
|
@ -7,22 +7,8 @@ in {
|
|||||||
enable = lib.mkEnableOption "Configure gaming options";
|
enable = lib.mkEnableOption "Configure gaming options";
|
||||||
};
|
};
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
nixpkgs.config.retroarch = {
|
|
||||||
enableDesmume = true;
|
|
||||||
enableMGBA = true;
|
|
||||||
enableDolphin = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
winePackages.stagingFull winetricks lutris-free-wrapped
|
winePackages.stagingFull winetricks lutris-free-wrapped
|
||||||
|
|
||||||
retroarch
|
|
||||||
|
|
||||||
steam-wrapped # Custom package
|
|
||||||
|
|
||||||
nur.repos.dukzcry.gamescope
|
|
||||||
];
|
];
|
||||||
|
|
||||||
hardware.steam-hardware.enable = true;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -100,8 +100,8 @@ in {
|
|||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "zsh-users";
|
owner = "zsh-users";
|
||||||
repo = "zsh-syntax-highlighting";
|
repo = "zsh-syntax-highlighting";
|
||||||
rev = "c5ce0014677a0f69a10b676b6038ad127f40c6b1";
|
rev = "6e0e950154a4c6983d9e077ed052298ad9126144";
|
||||||
sha256 = "sha256-UqeK+xFcKMwdM62syL2xkV8jwkf/NWfubxOTtczWEwA=";
|
sha256 = "09bkg1a7qs6kvnq17jnw5cbcjhz9sk259mv0d5mklqaifd0hms4v";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
@ -15,12 +15,12 @@ in {
|
|||||||
version = "1.0.1";
|
version = "1.0.1";
|
||||||
copyIntoSandbox = [ "share/pixmaps" ];
|
copyIntoSandbox = [ "share/pixmaps" ];
|
||||||
desktopFileArgs = {
|
desktopFileArgs = {
|
||||||
name = "discord-wrapped";
|
name = "Discord (wrapped)";
|
||||||
#exec = "discord";
|
#exec = "discord";
|
||||||
icon = "discord";
|
icon = "discord";
|
||||||
desktopName = "Discord (wrapped)";
|
desktopName = "Discord (wrapped)";
|
||||||
genericName = "Instant Messenger";
|
genericName = "Instant Messenger";
|
||||||
categories = [ "Network" "InstantMessaging" ];
|
categories = "Network;InstantMessaging;";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
minecraft-wrapped = wrapInSandbox {
|
minecraft-wrapped = wrapInSandbox {
|
||||||
|
@ -90,7 +90,7 @@ final: prev:
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
/*
|
# TODO: Remove when updated in nixos-unstable
|
||||||
discord = prev.discord.overrideAttrs (old: {
|
discord = prev.discord.overrideAttrs (old: {
|
||||||
version = "0.0.17";
|
version = "0.0.17";
|
||||||
src = prev.fetchurl {
|
src = prev.fetchurl {
|
||||||
@ -98,9 +98,4 @@ final: prev:
|
|||||||
sha256 = "sha256-NGJzLl1dm7dfkB98pQR3gv4vlldrII6lOMWTuioDExU=";
|
sha256 = "sha256-NGJzLl1dm7dfkB98pQR3gv4vlldrII6lOMWTuioDExU=";
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
*/
|
|
||||||
|
|
||||||
tor-browser-bundle-bin = prev.tor-browser-bundle-bin.override {
|
|
||||||
useHardenedMalloc = false;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user