diff --git a/flake.lock b/flake.lock index 27a2c147..b3ba627b 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1665392861, - "narHash": "sha256-bCd8fYJMAb0LzabsiXl4nxECDoz483bJOCa2hjox7N0=", + "lastModified": 1668784520, + "narHash": "sha256-gGgVAMwYPPmrfnvnoRi6OkEB5KRsNTb9uYzEceLdO/g=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "ef56fd8979b5f4e800c4716f62076e00600b1172", + "rev": "6349b99bc2b96ded34d068a88c7c5ced406b7f7f", "type": "github" }, "original": { @@ -85,11 +85,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1659725433, - "narHash": "sha256-1ZxuK67TL29YLw88vQ18Y2Y6iYg8Jb7I6/HVzmNB6nM=", + "lastModified": 1668797197, + "narHash": "sha256-0w6iD3GSSQbIeSFVDzAAQZB+hDq670ZTms3d9XI+BtM=", "owner": "serokell", "repo": "deploy-rs", - "rev": "41f15759dd8b638e7b4f299730d94d5aa46ab7eb", + "rev": "2a3c5f70eee04a465aa534d8bd4fcc9bb3c4a8ce", "type": "github" }, "original": { @@ -231,6 +231,22 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1642700792, @@ -332,11 +348,11 @@ ] }, "locked": { - "lastModified": 1665996265, - "narHash": "sha256-/k9og6LDBQwT+f/tJ5ClcWiUl8kCX5m6ognhsAxOiCY=", + "lastModified": 1667907331, + "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", "owner": "nix-community", "repo": "home-manager", - "rev": "b81e128fc053ab3159d7b464d9b7dedc9d6a6891", + "rev": "6639e3a837fc5deb6f99554072789724997bc8e5", "type": "github" }, "original": { @@ -364,11 +380,11 @@ }, "latest_2": { "locked": { - "lastModified": 1668765800, - "narHash": "sha256-rC40+/W6Hio7b/RsY8SvQPKNx4WqNcTgfYv8cUMAvJk=", + "lastModified": 1669320964, + "narHash": "sha256-EBFw+ge12Pcr3qCk8If3/eMBAoQLR7ytndXZoRevUtM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "52b2ac8ae18bbad4374ff0dd5aeee0fdf1aea739", + "rev": "27ccd29078f974ddbdd7edc8e38c8c8ae003c877", "type": "github" }, "original": { @@ -380,11 +396,11 @@ }, "master": { "locked": { - "lastModified": 1668785491, - "narHash": "sha256-0FfPWQPImgWkIkpCgWAZVtZb28i4t9wxELlfm1x5d08=", + "lastModified": 1669473549, + "narHash": "sha256-+fILdVXXYES1wQrc3GtWZcTMgMzzMU0pemjEhqKdTkE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7e853f1d552a6327304339cd6c26d492d2def940", + "rev": "ff19f26c6d76fd573676cdd6beb3f1a9f49d474a", "type": "github" }, "original": { @@ -456,11 +472,11 @@ }, "nixos": { "locked": { - "lastModified": 1668908668, - "narHash": "sha256-oimCE4rY7Btuo/VYmA8khIyTHSMV7qUWTpz9w8yc9LQ=", + "lastModified": 1669378442, + "narHash": "sha256-nm+4PN0A4SnV0SzEchxrMyKPvI3Ld/aoom4PnHeHucs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b68a6a27adb452879ab66c0eaac0c133e32823b2", + "rev": "0faaf0a9bb6dedb69bfd43ac06fb27fadc476c51", "type": "github" }, "original": { @@ -476,11 +492,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1666016402, - "narHash": "sha256-Cm/nrdUMXwXiFQforG1Mv8OA4o8yhuVx6E1eDFH4rew=", + "lastModified": 1669065280, + "narHash": "sha256-3+pq1oJWjGDLfd8G/vR3IIFZ+EQ/aglukA0bTiMlf3o=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "688db42a1eb34853f050267ff65c975f664312f0", + "rev": "50aeec40f2072d2ab267c8ec8a345573704ec110", "type": "github" }, "original": { @@ -491,11 +507,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1665987993, - "narHash": "sha256-MvlaIYTRiqefG4dzI5p6vVCfl+9V8A1cPniUjcn6Ngc=", + "lastModified": 1669146234, + "narHash": "sha256-HEby7EG1yaq1oT2Ze6Cvok9CFju1XHkSvVHmkptLW9U=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "0e6593630071440eb89cd97a52921497482b22c6", + "rev": "0099253ad0b5283f06ffe31cf010af3f9ad7837d", "type": "github" }, "original": { @@ -570,6 +586,7 @@ "darwin": "darwin", "deploy": "deploy", "digga": "digga", + "flake-compat": "flake-compat_3", "home": "home", "latest": "latest_2", "master": "master", @@ -609,11 +626,11 @@ }, "locked": { "dir": "vmtools", - "lastModified": 1665580523, - "narHash": "sha256-cpe/wE10iXQ7Rnbmpu0i2oUqw306lLs+NKSJ+e+/4Sk=", + "lastModified": 1668514320, + "narHash": "sha256-P+wzdarT2l+91VPf9hsYtKJad7WHttN5oFFlGQHJ5mQ=", "ref": "main", - "rev": "b6bb5c4f37bf184f2072618b82c51a552eaf8168", - "revCount": 26, + "rev": "8648709ed952423e82d62eb634918de1b1cfdc82", + "revCount": 27, "type": "git", "url": "https://git.b12f.io/pub-solar/infra?dir=vmtools" }, @@ -633,11 +650,11 @@ ] }, "locked": { - "lastModified": 1665580466, - "narHash": "sha256-q8kVIE3XaOSCVl7oqkaKs2LDEbBcZRIzlnSG8PIKRQ0=", + "lastModified": 1669411978, + "narHash": "sha256-GvT/mYBe+mUybYJ3NsWlWmIiDvrLehRAM7nM+2TPPXE=", "ref": "main", - "rev": "70d759b6d8b5e076bee6a28255614ab3d75f6763", - "revCount": 49, + "rev": "ada06c3c43db5913d76e74426b89dc8373791864", + "revCount": 51, "type": "git", "url": "https://git.greenbaum.cloud/dev/tritonshell" }, diff --git a/flake.nix b/flake.nix index d2872a3e..6c3e87d8 100644 --- a/flake.nix +++ b/flake.nix @@ -5,190 +5,198 @@ nixConfig.extra-substituters = "https://nix-dram.cachix.org https://dram.cachix.org https://nrdxp.cachix.org https://nix-community.cachix.org"; nixConfig.extra-trusted-public-keys = "nix-dram.cachix.org-1:CKjZ0L1ZiqH3kzYAZRt8tg8vewAx5yj8Du/+iR8Efpg= dram.cachix.org-1:baoy1SXpwYdKbqdTbfKGTKauDDeDlHhUpC+QuuILEMY= nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="; - inputs = - { - # Track channels with commits tested and built by hydra - nixos.url = "github:nixos/nixpkgs/nixos-22.05"; - latest.url = "github:nixos/nixpkgs/nixos-unstable"; - master.url = "github:nixos/nixpkgs/master"; + inputs = { + # Track channels with commits tested and built by hydra + nixos.url = "github:nixos/nixpkgs/nixos-22.05"; + latest.url = "github:nixos/nixpkgs/nixos-unstable"; + master.url = "github:nixos/nixpkgs/master"; - digga.url = "github:pub-solar/digga/fix/bootstrap-iso"; - digga.inputs.nixpkgs.follows = "nixos"; - digga.inputs.nixlib.follows = "nixos"; - digga.inputs.home-manager.follows = "home"; - digga.inputs.deploy.follows = "deploy"; + flake-compat.url = "github:edolstra/flake-compat"; + flake-compat.flake = false; - home.url = "github:nix-community/home-manager/release-22.05"; - home.inputs.nixpkgs.follows = "nixos"; + digga.url = "github:pub-solar/digga/fix/bootstrap-iso"; + digga.inputs.nixpkgs.follows = "nixos"; + digga.inputs.nixlib.follows = "nixos"; + digga.inputs.home-manager.follows = "home"; + digga.inputs.deploy.follows = "deploy"; - darwin.url = "github:LnL7/nix-darwin"; - darwin.inputs.nixpkgs.follows = "nixos"; + home.url = "github:nix-community/home-manager/release-22.05"; + home.inputs.nixpkgs.follows = "nixos"; - deploy.url = "github:serokell/deploy-rs"; - deploy.inputs.nixpkgs.follows = "nixos"; + darwin.url = "github:LnL7/nix-darwin"; + darwin.inputs.nixpkgs.follows = "nixos"; - agenix.url = "github:ryantm/agenix"; - agenix.inputs.nixpkgs.follows = "nixos"; + deploy.url = "github:serokell/deploy-rs"; + deploy.inputs.nixpkgs.follows = "nixos"; - naersk.url = "github:nmattia/naersk"; - naersk.inputs.nixpkgs.follows = "nixos"; + agenix.url = "github:ryantm/agenix"; + agenix.inputs.nixpkgs.follows = "nixos"; - nixos-hardware.url = "github:nixos/nixos-hardware"; + naersk.url = "github:nmattia/naersk"; + naersk.inputs.nixpkgs.follows = "nixos"; - nixos-generators.url = "github:nix-community/nixos-generators"; + nixos-hardware.url = "github:nixos/nixos-hardware"; - # PubSolarOS additions - triton-vmtools.url = "git+https://git.b12f.io/pub-solar/infra?ref=main&dir=vmtools"; - triton-vmtools.inputs.nixpkgs.follows = "latest"; + nixos-generators.url = "github:nix-community/nixos-generators"; - tritonshell.url = "git+https://git.greenbaum.cloud/dev/tritonshell?ref=main"; - tritonshell.inputs.nixpkgs.follows = "latest"; + # PubSolarOS additions + triton-vmtools.url = "git+https://git.b12f.io/pub-solar/infra?ref=main&dir=vmtools"; + triton-vmtools.inputs.nixpkgs.follows = "latest"; - nix-autobahn.url = "github:wucke13/nix-autobahn"; - nix-autobahn.inputs.nixpkgs.follows = "latest"; - nix-autobahn.inputs.naersk.follows = "naersk"; - }; + tritonshell.url = "git+https://git.greenbaum.cloud/dev/tritonshell?ref=main"; + tritonshell.inputs.nixpkgs.follows = "latest"; - outputs = - { self - , digga - , nixos - , home - , nixos-hardware - , nur - , agenix - , deploy - , tritonshell - , nix-autobahn - , ... - } @ inputs: + nix-autobahn.url = "github:wucke13/nix-autobahn"; + nix-autobahn.inputs.nixpkgs.follows = "latest"; + nix-autobahn.inputs.naersk.follows = "naersk"; + }; + + outputs = { + self, + digga, + nixos, + home, + nixos-hardware, + nur, + agenix, + deploy, + tritonshell, + nix-autobahn, + ... + } @ inputs: digga.lib.mkFlake - { - inherit self inputs; + { + inherit self inputs; - channelsConfig = { - allowUnfree = true; - }; + channelsConfig = { + allowUnfree = true; + }; - supportedSystems = [ "x86_64-linux" "aarch64-linux" ]; - - channels = { - nixos = { - imports = [ (digga.lib.importOverlays ./overlays) ]; - overlays = [ ]; - }; - latest = { }; - master = { }; - }; - - lib = import ./lib { lib = digga.lib // nixos.lib; }; - - sharedOverlays = [ - (final: prev: { - __dontExport = true; - lib = prev.lib.extend (lfinal: lprev: { - our = self.lib; - }); - }) - nur.overlay - agenix.overlay - - (import ./pkgs) - ]; + supportedSystems = ["x86_64-linux" "aarch64-linux"]; + channels = { nixos = { - hostDefaults = { - system = "x86_64-linux"; - channelName = "nixos"; - imports = [ (digga.lib.importExportableModules ./modules) ]; + imports = [(digga.lib.importOverlays ./overlays)]; + overlays = []; + }; + latest = {}; + master = {}; + }; + + lib = import ./lib {lib = digga.lib // nixos.lib;}; + + sharedOverlays = [ + (final: prev: { + __dontExport = true; + lib = prev.lib.extend (lfinal: lprev: { + our = self.lib; + }); + }) + nur.overlay + agenix.overlay + + (import ./pkgs) + ]; + + nixos = { + hostDefaults = { + system = "x86_64-linux"; + channelName = "nixos"; + imports = [(digga.lib.importExportableModules ./modules)]; + modules = [ + {lib.our = self.lib;} + # FIXME: upstream module causes a huge number of unnecessary + # dependencies to be pulled in for all systems -- many of them are + # graphical. should only be imported as needed. + # digga.nixosModules.bootstrapIso + digga.nixosModules.nixConfig + home.nixosModules.home-manager + agenix.nixosModules.age + ]; + }; + + imports = [(digga.lib.importHosts ./hosts)]; + hosts = { + /* + set host specific properties here + */ + bootstrap = { modules = [ - { lib.our = self.lib; } - # FIXME: upstream module causes a huge number of unnecessary - # dependencies to be pulled in for all systems -- many of them are - # graphical. should only be imported as needed. - # digga.nixosModules.bootstrapIso - digga.nixosModules.nixConfig - home.nixosModules.home-manager - agenix.nixosModules.age + digga.nixosModules.bootstrapIso ]; }; - - imports = [ (digga.lib.importHosts ./hosts) ]; - hosts = { - /* set host specific properties here */ - bootstrap = { - modules = [ - digga.nixosModules.bootstrapIso - ]; - }; - PubSolarOS = { - tests = [ - (import ./tests/first-test.nix { pkgs = nixos.legacyPackages.x86_64-linux; lib = nixos.lib; }) - ]; - }; - fae = { - system = "aarch64-linux"; - }; - powder = { - system = "x86_64-linux"; - }; + PubSolarOS = { + tests = [ + (import ./tests/first-test.nix { + pkgs = nixos.legacyPackages.x86_64-linux; + lib = nixos.lib; + }) + ]; }; - importables = rec { - profiles = digga.lib.rakeLeaves ./profiles // { - users = digga.lib.rakeLeaves ./users; - }; - suites = with profiles; rec { - base = [ users.pub-solar users.root ]; - iso = base ++ [ base-user graphical pub-solar-iso ]; - pubsolaros = [ full-install base-user users.root ]; - anonymous = [ pubsolaros users.pub-solar ]; - teutat3s = pubsolaros ++ [ users.teutat3s ]; - dumpyourvms = teutat3s ++ [ graphical ]; - ryzensun = teutat3s ++ [ graphical ]; - }; - }; - }; - - home = { - imports = [ (digga.lib.importExportableModules ./users/modules) ]; - modules = [ ]; - importables = rec { - profiles = digga.lib.rakeLeaves ./users/profiles; - suites = with profiles; rec { - base = [ direnv ]; - }; - }; - users = { - pub-solar = { suites, ... }: { imports = suites.base; }; - teutat3s = { suites, ... }: { imports = suites.base; }; - }; # digga.lib.importers.rakeLeaves ./users/hm; - }; - - devshell = ./shell; - - homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations; - - deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { fae = { - hostname = "fae.fritz.box:22"; - sshUser = "pub-solar"; - fastConnect = true; - profilesOrder = [ "system" "direnv" ]; - profiles.direnv = { - user = "pub-solar"; - path = deploy.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.pub-solar; - }; + system = "aarch64-linux"; }; powder = { - hostname = "80.71.153.194"; - sshUser = "root"; - profilesOrder = [ "system" "direnv" ]; - profiles.direnv = { - user = "pub-solar"; - path = deploy.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.pub-solar; - }; + system = "x86_64-linux"; }; }; - } - ; + importables = rec { + profiles = + digga.lib.rakeLeaves ./profiles + // { + users = digga.lib.rakeLeaves ./users; + }; + suites = with profiles; rec { + base = [users.pub-solar users.root]; + iso = base ++ [base-user graphical pub-solar-iso]; + pubsolaros = [full-install base-user users.root]; + anonymous = [pubsolaros users.pub-solar]; + teutat3s = pubsolaros ++ [users.teutat3s]; + dumpyourvms = teutat3s ++ [graphical]; + ryzensun = teutat3s ++ [graphical]; + }; + }; + }; + + home = { + imports = [(digga.lib.importExportableModules ./users/modules)]; + modules = []; + importables = rec { + profiles = digga.lib.rakeLeaves ./users/profiles; + suites = with profiles; rec { + base = [direnv]; + }; + }; + users = { + pub-solar = {suites, ...}: {imports = suites.base;}; + teutat3s = {suites, ...}: {imports = suites.base;}; + }; # digga.lib.importers.rakeLeaves ./users/hm; + }; + + devshell = ./shell; + + homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations; + + deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { + fae = { + hostname = "fae.fritz.box:22"; + sshUser = "pub-solar"; + fastConnect = true; + profilesOrder = ["system" "direnv"]; + profiles.direnv = { + user = "pub-solar"; + path = deploy.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.pub-solar; + }; + }; + powder = { + hostname = "80.71.153.194"; + sshUser = "root"; + profilesOrder = ["system" "direnv"]; + profiles.direnv = { + user = "pub-solar"; + path = deploy.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.pub-solar; + }; + }; + }; + }; } diff --git a/lib/compat/default.nix b/lib/compat/default.nix index 9d0c2837..fc1bc0cc 100644 --- a/lib/compat/default.nix +++ b/lib/compat/default.nix @@ -1,14 +1,21 @@ let - rev = "e7e5d481a0e15dcd459396e55327749989e04ce0"; - flake = (import + lock = builtins.fromJSON (builtins.readFile builtins.path { + path = ../../flake.lock; + name = "lockPath"; + }); + flake = + import ( fetchTarball { - url = "https://github.com/edolstra/flake-compat/archive/${rev}.tar.gz"; - sha256 = "0zd3x46fswh5n6faq4x2kkpy6p3c6j593xbdlbsl40ppkclwc80x"; + url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; + sha256 = lock.nodes.flake-compat.locked.narHash; } ) { - src = ../../.; - }); + src = builtins.path { + path = ../../.; + name = "projectRoot"; + }; + }; in -flake + flake diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix index 83e13eab..44c0a8c3 100644 --- a/pkgs/_sources/generated.nix +++ b/pkgs/_sources/generated.nix @@ -1,147 +1,150 @@ # This file was generated by nvfetcher, please do not modify it manually. -{ fetchgit, fetchurl, fetchFromGitHub }: { + fetchgit, + fetchurl, + fetchFromGitHub, +}: { F-Sy-H = { pname = "F-Sy-H"; - version = "b935a87a75560f8173dd78deee6717c59d464e06"; - src = fetchFromGitHub ({ + version = "81315330ff4eb4bc13b03fe6ec5bbb6fee0f27ac"; + src = fetchFromGitHub { owner = "z-shell"; repo = "F-Sy-H"; - rev = "b935a87a75560f8173dd78deee6717c59d464e06"; + rev = "81315330ff4eb4bc13b03fe6ec5bbb6fee0f27ac"; fetchSubmodules = false; - sha256 = "sha256-448OlDnrDkUjvaSLDhXsa9bkgYXzj1Ju8CTpJVjH8LM="; - }); + sha256 = "sha256-2b/O/1SIhKgqHYjwy7yPCEb3EMXgkIvOk+FC4PbuQ8c="; + }; }; instant-nvim-nvfetcher = { pname = "instant-nvim-nvfetcher"; version = "294b6d08143b3db8f9db7f606829270149e1a786"; - src = fetchFromGitHub ({ + src = fetchFromGitHub { owner = "jbyuki"; repo = "instant.nvim"; rev = "294b6d08143b3db8f9db7f606829270149e1a786"; fetchSubmodules = false; sha256 = "sha256-DXJWji/NR8ZCxe014rD51v3EHJHMhRQeOoI3SsY8mR4="; - }); + }; }; manix = { pname = "manix"; version = "d08e7ca185445b929f097f8bfb1243a8ef3e10e4"; - src = fetchFromGitHub ({ + src = fetchFromGitHub { owner = "mlvzk"; repo = "manix"; rev = "d08e7ca185445b929f097f8bfb1243a8ef3e10e4"; fetchSubmodules = false; sha256 = "sha256-GqPuYscLhkR5E2HnSFV4R48hCWvtM3C++3zlJhiK/aw="; - }); + }; }; ohmyzsh = { pname = "ohmyzsh"; - version = "a7d910c3a61d8599f748a8ddae59ecdd9424022a"; - src = fetchFromGitHub ({ + version = "c35ca17258dd870f1724eeb92e9077177d2e3bed"; + src = fetchFromGitHub { owner = "ohmyzsh"; repo = "ohmyzsh"; - rev = "a7d910c3a61d8599f748a8ddae59ecdd9424022a"; + rev = "c35ca17258dd870f1724eeb92e9077177d2e3bed"; fetchSubmodules = false; - sha256 = "sha256-BWpvRkUXQhP1VLrlTBqqXvycyPFZaIZmgMfrkqIugSY="; - }); + sha256 = "sha256-EA880CWKBxvMj6chH2pzoUKaJKEO+ACEnFcfh3Agjm8="; + }; }; powerlevel10k = { pname = "powerlevel10k"; - version = "8091c8a3a8a845c70046684235a01cd500075def"; - src = fetchFromGitHub ({ + version = "cf83ab21e440ffa276a13ab5fd63b6372b674b5e"; + src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; - rev = "8091c8a3a8a845c70046684235a01cd500075def"; + rev = "cf83ab21e440ffa276a13ab5fd63b6372b674b5e"; fetchSubmodules = false; - sha256 = "sha256-I0/tktXCbZ3hMYTNvPoWfOEYWRgmHoXsar/jcUB6bpo="; - }); + sha256 = "sha256-BBSyF+TFtfD7lDE+m7uEYOp/bct+/P8g3Q2SJPpx5nI="; + }; }; rnix-lsp-nvfetcher = { pname = "rnix-lsp-nvfetcher"; - version = "6925256babec4307479a4080b44f2be38056f210"; - src = fetchFromGitHub ({ + version = "7339d80b7bf415ea42d790e073fbd69d21d09db4"; + src = fetchFromGitHub { owner = "nix-community"; repo = "rnix-lsp"; - rev = "6925256babec4307479a4080b44f2be38056f210"; + rev = "7339d80b7bf415ea42d790e073fbd69d21d09db4"; fetchSubmodules = false; - sha256 = "sha256-OKLyIXIXhUnRB3Xw+7zI3u6XkwF7Mrbfz1XaasV6i7Q="; - }); + sha256 = "sha256-SKe5jEBHjjinb5R/fnJElwammKfof6zICc30E/we43Q="; + }; }; vim-apprentice-nvfetcher = { pname = "vim-apprentice-nvfetcher"; version = "9942d0bb0a5d82f7a24450b00051c1f2cc008659"; - src = fetchFromGitHub ({ + src = fetchFromGitHub { owner = "romainl"; repo = "Apprentice"; rev = "9942d0bb0a5d82f7a24450b00051c1f2cc008659"; fetchSubmodules = false; sha256 = "sha256-Xs+vTdnihNbBFPOKsW+NB40pqN9eaadqzc0DIeNoOFo="; - }); + }; }; vim-beautify-nvfetcher = { pname = "vim-beautify-nvfetcher"; version = "e0691483927dc5a0c051433602397419f9628623"; - src = fetchFromGitHub ({ + src = fetchFromGitHub { owner = "zeekay"; repo = "vim-beautify"; rev = "e0691483927dc5a0c051433602397419f9628623"; fetchSubmodules = false; sha256 = "sha256-QPTCl6KaGcAjTS5yVDov9yxmv0fDaFoPLMsrtVIG6GQ="; - }); + }; }; vim-caddyfile-nvfetcher = { pname = "vim-caddyfile-nvfetcher"; version = "24fe0720551883e407cb70ae1d7c03f162d1d5a0"; - src = fetchFromGitHub ({ + src = fetchFromGitHub { owner = "isobit"; repo = "vim-caddyfile"; rev = "24fe0720551883e407cb70ae1d7c03f162d1d5a0"; fetchSubmodules = false; sha256 = "sha256-rRYv3vnt31g7hNTxttTD6BWdv5JJ+ko3rPNyDUEOZ9o="; - }); + }; }; vim-workspace-nvfetcher = { pname = "vim-workspace-nvfetcher"; version = "c26b473f9b073f24bacecd38477f44c5cd1f5a62"; - src = fetchFromGitHub ({ + src = fetchFromGitHub { owner = "thaerkh"; repo = "vim-workspace"; rev = "c26b473f9b073f24bacecd38477f44c5cd1f5a62"; fetchSubmodules = false; sha256 = "sha256-XV7opLyfkHIDO0+JJaO/x0za0gsHuklrzapTGdLHJmI="; - }); + }; }; vimagit-nvfetcher = { pname = "vimagit-nvfetcher"; version = "308650ddc1e9a94e49fae0ea04bbc1c45f23d4c4"; - src = fetchFromGitHub ({ + src = fetchFromGitHub { owner = "jreybert"; repo = "vimagit"; rev = "308650ddc1e9a94e49fae0ea04bbc1c45f23d4c4"; fetchSubmodules = false; sha256 = "sha256-fhazQQqyFaO0fdoeNI9nBshwTDhKNHH262H/QThtuO0="; - }); + }; }; wik = { pname = "wik"; version = "aca76040770543a55b8fb0574901bf52df099c34"; - src = fetchFromGitHub ({ + src = fetchFromGitHub { owner = "yashsinghcodes"; repo = "wik"; rev = "aca76040770543a55b8fb0574901bf52df099c34"; fetchSubmodules = false; sha256 = "sha256-qFNRzgXFyOgIvtNKR+7NG5lvQObjgezfRaloA7VH9Lc="; - }); + }; }; zsh-nix-shell = { pname = "zsh-nix-shell"; version = "af6f8a266ea1875b9a3e86e14796cadbe1cfbf08"; - src = fetchFromGitHub ({ + src = fetchFromGitHub { owner = "chisui"; repo = "zsh-nix-shell"; rev = "af6f8a266ea1875b9a3e86e14796cadbe1cfbf08"; fetchSubmodules = false; sha256 = "sha256-BjgMhILEL/qdgfno4LR64LSB8n9pC9R+gG7IQWwgyfQ="; - }); + }; }; } diff --git a/shell/devos.nix b/shell/devos.nix index 3b83163d..5a922b4b 100644 --- a/shell/devos.nix +++ b/shell/devos.nix @@ -39,21 +39,6 @@ in { # override for our own welcome devshell.name = pkgs.lib.mkForce "PubSolarOS"; - # tempfix: remove when merged https://github.com/numtide/devshell/pull/123 - devshell.startup.load_profiles = pkgs.lib.mkForce (pkgs.lib.noDepEntry '' - # PATH is devshell's exorbitant privilige: - # fence against its pollution - _PATH=''${PATH} - # Load installed profiles - for file in "$DEVSHELL_DIR/etc/profile.d/"*.sh; do - # If that folder doesn't exist, bash loves to return the whole glob - [[ -f "$file" ]] && source "$file" - done - # Exert exorbitant privilige and leave no trace - export PATH=''${_PATH} - unset _PATH - ''); - commands = with pkgs; [ (devos nix)