format: apply nixpkgs-fmt
This commit is contained in:
parent
14edf3fd19
commit
2369f43398
@ -1,14 +1,12 @@
|
|||||||
|
|
||||||
# WARN: this file will get overwritten by $ cachix use <name>
|
# WARN: this file will get overwritten by $ cachix use <name>
|
||||||
{ pkgs, lib, ... }:
|
{ pkgs, lib, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
folder = ./cachix;
|
folder = ./cachix;
|
||||||
toImport = name: value: folder + ("/" + name);
|
toImport = name: value: folder + ("/" + name);
|
||||||
filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
|
filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
|
||||||
imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
|
imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
inherit imports;
|
inherit imports;
|
||||||
nix.binaryCaches = ["https://cache.nixos.org/"];
|
nix.binaryCaches = [ "https://cache.nixos.org/" ];
|
||||||
}
|
}
|
||||||
|
|
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
nix = {
|
nix = {
|
||||||
binaryCaches = [
|
binaryCaches = [
|
||||||
@ -9,4 +8,3 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -7,11 +7,13 @@ let
|
|||||||
|
|
||||||
hostname = lib.fileContents /etc/hostname;
|
hostname = lib.fileContents /etc/hostname;
|
||||||
host = "/etc/nixos/hosts/${hostname}.nix";
|
host = "/etc/nixos/hosts/${hostname}.nix";
|
||||||
config = if (builtins.pathExists host) then
|
config =
|
||||||
|
if (builtins.pathExists host) then
|
||||||
[ host ]
|
[ host ]
|
||||||
else
|
else
|
||||||
[ /etc/nixos/hosts/NixOS.nix ];
|
[ /etc/nixos/hosts/NixOS.nix ];
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
imports = (import ./modules/list.nix) ++ [
|
imports = (import ./modules/list.nix) ++ [
|
||||||
"${
|
"${
|
||||||
builtins.fetchTarball
|
builtins.fetchTarball
|
||||||
@ -27,8 +29,11 @@ in {
|
|||||||
"nixpkgs-overlays=/etc/nixos/overlays"
|
"nixpkgs-overlays=/etc/nixos/overlays"
|
||||||
];
|
];
|
||||||
|
|
||||||
nixpkgs.overlays = let
|
nixpkgs.overlays =
|
||||||
overlays = map (name: import (./overlays + "/${name}"))
|
let
|
||||||
|
overlays = map
|
||||||
|
(name: import (./overlays + "/${name}"))
|
||||||
(attrNames (readDir ./overlays));
|
(attrNames (readDir ./overlays));
|
||||||
in overlays;
|
in
|
||||||
|
overlays;
|
||||||
}
|
}
|
||||||
|
15
flake.nix
15
flake.nix
@ -26,7 +26,8 @@
|
|||||||
pkgs = pkgImport nixpkgs;
|
pkgs = pkgImport nixpkgs;
|
||||||
unstablePkgs = pkgImport unstable;
|
unstablePkgs = pkgImport unstable;
|
||||||
|
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
nixosConfigurations =
|
nixosConfigurations =
|
||||||
import ./hosts (inputs // { inherit system pkgs unstablePkgs utils; });
|
import ./hosts (inputs // { inherit system pkgs unstablePkgs utils; });
|
||||||
|
|
||||||
@ -34,15 +35,18 @@
|
|||||||
|
|
||||||
overlay = import ./pkgs;
|
overlay = import ./pkgs;
|
||||||
|
|
||||||
overlays = let
|
overlays =
|
||||||
|
let
|
||||||
overlayDir = ./overlays;
|
overlayDir = ./overlays;
|
||||||
fullPath = name: overlayDir + "/${name}";
|
fullPath = name: overlayDir + "/${name}";
|
||||||
overlayPaths = map fullPath (attrNames (readDir overlayDir));
|
overlayPaths = map fullPath (attrNames (readDir overlayDir));
|
||||||
in pathsToImportedAttrs overlayPaths;
|
in
|
||||||
|
pathsToImportedAttrs overlayPaths;
|
||||||
|
|
||||||
packages."${system}" = self.overlay pkgs pkgs;
|
packages."${system}" = self.overlay pkgs pkgs;
|
||||||
|
|
||||||
nixosModules = let
|
nixosModules =
|
||||||
|
let
|
||||||
# binary cache
|
# binary cache
|
||||||
cachix = import ./cachix.nix;
|
cachix = import ./cachix.nix;
|
||||||
cachixAttrs = { inherit cachix; };
|
cachixAttrs = { inherit cachix; };
|
||||||
@ -55,6 +59,7 @@
|
|||||||
profilesList = import ./profiles/list.nix;
|
profilesList = import ./profiles/list.nix;
|
||||||
profilesAttrs = { profiles = pathsToImportedAttrs profilesList; };
|
profilesAttrs = { profiles = pathsToImportedAttrs profilesList; };
|
||||||
|
|
||||||
in cachixAttrs // modulesAttrs // profilesAttrs;
|
in
|
||||||
|
cachixAttrs // modulesAttrs // profilesAttrs;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -8,7 +8,8 @@ let
|
|||||||
lib.nixosSystem {
|
lib.nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
|
|
||||||
modules = let
|
modules =
|
||||||
|
let
|
||||||
inherit (home.nixosModules) home-manager;
|
inherit (home.nixosModules) home-manager;
|
||||||
|
|
||||||
core = self.nixosModules.profiles.core;
|
core = self.nixosModules.profiles.core;
|
||||||
@ -37,7 +38,8 @@ let
|
|||||||
with unstablePkgs; {
|
with unstablePkgs; {
|
||||||
inherit starship element-desktop discord signal-desktop mpv
|
inherit starship element-desktop discord signal-desktop mpv
|
||||||
dhall;
|
dhall;
|
||||||
})
|
}
|
||||||
|
)
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -47,7 +49,8 @@ let
|
|||||||
flakeModules =
|
flakeModules =
|
||||||
attrValues (removeAttrs self.nixosModules [ "profiles" ]);
|
attrValues (removeAttrs self.nixosModules [ "profiles" ]);
|
||||||
|
|
||||||
in flakeModules ++ [ core global local home-manager unstables ];
|
in
|
||||||
|
flakeModules ++ [ core global local home-manager unstables ];
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -55,4 +58,5 @@ let
|
|||||||
dir = ./.;
|
dir = ./.;
|
||||||
_import = config;
|
_import = config;
|
||||||
};
|
};
|
||||||
in hosts
|
in
|
||||||
|
hosts
|
||||||
|
@ -13,18 +13,21 @@ let
|
|||||||
# Generate an attribute set by mapping a function over a list of values.
|
# Generate an attribute set by mapping a function over a list of values.
|
||||||
genAttrs' = values: f: listToAttrs (map f values);
|
genAttrs' = values: f: listToAttrs (map f values);
|
||||||
|
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
inherit mapFilterAttrs genAttrs';
|
inherit mapFilterAttrs genAttrs';
|
||||||
|
|
||||||
recImport = { dir, _import ? base: import "${dir}/${base}.nix" }:
|
recImport = { dir, _import ? base: import "${dir}/${base}.nix" }:
|
||||||
mapFilterAttrs (_: v: v != null) (n: v:
|
mapFilterAttrs
|
||||||
|
(_: v: v != null)
|
||||||
|
(n: v:
|
||||||
if n != "default.nix" && hasSuffix ".nix" n && v == "regular"
|
if n != "default.nix" && hasSuffix ".nix" n && v == "regular"
|
||||||
|
|
||||||
then
|
then
|
||||||
let name = removeSuffix ".nix" n; in nameValuePair (name) (_import name)
|
let name = removeSuffix ".nix" n; in nameValuePair (name) (_import name)
|
||||||
|
|
||||||
else
|
else
|
||||||
nameValuePair ("") (null)) (readDir dir);
|
nameValuePair ("") (null))
|
||||||
|
(readDir dir);
|
||||||
|
|
||||||
# Convert a list to file paths to attribute set
|
# Convert a list to file paths to attribute set
|
||||||
# that has the filenames stripped of nix extension as keys
|
# that has the filenames stripped of nix extension as keys
|
||||||
|
@ -8,7 +8,8 @@ let
|
|||||||
cmdline = ''
|
cmdline = ''
|
||||||
ibrs noibpb nopti nospectre_v2 nospectre_v1 l1tf=off nospec_store_bypass_disable no_stf_barrier mds=off tsx=on tsx_async_abort=off mitigations=off
|
ibrs noibpb nopti nospectre_v2 nospectre_v1 l1tf=off nospec_store_bypass_disable no_stf_barrier mds=off tsx=on tsx_async_abort=off mitigations=off
|
||||||
'';
|
'';
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options = {
|
options = {
|
||||||
security.mitigations.disable = mkOption {
|
security.mitigations.disable = mkOption {
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
let cfg = config.services.gamemode;
|
let cfg = config.services.gamemode;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.services.gamemode = {
|
options.services.gamemode = {
|
||||||
enable = mkOption {
|
enable = mkOption {
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
let cfg = config.services.wii-u-gc-adapter;
|
let cfg = config.services.wii-u-gc-adapter;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options = {
|
options = {
|
||||||
services.wii-u-gc-adapter = {
|
services.wii-u-gc-adapter = {
|
||||||
enable = mkOption {
|
enable = mkOption {
|
||||||
|
@ -4,7 +4,8 @@ let
|
|||||||
cfg = config.services.qbittorrent;
|
cfg = config.services.qbittorrent;
|
||||||
configDir = "${cfg.dataDir}/.config";
|
configDir = "${cfg.dataDir}/.config";
|
||||||
openFilesLimit = 4096;
|
openFilesLimit = 4096;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.services.qbittorrent = {
|
options.services.qbittorrent = {
|
||||||
enable = mkOption {
|
enable = mkOption {
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
{ pkgs, lib, config, ... }:
|
{ pkgs, lib, config, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
let cfg = config.services.xserver.windowManager.steam;
|
let cfg = config.services.xserver.windowManager.steam;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options = {
|
options = {
|
||||||
services.xserver.windowManager.steam = {
|
services.xserver.windowManager.steam = {
|
||||||
enable = mkEnableOption "steam";
|
enable = mkEnableOption "steam";
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
let version = "1.6.0";
|
let version = "1.6.0";
|
||||||
in final: prev: {
|
in
|
||||||
|
final: prev: {
|
||||||
pcsx2 = prev.pcsx2.overrideAttrs (o: {
|
pcsx2 = prev.pcsx2.overrideAttrs (o: {
|
||||||
inherit version;
|
inherit version;
|
||||||
src = prev.fetchFromGitHub {
|
src = prev.fetchFromGitHub {
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
let version = "1.8.9";
|
let version = "1.8.9";
|
||||||
in final: prev: {
|
in
|
||||||
|
final: prev: {
|
||||||
retroarchBare = prev.retroarchBare.overrideAttrs (o: {
|
retroarchBare = prev.retroarchBare.overrideAttrs (o: {
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
final: prev: {
|
final: prev: {
|
||||||
slock = prev.slock.overrideAttrs
|
slock = prev.slock.overrideAttrs (o: { patches = [ ../pkgs/misc/screensavers/slock/window_name.patch ]; });
|
||||||
(o: { patches = [ ../pkgs/misc/screensavers/slock/window_name.patch ]; });
|
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
{ stdenv, fetchFromGitHub, ... }:
|
{ stdenv, fetchFromGitHub, ... }:
|
||||||
let version = "0.1.5";
|
let version = "0.1.5";
|
||||||
in stdenv.mkDerivation {
|
in
|
||||||
|
stdenv.mkDerivation {
|
||||||
pname = "sddm-chili";
|
pname = "sddm-chili";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
|
@ -1,5 +1,17 @@
|
|||||||
{ stdenv, fetchFromGitHub, libudev, SDL, SDL_image, libXdamage, libXcomposite
|
{ stdenv
|
||||||
, libXrender, libXext, libXxf86vm, pkgconfig, autoreconfHook, gnumake }:
|
, fetchFromGitHub
|
||||||
|
, libudev
|
||||||
|
, SDL
|
||||||
|
, SDL_image
|
||||||
|
, libXdamage
|
||||||
|
, libXcomposite
|
||||||
|
, libXrender
|
||||||
|
, libXext
|
||||||
|
, libXxf86vm
|
||||||
|
, pkgconfig
|
||||||
|
, autoreconfHook
|
||||||
|
, gnumake
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "steamcompmgr";
|
name = "steamcompmgr";
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
let version = "2.0.0";
|
let version = "2.0.0";
|
||||||
in { stdenv, fetchzip }:
|
in
|
||||||
|
{ stdenv, fetchzip }:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "dejavu-nerdfont";
|
pname = "dejavu-nerdfont";
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
{ stdenv, meson, ninja, fetchFromGitHub, ... }:
|
{ stdenv, meson, ninja, fetchFromGitHub, ... }:
|
||||||
let version = "r50";
|
let version = "r50";
|
||||||
in stdenv.mkDerivation {
|
in
|
||||||
|
stdenv.mkDerivation {
|
||||||
pname = "libinih";
|
pname = "libinih";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
|
@ -1,6 +1,16 @@
|
|||||||
let version = "1.5.1";
|
let version = "1.5.1";
|
||||||
in { stdenv, meson, ninja, polkit, pkgconfig, systemd, dbus, libinih
|
in
|
||||||
, fetchFromGitHub, ... }:
|
{ stdenv
|
||||||
|
, meson
|
||||||
|
, ninja
|
||||||
|
, polkit
|
||||||
|
, pkgconfig
|
||||||
|
, systemd
|
||||||
|
, dbus
|
||||||
|
, libinih
|
||||||
|
, fetchFromGitHub
|
||||||
|
, ...
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "gamemode";
|
pname = "gamemode";
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
{ stdenv, fetchFromGitHub }:
|
{ stdenv, fetchFromGitHub }:
|
||||||
let version = "0e87bd8";
|
let version = "0e87bd8";
|
||||||
in stdenv.mkDerivation {
|
in
|
||||||
|
stdenv.mkDerivation {
|
||||||
pname = "pure";
|
pname = "pure";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
|
@ -5,7 +5,8 @@ let
|
|||||||
inherit (builtins) readFile toFile;
|
inherit (builtins) readFile toFile;
|
||||||
|
|
||||||
init = toFile "init.sh" "${readFile ./init.sh}";
|
init = toFile "init.sh" "${readFile ./init.sh}";
|
||||||
in buildRustPackage {
|
in
|
||||||
|
buildRustPackage {
|
||||||
pname = "purs";
|
pname = "purs";
|
||||||
version = "0.1.0";
|
version = "0.1.0";
|
||||||
|
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
let inherit (lib) fileContents;
|
let inherit (lib) fileContents;
|
||||||
|
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
nix.package = pkgs.nixFlakes;
|
nix.package = pkgs.nixFlakes;
|
||||||
|
|
||||||
nix.systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
|
nix.systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
|
||||||
@ -38,7 +39,8 @@ in {
|
|||||||
|
|
||||||
shellAliases =
|
shellAliases =
|
||||||
let ifSudo = lib.mkIf config.security.sudo.enable;
|
let ifSudo = lib.mkIf config.security.sudo.enable;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
# quick cd
|
# quick cd
|
||||||
".." = "cd ..";
|
".." = "cd ..";
|
||||||
"..." = "cd ../..";
|
"..." = "cd ../..";
|
||||||
|
@ -1,7 +1,9 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
let inherit (pkgs) python3Packages;
|
let inherit (pkgs) python3Packages;
|
||||||
in {
|
in
|
||||||
environment.systemPackages = let
|
{
|
||||||
|
environment.systemPackages =
|
||||||
|
let
|
||||||
packages = pythonPackages:
|
packages = pythonPackages:
|
||||||
with pythonPackages; [
|
with pythonPackages; [
|
||||||
numpy
|
numpy
|
||||||
@ -13,10 +15,13 @@ in {
|
|||||||
|
|
||||||
python = pkgs.python3.withPackages packages;
|
python = pkgs.python3.withPackages packages;
|
||||||
|
|
||||||
in [ python ];
|
in
|
||||||
|
[ python ];
|
||||||
environment.sessionVariables = {
|
environment.sessionVariables = {
|
||||||
PYTHONSTARTUP = let
|
PYTHONSTARTUP =
|
||||||
startup = pkgs.writers.writePython3 "ptpython.py" {
|
let
|
||||||
|
startup = pkgs.writers.writePython3 "ptpython.py"
|
||||||
|
{
|
||||||
libraries = with python3Packages; [ ptpython ];
|
libraries = with python3Packages; [ ptpython ];
|
||||||
} ''
|
} ''
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
@ -36,7 +41,7 @@ in {
|
|||||||
else:
|
else:
|
||||||
sys.exit(embed(globals(), locals(), configure=configure))
|
sys.exit(embed(globals(), locals(), configure=configure))
|
||||||
'';
|
'';
|
||||||
in "${startup}";
|
in
|
||||||
|
"${startup}";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5,10 +5,12 @@ let
|
|||||||
inherit (lib) removePrefix;
|
inherit (lib) removePrefix;
|
||||||
|
|
||||||
pluginConf = plugins:
|
pluginConf = plugins:
|
||||||
concatStringsSep "\n\n" (map (plugin:
|
concatStringsSep "\n\n" (map
|
||||||
|
(plugin:
|
||||||
let name = removePrefix "tmuxplugin-" plugin.pname;
|
let name = removePrefix "tmuxplugin-" plugin.pname;
|
||||||
in "run-shell ${plugin}/share/tmux-plugins/${name}/${name}.tmux")
|
in "run-shell ${plugin}/share/tmux-plugins/${name}/${name}.tmux")
|
||||||
plugins);
|
plugins
|
||||||
|
);
|
||||||
|
|
||||||
plugins = with pkgs.tmuxPlugins; [
|
plugins = with pkgs.tmuxPlugins; [
|
||||||
copycat
|
copycat
|
||||||
@ -17,7 +19,8 @@ let
|
|||||||
yank
|
yank
|
||||||
vim-tmux-navigator
|
vim-tmux-navigator
|
||||||
];
|
];
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
environment.shellAliases = { tx = "tmux new-session -A -s $USER"; };
|
environment.shellAliases = { tx = "tmux new-session -A -s $USER"; };
|
||||||
|
|
||||||
programs.tmux = {
|
programs.tmux = {
|
||||||
|
@ -4,19 +4,24 @@ let
|
|||||||
|
|
||||||
inherit (lib) fileContents;
|
inherit (lib) fileContents;
|
||||||
|
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
users.defaultUserShell = pkgs.zsh;
|
users.defaultUserShell = pkgs.zsh;
|
||||||
|
|
||||||
environment = {
|
environment = {
|
||||||
sessionVariables = let fd = "${pkgs.fd}/bin/fd -H";
|
sessionVariables =
|
||||||
in {
|
let fd = "${pkgs.fd}/bin/fd -H";
|
||||||
|
in
|
||||||
|
{
|
||||||
BAT_PAGER = "less";
|
BAT_PAGER = "less";
|
||||||
SKIM_ALT_C_COMMAND = let
|
SKIM_ALT_C_COMMAND =
|
||||||
|
let
|
||||||
alt_c_cmd = pkgs.writeScriptBin "cdr-skim.zsh" ''
|
alt_c_cmd = pkgs.writeScriptBin "cdr-skim.zsh" ''
|
||||||
#!${pkgs.zsh}/bin/zsh
|
#!${pkgs.zsh}/bin/zsh
|
||||||
${fileContents ./cdr-skim.zsh}
|
${fileContents ./cdr-skim.zsh}
|
||||||
'';
|
'';
|
||||||
in "${alt_c_cmd}/bin/cdr-skim.zsh";
|
in
|
||||||
|
"${alt_c_cmd}/bin/cdr-skim.zsh";
|
||||||
SKIM_DEFAULT_COMMAND = fd;
|
SKIM_DEFAULT_COMMAND = fd;
|
||||||
SKIM_CTRL_T_COMMAND = fd;
|
SKIM_CTRL_T_COMMAND = fd;
|
||||||
};
|
};
|
||||||
@ -84,7 +89,8 @@ in {
|
|||||||
eval "$(${pkgs.starship}/bin/starship init zsh)"
|
eval "$(${pkgs.starship}/bin/starship init zsh)"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
interactiveShellInit = let
|
interactiveShellInit =
|
||||||
|
let
|
||||||
zshrc = fileContents ./zshrc;
|
zshrc = fileContents ./zshrc;
|
||||||
|
|
||||||
sources = with pkgs; [
|
sources = with pkgs; [
|
||||||
@ -107,8 +113,10 @@ in {
|
|||||||
man = "${pkgs.man}";
|
man = "${pkgs.man}";
|
||||||
exa = "${pkgs.exa}";
|
exa = "${pkgs.exa}";
|
||||||
|
|
||||||
installPhase = let basename = "\${file##*/}";
|
installPhase =
|
||||||
in ''
|
let basename = "\${file##*/}";
|
||||||
|
in
|
||||||
|
''
|
||||||
mkdir $out
|
mkdir $out
|
||||||
|
|
||||||
for file in $src/*; do
|
for file in $src/*; do
|
||||||
@ -122,7 +130,8 @@ in {
|
|||||||
"${pkgs.any-nix-shell}/bin/any-nix-shell zsh --info-right | source /dev/stdin"
|
"${pkgs.any-nix-shell}/bin/any-nix-shell zsh --info-right | source /dev/stdin"
|
||||||
] ++ source);
|
] ++ source);
|
||||||
|
|
||||||
in ''
|
in
|
||||||
|
''
|
||||||
${plugins}
|
${plugins}
|
||||||
|
|
||||||
fpath+=( ${functions} )
|
fpath+=( ${functions} )
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
let inherit (builtins) readFile;
|
let inherit (builtins) readFile;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
imports = [ ./sway ../develop ./xmonad ../networkmanager ../im ];
|
imports = [ ./sway ../develop ./xmonad ../networkmanager ../im ];
|
||||||
|
|
||||||
hardware.opengl.enable = true;
|
hardware.opengl.enable = true;
|
||||||
@ -35,12 +36,14 @@ in {
|
|||||||
# Theme settings
|
# Theme settings
|
||||||
QT_QPA_PLATFORMTHEME = "gtk2";
|
QT_QPA_PLATFORMTHEME = "gtk2";
|
||||||
|
|
||||||
GTK2_RC_FILES = let
|
GTK2_RC_FILES =
|
||||||
|
let
|
||||||
gtk = ''
|
gtk = ''
|
||||||
gtk-icon-theme-name="Papirus"
|
gtk-icon-theme-name="Papirus"
|
||||||
gtk-cursor-theme-name="Adwaita"
|
gtk-cursor-theme-name="Adwaita"
|
||||||
'';
|
'';
|
||||||
in [
|
in
|
||||||
|
[
|
||||||
("${pkgs.writeText "iconrc" "${gtk}"}")
|
("${pkgs.writeText "iconrc" "${gtk}"}")
|
||||||
"${pkgs.adapta-gtk-theme}/share/themes/Adapta/gtk-2.0/gtkrc"
|
"${pkgs.adapta-gtk-theme}/share/themes/Adapta/gtk-2.0/gtkrc"
|
||||||
"${pkgs.gnome3.gnome-themes-extra}/share/themes/Adwaita/gtk-2.0/gtkrc"
|
"${pkgs.gnome3.gnome-themes-extra}/share/themes/Adwaita/gtk-2.0/gtkrc"
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
let inherit (pkgs) alsaUtils bash gnugrep volnoti;
|
let inherit (pkgs) alsaUtils bash gnugrep volnoti;
|
||||||
in pkgs.writeScript "volnoti.sh" ''
|
in
|
||||||
|
pkgs.writeScript "volnoti.sh" ''
|
||||||
#!${bash}/bin/bash
|
#!${bash}/bin/bash
|
||||||
|
|
||||||
declare -i current=$(${alsaUtils}/bin/amixer get Master | ${gnugrep}/bin/grep -m1 -Po "[0-9]+(?=%)")
|
declare -i current=$(${alsaUtils}/bin/amixer get Master | ${gnugrep}/bin/grep -m1 -Po "[0-9]+(?=%)")
|
||||||
|
@ -1,11 +1,14 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
let inherit (builtins) readFile;
|
let inherit (builtins) readFile;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
sound.enable = true;
|
sound.enable = true;
|
||||||
|
|
||||||
environment = {
|
environment = {
|
||||||
etc."xdg/qutebrowser/config.py".text = let mpv = "${pkgs.mpv}/bin/mpv";
|
etc."xdg/qutebrowser/config.py".text =
|
||||||
in ''
|
let mpv = "${pkgs.mpv}/bin/mpv";
|
||||||
|
in
|
||||||
|
''
|
||||||
${readFile ./config.py}
|
${readFile ./config.py}
|
||||||
|
|
||||||
config.bind(',m', 'hint links spawn -d ${mpv} {hint-url}')
|
config.bind(',m', 'hint links spawn -d ${mpv} {hint-url}')
|
||||||
|
@ -3,7 +3,8 @@ let
|
|||||||
inherit (builtins) readFile;
|
inherit (builtins) readFile;
|
||||||
|
|
||||||
inherit (config.hardware) pulseaudio;
|
inherit (config.hardware) pulseaudio;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
imports = [ ../qutebrowser ];
|
imports = [ ../qutebrowser ];
|
||||||
|
|
||||||
sound.enable = true;
|
sound.enable = true;
|
||||||
@ -38,7 +39,8 @@ in {
|
|||||||
environment.etc = {
|
environment.etc = {
|
||||||
"sway/config".text =
|
"sway/config".text =
|
||||||
let volnoti = import ../misc/volnoti.nix { inherit pkgs; };
|
let volnoti = import ../misc/volnoti.nix { inherit pkgs; };
|
||||||
in ''
|
in
|
||||||
|
''
|
||||||
set $volume ${volnoti}
|
set $volume ${volnoti}
|
||||||
set $mixer "${pkgs.alsaUtils}/bin/amixer -q set Master"
|
set $mixer "${pkgs.alsaUtils}/bin/amixer -q set Master"
|
||||||
|
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
{ autostart, screenshots, pkgs, stoggle, volnoti }:
|
{ autostart, screenshots, pkgs, stoggle, volnoti }:
|
||||||
let inherit (pkgs) alsaUtils;
|
let inherit (pkgs) alsaUtils;
|
||||||
in ''
|
in
|
||||||
|
''
|
||||||
-- Function for fullscreen toggle
|
-- Function for fullscreen toggle
|
||||||
fullToggle :: X ()
|
fullToggle :: X ()
|
||||||
fullToggle = do
|
fullToggle = do
|
||||||
|
@ -13,7 +13,8 @@ let
|
|||||||
writeScript "xmonad-touchtoggle" (readFile ./scripts/touchtoggle);
|
writeScript "xmonad-touchtoggle" (readFile ./scripts/touchtoggle);
|
||||||
|
|
||||||
volnoti = import ../misc/volnoti.nix { inherit pkgs; };
|
volnoti = import ../misc/volnoti.nix { inherit pkgs; };
|
||||||
in ''
|
in
|
||||||
|
''
|
||||||
${readFile ./_xmonad.hs}
|
${readFile ./_xmonad.hs}
|
||||||
${import ./_xmonad.nix {
|
${import ./_xmonad.nix {
|
||||||
inherit screenshots touchtoggle autostart stoggle pkgs volnoti;
|
inherit screenshots touchtoggle autostart stoggle pkgs volnoti;
|
||||||
|
@ -5,4 +5,3 @@
|
|||||||
signal-desktop
|
signal-desktop
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -45,7 +45,8 @@
|
|||||||
'';
|
'';
|
||||||
services.logind.lidSwitch = "suspend";
|
services.logind.lidSwitch = "suspend";
|
||||||
|
|
||||||
nixpkgs.overlays = let
|
nixpkgs.overlays =
|
||||||
|
let
|
||||||
light_ov = self: super: {
|
light_ov = self: super: {
|
||||||
light = super.light.overrideAttrs (o: {
|
light = super.light.overrideAttrs (o: {
|
||||||
src = self.fetchFromGitHub {
|
src = self.fetchFromGitHub {
|
||||||
@ -56,5 +57,6 @@
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
in [ light_ov ];
|
in
|
||||||
|
[ light_ov ];
|
||||||
}
|
}
|
||||||
|
@ -33,10 +33,12 @@ let
|
|||||||
|
|
||||||
blacklist = concatStringsSep ''
|
blacklist = concatStringsSep ''
|
||||||
|
|
||||||
0.0.0.0 '' [
|
0.0.0.0 ''
|
||||||
|
[
|
||||||
"# auto-generated: must be first"
|
"# auto-generated: must be first"
|
||||||
|
|
||||||
# starts here
|
# starts here
|
||||||
];
|
];
|
||||||
|
|
||||||
in { networking.extraHosts = readFile "${hosts}/etc/hosts"; }
|
in
|
||||||
|
{ networking.extraHosts = readFile "${hosts}/etc/hosts"; }
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
let
|
let
|
||||||
inherit (config.services.qbittorrent) port;
|
inherit (config.services.qbittorrent) port;
|
||||||
inherit (lib) mkAfter;
|
inherit (lib) mkAfter;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
services.qbittorrent = {
|
services.qbittorrent = {
|
||||||
enable = true;
|
enable = true;
|
||||||
group = "media";
|
group = "media";
|
||||||
|
@ -5,4 +5,3 @@
|
|||||||
package = pkgs.postgresql_12;
|
package = pkgs.postgresql_12;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6,4 +6,3 @@
|
|||||||
forwardX11 = true;
|
forwardX11 = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -7,17 +7,18 @@
|
|||||||
# you'll need to add your user to 'libvirtd' group to use virt-manager
|
# you'll need to add your user to 'libvirtd' group to use virt-manager
|
||||||
environment.systemPackages = with pkgs; [ virt-manager ];
|
environment.systemPackages = with pkgs; [ virt-manager ];
|
||||||
|
|
||||||
nixpkgs.overlays = let
|
nixpkgs.overlays =
|
||||||
|
let
|
||||||
overlay = final: prev: {
|
overlay = final: prev: {
|
||||||
|
|
||||||
# Patch libvirt to use ebtables-legacy
|
# Patch libvirt to use ebtables-legacy
|
||||||
libvirt = if prev.libvirt.version <= "5.4.0" && prev.ebtables.version
|
libvirt =
|
||||||
|
if prev.libvirt.version <= "5.4.0" && prev.ebtables.version
|
||||||
> "2.0.10-4" then
|
> "2.0.10-4" then
|
||||||
prev.libvirt.overrideAttrs
|
prev.libvirt.overrideAttrs (o: { EBTABLES_PATH = "${final.ebtables}/bin/ebtables-legacy"; })
|
||||||
(o: { EBTABLES_PATH = "${final.ebtables}/bin/ebtables-legacy"; })
|
|
||||||
else
|
else
|
||||||
prev.libvirt;
|
prev.libvirt;
|
||||||
};
|
};
|
||||||
in [ overlay ];
|
in
|
||||||
|
[ overlay ];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5,7 +5,8 @@ let
|
|||||||
buildIso = pkgs.writeShellScriptBin "build-iso" ''
|
buildIso = pkgs.writeShellScriptBin "build-iso" ''
|
||||||
nix build ${configs}.niximg.config.system.build.isoImage $@
|
nix build ${configs}.niximg.config.system.build.isoImage $@
|
||||||
'';
|
'';
|
||||||
in pkgs.mkShell {
|
in
|
||||||
|
pkgs.mkShell {
|
||||||
name = "nixflk";
|
name = "nixflk";
|
||||||
nativeBuildInputs = with pkgs; [ git git-crypt nixFlakes buildIso ];
|
nativeBuildInputs = with pkgs; [ git git-crypt nixFlakes buildIso ];
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user