diff --git a/flake.nix b/flake.nix index 16c6ecb..e261392 100644 --- a/flake.nix +++ b/flake.nix @@ -67,7 +67,7 @@ #, bud , nixos , home - #, nixos-hardware + , nixos-hardware #, nur #, agenix #, nvfetcher @@ -133,13 +133,11 @@ }; imports = [ (digga.lib.importHosts ./hosts) ]; - hosts = { - /* set host specific properties here */ - NixOS = { }; - }; + hosts = { }; importables = rec { profiles = (digga.lib.rakeLeaves ./profiles) // { users = digga.lib.rakeLeaves ./users; + nixos-hardware = nixos-hardware.nixosModules; }; suites = with profiles; { base = [ cachix core users.root ]; diff --git a/hosts/lungmen.nix b/hosts/lungmen.nix index 7ea7e91..54d671b 100644 --- a/hosts/lungmen.nix +++ b/hosts/lungmen.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, modulesPath, suites, ... }: +{ config, lib, pkgs, modulesPath, suites, profiles, ... }: let btrfsPartPath = "/dev/disk/by-label/NIXOS"; btrfsOptions = [ "compress-force=zstd" "noatime" ]; @@ -35,7 +35,7 @@ in imports = suites.base ++ suites.work ++ [ ../profiles/network/networkmanager (modulesPath + "/installer/scan/not-detected.nix") - ]; + ] ++ (with profiles.nixos-hardware; [ common-pc-ssd common-pc common-gpu-amd common-cpu-amd ]); boot = { loader = { diff --git a/overlays/vscode-wayland.nix b/overlays/vscode-wayland.nix index 2ddbb53..1ef9a46 100644 --- a/overlays/vscode-wayland.nix +++ b/overlays/vscode-wayland.nix @@ -6,7 +6,7 @@ let let flags = [ "--flag-switches-begin" - "--enable-features=UseOzonePlatform,WebRTCPipeWireCapturer,IgnoreGPUBlocklist,Vulkan" + "--enable-features=UseOzonePlatform,WebRTCPipeWireCapturer,IgnoreGPUBlocklist" "--flag-switches-end" "--ozone-platform=wayland" "--enable-webrtc-pipewire-capturer" @@ -37,15 +37,15 @@ in version = pkgs.vscode.version; nativeBuildInputs = [ pkgs.makeWrapper ]; - phases = [ "installPhase" "fixupPhase" ]; + phases = [ "installPhase" /*"fixupPhase"*/ ]; installPhase = '' mkdir -p $out/bin install -m755 ${vscodeWayland}/bin/${pname}-wayland $out/bin/${pname} cp -r ${desktop}/share $out/share ''; - fixupPhase = '' + /*fixupPhase = '' 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 ])} + '';*/ }); } diff --git a/profiles/core/default.nix b/profiles/core/default.nix index ec060c0..3e0e1cf 100644 --- a/profiles/core/default.nix +++ b/profiles/core/default.nix @@ -41,6 +41,7 @@ in utillinux whois bat + fzf exa git lm_sensors @@ -122,9 +123,11 @@ in myip = "${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 nixos-option = "nixos-option -I nixpkgs=${self}/lib/compat"; @@ -182,10 +185,10 @@ in users.mutableUsers = false; # For rage encryption, all hosts need a ssh key pair - services.openssh = { + /*services.openssh = { enable = true; openFirewall = lib.mkDefault false; - }; + };*/ services.earlyoom.enable = true; }