megamanmalte/nixos
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Clean up

Browse source
This commit is contained in:
Malte Tammena 2021-12-22 18:45:44 +01:00
parent 3c6ac3d843
commit f6ceb79b99
7 changed files with 4 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
flake.lock
View file

@ -331,22 +331,6 @@
"type": "github" "type": "github"
} }
}, },
"mosh": {
"flake": false,
"locked": {
"lastModified": 1636044370,
"narHash": "sha256-RUJRqeVG00q3cwbdFGosDIb9v/nt1xf85YBwo6jvLmM=",
"owner": "mobile-shell",
"repo": "mosh",
"rev": "6b2ffa904d8d294657be641780adcd8dfc859bc3",
"type": "github"
},
"original": {
"owner": "mobile-shell",
"repo": "mosh",
"type": "github"
}
},
"naersk": { "naersk": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
@ -456,38 +440,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-21.05": {
"locked": {
"lastModified": 1638564543,
"narHash": "sha256-slB5V8mWwtpAYquwG/s7vlTROJhObkCPdGrshQlWicM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b86b6bc5e753919ab4d7c902210234f324d0efa4",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-21.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-master": {
"locked": {
"lastModified": 1638741798,
"narHash": "sha256-u6mir0D1ZkmhRnUX9EbB6/8mTEmn5FzcoPjrDL0LBDo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f88b90f5c329a5a4d49e142315fbcb27986a13b1",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-wayland": { "nixpkgs-wayland": {
"inputs": { "inputs": {
"cachix": "cachix", "cachix": "cachix",
@ -736,16 +688,11 @@
"gruvbox-material-gtk": "gruvbox-material-gtk", "gruvbox-material-gtk": "gruvbox-material-gtk",
"home-manager": "home-manager", "home-manager": "home-manager",
"mensa": "mensa", "mensa": "mensa",
"mosh": "mosh",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_11", "nixpkgs": "nixpkgs_11",
"nixpkgs-21.05": "nixpkgs-21.05",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-wayland": "nixpkgs-wayland", "nixpkgs-wayland": "nixpkgs-wayland",
"rip": "rip", "rip": "rip",
"sops-nix": "sops-nix", "sops-nix": "sops-nix"
"sway": "sway",
"wlroots": "wlroots"
} }
}, },
"rust-analyzer-src": { "rust-analyzer-src": {
@ -884,22 +831,6 @@
"type": "github" "type": "github"
} }
}, },
"sway": {
"flake": false,
"locked": {
"lastModified": 1637950218,
"narHash": "sha256-KRZpVETTIt7VGQTCcrCIQ1aG+ma85V1GrYSWYvvCmrA=",
"owner": "swaywm",
"repo": "sway",
"rev": "02b412a3d4e930237a1d16554af6e1e7d1855c89",
"type": "github"
},
"original": {
"owner": "swaywm",
"repo": "sway",
"type": "github"
}
},
"utils": { "utils": {
"locked": { "locked": {
"lastModified": 1638122382, "lastModified": 1638122382,
@ -929,22 +860,6 @@
"repo": "flake-utils", "repo": "flake-utils",
"type": "github" "type": "github"
} }
},
"wlroots": {
"flake": false,
"locked": {
"lastModified": 1635782940,
"narHash": "sha256-wKSJHYFIy6wEI90kmBx/YcgDk2OKmeAyWGSfFtfOqjk=",
"owner": "swaywm",
"repo": "wlroots",
"rev": "0855cdacb2eeeff35849e2e9c4db0aa996d78d10",
"type": "github"
},
"original": {
"owner": "swaywm",
"repo": "wlroots",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

20
flake.nix
View file

@ -3,8 +3,6 @@
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs.url = "nixpkgs/nixos-unstable";
nixpkgs-master.url = "github:NixOS/nixpkgs/master";
"nixpkgs-21.05".url = "github:NixOS/nixpkgs/nixos-21.05";
nixos-hardware.url = "github:NixOS/nixos-hardware"; nixos-hardware.url = "github:NixOS/nixos-hardware";
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
home-manager.url = "github:nix-community/home-manager"; home-manager.url = "github:nix-community/home-manager";
@ -23,18 +21,6 @@
url = "github:nivekuil/rip"; url = "github:nivekuil/rip";
flake = false; flake = false;
}; };
sway = {
url = "github:swaywm/sway";
flake = false;
};
wlroots = {
url = "github:swaywm/wlroots";
flake = false;
};
mosh = {
url = "github:mobile-shell/mosh";
flake = false;
};
"2i-emulator" = { "2i-emulator" = {
url = "github:klemens/2i-emulator"; url = "github:klemens/2i-emulator";
flake = false; flake = false;
@ -251,14 +237,8 @@
# Add some useful overlays # Add some useful overlays
nixpkgs.overlays = [ nixpkgs.overlays = [
(self: super: { (self: super: {
# Add a meta package containing packages from master
bleeding = inputs.nixpkgs-master.legacyPackages.x86_64-linux;
"nixpkgs-21.05" =
inputs."nixpkgs-21.05".legacyPackages.x86_64-linux;
# Add FiraCode as a package, but use NerdFonts # Add FiraCode as a package, but use NerdFonts
firaCodeNerd = super.nerdfonts.override { fonts = [ "FiraCode" ]; }; firaCodeNerd = super.nerdfonts.override { fonts = [ "FiraCode" ]; };
# TODO: Remove once khal is fixed
khal = super.bleeding.khal;
# Add the emulator # Add the emulator
"2a-emulator" = "2a-emulator" =
inputs.emulator-2a.packages.x86_64-linux."2a-emulator"; inputs.emulator-2a.packages.x86_64-linux."2a-emulator";

2
hosts/helix-texta.nix
View file

@ -184,7 +184,7 @@ in {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
thunderbolt thunderbolt
qt5.qtwayland qt5.qtwayland
pkgs."nixpkgs-21.05".chrysalis chrysalis
]; ];
services.printing.enable = true; services.printing.enable = true;

2
malte/khal.nix
View file

@ -43,7 +43,7 @@ let
''; '';
in { in {
home.packages = [ pkgs.bleeding.khal pkgs.vdirsyncer ]; home.packages = [ pkgs.vdirsyncer ];
# == Systemd settings to automatically run the sync == # == Systemd settings to automatically run the sync ==
systemd.user.services."synchronize-calendars" = { systemd.user.services."synchronize-calendars" = {

2
overlays/cataclysm-dda.nix
View file

@ -2,7 +2,7 @@ self: super:
let lock = builtins.fromJSON (builtins.readFile ../flake.lock); let lock = builtins.fromJSON (builtins.readFile ../flake.lock);
in { in {
cataclysm-dda-git = (super.bleeding.cataclysm-dda-git.override { cataclysm-dda-git = (super.cataclysm-dda-git.override {
useXdgDir = true; useXdgDir = true;
version = lock.nodes.cataclysm-dda.locked.rev; version = lock.nodes.cataclysm-dda.locked.rev;
rev = lock.nodes.cataclysm-dda.locked.rev; rev = lock.nodes.cataclysm-dda.locked.rev;

15
overlays/mosh.nix
View file

@ -1,15 +0,0 @@
self: super:
let lock = builtins.fromJSON (builtins.readFile ../flake.lock);
in {
mosh = super.mosh.overrideAttrs (old: {
version = lock.nodes.mosh.locked.rev;
src = super.fetchFromGitHub {
owner = lock.nodes.mosh.locked.owner;
repo = lock.nodes.mosh.locked.repo;
rev = lock.nodes.mosh.locked.rev;
sha256 = lock.nodes.mosh.locked.narHash;
};
patches = builtins.filter (patch: builtins.isPath patch) old.patches;
});
}

23
overlays/sway.nix
View file

@ -1,23 +0,0 @@
self: super:
let lock = builtins.fromJSON (builtins.readFile ../flake.lock);
in {
sway = super.sway.overrideAttrs (old: {
version = lock.nodes.sway.locked.rev;
src = super.fetchFromGitHub {
owner = lock.nodes.sway.locked.owner;
repo = lock.nodes.sway.locked.repo;
rev = lock.nodes.sway.locked.rev;
sha256 = lock.nodes.sway.locked.narHash;
};
});
wlroots = super.wlroots.overrideAttrs (old: {
version = lock.nodes.wlroots.locked.rev;
src = super.fetchFromGitHub {
owner = lock.nodes.wlroots.locked.owner;
repo = lock.nodes.wlroots.locked.repo;
rev = lock.nodes.wlroots.locked.rev;
sha256 = lock.nodes.wlroots.locked.narHash;
};
});
}