diff options
Diffstat (limited to 'users')
-rw-r--r-- | users/glittershark/owothia/owothia.cabal | 2 | ||||
-rw-r--r-- | users/glittershark/system/home/modules/development.nix | 3 | ||||
-rw-r--r-- | users/glittershark/system/system/modules/kernel.nix | 1 | ||||
-rw-r--r-- | users/glittershark/xanthous/src/Xanthous/Orphans.hs | 7 | ||||
-rw-r--r-- | users/tazjin/nixos/frog/default.nix | 1 |
5 files changed, 4 insertions, 10 deletions
diff --git a/users/glittershark/owothia/owothia.cabal b/users/glittershark/owothia/owothia.cabal index 63c438fb8aa0..ef5477ea1bf2 100644 --- a/users/glittershark/owothia/owothia.cabal +++ b/users/glittershark/owothia/owothia.cabal @@ -5,7 +5,7 @@ version: 0.0.1.0 executable owothia main-is: Main.hs build-depends: base - , relude ^>= 0.6.0.0 + , relude , irc-client , lens , chatter diff --git a/users/glittershark/system/home/modules/development.nix b/users/glittershark/system/home/modules/development.nix index aef0c3e6fdca..4e34bcfb0f61 100644 --- a/users/glittershark/system/home/modules/development.nix +++ b/users/glittershark/system/home/modules/development.nix @@ -20,7 +20,8 @@ let sha256 = "1an4h8jjbj3r618ykjwk9brii4h9cxjqy47c4c8rivnvhimgf4wm"; }; - modSha256 = "07ci2726nrn8qjvwcypk6nf8zqmfnmvch8l28bmgj7hpfrbyb424"; + vendorSha256 = "1a5fx6mrv30cl46kswicd8lf5i5shn1fykchvbnbhdpgxhbz6qi4"; + deleteVendor = true; }; in diff --git a/users/glittershark/system/system/modules/kernel.nix b/users/glittershark/system/system/modules/kernel.nix index 92aa6955a73b..bad6845ff769 100644 --- a/users/glittershark/system/system/modules/kernel.nix +++ b/users/glittershark/system/system/modules/kernel.nix @@ -16,6 +16,7 @@ in { boot.kernelPackages = pkgs.linuxPackages.extend (self: super: { kernel = super.kernel.override { + ignoreConfigErrors = true; kernelPatches = super.kernel.kernelPatches ++ [{ name = "linux-ck"; patch = linux-ck; diff --git a/users/glittershark/xanthous/src/Xanthous/Orphans.hs b/users/glittershark/xanthous/src/Xanthous/Orphans.hs index 8e82c372b21c..39821150ef97 100644 --- a/users/glittershark/xanthous/src/Xanthous/Orphans.hs +++ b/users/glittershark/xanthous/src/Xanthous/Orphans.hs @@ -304,16 +304,9 @@ instance forall t name. (NFData t, Monoid t, NFData name) => NFData (Editor t name) where rnf ed = getName @_ @name ed `deepseq` getEditContents ed `deepseq` () -instance NFData StdGen where - -- StdGen's fields are bang-patterned so this is actually correct! - rnf sg = sg `seq` () - deriving via (ReadShowJSON StdGen) instance ToJSON StdGen deriving via (ReadShowJSON StdGen) instance FromJSON StdGen -instance Function StdGen where - function = functionShow - -------------------------------------------------------------------------------- instance CoArbitrary a => CoArbitrary (NonNull a) where diff --git a/users/tazjin/nixos/frog/default.nix b/users/tazjin/nixos/frog/default.nix index 22993c929783..e9381bb076d3 100644 --- a/users/tazjin/nixos/frog/default.nix +++ b/users/tazjin/nixos/frog/default.nix @@ -51,7 +51,6 @@ in depot.lib.fix(self: { hardware = { cpu.amd.updateMicrocode = true; enableRedistributableFirmware = true; - u2f.enable = true; opengl = { enable = true; driSupport = true; |