From e5ca6feefffe0e38edc4105e8e18a75ce8612367 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Sat, 26 Feb 2022 01:21:29 +0100 Subject: [PATCH] Testing new packages (for `pbp`) --- .github/workflows/release.yml | 4 +- bud/default.nix | 10 - bud/get.bash | 1 - flake.lock | 354 +++++++--------------------- flake.nix | 36 +-- hosts/hs/default.nix | 2 - hosts/pbp/configuration.nix | 5 +- hosts/pbp/default.nix | 2 - hosts/pc/configuration.nix | 2 +- hosts/pc/default.nix | 2 - overlays/manix.nix | 5 - pkgs/_sources/generated.nix | 16 -- pkgs/default.nix | 2 +- pkgs/sources.toml | 4 - profiles/cachix/aciceri-fleet.nix | 6 +- profiles/cachix/arm.nix | 6 +- profiles/cachix/default.nix | 2 +- profiles/cachix/haskell.nix | 6 +- profiles/cachix/nix-community.nix | 6 +- profiles/cachix/nixpkgs-wayland.nix | 6 +- profiles/cachix/nrdxp.nix | 6 +- profiles/core/default.nix | 13 +- profiles/dbus/default.nix | 2 +- profiles/qmk-udev/default.nix | 3 + shell/default.nix | 4 +- shell/devos.nix | 12 +- users/ccr/default.nix | 6 +- users/profiles/blender/default.nix | 2 +- users/profiles/cura/default.nix | 7 +- users/profiles/emacs/default.nix | 6 +- users/profiles/qmk/default.nix | 6 +- users/profiles/vscode/default.nix | 3 + 32 files changed, 152 insertions(+), 395 deletions(-) delete mode 100644 bud/default.nix delete mode 100644 bud/get.bash delete mode 100644 overlays/manix.nix delete mode 100644 pkgs/_sources/generated.nix delete mode 100644 pkgs/sources.toml create mode 100644 profiles/qmk-udev/default.nix diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e35399a..8843eae 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,8 +33,8 @@ jobs: with: name: aciceri-fleet authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" - - run: nix -Lv develop -c bud build pc pcBootstrapIso - - run: nix -Lv develop -c bud build hs hsBootstrapIso + # - run: nix -Lv develop -c bud build pc pcBootstrapIso + # - run: nix -Lv develop -c bud build hs hsBootstrapIso - uses: marvinpinto/action-automatic-releases@latest with: repo_token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/bud/default.nix b/bud/default.nix deleted file mode 100644 index c486636..0000000 --- a/bud/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ pkgs, lib, budUtils, ... }: { - bud.cmds = with pkgs; { - get = { - writer = budUtils.writeBashWithPaths [ nixUnstable git coreutils ]; - synopsis = "get [DEST]"; - help = "Copy the desired template to DEST"; - script = ./get.bash; - }; - }; -} diff --git a/bud/get.bash b/bud/get.bash deleted file mode 100644 index 3b4d9a7..0000000 --- a/bud/get.bash +++ /dev/null @@ -1 +0,0 @@ -nix flake new -t "github:divnix/devos/core" "${2:-devos}" diff --git a/flake.lock b/flake.lock index 12ff349..c8d6ad6 100644 --- a/flake.lock +++ b/flake.lock @@ -1,25 +1,5 @@ { "nodes": { - "beautysh": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "poetry2nix": "poetry2nix" - }, - "locked": { - "lastModified": 1630693543, - "narHash": "sha256-7Sly3ReaJZw60Qo0rpfN4jF6zy94nwQz6ENgUUFzJfg=", - "owner": "lovesegfault", - "repo": "beautysh", - "rev": "5609593961b70428f58d5c1b4b25cdda43b0d0bd", - "type": "github" - }, - "original": { - "owner": "lovesegfault", - "repo": "beautysh", - "type": "github" - } - }, "blank": { "locked": { "lastModified": 1625557891, @@ -35,31 +15,6 @@ "type": "github" } }, - "bud": { - "inputs": { - "beautysh": "beautysh", - "devshell": [ - "digga", - "devshell" - ], - "nixpkgs": [ - "unstable" - ] - }, - "locked": { - "lastModified": 1640836100, - "narHash": "sha256-My9Lay6BCDwAZgrL4SuVXHkYPHIU7ypnuiS/pd7eg1M=", - "owner": "divnix", - "repo": "bud", - "rev": "b1d8ab3970f4dfb5fb90d7d8a9ab493c75d031fc", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "bud", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -67,11 +22,11 @@ ] }, "locked": { - "lastModified": 1641152326, - "narHash": "sha256-yQXzXrjrilGzBjC+2kZVPZRgBPSdCLovSLmJ7Na7EDo=", + "lastModified": 1645293039, + "narHash": "sha256-PwdDu+SkX8dreeuJ/4av1sEluNZdrpdXv8JsRKKg1Yc=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "15635ae63878b83598a18ae421e8c819b691dc55", + "rev": "1df878b6f8351795a3bebfbe4fd2d02e1e8b29d6", "type": "github" }, "original": { @@ -83,7 +38,10 @@ "deploy": { "inputs": { "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_3", + "nixpkgs": [ + "digga", + "latest" + ], "utils": "utils" }, "locked": { @@ -120,7 +78,7 @@ "blank": "blank", "deploy": "deploy", "devshell": "devshell", - "flake-utils": "flake-utils_3", + "flake-compat": "flake-compat_2", "flake-utils-plus": "flake-utils-plus", "home-manager": [ "unstable" @@ -135,11 +93,11 @@ ] }, "locked": { - "lastModified": 1641574422, - "narHash": "sha256-Xqv1S59sClwoTcCLGOTtA1voSaHYmrseV3cc8FddF/A=", + "lastModified": 1646514950, + "narHash": "sha256-mlpCjnpwACmQ8qisIMep20likgT0anOjuo+3aVMFtnE=", "owner": "divnix", "repo": "digga", - "rev": "fca1df3dcdb78531772baf801b79e01489280864", + "rev": "8b88f511dbef2af60c95f9202b45c0b20795b58c", "type": "github" }, "original": { @@ -150,11 +108,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1641638682, - "narHash": "sha256-vD5iIMRFMsHiimXDgUjb0Oh7L+ekfoahqP0sZToI0CU=", + "lastModified": 1646818969, + "narHash": "sha256-35Ymee1xFKYgGSvpteI0ZT+Fc8qPygYleCy3vyeXj2w=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "aff3bc2b1626b05207cd37076c113712af4ca32d", + "rev": "55a555f10b76f1e632a429dc6b9d10b81fa86023", "type": "github" }, "original": { @@ -179,13 +137,45 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1641205782, + "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1641205782, + "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "owner": "numtide", "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { @@ -196,67 +186,22 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils_4" + "flake-utils": "flake-utils" }, "locked": { - "lastModified": 1638994888, - "narHash": "sha256-iz/ynGNZlvqKCOnFrEKqGA+BVKGQMG+g2JT+e3OOLN8=", - "owner": "divnix", + "lastModified": 1639385028, + "narHash": "sha256-oqorKz3mwf7UuDJwlbCEYCB2LfcWLL0DkeCWhRIL820=", + "owner": "gytis-ivaskevicius", "repo": "flake-utils-plus", - "rev": "b4f9f517574cb7bd6ee3f19c72c19634c9f536e1", + "rev": "be1be083af014720c14f3b574f57b6173b4915d0", "type": "github" }, "original": { - "owner": "divnix", + "owner": "gytis-ivaskevicius", "repo": "flake-utils-plus", "type": "github" } }, - "flake-utils_2": { - "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home": { "inputs": { "nixpkgs": [ @@ -264,11 +209,11 @@ ] }, "locked": { - "lastModified": 1639871969, - "narHash": "sha256-6feWUnMygRzA9tzkrfAzpA5/NBYg75bkFxnqb1DtD7E=", + "lastModified": 1643933536, + "narHash": "sha256-yRmsWAG4DnLxLIUtlaZsl0kH7rN5xSoyNRlf0YZrcH4=", "owner": "nix-community", "repo": "home-manager", - "rev": "697cc8c68ed6a606296efbbe9614c32537078756", + "rev": "2860d7e3bb350f18f7477858f3513f9798896831", "type": "github" }, "original": { @@ -296,11 +241,11 @@ }, "nixlib": { "locked": { - "lastModified": 1641083655, - "narHash": "sha256-S4lNc3fb9UpYgVtTa/mZZXphq7+xGy74YGIlOWB1ceE=", + "lastModified": 1641688481, + "narHash": "sha256-6L+EU12xLDHby7y8elgFtRKVBxix+7qV8DhVgXqrKZo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "a07deba0302ca942aca4440a43efb3b4bbba2baf", + "rev": "f697717b3d3a074ffc16c8c8227504f0db292886", "type": "github" }, "original": { @@ -311,10 +256,8 @@ }, "nixos": { "locked": { - "lastModified": 1632257251, "narHash": "sha256-obk4aD7DmB0yyKsw1tL8Pd1WQLFp/arZETIIMKTVx+E=", "path": "/nix/store/r4y8hrjiix7zj2m2jgn2bjiqj2hd4rd4-source", - "rev": "12f3f58f48d4a610d8c4eb9feacbf13fc50c779d", "type": "path" }, "original": { @@ -325,7 +268,10 @@ "nixos-generators": { "inputs": { "nixlib": "nixlib", - "nixpkgs": "nixpkgs_4" + "nixpkgs": [ + "digga", + "blank" + ] }, "locked": { "lastModified": 1637655461, @@ -343,11 +289,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1640686209, - "narHash": "sha256-6glXUlKRDhEhNuYx6r3fXU6KH2/Vq9mJZjB9oUpwrmc=", + "lastModified": 1646751686, + "narHash": "sha256-hnHZ2qaXVIm05+1EqWNg/yaaeTTNR8TPd7jaOM/DNZA=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "46df95ca81e7e4cf3458cdb4b7d1714b5fce9da5", + "rev": "c730530902842de8968fe234b6e0833fa669d466", "type": "github" }, "original": { @@ -356,37 +302,22 @@ "type": "github" } }, - "nixpkgs": { - "locked": { - "lastModified": 1641608739, - "narHash": "sha256-8kpW/lv3Cw/hta6YS+XiTw8DNN0TzcFXtdn6ZmrxI9w=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "85a078a25d7d41d805ef5fb3e90af7476d5fefd4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-wayland": { "inputs": { "cachix": [ "unstable" ], + "flake-compat": "flake-compat_3", "nixpkgs": [ "unstable" ] }, "locked": { - "lastModified": 1641651076, - "narHash": "sha256-SI8mRbZTqW9/lpXPb6F3B03y4Kk/XyNaSvyevSxXmas=", + "lastModified": 1646813742, + "narHash": "sha256-Tv9O9Ip2dA4zSuQaFcV08QPuipP5gVZOqfJejJ5n9/8=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "6cf380957b9d46834b3e84b41e33d87388ba1aab", + "rev": "85bc72b1ffe2651c7d271c65b42d34f832d381e6", "type": "github" }, "original": { @@ -395,60 +326,13 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1641653154, - "narHash": "sha256-uK01fq171uQcmelzvJl/Qa1sKvMolZuix+oTogS5iiA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3045dd2aef0d801a1f79e940b7d2a004bcc75cd3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1641577433, - "narHash": "sha256-T7lS8vpbC3dgtrkb2ueC9HWaX4RYUwdP7IEttnvKQ8Y=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "568e0bc498ee51fdd88e1e94089de05f2fdbd18b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1641577433, - "narHash": "sha256-T7lS8vpbC3dgtrkb2ueC9HWaX4RYUwdP7IEttnvKQ8Y=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "568e0bc498ee51fdd88e1e94089de05f2fdbd18b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "locked": { - "lastModified": 1641645925, - "narHash": "sha256-fT9nNkG97KPMMhXAfQtOG35y8nfMPnDwIeAI2TUSa0I=", + "lastModified": 1646821226, + "narHash": "sha256-CjeiKHCqwWGJ1hec4Z5GsUTKOswEIDWdpJZq5lbX0FU=", "owner": "nix-community", "repo": "NUR", - "rev": "238917d0de4175d1349bbbff1246c1ff05cf9a80", + "rev": "000ff96f578e82c8c0357157fcecf359acc4798e", "type": "github" }, "original": { @@ -457,91 +341,25 @@ "type": "github" } }, - "nvfetcher": { - "inputs": { - "flake-compat": [ - "digga", - "deploy", - "flake-compat" - ], - "flake-utils": [ - "digga", - "flake-utils-plus", - "flake-utils" - ], - "nixpkgs": [ - "unstable" - ] - }, - "locked": { - "lastModified": 1641502098, - "narHash": "sha256-WDFR9Mztr7hs5XLSnXpOtbZ8SNqUTNdIIgJ3yDliBiY=", - "owner": "berberman", - "repo": "nvfetcher", - "rev": "ebbb3e9c8d0f97795088b6195a0ffff8cab533ab", - "type": "github" - }, - "original": { - "owner": "berberman", - "repo": "nvfetcher", - "type": "github" - } - }, "pinebook-pro": { "flake": false, "locked": { - "lastModified": 1630789867, - "narHash": "sha256-4dTNjvFFI7XODv3vW7Vg+rXx6VU2NMnxhh3HT3dKVq8=", + "lastModified": 1645407638, + "narHash": "sha256-6iQBfyhQaPLDapPo5ZhLu8fYjlpbG/eB0wqjzYGMzZ4=", "owner": "samueldr", "repo": "wip-pinebook-pro", - "rev": "7df87f4f3baecccba79807c291b3bbd62ac61e0f", + "rev": "995a6859f3eb4d740dbc086150dee8f98175a3b6", "type": "github" }, "original": { "owner": "samueldr", "repo": "wip-pinebook-pro", - "rev": "7df87f4f3baecccba79807c291b3bbd62ac61e0f", - "type": "github" - } - }, - "pinebook-pro-kernel-latest": { - "locked": { - "lastModified": 1620803068, - "narHash": "sha256-o4TpuMFs/OoSmssDNyLFwGn+84odwQDfQCHYJxblv6w=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "755db9a1e9a35c185f7d6c0463025e94ef44622e", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "755db9a1e9a35c185f7d6c0463025e94ef44622e", - "type": "github" - } - }, - "poetry2nix": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1625240517, - "narHash": "sha256-2E1gaOP+bCplhf3kliVQWK5N1NV2h06mkJk2KTiRTJQ=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "e40e8ed0e8c11e709e4c8c7c20174facd265a021", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "poetry2nix", + "rev": "995a6859f3eb4d740dbc086150dee8f98175a3b6", "type": "github" } }, "root": { "inputs": { - "bud": "bud", "darwin": "darwin", "deploy": [ "digga", @@ -554,20 +372,18 @@ "nixos-hardware": "nixos-hardware", "nixpkgs-wayland": "nixpkgs-wayland", "nur": "nur", - "nvfetcher": "nvfetcher", "pinebook-pro": "pinebook-pro", - "pinebook-pro-kernel-latest": "pinebook-pro-kernel-latest", "stable": "stable", "unstable": "unstable" } }, "stable": { "locked": { - "lastModified": 1641643358, - "narHash": "sha256-9NfLuqmbml3qr43NkLrJftzHmqvSARuJ8feapM6Ern8=", + "lastModified": 1646813037, + "narHash": "sha256-oEc4qfgYaEmo76odve3xzOu3LgU11Qv+Vf5n/gFmR60=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9a0ff8e080633b00f66059f29d1d1e97b6bb2976", + "rev": "056010084ef1f48710a26df902d3a52106e4aaf2", "type": "github" }, "original": { @@ -579,11 +395,11 @@ }, "unstable": { "locked": { - "lastModified": 1641528457, - "narHash": "sha256-FyU9E63n1W7Ql4pMnhW2/rO9OftWZ37pLppn/c1aisY=", + "lastModified": 1646497237, + "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ff377a78794d412a35245e05428c8f95fef3951f", + "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index af949b0..0786d05 100644 --- a/flake.nix +++ b/flake.nix @@ -13,10 +13,6 @@ digga.inputs.nixlib.follows = "stable"; digga.inputs.home-manager.follows = "unstable"; - bud.url = "github:divnix/bud"; - bud.inputs.nixpkgs.follows = "unstable"; - bud.inputs.devshell.follows = "digga/devshell"; - home.url = "github:nix-community/home-manager/release-21.11"; home.inputs.nixpkgs.follows = "unstable"; @@ -25,20 +21,15 @@ deploy.follows = "digga/deploy"; - nvfetcher.url = "github:berberman/nvfetcher"; - nvfetcher.inputs.nixpkgs.follows = "unstable"; - nvfetcher.inputs.flake-compat.follows = "digga/deploy/flake-compat"; - nvfetcher.inputs.flake-utils.follows = "digga/flake-utils-plus/flake-utils"; - emacs-overlay.url = github:nix-community/emacs-overlay; nixos-hardware.url = "github:nixos/nixos-hardware"; pinebook-pro = { - url = "github:samueldr/wip-pinebook-pro/7df87f4f3baecccba79807c291b3bbd62ac61e0f"; + url = "github:samueldr/wip-pinebook-pro/995a6859f3eb4d740dbc086150dee8f98175a3b6"; flake = false; }; - pinebook-pro-kernel-latest.url = github:nixos/nixpkgs/755db9a1e9a35c185f7d6c0463025e94ef44622e; + # pinebook-pro-kernel-latest.url = github:nixos/nixpkgs/755db9a1e9a35c185f7d6c0463025e94ef44622e; nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; nixpkgs-wayland.inputs.nixpkgs.follows = "unstable"; @@ -48,17 +39,15 @@ outputs = { self , digga - , bud , nixos , home , nixos-hardware , darwin , pinebook-pro - , pinebook-pro-kernel-latest + # , pinebook-pro-kernel-latest , nixpkgs-wayland , emacs-overlay , nur - , nvfetcher , deploy , ... } @ inputs: @@ -74,7 +63,6 @@ commonOverlays = [ nur.overlay emacs-overlay.overlay - nvfetcher.overlay deploy.overlay #nixpkgs-wayland.overlay ./pkgs/default.nix @@ -115,7 +103,6 @@ digga.nixosModules.bootstrapIso digga.nixosModules.nixConfig home.nixosModules.home-manager - bud.nixosModules.bud ]; }; hosts = { @@ -130,6 +117,7 @@ }; pbp = { system = "aarch64-linux"; + channelName = "stable"; imports = [{ modules = ./hosts/pbp; }]; modules = [ "${pinebook-pro}/pinebook_pro.nix" @@ -144,15 +132,6 @@ suites = with profiles; rec { base = [ core users.ccr users.root ]; }; - pbpKernelLatest = ( - import pinebook-pro-kernel-latest { - system = "aarch64-linux"; - overlays = [ - (import "${pinebook-pro}/overlay.nix") - ]; - config.allowUnfree = true; - } - ).pkgs.linuxPackages_pinebookpro_latest; }; }; @@ -179,15 +158,8 @@ homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations; deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { }; - - defaultTemplate = self.templates.bud; - templates.bud.path = ./.; - templates.bud.description = "bud template"; - } // { - budModules = { devos = import ./bud; }; - # checks.aarch64-linux = { }; # ga-uncomment # checks.x86_64-darwin = { }; # ga-uncomment # packages.x86_64-darwin = { }; # ga-uncomment diff --git a/hosts/hs/default.nix b/hosts/hs/default.nix index 9f55f75..0418194 100644 --- a/hosts/hs/default.nix +++ b/hosts/hs/default.nix @@ -4,6 +4,4 @@ ./configuration.nix ] ++ suites.base; - bud.enable = true; - bud.localFlakeClone = "/home/ccr/fleet"; } diff --git a/hosts/pbp/configuration.nix b/hosts/pbp/configuration.nix index 33fde87..1fdbf6a 100644 --- a/hosts/pbp/configuration.nix +++ b/hosts/pbp/configuration.nix @@ -1,12 +1,11 @@ -{ config, lib, pkgs, profiles, pbpKernelLatest, ... }: +{ config, lib, pkgs, profiles, ... }: { imports = with profiles; [ mount-nas sshd dbus avahi printing xdg syncthing ]; boot = { initrd.availableKernelModules = [ "usbhid" ]; - kernelPackages = pbpKernelLatest; - kernelModules = [ ]; + kernelPackages = pkgs.linuxPackages_latest; extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; diff --git a/hosts/pbp/default.nix b/hosts/pbp/default.nix index c160bfa..0418194 100644 --- a/hosts/pbp/default.nix +++ b/hosts/pbp/default.nix @@ -4,6 +4,4 @@ ./configuration.nix ] ++ suites.base; - bud.enable = false; - bud.localFlakeClone = "/home/ccr/fleet"; } diff --git a/hosts/pc/configuration.nix b/hosts/pc/configuration.nix index c5a534c..acc6492 100644 --- a/hosts/pc/configuration.nix +++ b/hosts/pc/configuration.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, profiles, ... }: { - imports = with profiles; [ mount-nas sshd dbus avahi printing xdg docker adb syncthing ]; + imports = with profiles; [ mount-nas sshd dbus avahi printing xdg docker adb syncthing qmk-udev ]; boot = { initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; diff --git a/hosts/pc/default.nix b/hosts/pc/default.nix index 9f55f75..0418194 100644 --- a/hosts/pc/default.nix +++ b/hosts/pc/default.nix @@ -4,6 +4,4 @@ ./configuration.nix ] ++ suites.base; - bud.enable = true; - bud.localFlakeClone = "/home/ccr/fleet"; } diff --git a/overlays/manix.nix b/overlays/manix.nix deleted file mode 100644 index d39baa7..0000000 --- a/overlays/manix.nix +++ /dev/null @@ -1,5 +0,0 @@ -final: prev: { - manix = prev.manix.overrideAttrs (o: rec{ - inherit (prev.sources.manix) pname version src; - }); -} diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix deleted file mode 100644 index 71be396..0000000 --- a/pkgs/_sources/generated.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was generated by nvfetcher, please do not modify it manually. -{ fetchgit, fetchurl }: -{ - manix = { - pname = "manix"; - version = "d08e7ca185445b929f097f8bfb1243a8ef3e10e4"; - src = fetchgit { - url = "https://github.com/mlvzk/manix"; - rev = "d08e7ca185445b929f097f8bfb1243a8ef3e10e4"; - fetchSubmodules = false; - deepClone = false; - leaveDotGit = false; - sha256 = "1b7xi8c2drbwzfz70czddc4j33s7g1alirv12dwl91hbqxifx8qs"; - }; - }; -} diff --git a/pkgs/default.nix b/pkgs/default.nix index 52dfcdb..42811cc 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,6 +1,6 @@ final: prev: { # keep sources this first - sources = prev.callPackage (import ./_sources/generated.nix) { }; + # sources = prev.callPackage (import ./_sources/generated.nix) { }; customEmacs = prev.callPackage (import ./emacs) { }; amule = prev.callPackage (import ./amule) { }; # then, call packages with `final.callPackage` diff --git a/pkgs/sources.toml b/pkgs/sources.toml deleted file mode 100644 index f7af168..0000000 --- a/pkgs/sources.toml +++ /dev/null @@ -1,4 +0,0 @@ -# nvfetcher.toml -[manix] -src.git = "https://github.com/mlvzk/manix" -fetch.github = "mlvzk/manix" diff --git a/profiles/cachix/aciceri-fleet.nix b/profiles/cachix/aciceri-fleet.nix index bc00051..c9d850e 100644 --- a/profiles/cachix/aciceri-fleet.nix +++ b/profiles/cachix/aciceri-fleet.nix @@ -1,9 +1,9 @@ { - nix = { - binaryCaches = [ + nix.settings = { + substituters = [ "https://aciceri-fleet.cachix.org" ]; - binaryCachePublicKeys = [ + trusted-public-keys = [ "aciceri-fleet.cachix.org-1:WiHJIK4UFTdfvWx0lG3mCR4EddyYsRhIuMGSje3/YGI=" ]; }; diff --git a/profiles/cachix/arm.nix b/profiles/cachix/arm.nix index 5f2f128..185e4fd 100644 --- a/profiles/cachix/arm.nix +++ b/profiles/cachix/arm.nix @@ -1,9 +1,9 @@ { - nix = { - binaryCaches = [ + nix.settings = { + substituters = [ "https://arm.cachix.org" ]; - binaryCachePublicKeys = [ + trusted-public-keys = [ "arm.cachix.org-1:K3XjAeWPgWkFtSS9ge5LJSLw3xgnNqyOaG7MDecmTQ8=" ]; }; diff --git a/profiles/cachix/default.nix b/profiles/cachix/default.nix index d88a3f7..26ca2ca 100644 --- a/profiles/cachix/default.nix +++ b/profiles/cachix/default.nix @@ -7,5 +7,5 @@ let in { inherit imports; - nix.binaryCaches = [ "https://cache.nixos.org/" ]; + nix.settings.substituters = [ "https://cache.nixos.org/" ]; } diff --git a/profiles/cachix/haskell.nix b/profiles/cachix/haskell.nix index 99b570a..6abb4f3 100644 --- a/profiles/cachix/haskell.nix +++ b/profiles/cachix/haskell.nix @@ -1,9 +1,9 @@ { - nix = { - binaryCaches = [ + nix.settings = { + substituters = [ "https://hydra.iohk.io" ]; - binaryCachePublicKeys = [ + trusted-public-keys = [ "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" ]; }; diff --git a/profiles/cachix/nix-community.nix b/profiles/cachix/nix-community.nix index 7e4be28..3c957fc 100644 --- a/profiles/cachix/nix-community.nix +++ b/profiles/cachix/nix-community.nix @@ -1,9 +1,9 @@ { - nix = { - binaryCaches = [ + nix.settings = { + substituters = [ "https://nix-community.cachix.org" ]; - binaryCachePublicKeys = [ + trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ]; }; diff --git a/profiles/cachix/nixpkgs-wayland.nix b/profiles/cachix/nixpkgs-wayland.nix index aa84dce..141ad05 100644 --- a/profiles/cachix/nixpkgs-wayland.nix +++ b/profiles/cachix/nixpkgs-wayland.nix @@ -1,9 +1,9 @@ { - nix = { - binaryCaches = [ + nix.settings = { + substituters = [ "https://nixpkgs-wayland.cachix.org" ]; - binaryCachePublicKeys = [ + trusted-public-keys = [ "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA=" ]; }; diff --git a/profiles/cachix/nrdxp.nix b/profiles/cachix/nrdxp.nix index bb3b4a5..ddced9c 100644 --- a/profiles/cachix/nrdxp.nix +++ b/profiles/cachix/nrdxp.nix @@ -1,9 +1,9 @@ { - nix = { - binaryCaches = [ + nix.settings = { + substituters = [ "https://nrdxp.cachix.org" ]; - binaryCachePublicKeys = [ + trusted-public-keys = [ "nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4=" ]; }; diff --git a/profiles/core/default.nix b/profiles/core/default.nix index b63820f..1ced4b5 100644 --- a/profiles/core/default.nix +++ b/profiles/core/default.nix @@ -5,8 +5,6 @@ in { imports = [ ../cachix ]; - nix.systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; - environment = { systemPackages = with pkgs; [ @@ -52,12 +50,15 @@ in ]; nix = { - autoOptimiseStore = true; gc.automatic = true; optimise.automatic = true; - useSandbox = true; - allowedUsers = [ "@wheel" ]; - trustedUsers = [ "root" "@wheel" ]; + settings = { + sandbox = true; + trusted-users = [ "root" "@wheel" ]; + allowed-users = [ "@wheel" ]; + system-features = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; + auto-optimise-store = true; + }; extraOptions = '' min-free = 536870912 keep-outputs = true diff --git a/profiles/dbus/default.nix b/profiles/dbus/default.nix index 605602d..f1d7d01 100644 --- a/profiles/dbus/default.nix +++ b/profiles/dbus/default.nix @@ -1,5 +1,5 @@ { pkgs, ... }: { - services.dbus.packages = with pkgs; [ gnome3.dconf ]; + services.dbus.packages = with pkgs; [ dconf ]; programs.dconf.enable = true; } diff --git a/profiles/qmk-udev/default.nix b/profiles/qmk-udev/default.nix new file mode 100644 index 0000000..f995ceb --- /dev/null +++ b/profiles/qmk-udev/default.nix @@ -0,0 +1,3 @@ +{ pkgs, ... }: { + services.udev.packages = [ pkgs.qmk-udev-rules ]; +} diff --git a/shell/default.nix b/shell/default.nix index d022db7..743107e 100644 --- a/shell/default.nix +++ b/shell/default.nix @@ -1,8 +1,6 @@ { self, inputs, ... }: { - exportedModules = with inputs; [ - bud.devshellModules.bud - ]; + modules = [ ./devos.nix ]; diff --git a/shell/devos.nix b/shell/devos.nix index be31a75..5a14674 100644 --- a/shell/devos.nix +++ b/shell/devos.nix @@ -38,12 +38,12 @@ in commands = with pkgs; [ (devos nixUnstable) - { - category = "devos"; - name = nvfetcher-bin.pname; - help = nvfetcher-bin.meta.description; - command = "cd $DEVSHELL_ROOT/pkgs; ${pkgs.nvfetcher-bin}/bin/nvfetcher -c ./sources.toml --no-output $@"; - } + # { + # category = "devos"; + # name = nvfetcher-bin.pname; + # help = nvfetcher-bin.meta.description; + # command = "cd $DEVSHELL_ROOT/pkgs; ${pkgs.nvfetcher-bin}/bin/nvfetcher -c ./sources.toml --no-output $@"; + # } (linter nixpkgs-fmt) (linter editorconfig-checker) # (docs python3Packages.grip) too many deps diff --git a/users/ccr/default.nix b/users/ccr/default.nix index c0a6bcd..7867f48 100644 --- a/users/ccr/default.nix +++ b/users/ccr/default.nix @@ -23,11 +23,13 @@ python39Packages.poetry texlive.combined.scheme-full gphoto2 - digikam rawtherapee deploy-rs.deploy-rs ] ++ - (if !stdenv.hostPlatform.isAarch64 then [ wineWowPackages.full ] else [ ]) + (if !stdenv.hostPlatform.isAarch64 then [ + wineWowPackages.full + #digikam # broken + ] else [ ]) else [ ]); }; diff --git a/users/profiles/blender/default.nix b/users/profiles/blender/default.nix index 1f43e6b..2aeb55b 100644 --- a/users/profiles/blender/default.nix +++ b/users/profiles/blender/default.nix @@ -4,7 +4,7 @@ openscad ] ++ (if !stdenv.hostPlatform.isAarch64 then [ blender - freecad + # freecad ] else [ ]); } diff --git a/users/profiles/cura/default.nix b/users/profiles/cura/default.nix index ca54120..6b6ac0b 100644 --- a/users/profiles/cura/default.nix +++ b/users/profiles/cura/default.nix @@ -1,8 +1,9 @@ { pkgs, ... }: { - home.packages = with pkgs; [ - cura - ]; + home.packages = with pkgs; [ ] ++ + (if !stdenv.hostPlatform.isAarch64 then [ + cura # cura is currently broken on aarch64 + ] else [ ]); home.sessionVariables = { QT_QPA_PLATFORM = "xcb"; }; diff --git a/users/profiles/emacs/default.nix b/users/profiles/emacs/default.nix index 9f99716..d600153 100644 --- a/users/profiles/emacs/default.nix +++ b/users/profiles/emacs/default.nix @@ -7,7 +7,7 @@ }; programs.emacs = { - enable = true; + enable = !pkgs.stdenv.hostPlatform.isDarwin; package = pkgs.customEmacs; }; @@ -35,7 +35,7 @@ }; in with pkgs; [ - ag + silver-searcher fd graphviz-nox hunspell @@ -56,7 +56,7 @@ comment = "Org protocol"; desktopName = "org-protocol"; type = "Application"; - mimeType = "x-scheme-handler/org-protocol"; + mimeTypes = [ "x-scheme-handler/org-protocol" ]; } ) ] ++ (if pkgs.system == "x86_64-linux" then [ diff --git a/users/profiles/qmk/default.nix b/users/profiles/qmk/default.nix index 887ddbc..bf09352 100644 --- a/users/profiles/qmk/default.nix +++ b/users/profiles/qmk/default.nix @@ -1,5 +1,9 @@ { pkgs, ... }: with pkgs; { - home.packages = [ qmk ]; + home.packages = [ + gnumake + qmk + vial + ]; } diff --git a/users/profiles/vscode/default.nix b/users/profiles/vscode/default.nix index a7cc608..3bcc7c1 100644 --- a/users/profiles/vscode/default.nix +++ b/users/profiles/vscode/default.nix @@ -18,6 +18,9 @@ "window"."menuBarVisibility" = "classic"; "[nix]"."editor.tabSize" = 2; "nix"."enableLanguageServer" = true; + "github.copilot.enable" = { + "*" = true; + }; }; extensions = with pkgs.vscode-extensions; [ eamodio.gitlens