steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'pr/bump-t480s-work' into 'master'

Browse source 
Pr/bump t480s work

See merge request steveeJ/infra!62
This commit is contained in:
steveej 2020-11-22 20:26:07 +00:00
commit 3815d111fc
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nix/home-manager/configuration/graphical-fullblown.nix
View file

@ -133,6 +133,8 @@ in {
# (builtins.fetchurl { url ="https://patch-diff.githubusercontent.com/raw/kubernetes/minikube/pull/2517.diff"; }) # (builtins.fetchurl { url ="https://patch-diff.githubusercontent.com/raw/kubernetes/minikube/pull/2517.diff"; })
# ]; # ];
# })) # }))
appimage-run
# Remote Control Tools # Remote Control Tools
remmina remmina
@ -267,7 +269,7 @@ in {
python38Packages.binwalk python38Packages.binwalk
gptfdisk gptfdisk
gparted gparted
smartmontools
## Android ## Android
androidenv.androidPkgs_9_0.platform-tools androidenv.androidPkgs_9_0.platform-tools
@ -312,5 +314,7 @@ in {
screenkey screenkey
# shotcut # shotcut
# openshot-qt # openshot-qt
ledger-live-desktop
]); ]);
} }

3
nix/os/devices/steveej-laptop/system.nix
View file

@ -31,9 +31,6 @@ in {
enable = true; enable = true;
drivers = with pkgs; [ drivers = with pkgs; [
hplip hplip
cups-kyodialog3
mfcj6510dwlpr
mfcj6510dw-cupswrapper
]; ];
}; };

5
nix/os/devices/steveej-t480s-work/system.nix
View file

@ -32,9 +32,6 @@ in {
enable = true; enable = true;
drivers = with pkgs; [ drivers = with pkgs; [
hplip hplip
cups-kyodialog3
mfcj6510dwlpr
mfcj6510dw-cupswrapper
mfcl3770cdw.driver mfcl3770cdw.driver
mfcl3770cdw.cupswrapper mfcl3770cdw.cupswrapper
]; ];
@ -138,4 +135,6 @@ in {
} }
''; '';
}; };
hardware.ledger.enable = true;
} }

8
nix/os/devices/steveej-t480s-work/versions.nix
View file

@ -2,7 +2,7 @@ let
nixpkgs = { nixpkgs = {
url = "https://github.com/NixOS/nixpkgs/"; url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-20.09"; ref = "nixos-20.09";
rev = "13d0c311e3ae923a00f734b43fd1d35b47d8943a"; rev = "58f9c4c7d3a42c912362ca68577162e38ea8edfb";
}; };
in in
@ -15,16 +15,16 @@ in
"channels-nixos-unstable" = { "channels-nixos-unstable" = {
url = "https://github.com/NixOS/nixpkgs/"; url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-unstable"; ref = "nixos-unstable";
rev = "1dc37370c489b610f8b91d7fdd40633163ffbafd"; rev = "2deeb58f49480f468adca6b08291322de4dbce6b";
}; };
"nixpkgs-master" = { "nixpkgs-master" = {
url = "https://github.com/NixOS/nixpkgs/"; url = "https://github.com/NixOS/nixpkgs/";
ref = "master"; ref = "master";
rev = "3d04e9a779a3ca28230e0e8f3c4310264960e979"; rev = "c81c3c3daff4a96980da2fce2d80a9e57f9db953";
}; };
"home-manager-module" = { "home-manager-module" = {
url = "https://github.com/nix-community/home-manager"; url = "https://github.com/nix-community/home-manager";
ref = "release-20.09"; ref = "release-20.09";
rev = "abaebf3b346c4bef500c5bd2fdebbed109261a0c"; rev = "63f299b3347aea183fc5088e4d6c4a193b334a41";
}; };
} }