summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrigory Shipunov2023-06-19 19:29:51 +0200
committerGrigory Shipunov2023-06-19 19:29:51 +0200
commit9d3531ec27ca41aff931dde8a5d84615bb6ca43b (patch)
treecb828e62ed2d3f4ad640a17cad21c58b5a385e1a
parent7e22d089a1bc836cb15199e4ed48a7adc94b08e9 (diff)
remove dead code
-rw-r--r--flake.lock105
-rw-r--r--flake.nix15
-rw-r--r--hosts/toaster/amdgpu-sg-fix.nix4
-rw-r--r--microvms/nextcloud/default.nix2
-rw-r--r--modules/devtools.nix1
5 files changed, 4 insertions, 123 deletions
diff --git a/flake.lock b/flake.lock
index 557b6fa..d2b2c52 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,29 +1,5 @@
{
"nodes": {
- "emacs-overlay": {
- "inputs": {
- "flake-utils": [
- "flake-utils"
- ],
- "nixpkgs": [
- "nixpkgs-unstable"
- ],
- "nixpkgs-stable": "nixpkgs-stable"
- },
- "locked": {
- "lastModified": 1687083221,
- "narHash": "sha256-7cVyuBB5Q7ANTUitSXam9q/cN9I1V4MsO3G2IqlaE/U=",
- "owner": "nix-community",
- "repo": "emacs-overlay",
- "rev": "a4c1f4b163c9ba956a6d09476a2fcb1feb9057ea",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "emacs-overlay",
- "type": "github"
- }
- },
"fenix": {
"inputs": {
"nixpkgs": [
@@ -82,24 +58,6 @@
"type": "github"
}
},
- "flake-parts_2": {
- "inputs": {
- "nixpkgs-lib": "nixpkgs-lib"
- },
- "locked": {
- "lastModified": 1685662779,
- "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "type": "github"
- }
- },
"flake-utils": {
"inputs": {
"systems": "systems"
@@ -189,27 +147,6 @@
"type": "github"
}
},
- "nixd": {
- "inputs": {
- "flake-parts": "flake-parts_2",
- "nixpkgs": [
- "nixpkgs-unstable"
- ]
- },
- "locked": {
- "lastModified": 1687101900,
- "narHash": "sha256-MdVF1hSZ/cHk1t3xOmF8kVfP87MaC4e+fO+gICqwCik=",
- "owner": "nix-community",
- "repo": "nixd",
- "rev": "9de92214f6d0252de55dce58f92ffde471d1238f",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "nixd",
- "type": "github"
- }
- },
"nixpkgs": {
"locked": {
"lastModified": 1686921029,
@@ -226,42 +163,8 @@
"type": "github"
}
},
- "nixpkgs-lib": {
- "locked": {
- "dir": "lib",
- "lastModified": 1685564631,
- "narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a",
- "type": "github"
- },
- "original": {
- "dir": "lib",
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"nixpkgs-stable": {
"locked": {
- "lastModified": 1686921029,
- "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-23.05",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs-stable_2": {
- "locked": {
"lastModified": 1678872516,
"narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
"owner": "NixOS",
@@ -276,7 +179,7 @@
"type": "github"
}
},
- "nixpkgs-stable_3": {
+ "nixpkgs-stable_2": {
"locked": {
"lastModified": 1687031877,
"narHash": "sha256-yMFcVeI+kZ6KD2QBrFPNsvBrLq2Gt//D0baHByMrjFY=",
@@ -323,7 +226,7 @@
"lanzaboote",
"nixpkgs"
],
- "nixpkgs-stable": "nixpkgs-stable_2"
+ "nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1684842236,
@@ -341,12 +244,10 @@
},
"root": {
"inputs": {
- "emacs-overlay": "emacs-overlay",
"fenix": "fenix",
"flake-utils": "flake-utils",
"lanzaboote": "lanzaboote",
"microvm": "microvm",
- "nixd": "nixd",
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"sops-nix": "sops-nix",
@@ -375,7 +276,7 @@
"nixpkgs": [
"nixpkgs"
],
- "nixpkgs-stable": "nixpkgs-stable_3"
+ "nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1687058111,
diff --git a/flake.nix b/flake.nix
index 0be64f7..6fb7c5f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -36,29 +36,14 @@
flake-utils.follows = "flake-utils";
};
};
-
- emacs-overlay = {
- url = "github:nix-community/emacs-overlay";
- inputs = {
- nixpkgs.follows = "nixpkgs-unstable";
- flake-utils.follows = "flake-utils";
- };
- };
-
- nixd = {
- url = "github:nix-community/nixd";
- inputs.nixpkgs.follows = "nixpkgs-unstable";
- };
};
outputs =
inputs@{ self
- , emacs-overlay
, fenix
, flake-utils
, lanzaboote
, microvm
- , nixd
, nixpkgs
, nixpkgs-unstable
, sops-nix
diff --git a/hosts/toaster/amdgpu-sg-fix.nix b/hosts/toaster/amdgpu-sg-fix.nix
deleted file mode 100644
index b67bd57..0000000
--- a/hosts/toaster/amdgpu-sg-fix.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }:
-{
- boot.kernelParams = [ "amdgpu.sg_display=0" ];
-}
diff --git a/microvms/nextcloud/default.nix b/microvms/nextcloud/default.nix
index 5be2662..c2c669c 100644
--- a/microvms/nextcloud/default.nix
+++ b/microvms/nextcloud/default.nix
@@ -52,7 +52,7 @@
enable = true;
hostName = "nc.oxapentane.com";
home = "/var/lib/nextcloud-oxa";
- package = pkgs.nextcloud27;
+ package = pkgs.nextcloud26;
maxUploadSize = "5000M";
caching.redis = true;
autoUpdateApps = {
diff --git a/modules/devtools.nix b/modules/devtools.nix
index 06848d7..a0d9f25 100644
--- a/modules/devtools.nix
+++ b/modules/devtools.nix
@@ -17,7 +17,6 @@
# nix
rnix-lsp
nil
- inputs.nixd.packages."x86_64-linux".nixd
nixpkgs-fmt
nix-index
# julia