diff --git a/flake.lock b/flake.lock index ef9a668..36b12ba 100644 --- a/flake.lock +++ b/flake.lock @@ -1,30 +1,44 @@ { "nodes": { - "emacs-overlay": { + "deploy-rs": { "inputs": { - "nixpkgs": [ - "me-emacs", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs", + "utils": "utils" }, "locked": { - "lastModified": 1737825153, - "narHash": "sha256-R1p2ZXOydII+MT/SpeOXBjo/dgfD/gIArge2YAgSw38=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "4ebe4c890e7c8662ae31192359a56b0505cf10ba", + "lastModified": 1749105467, + "narHash": "sha256-hXh76y/wDl15almBcqvjryB50B0BaiXJKk20f314RoE=", + "owner": "serokell", + "repo": "deploy-rs", + "rev": "6bc76b872374845ba9d645a2f012b764fecd765f", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "emacs-overlay", + "owner": "serokell", + "repo": "deploy-rs", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", "type": "github" } }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -42,7 +56,25 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, @@ -80,11 +112,11 @@ ] }, "locked": { - "lastModified": 1741701235, - "narHash": "sha256-gBlb8R9gnjUAT5XabJeel3C2iEUiBHx3+91651y3Sqo=", + "lastModified": 1750304462, + "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=", "owner": "nix-community", "repo": "home-manager", - "rev": "c630dfa8abcc65984cc1e47fb25d4552c81dd37e", + "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c", "type": "github" }, "original": { @@ -121,7 +153,7 @@ "narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=", "rev": "b90bf629bbd835e61f1317b99e12f8c831017006", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006" }, "original": { "type": "tarball", @@ -130,18 +162,17 @@ }, "me-emacs": { "inputs": { - "emacs-overlay": "emacs-overlay", "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1741880390, - "narHash": "sha256-SbgthgZFaVOu/olUzvSIKANuldn/CBnWsSyTJ1sxaAM=", + "lastModified": 1742486781, + "narHash": "sha256-Q0JINFp8mtpkbvODO2arZJUONfXhYBu8O4oGqUjso2A=", "ref": "refs/heads/master", - "rev": "91e2a5430d24f0f7077dd43b75262f5616b87e3d", - "revCount": 73, + "rev": "14454885f19e63584cc3ce557e97488541f15883", + "revCount": 77, "type": "git", "url": "https://git.syzygial.cc/Syzygial/EmacsConfig.git" }, @@ -150,6 +181,28 @@ "url": "https://git.syzygial.cc/Syzygial/EmacsConfig.git" } }, + "microvm": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "nixpkgs" + ], + "spectrum": "spectrum" + }, + "locked": { + "lastModified": 1750358184, + "narHash": "sha256-17EYMeY5v8KRk9HW6Z4dExY8Wg4y/zM2eM2wbbx+vMs=", + "owner": "astro", + "repo": "microvm.nix", + "rev": "fd9f5dba1ffee5ad6f29394b2a9e4c66c1ce77dc", + "type": "github" + }, + "original": { + "owner": "astro", + "repo": "microvm.nix", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -157,11 +210,11 @@ ] }, "locked": { - "lastModified": 1741229100, - "narHash": "sha256-0HwrTDXp9buEwal/1ymK9uQmzUD5ozIA7CJGqnT/gLs=", + "lastModified": 1750325256, + "narHash": "sha256-vvlxGz/waqJ3TGqM/iqXbnEc7/R1qnEXmaBiPaQ1RE0=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "adf5c88ba1fe21af5c083b4d655004431f20c5ab", + "rev": "0d71cbf88d63e938b37b85b3bf8b238bcf7b39b9", "type": "github" }, "original": { @@ -173,11 +226,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741513245, - "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", + "lastModified": 1743014863, + "narHash": "sha256-jAIUqsiN2r3hCuHji80U7NNEafpIMBXiwKlSrjWMlpg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", + "rev": "bd3bac8bfb542dbde7ffffb6987a1a1f9d41699f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1750134718, + "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", "type": "github" }, "original": { @@ -187,29 +256,13 @@ "type": "github" } }, - "nixpkgs-stable": { + "nixpkgs_3": { "locked": { - "lastModified": 1737672001, - "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1731763621, - "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c69a9bffbecde46b4b939465422ddc59493d3e4d", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "type": "github" }, "original": { @@ -221,24 +274,26 @@ }, "root": { "inputs": { + "deploy-rs": "deploy-rs", "home-manager": "home-manager", "lix-module": "lix-module", "me-emacs": "me-emacs", + "microvm": "microvm", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "sops-nix": "sops-nix" } }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1741644481, - "narHash": "sha256-E0RrMykMtEv15V3QhpsFutgoSKhL1JBhidn+iZajOyg=", + "lastModified": 1750119275, + "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e653d71e82575a43fe9d228def8eddb73887b866", + "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2", "type": "github" }, "original": { @@ -247,6 +302,22 @@ "type": "github" } }, + "spectrum": { + "flake": false, + "locked": { + "lastModified": 1746869549, + "narHash": "sha256-BKZ/yZO/qeLKh9YqVkKB6wJiDQJAZNN5rk5NsMImsWs=", + "ref": "refs/heads/main", + "rev": "d927e78530892ec8ed389e8fae5f38abee00ad87", + "revCount": 862, + "type": "git", + "url": "https://spectrum-os.org/git/spectrum" + }, + "original": { + "type": "git", + "url": "https://spectrum-os.org/git/spectrum" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -276,6 +347,54 @@ "repo": "default", "type": "github" } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 281ee87..6cd2372 100644 --- a/flake.nix +++ b/flake.nix @@ -12,9 +12,12 @@ url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; }; + microvm.url = "github:astro/microvm.nix"; + microvm.inputs.nixpkgs.follows = "nixpkgs"; + deploy-rs.url = "github:serokell/deploy-rs"; }; - outputs = { self, nixpkgs, sops-nix, me-emacs, nix-darwin, home-manager, lix-module }@inputs: let + outputs = { self, nixpkgs, sops-nix, me-emacs, nix-darwin, home-manager, lix-module, microvm, deploy-rs }@inputs: let overlays = import ./overlays/default.nix inputs; modules = import ./modules/default.nix inputs; @@ -60,7 +63,16 @@ overlays.emacs ]) modules.sops - lix-module.nixosModules.default + # Broken w/ this nixpkgs input + # lix-module.nixosModules.default + ]; + }; + pericyte = nixosSystem' { + modules = [ + ./machines/pericyte/configuration.nix + modules.sops + #lix-module.nixosModules.default + microvm.nixosModules.host ]; }; }; @@ -91,6 +103,21 @@ }; }; + deploy = { + nodes = { + pericyte = { + hostname = "opcp"; + sshUser = "root"; + profiles.system = { + user = "root"; + path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.pericyte; + }; + }; + }; + }; + # This is highly advised, and will prevent many possible mistakes + checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib; + hydraJobs = { inherit (me-emacs) packages; }; diff --git a/machines/pericyte/configuration.nix b/machines/pericyte/configuration.nix new file mode 100644 index 0000000..1aec683 --- /dev/null +++ b/machines/pericyte/configuration.nix @@ -0,0 +1,30 @@ +{ pkgs, inputs, ... }: { + imports = [ + ./hardware-configuration.nix + "${inputs.nixpkgs}/nixos/modules/profiles/headless.nix" + "${inputs.nixpkgs}/nixos/modules/profiles/minimal.nix" + + ./podman.nix + ./container-registry.nix + ./test.nix + # ./microvm-configuration.nix + # ./k3s.nix + ]; + + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + + environment.systemPackages = with pkgs; [ + git + btop + tmux + oci-cli + ]; + + boot.tmp.cleanOnBoot = true; + # zramSwap.enable = true; + networking.hostName = "pericyte"; + networking.domain = ""; + services.openssh.enable = true; + users.users.root.openssh.authorizedKeys.keys = [''ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOaNNSV/wurGA8D7bT+WX4UlHdKqd9SFfVXvSalvHag5qYDPUIsGGkqSNj1dcong9qxrC8y7G7ybWhwRKTKXInXrq6EO4JkVkCSbVqrq8gIv66upsKltvmf0esiOdrpRgHoiup8JKaX93aUT27rykReT39mFwkJZDoD4ViNiK7QmbgDC/9pyGDSJykreSnBoxtczox8Zi+pwN8XMI4nRVdV9hppXMpj38/O3Qaq+oXdHJ2MVNy9D+TqxYofstFbzpJpEb2xA4QYnq/VVJFk8VaZlg3qxelwBJ1GNZO8TMkLA+6b07D3aISyEIQAONviNktPwRPiw903hsDyeKDunDx ssh-key-2025-03-31'' ]; + system.stateVersion = "25.05"; +} diff --git a/machines/pericyte/container-registry.nix b/machines/pericyte/container-registry.nix new file mode 100644 index 0000000..85f7a82 --- /dev/null +++ b/machines/pericyte/container-registry.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: { + services.dockerRegistry = { + enable = true; + package = pkgs.distribution; + }; +} diff --git a/machines/pericyte/hardware-configuration.nix b/machines/pericyte/hardware-configuration.nix new file mode 100644 index 0000000..1ca17dd --- /dev/null +++ b/machines/pericyte/hardware-configuration.nix @@ -0,0 +1,18 @@ +{ modulesPath, ... }: +{ + imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; + boot.loader.grub = { + efiSupport = true; + efiInstallAsRemovable = true; + device = "nodev"; + }; + fileSystems."/boot" = { device = "/dev/disk/by-uuid/FCE4-1F46"; fsType = "vfat"; }; + fileSystems."/" = { device = "/dev/sda1"; fsType = "ext4"; }; + swapDevices = [ + { + device = "/swapfile"; + } + ]; + boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ]; + boot.initrd.kernelModules = [ "nvme" ]; +} diff --git a/machines/pericyte/k3s.nix b/machines/pericyte/k3s.nix new file mode 100644 index 0000000..e8e8508 --- /dev/null +++ b/machines/pericyte/k3s.nix @@ -0,0 +1,19 @@ +{ pkgs, ... }: { + networking.firewall = { + allowedTCPPorts = [ + 6443 # k3s: required so that pods can reach the API server (running on port 6443 by default) + # 2379 # k3s, etcd clients: required if using a "High Availability Embedded etcd" configuration + # 2380 # k3s, etcd peers: required if using a "High Availability Embedded etcd" configuration + ]; + allowedUDPPorts = [ + # 8472 # k3s, flannel: required if using multi-node for inter-node networking + ]; + }; + services.k3s = { + enable = true; + role = "server"; + extraFlags = toString [ + # "--debug" # Optionally add additional args to k3s + ]; + }; +} diff --git a/machines/pericyte/microvm-configuration.nix b/machines/pericyte/microvm-configuration.nix new file mode 100644 index 0000000..ba993fc --- /dev/null +++ b/machines/pericyte/microvm-configuration.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: { + microvm.autostart = [ + "vm-starbot" + "vm-starbot-dev" + ]; +} diff --git a/machines/pericyte/podman.nix b/machines/pericyte/podman.nix new file mode 100644 index 0000000..a23a625 --- /dev/null +++ b/machines/pericyte/podman.nix @@ -0,0 +1,21 @@ +{ pkgs, ... }: { + # Enable common container config files in /etc/containers + virtualisation.containers.enable = true; + virtualisation = { + podman = { + enable = true; + + # Required for containers under podman-compose to be able to talk to each other. + defaultNetwork.settings.dns_enabled = true; + }; + }; + + # Useful other development tools + environment.systemPackages = with pkgs; [ + dive # look into docker image layers + skopeo # Inspect images + podlet # create quadlets (systemd units) + podman-tui # status of containers in the terminal + podman-compose # start group of containers for dev + ]; +} diff --git a/machines/pericyte/test.nix b/machines/pericyte/test.nix new file mode 100644 index 0000000..82f4603 --- /dev/null +++ b/machines/pericyte/test.nix @@ -0,0 +1,32 @@ +{ pkgs, ... }: { + users.groups.peertube = { }; + users.users.peertube = { + isSystemUser = true; + group = "peertube"; + home = "/var/lib/peertube"; + createHome = true; + uid = 2342; + subUidRanges = [ + { + count = 65536; + startUid = 2147483646; + } + ]; + subGidRanges = [ + { + count = 65536; + startGid = 2147483647; + } + ]; + }; + virtualisation.oci-containers = { + backend = "podman"; + # containers.peertube = { + # image = "chocobozzz/peertube:latest"; + # ports = [ ]; + # podman = { + # user = "peertube"; + # }; + # }; + }; +} diff --git a/machines/universeair/configuration.nix b/machines/universeair/configuration.nix index 668ab89..104c437 100644 --- a/machines/universeair/configuration.nix +++ b/machines/universeair/configuration.nix @@ -3,7 +3,7 @@ in { imports = [ # Install Apps Detactable by Spotlight - ./app-fix.nix + # ./app-fix.nix # Tiling Window Manager ./yabai.nix # Shortcuts babe, not Automator @@ -13,6 +13,10 @@ in nixpkgs.config.allowUnfree = true; # nix.package = pkgs.nixUnstable; nix.settings.auto-optimise-store = false; + nix.settings.trusted-users = [ + "root" + "universelaptop" + ]; users.users.universelaptop = { name = "universelaptop"; @@ -55,7 +59,9 @@ in services.emacs = { # Emacsclient behaving weirdly # enable = true; - package = pkgs.me-emacs; + package = pkgs.me-emacs.override { + withNativeCompilation = false; + }; }; environment.variables = { @@ -140,7 +146,10 @@ in ]; environment.systemPackages = (with pkgs; [ - me-emacs + (me-emacs.override { + withNativeCompilation = false; + }) + svgbob (aspellWithDicts (p: with p;[ en en-computers diff --git a/machines/universeair/libresprite_TODO_PR.nix b/machines/universeair/libresprite_TODO_PR.nix new file mode 100644 index 0000000..222963f --- /dev/null +++ b/machines/universeair/libresprite_TODO_PR.nix @@ -0,0 +1,18 @@ + (libresprite.overrideAttrs (old: { + src = pkgs.fetchFromGitHub { + owner = "LibreSprite"; + repo = "LibreSprite"; + rev = "c99d3666b17ff731824e3eccc79cf3ec48564ad5"; + fetchSubmodules = true; + sha256 = "sha256-mdMdHQvl6Mt0oisZ4c/Wk6dvklq3Iyz05brbFxSIaj0="; + }; + patches = []; + buildInputs = old.buildInputs ++ (with pkgs; [ + libarchive + tinyxml-2 + ]); + postPatch = '' + sed -i -e 's/if(''${CMAKE_SYSTEM_NAME} MATCHES "Darwin")/if(FALSE)/' CMakeLists.txt + ''; + meta.broken = false; + })) diff --git a/machines/universeair/skhd.nix b/machines/universeair/skhd.nix index a5b508f..a6ee379 100644 --- a/machines/universeair/skhd.nix +++ b/machines/universeair/skhd.nix @@ -2,7 +2,7 @@ services.skhd = { enable = true; skhdConfig = '' - cmd + shift - e : open '${pkgs.me-emacs}/Applications/Emacs.app' + cmd + shift - e : open '${(pkgs.me-emacs.override {withNativeCompilation = false;})}/Applications/Emacs.app' cmd + shift + ctrl - e : kitty -d ~ -1 ''; }; diff --git a/machines/universedesktop/desktop/dwm.nix b/machines/universedesktop/desktop/dwm.nix index 54395be..4a8a007 100644 --- a/machines/universedesktop/desktop/dwm.nix +++ b/machines/universedesktop/desktop/dwm.nix @@ -2,11 +2,7 @@ nixpkgs.overlays = [ (final: prev: { st = prev.st.override { - conf = builtins.readFile (pkgs.substituteAll { - src = ./dwm/st-config.def.h; - env = { - }; - }); + conf = builtins.readFile (pkgs.replaceVars ./dwm/st-config.def.h {}); }; }) ]; @@ -18,21 +14,18 @@ emacsclient --create-frame --alternate-editor="" ''; in pkgs.dwm.override { - conf = pkgs.substituteAll { - src = ./dwm/config.h; - env = { - dmenucmd="${pkgs.dmenu}/bin/dmenu_run"; - termcmd="${pkgs.st}/bin/st"; - editcmd="${launch_emacs}"; - playcmd=pkgs.writeScript "playerctl-play-pause" '' - #!${pkgs.bash}/bin/bash - ${pkgs.playerctl}/bin/playerctl play-pause - ''; - scrncmd=pkgs.writeScript "screenshot-region" '' - #!${pkgs.bash}/bin/bash - ${pkgs.maim}/bin/maim -o -s | ${pkgs.xclip}/bin/xclip -sel clip -t image/png - ''; - }; + conf = pkgs.replaceVars ./dwm/config.h { + dmenucmd="${pkgs.dmenu}/bin/dmenu_run"; + termcmd="${pkgs.st}/bin/st"; + editcmd="${launch_emacs}"; + playcmd=pkgs.writeScript "playerctl-play-pause" '' + #!${pkgs.bash}/bin/bash + ${pkgs.playerctl}/bin/playerctl play-pause + ''; + scrncmd=pkgs.writeScript "screenshot-region" '' + #!${pkgs.bash}/bin/bash + ${pkgs.maim}/bin/maim -o -s | ${pkgs.xclip}/bin/xclip -sel clip -t image/png + ''; }; patches = [ ./dwm/fullscreen.patch @@ -56,5 +49,6 @@ dmenu xclip pwvucontrol + st ]; } diff --git a/machines/universedesktop/desktop/graphics.nix b/machines/universedesktop/desktop/graphics.nix index 05b9ca0..fa6c7d8 100644 --- a/machines/universedesktop/desktop/graphics.nix +++ b/machines/universedesktop/desktop/graphics.nix @@ -9,7 +9,7 @@ powerManagement.finegrained = false; nvidiaSettings = true; open = true; - #package = config.boot.kernelPackages.nvidiaPackages.beta; + # package = config.boot.kernelPackages.nvidiaPackages.vulkan_beta; #package = let # rcu_patch = pkgs.fetchpatch { # url = "https://github.com/gentoo/gentoo/raw/c64caf53/x11-drivers/nvidia-drivers/files/nvidia-drivers-470.223.02-gpl-pfn_valid.patch"; diff --git a/machines/universedesktop/programs/desktop.nix b/machines/universedesktop/programs/desktop.nix index e9081a3..c928652 100644 --- a/machines/universedesktop/programs/desktop.nix +++ b/machines/universedesktop/programs/desktop.nix @@ -24,9 +24,7 @@ nextcloud-client libsForQt5.kdeconnect-kde - vesktop - slack - signal-desktop + discord zoom-us anki diff --git a/machines/universedesktop/programs/office.nix b/machines/universedesktop/programs/office.nix index f92c791..0f16524 100644 --- a/machines/universedesktop/programs/office.nix +++ b/machines/universedesktop/programs/office.nix @@ -1,6 +1,6 @@ { lib, config, pkgs, ... }: { environment.systemPackages = with pkgs; [ - me-emacs + emacs texlive.combined.scheme-full pandoc libreoffice-qt