dusk/ark
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nixos-hardware, better mn

Browse Source
This commit is contained in:
dusk 2021-08-22 20:54:38 +03:00
parent e1595e9161
commit 325c86fe06
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.nix
View File

@ -67,7 +67,7 @@
#, bud #, bud
, nixos , nixos
, home , home
#, nixos-hardware , nixos-hardware
#, nur #, nur
#, agenix #, agenix
#, nvfetcher #, nvfetcher
@ -133,13 +133,11 @@
}; };
imports = [ (digga.lib.importHosts ./hosts) ]; imports = [ (digga.lib.importHosts ./hosts) ];
hosts = { hosts = { };
/* set host specific properties here */
NixOS = { };
};
importables = rec { importables = rec {
profiles = (digga.lib.rakeLeaves ./profiles) // { profiles = (digga.lib.rakeLeaves ./profiles) // {
users = digga.lib.rakeLeaves ./users; users = digga.lib.rakeLeaves ./users;
nixos-hardware = nixos-hardware.nixosModules;
}; };
suites = with profiles; { suites = with profiles; {
base = [ cachix core users.root ]; base = [ cachix core users.root ];

4
hosts/lungmen.nix
View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, modulesPath, suites, ... }: { config, lib, pkgs, modulesPath, suites, profiles, ... }:
let let
btrfsPartPath = "/dev/disk/by-label/NIXOS"; btrfsPartPath = "/dev/disk/by-label/NIXOS";
btrfsOptions = [ "compress-force=zstd" "noatime" ]; btrfsOptions = [ "compress-force=zstd" "noatime" ];
@ -35,7 +35,7 @@ in
imports = suites.base ++ suites.work ++ [ imports = suites.base ++ suites.work ++ [
../profiles/network/networkmanager ../profiles/network/networkmanager
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ] ++ (with profiles.nixos-hardware; [ common-pc-ssd common-pc common-gpu-amd common-cpu-amd ]);
boot = { boot = {
loader = { loader = {

10
overlays/vscode-wayland.nix
View File

@ -6,7 +6,7 @@ let
let let
flags = [ flags = [
"--flag-switches-begin" "--flag-switches-begin"
"--enable-features=UseOzonePlatform,WebRTCPipeWireCapturer,IgnoreGPUBlocklist,Vulkan" "--enable-features=UseOzonePlatform,WebRTCPipeWireCapturer,IgnoreGPUBlocklist"
"--flag-switches-end" "--flag-switches-end"
"--ozone-platform=wayland" "--ozone-platform=wayland"
"--enable-webrtc-pipewire-capturer" "--enable-webrtc-pipewire-capturer"
@ -37,15 +37,15 @@ in
version = pkgs.vscode.version; version = pkgs.vscode.version;
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.makeWrapper ];
phases = [ "installPhase" "fixupPhase" ]; phases = [ "installPhase" /*"fixupPhase"*/ ];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
install -m755 ${vscodeWayland}/bin/${pname}-wayland $out/bin/${pname} install -m755 ${vscodeWayland}/bin/${pname}-wayland $out/bin/${pname}
cp -r ${desktop}/share $out/share cp -r ${desktop}/share $out/share
''; '';
fixupPhase = '' /*fixupPhase = ''
wrapProgram $out/bin/${pname} \ wrapProgram $out/bin/${pname} \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath (with pkgs; [ vulkan-loader vulkan-extension-layer libGL ])} --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath (with pkgs; [ vulkan-loader vulkan-extension-layer libGL ])}
''; '';*/
}); });
} }

13
profiles/core/default.nix
View File

@ -41,6 +41,7 @@ in
utillinux utillinux
whois whois
bat bat
fzf
exa exa
git git
lm_sensors lm_sensors
@ -122,9 +123,11 @@ in
myip = myip =
"${pkgs.dnsutils}/bin/dig +short myip.opendns.com @208.67.222.222 2>&1"; "${pkgs.dnsutils}/bin/dig +short myip.opendns.com @208.67.222.222 2>&1";
mn = ''
manix "" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | sk --preview="manix '{}'" | xargs manix mn =
''; let manix_preview = "manix '{}' | sed 's/type: /> type: /g' | bat -l Markdown --color=always --plain"; in
''manix "" | rg '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | sk --preview="${manix_preview}" | xargs manix'';
# fix nixos-option # fix nixos-option
nixos-option = "nixos-option -I nixpkgs=${self}/lib/compat"; nixos-option = "nixos-option -I nixpkgs=${self}/lib/compat";
@ -182,10 +185,10 @@ in
users.mutableUsers = false; users.mutableUsers = false;
# For rage encryption, all hosts need a ssh key pair # For rage encryption, all hosts need a ssh key pair
services.openssh = { /*services.openssh = {
enable = true; enable = true;
openFirewall = lib.mkDefault false; openFirewall = lib.mkDefault false;
}; };*/
services.earlyoom.enable = true; services.earlyoom.enable = true;
} }