From 5b2a8031c2ed94765829c29c7d8646601e537bf4 Mon Sep 17 00:00:00 2001 From: Artur Manuel Date: Sat, 8 Feb 2025 22:24:28 +0000 Subject: [PATCH] chore(emergency): commit everything to prepare for a reinstall What happened? My system OOM'd, and now my entire system is broken. I have to reinstall *everything*. --- flake.lock | 62 +++++++++++++------------- hosts/shared/support.nix | 5 +++ lib/default.nix | 3 ++ overlays/derivations/nu/cfg/config.nu | 7 +-- overlays/derivations/xonsh/default.nix | 6 +-- 5 files changed, 46 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index ec9b10b..49369ba 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1738695322, - "narHash": "sha256-YF3xLERHt3hwzUg+d6SL634sE5Q65Nam7V1SwTlqxH8=", + "lastModified": 1739040445, + "narHash": "sha256-GY24J4kpdrQlM9Ba5oCPKF8oJnwzic/lnY/0A+NtIJE=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "888cff8a6485296ae11cec13cc6f989f9c39aa23", + "rev": "a4c58e0ac0aaf1fb4e81e2c00df9c6bfd65eed6c", "type": "github" }, "original": { @@ -28,11 +28,11 @@ "nixpkgs": ["nixpkgs"] }, "locked": { - "lastModified": 1738148035, - "narHash": "sha256-KYOATYEwaKysL3HdHdS5kbQMXvzS4iPJzJrML+3TKAo=", + "lastModified": 1738765162, + "narHash": "sha256-3Z40qHaFScWUCVQrGc4Y+RdoPsh1R/wIh+AN4cTXP0I=", "owner": "nix-community", "repo": "disko", - "rev": "18d0a984cc2bc82cf61df19523a34ad463aa7f54", + "rev": "ff3568858c54bd306e9e1f2886f0f781df307dff", "type": "github" }, "original": { @@ -66,11 +66,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1738477724, - "narHash": "sha256-S1x0F7q9cJ6EEmZsakse2Ps6Adi7NadxRtGiuWUlwT0=", + "lastModified": 1738823732, + "narHash": "sha256-1NnSYno8qRN5zBF7xhaOn1WmC52qKBh7tEuRaDRFuMs=", "owner": "nix-community", "repo": "fenix", - "rev": "1936bb37b1d8597273e3611873dc09dd61b09818", + "rev": "17bbc481e3d0cb52a605dd9316043c66ceaa17d7", "type": "github" }, "original": { @@ -226,11 +226,11 @@ "nixpkgs": ["chaotic", "nixpkgs"] }, "locked": { - "lastModified": 1738448366, - "narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=", + "lastModified": 1738841109, + "narHash": "sha256-sEgE3nifaRU5gfAx33ds0tx/j+qM0/5/bHopv/w6c0c=", "owner": "nix-community", "repo": "home-manager", - "rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93", + "rev": "f99c704fe3a4cf8d72b2d568ec80bc38be1a9407", "type": "github" }, "original": { @@ -245,11 +245,11 @@ "nixpkgs": ["chaotic", "nixpkgs"] }, "locked": { - "lastModified": 1738478597, - "narHash": "sha256-it7lc+HRSQiLV+3CcA+c6fkr2355HyT2GGUowHdfa/E=", + "lastModified": 1738656811, + "narHash": "sha256-z7Dzz713ueSQJYSdsWcH+D7o2pbq/sAl7/nBxru5oNA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "77fb0818cb42ca0db98839d47bbc6a317c286282", + "rev": "cd9caf9afb1c8fe848f140a7831fe462b73df91a", "type": "github" }, "original": { @@ -314,11 +314,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738546358, - "narHash": "sha256-nLivjIygCiqLp5QcL7l56Tca/elVqM9FG1hGd9ZSsrg=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6e957d81b96751a3d5967a0fd73694f303cc914", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { @@ -374,11 +374,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1738546358, - "narHash": "sha256-nLivjIygCiqLp5QcL7l56Tca/elVqM9FG1hGd9ZSsrg=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c6e957d81b96751a3d5967a0fd73694f303cc914", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { @@ -615,11 +615,11 @@ "nvf": "nvf" }, "locked": { - "lastModified": 1738465927, - "narHash": "sha256-HWfSQMxa4Cpxyo44cY3Y4OzsBu4etaeejsENUjUHUss=", + "lastModified": 1739046151, + "narHash": "sha256-yZRCxrl0mLMGYbMQoyIfflc3+Hkyp0AarPZf37KJAq4=", "ref": "master", - "rev": "841cddc0a522974439fe3332233ff334b7309e96", - "revCount": 21, + "rev": "85f8fee5951302f2cbe4f25c61789586ca01b208", + "revCount": 22, "type": "git", "url": "https://codeberg.org/amadaluzia/painless-neovim.git" }, @@ -3343,11 +3343,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1738433753, - "narHash": "sha256-lyhEsEf5FQzV+KHVkfxIApMOFWHqyls5+llcQ/uhV6Y=", + "lastModified": 1738754241, + "narHash": "sha256-hiw8wVE2tTrLPtIz1xSbJ3eEXCOx729kRq7UpMRTaU0=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "88b901878e684e4f68f104fdbc48749f41bcccd3", + "rev": "ca47cddc31ae76a05e8709ed4aec805c5ef741d3", "type": "github" }, "original": { @@ -3444,11 +3444,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1738663128, - "narHash": "sha256-k+lXb31oXWD2Sc8/+F4Tw9IAOEvi14e3hnx/hpBSbcE=", + "lastModified": 1738760685, + "narHash": "sha256-S62Of2CyRhY62U5z/apIGLpFqh8gSXoXjY33CWbgRaU=", "owner": "notashelf", "repo": "wallpkgs", - "rev": "6b0d216132199fa58808fde281117c1fcd892e98", + "rev": "d5a23d13d469da55af20477b028b7b4391e7f7e5", "type": "github" }, "original": { diff --git a/hosts/shared/support.nix b/hosts/shared/support.nix index c5fa3e5..c16be64 100644 --- a/hosts/shared/support.nix +++ b/hosts/shared/support.nix @@ -1,6 +1,7 @@ { config, lib, + pkgs, ... }: let cfg = config.alqueva.support; @@ -15,6 +16,10 @@ in { xdgOpenUsePortal = true; }; + environment.systemPackages = [ + pkgs.wl-clipboard + ]; + environment.sessionVariables = { "NIXOS_OZONE_WL" = "1"; "QT_QPA_PLATFORM" = "wayland"; diff --git a/lib/default.nix b/lib/default.nix index 0a02007..a3ce64c 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -37,6 +37,9 @@ inputs.self.overlays.default ]; networking.hostName = host; + systemd.oomd = { + enableRootSlice = true; + }; }; }) ]; diff --git a/overlays/derivations/nu/cfg/config.nu b/overlays/derivations/nu/cfg/config.nu index 99ab510..e671b14 100644 --- a/overlays/derivations/nu/cfg/config.nu +++ b/overlays/derivations/nu/cfg/config.nu @@ -17,8 +17,8 @@ # You can remove these comments if you want or leave # them for future reference. -# alias the built-in ls command to ls-builtin -alias ls-builtin = ls +# Alias the built-in ls command to `ls!`, I like to pretend it's like the Nix/Haskell prime. +alias ls! = ls # List the filenames, sizes, and modification times of items in a directory. def ls [ @@ -33,7 +33,7 @@ def ls [ ...pattern: glob, # The glob pattern to use. ]: [ nothing -> table ] { let pattern = if ($pattern | is-empty) { [ '.' ] } else { $pattern } - (ls-builtin + (ls! --all=$all --long=$long --short-names=$short_names @@ -47,6 +47,7 @@ def ls [ } alias nos = nh os +alias e = ^$env.EDITOR mkdir ($nu.data-dir | path join "vendor/autoload") starship init nu | save -f ($nu.data-dir | path join "vendor/autoload/starship.nu") diff --git a/overlays/derivations/xonsh/default.nix b/overlays/derivations/xonsh/default.nix index 9d31917..8a4752d 100644 --- a/overlays/derivations/xonsh/default.nix +++ b/overlays/derivations/xonsh/default.nix @@ -11,10 +11,10 @@ packageOverrides = pyprev: _pyfinal: { custom-xonsh = pyprev.xonsh.overrideAttrs (finalAttrs: { src = fetchFromGitHub { - owner = "amadaluzia"; + owner = "xonsh"; repo = finalAttrs.pname; - rev = "configurable-xonsh-dirs"; - hash = "sha256-ynKPzw2MAp7wVXKHA8vZulJ+O9pJ+tvVc1c0wzlZICQ="; + rev = "0292b43e64c72ef16a75128d6346ce7d3b316d66"; + hash = "sha256-kCtn8ujD0UahOLxtV9DD81awOYl6xirgnBoW/ywZxs0="; }; }); };