pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

b12f restructure #1

Merged
teutat3s merged 218 commits from b12f into main 2020-11-24 18:27:01 +00:00
Conversation 0 Commits 218 Files changed 87 +402 -255
21 changed files with 402 additions and 255 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 87e48217d0 - Show all commits

1
.drone.yml
View file

@ -67,7 +67,6 @@ steps:
image: plugins/matrix image: plugins/matrix
when: when:
status: status:
- success
- failure - failure
event: event:
- cron - cron

1
bud/get.bash
View file

@ -1 +0,0 @@
nix flake new -t "github:divnix/devos/main" "${2:-devos}"

403
flake.lock
View file

@ -3,15 +3,15 @@
"agenix": { "agenix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"latest" "nixos"
] ]
}, },
"locked": { "locked": {
"lastModified": 1631896269, "lastModified": 1640802000,
"narHash": "sha256-DAyCxJ8JacayOzGgGSfzrn7ghtsfL/EsCyk1NEUaAR8=", "narHash": "sha256-ZiI94Zv/IgW64fqKrtVaQqfUCkn9STvAjgfFmvtqcQ8=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "daf1d773989ac5d949aeef03fce0fe27e583dbca", "rev": "c5558c88b2941bf94886dfdede6926b1ba5f5629",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -44,10 +44,7 @@
"beautysh": { "beautysh": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": "nixpkgs",
"bud",
"nixpkgs"
],
"poetry2nix": "poetry2nix" "poetry2nix": "poetry2nix"
}, },
"locked": { "locked": {
@ -91,11 +88,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1633877936, "lastModified": 1640836100,
"narHash": "sha256-+o3n6s7fR8dBGRldTGelyp2j3jSyTlrniOXwNfmMG20=", "narHash": "sha256-My9Lay6BCDwAZgrL4SuVXHkYPHIU7ypnuiS/pd7eg1M=",
"owner": "divnix", "owner": "divnix",
"repo": "bud", "repo": "bud",
"rev": "15df091133ff95216c321b09be04905c0a0944c4", "rev": "b1d8ab3970f4dfb5fb90d7d8a9ab493c75d031fc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -107,15 +104,15 @@
"darwin": { "darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"latest" "nixos"
] ]
}, },
"locked": { "locked": {
"lastModified": 1631730143, "lastModified": 1641152326,
"narHash": "sha256-A8PaUyZu5WVp+IojG5q+39rjf5x57OFDYmVoDFPZLlY=", "narHash": "sha256-yQXzXrjrilGzBjC+2kZVPZRgBPSdCLovSLmJ7Na7EDo=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "e1a3f7292f085fd588d11f94ed0f47968c16df0c", "rev": "15635ae63878b83598a18ae421e8c819b691dc55",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -126,37 +123,34 @@
}, },
"deploy": { "deploy": {
"inputs": { "inputs": {
"fenix": "fenix",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"nixpkgs": [ "nixpkgs": [
"digga", "nixos"
"latest"
], ],
"utils": [ "utils": "utils"
"digga",
"flake-utils"
]
}, },
"locked": { "locked": {
"lastModified": 1632822684, "lastModified": 1639771334,
"narHash": "sha256-lt7eayYmgsD5OQwpb1XYfHpxttn43bWo7G7hIJs+zJw=", "narHash": "sha256-4hgZmsCPaL5QlcEijHmzaYYrEwHtUFqraCUrCqLGJOo=",
"owner": "serokell", "owner": "input-output-hk",
"repo": "deploy-rs", "repo": "deploy-rs",
"rev": "9a02de4373e0ec272d08a417b269a28ac8b961b4", "rev": "7267eab9139ca4476fd8ed49e2e8652bba4c037f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "serokell", "owner": "input-output-hk",
"repo": "deploy-rs", "repo": "deploy-rs",
"type": "github" "type": "github"
} }
}, },
"devshell": { "devshell": {
"locked": { "locked": {
"lastModified": 1632436039, "lastModified": 1637575296,
"narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=", "narHash": "sha256-ZY8YR5u8aglZPe27+AJMnPTG6645WuavB+w0xmhTarw=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "7a7a7aa0adebe5488e5abaec688fd9ae0f8ea9c6", "rev": "0e56ef21ba1a717169953122c7415fa6a8cd2618",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -168,7 +162,9 @@
"digga": { "digga": {
"inputs": { "inputs": {
"blank": "blank", "blank": "blank",
"deploy": "deploy", "deploy": [
"deploy"
],
"devshell": "devshell", "devshell": "devshell",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"flake-utils-plus": "flake-utils-plus", "flake-utils-plus": "flake-utils-plus",
@ -176,7 +172,6 @@
"home" "home"
], ],
"latest": "latest", "latest": "latest",
"nix": "nix",
"nixlib": [ "nixlib": [
"nixos" "nixos"
], ],
@ -186,11 +181,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1632959483, "lastModified": 1641238104,
"narHash": "sha256-jXogai6e+QRtiZFBOrMmYdeLXejzVT91kuDKu2RuJ10=", "narHash": "sha256-L+a+YEQ8DpX94qv/8/AhRRC+J7PcIdqWfH1i4Dd2gZI=",
"owner": "divnix", "owner": "divnix",
"repo": "digga", "repo": "digga",
"rev": "6549cf4c87d1a77138cbecbc6bb9483c20572cd7", "rev": "feeddc0a1bce63ec73938e390ee0971f6b39462b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -199,6 +194,25 @@
"type": "github" "type": "github"
} }
}, },
"fenix": {
"inputs": {
"nixpkgs": "nixpkgs_2",
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1639117493,
"narHash": "sha256-67H9uXUdauaqMfkcKzpgHR3GeOKPAwOs6G3C1VpT67o=",
"owner": "nix-community",
"repo": "fenix",
"rev": "94b5686cad2ed210da106b0b7e1e212dab43fbf2",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -215,6 +229,22 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1627913399,
"narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1623875721, "lastModified": 1623875721,
@ -232,17 +262,14 @@
}, },
"flake-utils-plus": { "flake-utils-plus": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": "flake-utils_3"
"digga",
"flake-utils"
]
}, },
"locked": { "locked": {
"lastModified": 1630859749, "lastModified": 1638994888,
"narHash": "sha256-qkoU2rIbbP2+T0dfcqXW35GCWNsi0Y1IgN9BELmt4Zo=", "narHash": "sha256-iz/ynGNZlvqKCOnFrEKqGA+BVKGQMG+g2JT+e3OOLN8=",
"owner": "divnix", "owner": "divnix",
"repo": "flake-utils-plus", "repo": "flake-utils-plus",
"rev": "a4e267e3fc87e60c5029c6c3855935ff1ff3018e", "rev": "b4f9f517574cb7bd6ee3f19c72c19634c9f536e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -253,11 +280,11 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"locked": { "locked": {
"lastModified": 1623875721, "lastModified": 1638122382,
"narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -268,11 +295,41 @@
}, },
"flake-utils_3": { "flake-utils_3": {
"locked": { "locked": {
"lastModified": 1623875721, "lastModified": 1638122382,
"narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", "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"
}
},
"flake-utils_5": {
"locked": {
"lastModified": 1638122382,
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -288,27 +345,27 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1633596850, "lastModified": 1639871969,
"narHash": "sha256-5+qVLYvfOropjLAvpQs/APtD8eYnEIbAd9a36lGHZM0=", "narHash": "sha256-6feWUnMygRzA9tzkrfAzpA5/NBYg75bkFxnqb1DtD7E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "49695f33aac22358b59e49c94fe6472218e5d766", "rev": "697cc8c68ed6a606296efbbe9614c32537078756",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-21.05", "ref": "release-21.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"latest": { "latest": {
"locked": { "locked": {
"lastModified": 1632660378, "lastModified": 1638198142,
"narHash": "sha256-sjA8eQlnyDjDLyAyq3XlJmN0nqW0ftl/pb7VnMg86L0=", "narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "31ffc50c571e6683e9ecc9dbcbd4a8e9914b4497", "rev": "8a308775674e178495767df90c419425474582a1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -320,11 +377,11 @@
}, },
"latest_2": { "latest_2": {
"locked": { "locked": {
"lastModified": 1634782485, "lastModified": 1641230035,
"narHash": "sha256-psfh4OQSokGXG0lpq3zKFbhOo3QfoeudRcaUnwMRkQo=", "narHash": "sha256-hFyqihERaTbLxCOlugy/rpp22VLtLh8SPRnA2uu3F/8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "34ad3ffe08adfca17fcb4e4a47bb5f3b113687be", "rev": "78cd22c1b8604de423546cd49bfe264b786eca13",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -334,35 +391,18 @@
"type": "github" "type": "github"
} }
}, },
"lowdown-src": {
"flake": false,
"locked": {
"lastModified": 1617481909,
"narHash": "sha256-SqnfOFuLuVRRNeVJr1yeEPJue/qWoCp5N6o5Kr///p4=",
"owner": "kristapsdz",
"repo": "lowdown",
"rev": "148f9b2f586c41b7e36e73009db43ea68c7a1a4d",
"type": "github"
},
"original": {
"owner": "kristapsdz",
"ref": "VERSION_0_8_4",
"repo": "lowdown",
"type": "github"
}
},
"naersk": { "naersk": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"latest" "nixos"
] ]
}, },
"locked": { "locked": {
"lastModified": 1632266297, "lastModified": 1639947939,
"narHash": "sha256-J1yeJk6Gud9ef2pEf6aKQemrfg1pVngYDSh+SAY94xk=", "narHash": "sha256-pGsM8haJadVP80GFq4xhnSpNitYNQpaXk4cnA796Cso=",
"owner": "nmattia", "owner": "nmattia",
"repo": "naersk", "repo": "naersk",
"rev": "ee7edec50b49ab6d69b06d62f1de554efccb1ccd", "rev": "2fc8ce9d3c025d59fee349c1f80be9785049d653",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -371,39 +411,17 @@
"type": "github" "type": "github"
} }
}, },
"nix": {
"inputs": {
"lowdown-src": "lowdown-src",
"nixpkgs": [
"digga",
"nixpkgs"
]
},
"locked": {
"lastModified": 1630335771,
"narHash": "sha256-eljjEPJdLK3aDskF7qX4YM/6KCq+w9nr+IKhrKW/AIQ=",
"owner": "nixos",
"repo": "nix",
"rev": "50a35860ee9237d341948437c5f70a7f0987d393",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nix",
"type": "github"
}
},
"nix-dram": { "nix-dram": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1628492639, "lastModified": 1639388919,
"narHash": "sha256-ffF/oEhLs/stAsXXobruKHyH9jnMC2rt/SM3ASrs2U8=", "narHash": "sha256-SdeGx7cPVj5WhQ08jcOwIoZkW8o3CAam5C04RNimmIw=",
"owner": "dramforever", "owner": "dramforever",
"repo": "nix-dram", "repo": "nix-dram",
"rev": "fba426108ea6bdeb1e362bac9da06cbd33726f41", "rev": "abab5fab1a63675aac85bffb5c1567e3837ccaeb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -412,39 +430,48 @@
"type": "github" "type": "github"
} }
}, },
"nixlib": {
"locked": {
"lastModified": 1641083655,
"narHash": "sha256-S4lNc3fb9UpYgVtTa/mZZXphq7+xGy74YGIlOWB1ceE=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "a07deba0302ca942aca4440a43efb3b4bbba2baf",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1635070614, "lastModified": 1641441041,
"narHash": "sha256-eRup9WsvSIhsRrSlNugPcQ7gfGOsbk3d4izufwVlz1Q=", "narHash": "sha256-HNRsnurIzLqLyy5U1Ev+hv5OCNlEjNAjOst5x4vpic0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3b1789322fcbcb5cf51228d732752714f1bf77da", "rev": "d3179446efde6bc6f5b01f18438b9131fe8f1741",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "release-21.05", "ref": "release-21.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixos-generators": { "nixos-generators": {
"inputs": { "inputs": {
"nixlib": [ "nixlib": "nixlib",
"digga", "nixpkgs": "nixpkgs_3"
"nixlib"
],
"nixpkgs": [
"digga",
"blank"
]
}, },
"locked": { "locked": {
"lastModified": 1624973746, "lastModified": 1637655461,
"narHash": "sha256-11JbJRduNwyf556gndGErR5/12ceyHOHBfEuha5Vws4=", "narHash": "sha256-kXZPbclN3gKwjhp2/RYFDFpAsSBwzX1iLF4EcnHZsPQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "022ef440af8dc237ab1f59fa363cb1e25783ec3e", "rev": "05a3eb158a9c7746a5d463726d7f7cccf07500e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -455,11 +482,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1633793047, "lastModified": 1640686209,
"narHash": "sha256-XSMlHMVPKwcEqyHGdFj/ZeGMeZeKNwVExOfLlxcg4oE=", "narHash": "sha256-6glXUlKRDhEhNuYx6r3fXU6KH2/Vq9mJZjB9oUpwrmc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "3aabf78bfcae62f5f99474f2ebbbe418f1c6e54f", "rev": "46df95ca81e7e4cf3458cdb4b7d1714b5fce9da5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -470,11 +497,59 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1626556499, "lastModified": 1641233575,
"narHash": "sha256-c2ueMT7fi/yvCNq3nGLEC2v5GklS7eHpB1240LRSW9Y=", "narHash": "sha256-7RQLnIAIEpqv2hv8C2tHGit07hF2RQ4beyzHacJ/i4I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b59c06dc92f8d03660eb4155754d93a6c34cda83", "rev": "a19ed837728332d183ed641edb310d1b6a50f55d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1638986258,
"narHash": "sha256-OceRdctKZRSgqQxVRvvNB0MaEnFMzQqjUffecoDE9eI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "581d2d6c9cd5c289002203581d8aa0861963a933",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1641463613,
"narHash": "sha256-xZN9igqdZvnhSeTx8OlGby/OaYQHwgXVrBrPW0gLEh8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "77fda7f672726e1a95c8cd200f27bccfc86c870b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1639347265,
"narHash": "sha256-q5feWoC64+h6T6J89o2HJJ8DOnB/4vwMODBlZIgeIlA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b0bf5f888d377dd2f36d90340df6dc9f035aaada",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -499,26 +574,18 @@
}, },
"nvfetcher": { "nvfetcher": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": "flake-compat_2",
"digga", "flake-utils": "flake-utils_5",
"deploy",
"flake-compat"
],
"flake-utils": [
"digga",
"flake-utils-plus",
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"latest" "nixos"
] ]
}, },
"locked": { "locked": {
"lastModified": 1633886330, "lastModified": 1641071623,
"narHash": "sha256-gYtHVP8oUSxSX8HxlqqA/YH3yQB9eDNYr1W40r/qVEM=", "narHash": "sha256-jxquDPaIJPub49c1UK96LHlFTzSCXCJ6Mv5fpeGtD90=",
"owner": "berberman", "owner": "berberman",
"repo": "nvfetcher", "repo": "nvfetcher",
"rev": "aacf12e7a13edccccaae2259c0f2a7eb34ceda32", "rev": "8aedc71c67960945bc18fb1077e7bdcd9046f1ee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -558,41 +625,51 @@
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"b12f-nix-fonts": "b12f-nix-fonts", "b12f-nix-fonts": "b12f-nix-fonts",
"blank": [
"digga",
"blank"
],
"bud": "bud", "bud": "bud",
"darwin": "darwin", "darwin": "darwin",
"deploy": [ "deploy": "deploy",
"digga",
"deploy"
],
"digga": "digga", "digga": "digga",
"flake-utils": [
"digga",
"flake-utils"
],
"flake-utils-plus": [
"digga",
"flake-utils-plus"
],
"home": "home", "home": "home",
"latest": "latest_2", "latest": "latest_2",
"naersk": "naersk", "naersk": "naersk",
"nix-dram": "nix-dram", "nix-dram": "nix-dram",
"nixlib": [
"digga",
"nixlib"
],
"nixos": "nixos", "nixos": "nixos",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": [
"nixos"
],
"nur": "nur", "nur": "nur",
"nvfetcher": "nvfetcher" "nvfetcher": "nvfetcher"
} }
},
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1639071661,
"narHash": "sha256-4YySLORuK0qGGIEJj78S7CZ4jy4GIHJ5ks17k5AWblo=",
"owner": "rust-analyzer",
"repo": "rust-analyzer",
"rev": "2534b7db1a093543d5bd759b3a1ca9e34418fa31",
"type": "github"
},
"original": {
"owner": "rust-analyzer",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"utils": {
"locked": {
"lastModified": 1637014545,
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

38
flake.nix
View file

@ -1,54 +1,45 @@
{ {
description = "A highly structured configuration database."; description = "A highly structured configuration database.";
nixConfig.extra-experimental-features = "nix-command flakes ca-references"; nixConfig.extra-experimental-features = "nix-command flakes";
nixConfig.extra-substituters = "https://nrdxp.cachix.org https://nix-community.cachix.org"; nixConfig.extra-substituters = "https://nrdxp.cachix.org https://nix-community.cachix.org";
nixConfig.extra-trusted-public-keys = "nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="; nixConfig.extra-trusted-public-keys = "nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=";
inputs = inputs =
{ {
nixos.url = "github:nixos/nixpkgs/release-21.05"; nixos.url = "github:nixos/nixpkgs/release-21.11";
latest.url = "github:nixos/nixpkgs/nixos-unstable"; latest.url = "github:nixos/nixpkgs/nixos-unstable";
digga.url = "github:divnix/digga"; digga.url = "github:divnix/digga";
digga.inputs.nixpkgs.follows = "nixos"; digga.inputs.nixpkgs.follows = "nixos";
digga.inputs.nixlib.follows = "nixos"; digga.inputs.nixlib.follows = "nixos";
digga.inputs.home-manager.follows = "home"; digga.inputs.home-manager.follows = "home";
digga.inputs.deploy.follows = "deploy";
bud.url = "github:divnix/bud"; bud.url = "github:divnix/bud";
bud.inputs.nixpkgs.follows = "nixos"; bud.inputs.nixpkgs.follows = "nixos";
bud.inputs.devshell.follows = "digga/devshell"; bud.inputs.devshell.follows = "digga/devshell";
home.url = "github:nix-community/home-manager/release-21.05"; home.url = "github:nix-community/home-manager/release-21.11";
home.inputs.nixpkgs.follows = "nixos"; home.inputs.nixpkgs.follows = "nixos";
darwin.url = "github:LnL7/nix-darwin"; darwin.url = "github:LnL7/nix-darwin";
darwin.inputs.nixpkgs.follows = "latest"; darwin.inputs.nixpkgs.follows = "nixos";
deploy.follows = "digga/deploy"; deploy.url = "github:input-output-hk/deploy-rs";
deploy.inputs.nixpkgs.follows = "nixos";
agenix.url = "github:ryantm/agenix"; agenix.url = "github:ryantm/agenix";
agenix.inputs.nixpkgs.follows = "latest"; agenix.inputs.nixpkgs.follows = "nixos";
nvfetcher.url = "github:berberman/nvfetcher"; nvfetcher.url = "github:berberman/nvfetcher";
nvfetcher.inputs.nixpkgs.follows = "latest"; nvfetcher.inputs.nixpkgs.follows = "nixos";
nvfetcher.inputs.flake-compat.follows = "digga/deploy/flake-compat";
nvfetcher.inputs.flake-utils.follows = "digga/flake-utils-plus/flake-utils";
naersk.url = "github:nmattia/naersk"; naersk.url = "github:nmattia/naersk";
naersk.inputs.nixpkgs.follows = "latest"; naersk.inputs.nixpkgs.follows = "nixos";
nixos-hardware.url = "github:nixos/nixos-hardware"; nixos-hardware.url = "github:nixos/nixos-hardware";
# start ANTI CORRUPTION LAYER
# remove after https://github.com/NixOS/nix/pull/4641
nixpkgs.follows = "nixos";
nixlib.follows = "digga/nixlib";
blank.follows = "digga/blank";
flake-utils-plus.follows = "digga/flake-utils-plus";
flake-utils.follows = "digga/flake-utils";
# end ANTI CORRUPTION LAYER
# PubSolarOS additions # PubSolarOS additions
nix-dram.url = "github:dramforever/nix-dram"; nix-dram.url = "github:dramforever/nix-dram";
@ -82,7 +73,6 @@
nixos = { nixos = {
imports = [ (digga.lib.importOverlays ./overlays) ]; imports = [ (digga.lib.importOverlays ./overlays) ];
overlays = [ overlays = [
digga.overlays.patchedNix
nur.overlay nur.overlay
agenix.overlay agenix.overlay
nvfetcher.overlay nvfetcher.overlay
@ -91,11 +81,7 @@
./pkgs/default.nix ./pkgs/default.nix
]; ];
}; };
latest = { latest = { };
overlays = [
deploy.overlay
];
};
}; };
lib = import ./lib { lib = digga.lib // nixos.lib; }; lib = import ./lib { lib = digga.lib // nixos.lib; };
@ -172,7 +158,7 @@
} }
// //
{ {
budModules = { devos = import ./bud; }; budModules = { devos = import ./shell/bud; };
} }
; ;
} }

13
modules/audio/default.nix
View file

@ -13,26 +13,33 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] { home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
home.packages = [ home.packages = [
# easyeffects, e.g. for microphone noise filtering
easyeffects
mu mu
pavucontrol pavucontrol
pa_applet pa_applet
playerctl playerctl
# Needed for pactl cmd, until pw-cli is more mature (vol up/down hotkeys?) # Needed for pactl cmd, until pw-cli is more mature (vol up/down hotkeys?)
pulseaudio pulseaudio
# pulseeffects for microphone noise filtering
pulseeffects-pw
vimpc vimpc
]; ];
xdg.configFile."vimpc/vimpcrc".source = ./.config/vimpc/vimpcrc; xdg.configFile."vimpc/vimpcrc".source = ./.config/vimpc/vimpcrc;
systemd.user.services.pulseeffects = import ./pulseeffects.service.nix pkgs; systemd.user.services.easyeffects = import ./easyeffects.service.nix pkgs;
}; };
# Enable sound using pipewire-pulse # Enable sound using pipewire-pulse
services.pipewire = { services.pipewire = {
enable = true;
alsa.enable = true; alsa.enable = true;
alsa.support32Bit = true; alsa.support32Bit = true;
pulse.enable = true; pulse.enable = true;
config.pipewire = {
context.default.clock = {
allowed-rates = [ 44100 48000 88200 96000 ];
rate = 44100;
};
};
config.pipewire-pulse = builtins.fromJSON (builtins.readFile ./pipewire-pulse.conf.json); config.pipewire-pulse = builtins.fromJSON (builtins.readFile ./pipewire-pulse.conf.json);
# Bluetooth configuration for pipewire # Bluetooth configuration for pipewire

8
modules/audio/easyeffects.service.nix Normal file
View file

@ -0,0 +1,8 @@
pkgs:
{
Service = {
Type = "dbus";
BusName = "com.github.wwmm.easyeffects";
ExecStart = "${pkgs.easyeffects}/bin/easyeffects --gapplication-service";
};
}

8
modules/audio/pulseeffects.service.nix
View file

@ -1,8 +0,0 @@
pkgs:
{
Service = {
Type = "dbus";
BusName = "com.github.wwmm.pulseeffects";
ExecStart = "${pkgs.pulseeffects-pw}/bin/pulseeffects --gapplication-service";
};
}

1
modules/devops/default.nix
View file

@ -15,6 +15,7 @@ in
croc croc
drone-cli drone-cli
nmap nmap
pgcli
python38Packages.ansible python38Packages.ansible
restic restic
shellcheck shellcheck

8
modules/terminal-life/nvim/default.nix
View file

@ -87,7 +87,7 @@ in
nodePackages.vscode-html-languageserver-bin nodePackages.vscode-html-languageserver-bin
nodePackages.vscode-json-languageserver-bin nodePackages.vscode-json-languageserver-bin
nodePackages.yaml-language-server nodePackages.yaml-language-server
python-language-server python39Packages.python-lsp-server
python3Full python3Full
solargraph solargraph
rnix-lsp rnix-lsp
@ -97,7 +97,11 @@ in
]; ];
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
completion-nvim nvim-cmp
cmp-nvim-lsp
cmp_luasnip
luasnip
lsp_extensions-nvim lsp_extensions-nvim
nvim-lspconfig nvim-lspconfig

111
modules/terminal-life/nvim/lsp.vim
View file

@ -14,11 +14,44 @@ set shortmess+=c
" https://gitlab.com/Iron_E/dotfiles/-/blob/master/.config/nvim/lua/_config/plugin/nvim_lsp.lua " https://gitlab.com/Iron_E/dotfiles/-/blob/master/.config/nvim/lua/_config/plugin/nvim_lsp.lua
lua <<EOF lua <<EOF
local nvim_lsp = require('lspconfig') local nvim_lsp = require('lspconfig')
-- Attach `completion-nvim` to the buffer.
local function lsp_setup() -- Use an on_attach function to only map the following keys
require('completion').on_attach() -- after the language server attaches to the current buffer
local on_attach = function(client, bufnr)
local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
-- Enable completion triggered by <c-x><c-o>
buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
-- Mappings.
local opts = { noremap=true, silent=true }
-- See `:help vim.lsp.*` for documentation on any of the below functions
buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
buf_set_keymap('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
buf_set_keymap('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
buf_set_keymap('n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
buf_set_keymap('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
buf_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
buf_set_keymap('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
buf_set_keymap('n', '<space>e', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts)
buf_set_keymap('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
buf_set_keymap('n', '<space>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
buf_set_keymap('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
end end
-- Add additional capabilities supported by nvim-cmp
local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities)
for lsp_key, lsp_settings in pairs({ for lsp_key, lsp_settings in pairs({
'bashls', ------------------------------- Bash 'bashls', ------------------------------- Bash
'ccls', --------------------------------- C / C++ / Objective-C 'ccls', --------------------------------- C / C++ / Objective-C
@ -46,7 +79,7 @@ lua <<EOF
['cmd'] = {"json-languageserver", "--stdio"} ['cmd'] = {"json-languageserver", "--stdio"}
}, },
'phpactor', ----------------------------- PHP 'phpactor', ----------------------------- PHP
'pyls', --------------------------------- Python 'pylsp', --------------------------------- Python
'rnix', --------------------------------- Nix 'rnix', --------------------------------- Nix
'solargraph', --------------------------- Ruby 'solargraph', --------------------------- Ruby
'rust_analyzer', ------------------------ Rust 'rust_analyzer', ------------------------ Rust
@ -75,18 +108,73 @@ lua <<EOF
}) do -- Setup all of the language servers. † }) do -- Setup all of the language servers. †
if type(lsp_key) == 'number' then -- Enable the LSP with defaults. if type(lsp_key) == 'number' then -- Enable the LSP with defaults.
-- The `lsp` is an index in this case. -- The `lsp` is an index in this case.
nvim_lsp[lsp_settings].setup{['on_attach'] = lsp_setup} nvim_lsp[lsp_settings].setup{
on_attach = on_attach,
flags = {
debounce_text_changes = 150,
},
capabilities = capabilities,
}
else -- Use the LSP's configuration. else -- Use the LSP's configuration.
local on_attach_setting = lsp_settings.on_attach local on_attach_setting = lsp_settings.on_attach
lsp_settings.on_attach = function() lsp_settings.on_attach = function()
lsp_setup()
if on_attach_setting then on_attach_setting() end if on_attach_setting then on_attach_setting() end
end end
nvim_lsp[lsp_key].setup(lsp_settings) nvim_lsp[lsp_key].setup(lsp_settings)
end end
end -- ‡ end -- ‡
-- Set completeopt to have a better completion experience
vim.o.completeopt = 'menuone,noselect'
-- luasnip setup
local luasnip = require 'luasnip'
-- nvim-cmp setup
local cmp = require 'cmp'
cmp.setup {
snippet = {
expand = function(args)
require('luasnip').lsp_expand(args.body)
end,
},
mapping = {
['<C-p>'] = cmp.mapping.select_prev_item(),
['<C-n>'] = cmp.mapping.select_next_item(),
['<C-d>'] = cmp.mapping.scroll_docs(-4),
['<C-f>'] = cmp.mapping.scroll_docs(4),
['<C-Space>'] = cmp.mapping.complete(),
['<C-e>'] = cmp.mapping.close(),
['<CR>'] = cmp.mapping.confirm {
behavior = cmp.ConfirmBehavior.Replace,
select = true,
},
['<Tab>'] = function(fallback)
if cmp.visible() then
cmp.select_next_item()
elseif luasnip.expand_or_jumpable() then
luasnip.expand_or_jump()
else
fallback()
end
end,
['<S-Tab>'] = function(fallback)
if cmp.visible() then
cmp.select_prev_item()
elseif luasnip.jumpable(-1) then
luasnip.jump(-1)
else
fallback()
end
end,
},
sources = {
{ name = 'nvim_lsp' },
{ name = 'luasnip' },
},
}
EOF EOF
" Visualize diagnostics " Visualize diagnostics
@ -105,14 +193,3 @@ autocmd CursorHold * lua vim.lsp.diagnostic.show_line_diagnostics({ focusable =
" have a fixed column for the diagnostics to appear in " have a fixed column for the diagnostics to appear in
" this removes the jitter when warnings/errors flow in " this removes the jitter when warnings/errors flow in
set signcolumn=yes set signcolumn=yes
" NeoVim 0.5 Code navigation shortcuts
nnoremap <silent> gd <cmd>lua vim.lsp.buf.definition()<CR>
nnoremap <silent> K <cmd>lua vim.lsp.buf.hover()<CR>
nnoremap <silent> gD <cmd>lua vim.lsp.buf.implementation()<CR>
nnoremap <silent> <c-k> <cmd>lua vim.lsp.buf.signature_help()<CR>
nnoremap <silent> 1gD <cmd>lua vim.lsp.buf.type_definition()<CR>
nnoremap <silent> gr <cmd>lua vim.lsp.buf.references()<CR>
nnoremap <silent> g0 <cmd>lua vim.lsp.buf.document_symbol()<CR>
nnoremap <silent> gW <cmd>lua vim.lsp.buf.workspace_symbol()<CR>
nnoremap <silent> <c-]> <cmd>lua vim.lsp.buf.declaration()<CR>

12
overlays/overrides.nix
View file

@ -8,16 +8,17 @@ channels: final: prev: {
docker-compose_2 docker-compose_2
dhall dhall
discord discord
element-desktop-wayland element-desktop
rage rage
docker-compose
neovim-unwrapped
nixpkgs-fmt nixpkgs-fmt
qutebrowser qutebrowser
signal-desktop signal-desktop
tdesktop
starship starship
deploy-rs deploy-rs
element-desktop-wayland
neovim-unwrapped
tdesktop
xdg-desktop-portal xdg-desktop-portal
xdg-desktop-portal-gtk xdg-desktop-portal-gtk
xdg-desktop-portal-wlr xdg-desktop-portal-wlr
@ -26,6 +27,9 @@ channels: final: prev: {
looking-glass-client looking-glass-client
; ;
# nix is set to 2.3 in 21.11
nix-direnv = prev.nix-direnv.override { nix = prev.nixUnstable; };
haskellPackages = prev.haskellPackages.override haskellPackages = prev.haskellPackages.override
(old: { (old: {
overrides = prev.lib.composeExtensions (old.overrides or (_: _: { })) (hfinal: hprev: overrides = prev.lib.composeExtensions (old.overrides or (_: _: { })) (hfinal: hprev:

11
overlays/various-flake-fixes.nix
View file

@ -1,11 +0,0 @@
final: prev: {
# Since: https://github.com/NixOS/nixpkgs/pull/126137
nix-direnv =
if builtins.hasAttr "enableFlakes" prev.nix-direnv.override.__functionArgs
then
prev.nix-direnv.override
{
enableFlakes = true;
}
else prev.nix-direnv;
}

1
profiles/base-user/.config/git/config.nix
View file

@ -9,6 +9,7 @@ in
${if user.gpgKeyId != null then "signingkey = ${user.gpgKeyId}" else ""} ${if user.gpgKeyId != null then "signingkey = ${user.gpgKeyId}" else ""}
[core] [core]
editor = /etc/profiles/per-user/${config.pub-solar.user.name}/bin/nvim editor = /etc/profiles/per-user/${config.pub-solar.user.name}/bin/nvim
excludesFile = /home/${config.pub-solar.user.name}/.config/git/global_gitignore
[alias] [alias]
pol = pull pol = pull
ack = -c color.grep.linenumber=\"bold yellow\"\n -c color.grep.filename=\"bold green\"\n -c color.grep.match=\"reverse yellow\"\n grep --break --heading --line-number ack = -c color.grep.linenumber=\"bold yellow\"\n -c color.grep.filename=\"bold green\"\n -c color.grep.match=\"reverse yellow\"\n grep --break --heading --line-number

4
profiles/base-user/.config/git/global_gitignore.nix Normal file
View file

@ -0,0 +1,4 @@
{ config, pkgs, ... }:
let
in
''tags''

1
profiles/base-user/home.nix
View file

@ -32,6 +32,7 @@ in
xdg.mimeApps = import ./mimeapps.nix; xdg.mimeApps = import ./mimeapps.nix;
xdg.configFile."git/config".text = import ./.config/git/config.nix { inherit config; inherit pkgs; }; xdg.configFile."git/config".text = import ./.config/git/config.nix { inherit config; inherit pkgs; };
xdg.configFile."git/global_gitignore".text = import ./.config/git/global_gitignore.nix { inherit config; inherit pkgs; };
xdg.configFile."dircolors".source = ./.config/dircolors; xdg.configFile."dircolors".source = ./.config/dircolors;
xdg.configFile."xmodmap".source = ./.config/xmodmap; xdg.configFile."xmodmap".source = ./.config/xmodmap;
xdg.configFile."user-dirs.dirs".source = ./.config/user-dirs.dirs; xdg.configFile."user-dirs.dirs".source = ./.config/user-dirs.dirs;

23
profiles/base-user/mimeapps.nix
View file

@ -1,25 +1,26 @@
{ {
enable = true; enable = true;
defaultApplications = { defaultApplications = {
"x-scheme-handler/http" = [ "firefox.desktop" ]; "application/octet-stream" = [ "firefox.desktop" ];
"x-scheme-handler/https" = [ "firefox.desktop" ]; "application/pdf" = [ "org.gnome.Evince.desktop" ];
"x-scheme-handler/ftp" = [ "firefox.desktop" ]; "application/x-bittorrent" = [ "deluge.desktop" ];
"x-scheme-handler/chrome" = [ "firefox.desktop" ];
"text/html" = [ "firefox.desktop" ];
"application/x-extension-htm" = [ "firefox.desktop" ]; "application/x-extension-htm" = [ "firefox.desktop" ];
"application/x-extension-html" = [ "firefox.desktop" ]; "application/x-extension-html" = [ "firefox.desktop" ];
"application/x-extension-shtml" = [ "firefox.desktop" ]; "application/x-extension-shtml" = [ "firefox.desktop" ];
"application/xhtml+xml" = [ "firefox.desktop" ];
"application/x-extension-xhtml" = [ "firefox.desktop" ]; "application/x-extension-xhtml" = [ "firefox.desktop" ];
"application/x-extension-xht" = [ "firefox.desktop" ]; "application/x-extension-xht" = [ "firefox.desktop" ];
"application/xhtml+xml" = [ "firefox.desktop" ];
"image/jpeg" = [ "org.gnome.eog.desktop" ]; "image/jpeg" = [ "org.gnome.eog.desktop" ];
"image/png" = [ "org.gnome.eog.desktop" ]; "image/png" = [ "org.gnome.eog.desktop" ];
"video/mp4" = [ "vlc.desktop" ];
"text/plain" = [ "firefox.desktop" ];
"x-scheme-handler/mailto" = [ "userapp-Thunderbird.desktop" ];
"message/rfc822" = [ "userapp-Thunderbird.desktop" ]; "message/rfc822" = [ "userapp-Thunderbird.desktop" ];
"application/pdf" = [ "org.gnome.Evince.desktop" ]; "text/html" = [ "firefox.desktop" ];
"application/x-bittorrent" = [ "deluge.desktop" ]; "text/plain" = [ "firefox.desktop" ];
"video/mp4" = [ "vlc.desktop" ];
"x-scheme-handler/chrome" = [ "firefox.desktop" ];
"x-scheme-handler/ftp" = [ "firefox.desktop" ];
"x-scheme-handler/http" = [ "firefox.desktop" ];
"x-scheme-handler/https" = [ "firefox.desktop" ];
"x-scheme-handler/mailto" = [ "userapp-Thunderbird.desktop" ];
"x-scheme-handler/msteams" = [ "teams.desktop" ]; "x-scheme-handler/msteams" = [ "teams.desktop" ];
"x-scheme-handler/tg" = [ "userapp-Telegram Desktop-JBKFU0.desktop" ]; "x-scheme-handler/tg" = [ "userapp-Telegram Desktop-JBKFU0.desktop" ];
}; };

4
profiles/core/default.nix
View file

@ -28,10 +28,9 @@ in
inetutils inetutils
pciutils pciutils
usbutils usbutils
git gitFull
git-lfs git-lfs
git-bug git-bug
git-crypt
wget wget
openssl openssl
openssh openssh
@ -68,6 +67,7 @@ in
niv niv
manix manix
nix-index nix-index
nix-tree
# Build broken, python2.7-PyJWT-2.0.1.drv' failed # Build broken, python2.7-PyJWT-2.0.1.drv' failed
#nixops #nixops
psos psos

0
bud/default.nix → shell/bud/default.nix
View file

1
shell/bud/get.bash Normal file
View file

@ -0,0 +1 @@
git clone https://github.com/divnix/devos.git "${2:-devos}"

7
shell/devos.nix
View file

@ -1,4 +1,4 @@
{ pkgs, extraModulesPath, ... }: { pkgs, extraModulesPath, inputs, ... }:
let let
hooks = import ./hooks; hooks = import ./hooks;
@ -43,12 +43,9 @@ in
(linter editorconfig-checker) (linter editorconfig-checker)
# (docs python3Packages.grip) too many deps # (docs python3Packages.grip) too many deps
(docs mdbook) (docs mdbook)
(devos inputs.deploy.packages.${pkgs.system}.deploy-rs)
] ]
++ lib.optional
(pkgs ? deploy-rs)
(devos deploy-rs.deploy-rs)
++ lib.optional ++ lib.optional
(system != "i686-linux") (system != "i686-linux")
(devos cachix) (devos cachix)

1
users/profiles/direnv/default.nix
View file

@ -3,7 +3,6 @@
enable = true; enable = true;
nix-direnv = { nix-direnv = {
enable = true; enable = true;
enableFlakes = true;
}; };
}; };
} }