megamanmalte/nixos
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Some configuration

Browse source
This commit is contained in:
Malte Tammena 2021-06-04 16:07:13 +02:00
parent 775234d82b
commit 1f0c8813eb
9 changed files with 115 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

101
flake.lock
View file

@ -1,5 +1,21 @@
{
"nodes": {
"cachix": {
"locked": {
"lastModified": 1622559709,
"narHash": "sha256-wnZUu3JNQTwu7q301TOsZFGxAcgBV8C3qks/aB8wztQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "cee3ca37c68dad981396365bf4b1d0c807ac4eb4",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-20.09",
"repo": "nixpkgs",
"type": "github"
}
},
"crate2nix": {
"flake": false,
"locked": {
@ -25,11 +41,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1622321033,
"narHash": "sha256-rTG/81nnmU3dWGuOg+b9cpuzeKmkSnsVbnNVvVG9hlg=",
"lastModified": 1622658312,
"narHash": "sha256-b5funj9JpmhOnXJFyaCk+/dzxPpwnhsR0hRW1OyAJIQ=",
"owner": "MalteT",
"repo": "2a-emulator",
"rev": "803fe1adc234404b99bf5b6f2ba15a304427d929",
"rev": "5674baa51c4e7d62de02ca5dad9d0602a53f0540",
"type": "github"
},
"original": {
@ -91,11 +107,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1622368473,
"narHash": "sha256-5/HXUr8uv+L9ZerwEF3UefYL8Ik+j4uPoMpnxealANo=",
"lastModified": 1622753049,
"narHash": "sha256-clDbg4Lg4RGHJnGBLi2jp5kV4+01P42dAYB0imNmrhU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d2aaeac42c563cf8cf76ee3b90d9585dadbb91e0",
"rev": "45f9cb06a9152ca367edc3e7eaa5449338885167",
"type": "github"
},
"original": {
@ -106,11 +122,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1622314052,
"narHash": "sha256-DwrLZ6NXPzKpQx3RTjdwdmlGDr6kHVx2gaeHCWCb09Q=",
"lastModified": 1622521809,
"narHash": "sha256-7XcqrtrHDeaasKzg/ruroLsC2fb6Fi3aenCrv1+xVLk=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "684ae160a6e76590eafa3fca8061b6ad57bcc9ad",
"rev": "b2186d6c3cdc58fb3a8def0f608bcae61138cc6f",
"type": "github"
},
"original": {
@ -135,6 +151,41 @@
"type": "github"
}
},
"nixpkgs-master": {
"locked": {
"lastModified": 1622810827,
"narHash": "sha256-IlPKkf5e1x++bQ5VwRv47EaN5T2Dnh6I7hoKaHnSzfs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f36a65f6e2e9f3641f12c7d6e48a5ec4b5c5394b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-wayland": {
"inputs": {
"cachix": "cachix",
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1622706696,
"narHash": "sha256-KL+Umw81MtuB+rzC8at13Hc267CONzJ1bkVZ0/2GEMM=",
"owner": "colemickens",
"repo": "nixpkgs-wayland",
"rev": "226aa9c2a6019dce37787b32ed7274c23034ffb0",
"type": "github"
},
"original": {
"owner": "colemickens",
"repo": "nixpkgs-wayland",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1617325113,
@ -152,10 +203,10 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1621840840,
"narHash": "sha256-o6h6+d5ZwrFmOTe+ma9s1Z9kyHsCW1C84IA8RZ9/fIU=",
"path": "/nix/store/jjsygkm01c9fg053m3l2ni1mny1iwmji-source",
"rev": "ea7d4aa9b8225abd6147339f0d56675d6f1f0fd1",
"lastModified": 1622194753,
"narHash": "sha256-76qtvFp/vFEz46lz5iZMJ0mnsWQYmuGYlb0fHgKqqMg=",
"path": "/nix/store/49d2fsjglqa57cca9cwqy1rzgxcanjjl-source",
"rev": "540dccb2aeaffa9dc69bfdc41c55abd7ccc6baa3",
"type": "path"
},
"original": {
@ -165,11 +216,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1622194753,
"narHash": "sha256-76qtvFp/vFEz46lz5iZMJ0mnsWQYmuGYlb0fHgKqqMg=",
"lastModified": 1622545032,
"narHash": "sha256-1Y+2LFqnMBEH9OZzMBdLWl6GWFt/xzNz0V5X+m05Ing=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "540dccb2aeaffa9dc69bfdc41c55abd7ccc6baa3",
"rev": "1c2986bbb806c57f9470bf3231d8da7250ab9091",
"type": "github"
},
"original": {
@ -179,6 +230,22 @@
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1622545032,
"narHash": "sha256-1Y+2LFqnMBEH9OZzMBdLWl6GWFt/xzNz0V5X+m05Ing=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1c2986bbb806c57f9470bf3231d8da7250ab9091",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"rip": {
"flake": false,
"locked": {
@ -202,6 +269,8 @@
"home-manager": "home-manager",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_4",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-wayland": "nixpkgs-wayland",
"rip": "rip"
}
},

19
flake.nix
View file

@ -2,7 +2,9 @@
description = "Malte Tammena's system configuration";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
inputs.nixpkgs-master.url = "github:NixOS/nixpkgs/master";
inputs.nixos-hardware.url = "github:NixOS/nixos-hardware";
inputs.nixpkgs-wayland.url = "github:colemickens/nixpkgs-wayland";
inputs.home-manager.url = "github:nix-community/home-manager";
inputs.emulator-2a.url = "github:MalteT/2a-emulator/develop";
inputs.gruvbox-material-gtk = {
@ -67,6 +69,23 @@
nixpkgs.lib.mkIf (self ? rev) self.rev;
nixpkgs.config.allowUnfree = true;
nix = {
# add binary caches
binaryCachePublicKeys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
# ...
];
binaryCaches = [
"https://cache.nixos.org"
"https://nixpkgs-wayland.cachix.org"
# ...
];
};
# use it as an overlay
nixpkgs.overlays = [ inputs.nixpkgs-wayland.overlay ];
environment.systemPackages = [ emulator-2a ];
nix.registry.nixpkgs.flake = nixpkgs;

4
malte/git.nix
View file

@ -10,9 +10,7 @@ in {
includes = [{ contents = { diff.colorMoved = "default"; }; }];
extraConfig = {
pull = { rebase = true; };
};
extraConfig = { pull = { rebase = true; }; };
delta = {
enable = true;

3
malte/home.nix
View file

@ -15,7 +15,7 @@ in {
./gpg.nix
./pass.nix
./zathura.nix
./unison.nix
#./unison.nix
./taskwarrior.nix
#./i3.nix
];
@ -25,7 +25,6 @@ in {
home = {
packages = with pkgs; [
(script "hwp2021pizzazz" ../scripts/hwp2021pizzazz.py)
discord-canary
feh
firefox
gimp

4
malte/neovim.nix
View file

@ -226,9 +226,7 @@ in {
withNodeJs = true;
withRuby = true;
extraPackages = with pkgs; [
jdk
];
extraPackages = with pkgs; [ jdk ];
};
systemd.user.sessionVariables = {

14
overlays/tdesktop.nix
View file

@ -1,14 +0,0 @@
self: super:
let version = "2.7.4";
in {
tdesktop = super.tdesktop.overrideAttrs (old: {
inherit version;
pname = "tdesktop";
src = super.fetchurl {
url =
"https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
sha256 = "1cigqvxa8lp79y7sp2w2izmmikxaxzrq9bh5ns3cy16z985nyllp";
};
});
}

8
pkgs/rip.nix
View file

@ -1,8 +1,4 @@
{ lib, stdenv
, rustPlatform
, fetchFromGitHub
, pkg-config
}:
{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config }:
let lock = builtins.fromJSON (builtins.readFile ../flake.lock);
in rustPlatform.buildRustPackage rec {
@ -24,7 +20,7 @@ in rustPlatform.buildRustPackage rec {
description = "A safe and ergonomic alternative to rm";
homepage = "https://github.com/nivekuil/rip";
license = with licenses; [ gpl3 ];
maintainers = with maintainers; [];
maintainers = with maintainers; [ ];
};
}

6
system/configuration.nix
View file

@ -37,10 +37,10 @@
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
#alsa.enable = true;
#alsa.support32Bit = true;
pulse.enable = true;
jack.enable = true;
#jack.enable = true;
};
users = {

4
system/lenovo-thinkpad-p1.nix
View file

@ -8,7 +8,8 @@
luks.devices."enc".device =
"/dev/disk/by-uuid/1f1e51d6-3084-4f4d-9b4b-6caa0352f542";
};
kernelModules = [ "kvm-intel" "nouveau" ];
kernelModules = [ "kvm-intel" "nvidia" ];
#blacklistedKernelModules = [ "nvidia" ];
supportedFilesystems = [ "btrfs" ];
};
@ -41,6 +42,7 @@
trackpoint.enable = true;
trackpoint.emulateWheel = lib.mkDefault config.hardware.trackpoint.enable;
};
services.xserver.videoDrivers = [ "nvidia" ];
nixpkgs.config.packageOverrides = pkgs: {
vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };