1
0
mirror of https://github.com/tboerger/nixos-config synced 2024-11-22 18:21:58 +01:00

feat: fix nvidia stuff, move packages to nur, add firefox and freelook

This commit is contained in:
Thomas Boerger 2023-01-16 10:00:01 +01:00
parent 2368cb7fe0
commit 4e06330d20
No known key found for this signature in database
GPG Key ID: 09745AFF9D63C79B
20 changed files with 112 additions and 316 deletions

@ -16,6 +16,14 @@
};
nvidia = {
powerManagement = {
enable = true;
};
modesetting = {
enable = true;
};
prime = {
sync = {
enable = true;

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1665870395,
"narHash": "sha256-Tsbqb27LDNxOoPLh0gw2hIb6L/6Ow/6lIBvqcHzEKBI=",
"lastModified": 1673301561,
"narHash": "sha256-gRUWHbBAtMuPDJQXotoI8u6+3DGBIUZHkyQWpIv7WpM=",
"owner": "ryantm",
"repo": "agenix",
"rev": "a630400067c6d03c9b3e0455347dc8559db14288",
"rev": "42d371d861a227149dc9a7e03350c9ab8b8ddd68",
"type": "github"
},
"original": {
@ -22,16 +22,18 @@
},
"arion": {
"inputs": {
"flake-parts": "flake-parts",
"haskell-flake": "haskell-flake",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1664986582,
"narHash": "sha256-syBM0apq0w/xDLvdTeLgW+NJ+JCZKVFbIrH+NwVL1EI=",
"lastModified": 1673633885,
"narHash": "sha256-XxFZvY20EqOYlOP1dF/YcPYpgSJtlRIqIeWXHJqCnws=",
"owner": "hercules-ci",
"repo": "arion",
"rev": "8159c4faa3502a571cf8b9347f4d4b49f35c4c9f",
"rev": "09ef2d13771ec1309536bbf97720767f90a5afa7",
"type": "github"
},
"original": {
@ -49,11 +51,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1668797197,
"narHash": "sha256-0w6iD3GSSQbIeSFVDzAAQZB+hDq670ZTms3d9XI+BtM=",
"lastModified": 1672327199,
"narHash": "sha256-pFlngSHXKBhAmbaKZ4FYtu57LLunG+vWdL7a5vw1RvQ=",
"owner": "serokell",
"repo": "deploy-rs",
"rev": "2a3c5f70eee04a465aa534d8bd4fcc9bb3c4a8ce",
"rev": "a5619f5660a00f58c2b7c16d89058e92327ac9b8",
"type": "github"
},
"original": {
@ -65,11 +67,11 @@
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1648199409,
"narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=",
"lastModified": 1668681692,
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "64a525ee38886ab9028e6f61790de0832aa3ef03",
"rev": "009399224d5e398d03b22badca40a37ac85412a1",
"type": "github"
},
"original": {
@ -78,13 +80,34 @@
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"arion",
"nixpkgs"
]
},
"locked": {
"lastModified": 1672877861,
"narHash": "sha256-ROnSmsk5grROL6gnHBnSdqlPPBrBJMApCeB7xzY567M=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "7930f5b1c356270cec420d4f4cb43f4907206640",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"hardware": {
"locked": {
"lastModified": 1669650994,
"narHash": "sha256-uwASLUfedIQ5q01TtMwZDEV2HCZr5nVPZjzVgCG+D5I=",
"lastModified": 1673803274,
"narHash": "sha256-zaJDlHFXewT4KUsidMpRcPE+REymGH1Y3Eoc3Pjv4Xs=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "7883883d135ce5b7eae5dce4bfa12262b85c1c46",
"rev": "7bd6b87b3712e68007823e8dd5c37ee9b114fee3",
"type": "github"
},
"original": {
@ -93,6 +116,21 @@
"type": "github"
}
},
"haskell-flake": {
"locked": {
"lastModified": 1668167720,
"narHash": "sha256-5wDTR6xt9BB3BjgKR+YOjOkZgMyDXKaX79g42sStzDU=",
"owner": "srid",
"repo": "haskell-flake",
"rev": "4fc511d93a55fedf815c1647ad146c26d7a2054e",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "haskell-flake",
"type": "github"
}
},
"homemanager": {
"inputs": {
"nixpkgs": [
@ -101,11 +139,11 @@
"utils": "utils_2"
},
"locked": {
"lastModified": 1669825171,
"narHash": "sha256-HxlZHSiRGXnWAFbIJMeujqBe2KgACYx5XDRY0EA9P+4=",
"lastModified": 1673815682,
"narHash": "sha256-zG7Rroki+89poCTr1D8BM/wTCl+DZJvU4IUE+5hxG7U=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "478610aa37c8339eacabfa03f07dacf5574edd47",
"rev": "3e42035fc013ed4d8af6ee8dc0079c0c551c45a5",
"type": "github"
},
"original": {
@ -116,11 +154,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1669791787,
"narHash": "sha256-KBfoA2fOI5+wCrm7PR+j7jHqXeTkVRPQ0m5fcKchyuU=",
"lastModified": 1673631141,
"narHash": "sha256-AprpYQ5JvLS4wQG/ghm2UriZ9QZXvAwh1HlgA/6ZEVQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e76c78d20685a043d23f5f9e0ccd2203997f1fb1",
"rev": "befc83905c965adfd33e5cae49acb0351f6e0404",
"type": "github"
},
"original": {
@ -132,11 +170,11 @@
},
"nur": {
"locked": {
"lastModified": 1669805596,
"narHash": "sha256-g1CPQZ+1jGhY4bsjppk+gH5jfzzqmPlqGHg0zSYS3Hw=",
"lastModified": 1673858859,
"narHash": "sha256-NYGSRzk5KY79igJisr1j++ApdE3StAj6p06buHFe2qY=",
"owner": "nix-community",
"repo": "NUR",
"rev": "c81b1e527f3a220abfa9bf8096153d52784c5007",
"rev": "4a9bc77b7d0866e7e6312f9e8b87bcb15ff7576a",
"type": "github"
},
"original": {
@ -159,11 +197,11 @@
},
"utils": {
"locked": {
"lastModified": 1648297722,
"narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {

@ -1,13 +1,13 @@
self: super:
{
# citrix_workspace = super.citrix_workspace.overrideAttrs (old: {
# src = super.fetchurl {
# name = "linuxx64-22.7.0.20.tar.gz";
# url = "https://owncloud.boerger.ws/s/zN0Qn7e4mKuu7Tf/download";
# hash = "sha256-oX5EeK0+rEsMvJ+3vg26J1g5O6LTtqgrMHT/BTWGxfU=";
# };
# });
citrix_workspace = super.citrix_workspace.overrideAttrs (old: {
src = super.fetchurl {
name = "linuxx64-22.12.0.12.tar.gz";
url = "https://dl.webhippie.de/misc/citrix-workspace-x64-22.12.0.12.tar.gz";
hash = "sha256-PsWj1VJqa6wXu5d7FzVC9b3VNaU7qm3KgMg6DWEinXQ=";
};
});
vscode-extensions = self.lib.recursiveUpdate super.vscode-extensions {
dzhavat.bracket-pair-toggler = self.vscode-utils.extensionFromVscodeMarketplace {
@ -18,16 +18,6 @@ self: super:
};
};
kubectl-ktop = super.callPackage ./kubectl-ktop { };
kubectl-neat = super.callPackage ./kubectl-neat { };
kubectl-oomd = super.callPackage ./kubectl-oomd { };
kubectl-pexec = super.callPackage ./kubectl-pexec { };
kubectl-realname-diff = super.callPackage ./kubectl-realname-diff { };
kubectl-resource-versions = super.callPackage ./kubectl-resource-versions { };
kubectl-view-secret = super.callPackage ./kubectl-view-secret { };
kubectl-whoami = super.callPackage ./kubectl-whoami { };
clickup = super.callPackage ./clickup { };
clockify = super.callPackage ./clockify { };
tailscale-systray = super.callPackage ./tailscale-systray { };
}

@ -1,29 +0,0 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "kubectl-ktop";
version = "0.3.0";
src = fetchFromGitHub {
owner = "vladimirvivien";
repo = "ktop";
rev = "v${version}";
sha256 = "sha256-9TKXOKGsxtmyTGGVq7GDy4v3I9BF5SDc48dhrj1pw9Q=";
};
vendorSha256 = "sha256-IbWdq6t9tgly7MRRIRJK5sDHus+sF0AT843aI4quO3c=";
doCheck = false;
subPackages = [ "." ];
postInstall = ''
mv $out/bin/ktop $out/bin/kubectl-ktop
'';
meta = with lib; {
description = "A top-like tool for your Kubernetes clusters";
homepage = "https://github.com/vladimirvivien/ktop/";
license = licenses.asl20;
maintainers = with maintainers; [ tboerger ];
};
}

@ -1,25 +0,0 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "kubectl-neat";
version = "2.0.3";
src = fetchFromGitHub {
owner = "itaysk";
repo = "kubectl-neat";
rev = "v${version}";
sha256 = "sha256-j8v0zJDBqHzmLamIZPW9UvMe9bv/m3JUQKY+wsgMTFk=";
};
vendorSha256 = "sha256-vGXoYR0DT9V1BD/FN/4szOal0clsLlqReTFkAd2beMw=";
doCheck = false;
subPackages = [ "." ];
meta = with lib; {
description = "A kubectl plugin that cleans up Kubernetes yaml and json output to make it readable";
homepage = "https://github.com/itaysk/kubectl-neat/";
license = licenses.asl20;
maintainers = with maintainers; [ tboerger ];
};
}

@ -1,29 +0,0 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "kubectl-oomd";
version = "0.0.6";
src = fetchFromGitHub {
owner = "jdockerty";
repo = "kubectl-oomd";
rev = "v${version}";
sha256 = "sha256-OqiBIS0I20P8xfGats3eKIpzWmMEYFRdKQxqRMu6aYk=";
};
vendorSha256 = "sha256-7zqbvsYHCZB8b5YGfyTVBCXgtsRtRN7v01QsKdo1gDU=";
doCheck = false;
subPackages = [ "cmd/plugin" ];
postInstall = ''
mv $out/bin/plugin $out/bin/kubectl-oomd
'';
meta = with lib; {
description = "A kubectl plugin that shows pods/containers which have recently been OOMKilled";
homepage = "https://github.com/jdockerty/kubectl-oomd/";
license = licenses.asl20;
maintainers = with maintainers; [ tboerger ];
};
}

@ -1,29 +0,0 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "kubectl-pexec";
version = "0.4.0";
src = fetchFromGitHub {
owner = "ssup2";
repo = "kpexec";
rev = "v${version}";
sha256 = "sha256-3teKIjBc8ToCON+LcVD+WCOSzmYmDHW0T1t8tbodg3Q=";
};
vendorSha256 = "sha256-HmRwez3NFSF97Dc6fD/Tt78qNDjovkhlfqloYo2qG68=";
doCheck = false;
subPackages = [ "cmd/kpexec" ];
postInstall = ''
mv $out/bin/kpexec $out/bin/kubectl-pexec
'';
meta = with lib; {
description = "A kubectl plugin to run commands in a container with high privileges";
homepage = "https://github.com/ssup2/kpexec/";
license = licenses.mit;
maintainers = with maintainers; [ tboerger ];
};
}

@ -1,25 +0,0 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "kubectl-realname-diff";
version = "0.2.3";
src = fetchFromGitHub {
owner = "hhiroshell";
repo = "kubectl-realname-diff";
rev = "v${version}";
sha256 = "sha256-H9+a7nb90AI2VUiii0LbDdik+Ihe1blSdLYwJRVRE8w=";
};
vendorSha256 = "sha256-Hw7f9nJvcslr6wbmjz9XtMxAm2XYVb4yhW2LssQOxrQ=";
doCheck = false;
subPackages = [ "cmd/kubectl-realname_diff" ];
meta = with lib; {
description = "A kubectl plugin that diffs live and local resources ignoring Kustomize hash-suffixes";
homepage = "https://github.com/hhiroshell/kubectl-realname-diff/";
license = licenses.asl20;
maintainers = with maintainers; [ tboerger ];
};
}

@ -1,29 +0,0 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "kubectl-resource-versions";
version = "0.1.2";
src = fetchFromGitHub {
owner = "chengshiwen";
repo = "kubectl-resource-versions";
rev = "v${version}";
sha256 = "sha256-iHxJCM7mTHAQXbcrAvfocs+EEw/1xliA7qd1AcAEaPc=";
};
vendorSha256 = "sha256-7tVHrQGfU8/GhGI4P7he8OeE1vZ3wrnu+tbT97WxVAU=";
doCheck = false;
subPackages = [ "." ];
postInstall = ''
mv $out/bin/kubectl-resource-versions $out/bin/kubectl-resource_versions
'';
meta = with lib; {
description = "A kubectl plugin to print the supported API resources";
homepage = "https://github.com/chengshiwen/kubectl-resource-versions/";
license = licenses.asl20;
maintainers = with maintainers; [ tboerger ];
};
}

@ -1,29 +0,0 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "kubectl-view-secret";
version = "0.10.0";
src = fetchFromGitHub {
owner = "elsesiy";
repo = "kubectl-view-secret";
rev = "v${version}";
sha256 = "sha256-YBPwJQFP0B0YhJ/ecbCW+ko8byu4Y4Yv2IGH7GQT4PA=";
};
vendorSha256 = "sha256-DyC9HiUt4Oyc6q1nFN7Uis+odREW6e/oQpzf2DNvJz8=";
doCheck = false;
subPackages = [ "cmd" ];
postInstall = ''
mv $out/bin/cmd $out/bin/kubectl-view_secret
'';
meta = with lib; {
description = "A kubectl plugin to decode Kubernetes secrets";
homepage = "https://github.com/elsesiy/kubectl-view-secret/";
license = licenses.mit;
maintainers = with maintainers; [ tboerger ];
};
}

@ -1,25 +0,0 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "kubectl-whoami";
version = "0.0.44";
src = fetchFromGitHub {
owner = "rajatjindal";
repo = "kubectl-whoami";
rev = "v${version}";
sha256 = "sha256-HYHQIkmKlwfk/TylBiLY4X+317tqzeC48+e/QOtRBxo=";
};
vendorSha256 = "sha256-tezDL7YZKGpYzXShPylsUXDiLWos3C2Wt6jJCd61FYo=";
doCheck = false;
subPackages = [ "." ];
meta = with lib; {
description = "A kubectl plugin that gets the subject name using the effective kubeconfig";
homepage = "https://github.com/rajatjindal/kubectl-whoami/";
license = licenses.asl20;
maintainers = with maintainers; [ tboerger ];
};
}

@ -1,30 +0,0 @@
{ lib
, buildGoModule
, fetchFromGitHub
, pkg-config
, libayatana-appindicator-gtk3
, gtk3 }:
buildGoModule rec {
pname = "tailscale-systray";
version = "2022-11-28";
src = fetchFromGitHub {
owner = "mattn";
repo = "tailscale-systray";
rev = "e7f8893684e7b8779f34045ca90e5abe6df6056d";
sha256 = "sha256-3kozp6jq0xGllxoK2lGCNUahy/FvXyq11vNSxfDehKE=";
};
vendorSha256 = "sha256-cztIq7Kkj5alAYDtbPU/6h5S+nG+KAyxJzHBb3pJujs=";
buildInputs = [ gtk3 libayatana-appindicator-gtk3 ];
nativeBuildInputs = [ pkg-config ];
meta = with lib; {
description = "Linux port of tailscale system tray menu";
homepage = "https://github.com/mattn/tailscale-systray/";
license = licenses.mit;
maintainers = with maintainers; [ tboerger ];
};
}

@ -19,6 +19,7 @@ in
config = mkIf cfg.enable {
environment = {
systemPackages = with pkgs; [
firefox
google-chrome
];
};

@ -20,7 +20,7 @@
./lens.nix
./lsd.nix
./lutris.nix
./mailspring.nix
./mail.nix
./mattermost.nix
./minecraft.nix
./neovim.nix

@ -28,13 +28,6 @@ let
python310 = pkgs.python310.withPackages (p: with p; [
ansible-core
ansible-doctor
ansible-later
ansible-lint
hcloud
yamllint
boto3
botocore
passlib
@ -58,12 +51,18 @@ in
systemPackages = with pkgs; [
python310
ansible
ansible-doctor
ansible-later
ansible-lint
act
awscli2
eksctl
git-chglog
gopass
graphviz
hcloud
httpie
ipcalc
ngrok
@ -72,6 +71,7 @@ in
shellcheck
sops
upx
yamllint
checkov
terraform

@ -30,14 +30,14 @@ in
krew
kubectl
kubectl-images
kubectl-ktop
kubectl-neat
kubectl-oomd
kubectl-pexec
kubectl-realname-diff
kubectl-resource-versions
kubectl-view-secret
kubectl-whoami
nur.repos.tboerger.kubectl-ktop
nur.repos.tboerger.kubectl-neat
nur.repos.tboerger.kubectl-oomd
nur.repos.tboerger.kubectl-pexec
nur.repos.tboerger.kubectl-realname-diff
nur.repos.tboerger.kubectl-resource-versions
nur.repos.tboerger.kubectl-view-secret
nur.repos.tboerger.kubectl-whoami
kubectx
kubelogin
kubernetes-helm

@ -2,15 +2,15 @@
with lib;
let
cfg = config.profile.programs.mailspring;
cfg = config.profile.programs.mail;
in
{
options = {
profile = {
programs = {
mailspring = {
enable = mkEnableOption "Mailspring";
mail = {
enable = mkEnableOption "Mail";
};
};
};
@ -19,6 +19,7 @@ in
config = mkIf cfg.enable {
environment = {
systemPackages = with pkgs; [
nur.repos.tboerger.freelook
mailspring
];
};

@ -74,7 +74,7 @@ in
lutris = {
enable = desktop;
};
mailspring = {
mail = {
enable = desktop;
};
mattermost = {

@ -19,6 +19,12 @@ in
};
config = mkIf cfg.enable {
programs = {
zsh = {
enable = true;
};
};
home-manager.users."${config.profile.username}" = { config, ... }: {
programs = {
zsh = {
@ -74,6 +80,8 @@ in
hgrep = "fc -El 0 | grep";
history = "fc -l 1";
sha256sum = "shasum -a 256";
molecule = "docker run -ti --rm -v /var/run/docker.sock:/var/run/docker.sock -v $(pwd):$(pwd) -w $(pwd) toolhippie/molecule:latest molecule";
};
sessionVariables = {

@ -24,7 +24,7 @@ in
config = mkIf cfg.enable {
environment = {
systemPackages = with pkgs; [
tailscale-systray
nur.repos.tboerger.tailscale-systray
];
};
@ -38,7 +38,7 @@ in
};
Service = {
ExecStartPre = "${pkgs.coreutils-full}/bin/sleep 5";
ExecStart = "${pkgs.tailscale-systray}/bin/tailscale-systray";
ExecStart = "${pkgs.nur.repos.tboerger.tailscale-systray}/bin/tailscale-systray";
};
};
};