ellmau/nixos
1
0
Fork 0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-21 09:49:39 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: ellmau:ad2e5ba2528894d21d416747f78e5372df2a2ec5
Branches Tags
ellmau:main
ellmau:fix/zsh
ellmau:flake/packages
ellmau:release-23.05
ellmau:xmonad
ellmau:dap-mode
ellmau:service/gitea
ellmau:swayfy
ellmau:redesign/flake
..
compare: ellmau:74ca4b3d0ffd628ddb59eecc09bbc58a6b502095
Branches Tags
ellmau:main
ellmau:fix/zsh
ellmau:flake/packages
ellmau:release-23.05
ellmau:xmonad
ellmau:dap-mode
ellmau:service/gitea
ellmau:swayfy
ellmau:redesign/flake

No commits in common. "ad2e5ba2528894d21d416747f78e5372df2a2ec5" and "74ca4b3d0ffd628ddb59eecc09bbc58a6b502095" have entirely different histories.
ad2e5ba252 ... 74ca4b3d0f

3 changed files with 32 additions and 50 deletions
Show Stats Expand all files Collapse all files

66
flake.lock generated
View File

@ -72,11 +72,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1696410469, "lastModified": 1696244446,
"narHash": "sha256-N8gQTrqQVW+d3bUcWKkfKPKvctMH3SzkzkFtysruPc4=", "narHash": "sha256-IAQEXDLlwrXaCSmt5bxuoqdhZiF8en/3NpiTrJt1bhE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "61ba9eca21db0a7e8a6471d11f3f6f74b79a70ba", "rev": "c231089aff799637747034d067fc4459753aa717",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -140,11 +140,11 @@
"flake-utils": "flake-utils_2" "flake-utils": "flake-utils_2"
}, },
"locked": { "locked": {
"lastModified": 1696331477, "lastModified": 1657226504,
"narHash": "sha256-YkbRa/1wQWdWkVJ01JvV+75KIdM37UErqKgTf0L54Fk=", "narHash": "sha256-GIYNjuq4mJlFgqKsZ+YrgzWm0IpA4axA3MCrdKYj7gs=",
"owner": "gytis-ivaskevicius", "owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus", "repo": "flake-utils-plus",
"rev": "bfc53579db89de750b25b0c5e7af299e0c06d7d3", "rev": "2bf0f91643c2e5ae38c1b26893ac2927ac9bd82a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -154,15 +154,12 @@
} }
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": { "locked": {
"lastModified": 1694529238, "lastModified": 1644229661,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -329,11 +326,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1696323343, "lastModified": 1696039360,
"narHash": "sha256-u7WLUrh5eb+6SBYwtkaGL2ryHpLcHzmLml+a+VqKJWE=", "narHash": "sha256-g7nIUV4uq1TOVeVIDEZLb005suTWCUjSY0zYOlSBsyE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3b79cc4bcd9c09b5aa68ea1957c25e437dc6bc58", "rev": "32dcb45f66c0487e92db8303a798ebc548cadedc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -345,11 +342,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1696123266, "lastModified": 1694908564,
"narHash": "sha256-S6MZEneQeE4M/E/C8SMnr7B7oBnjH/hbm96Kak5hAAI=", "narHash": "sha256-ducA98AuWWJu5oUElIzN24Q22WlO8bOfixGzBgzYdVc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dbe90e63a36762f1fbde546e26a84af774a32455", "rev": "596611941a74be176b98aeba9328aa9d01b8b322",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -361,11 +358,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1696193975, "lastModified": 1696019113,
"narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242", "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -377,11 +374,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1696323343, "lastModified": 1696039360,
"narHash": "sha256-u7WLUrh5eb+6SBYwtkaGL2ryHpLcHzmLml+a+VqKJWE=", "narHash": "sha256-g7nIUV4uq1TOVeVIDEZLb005suTWCUjSY0zYOlSBsyE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3b79cc4bcd9c09b5aa68ea1957c25e437dc6bc58", "rev": "32dcb45f66c0487e92db8303a798ebc548cadedc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -439,11 +436,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1696320910, "lastModified": 1695284550,
"narHash": "sha256-fbuEc6wylH+0VxG48lhPBK+SQJHfo2lusUwWHZNipIM=", "narHash": "sha256-z9fz/wz9qo9XePEvdduf+sBNeoI9QG8NJKl5ssA8Xl4=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "746c7fa1a64c1671a4bf287737c27fdc7101c4c2", "rev": "2f375ed8702b0d8ee2430885059d5e7975e38f78",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -468,21 +465,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": { "utils": {
"locked": { "locked": {
"lastModified": 1605370193, "lastModified": 1605370193,

2
packages/emacs/default.nix
View File

@ -52,7 +52,7 @@ with lib; let
}; };
}; };
emacsPackage = (pkgs.emacsPackagesFor pkgs.emacs29).emacsWithPackages (epkgs: let emacsPackage = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: let
lpkgs = import ./packages.nix {inherit lib pkgs epkgs;}; lpkgs = import ./packages.nix {inherit lib pkgs epkgs;};
#[ (defaultConfig lpkgs) ] ++ (with pkgs; [ #[ (defaultConfig lpkgs) ] ++ (with pkgs; [
# aspell # aspell

12
packages/emacs/packages.nix
View File

@ -8,12 +8,12 @@ in
with epkgs; rec { with epkgs; rec {
org-roam-ui = trivialBuild { org-roam-ui = trivialBuild {
pname = "org-roam-ui"; pname = "org-roam-ui";
version = "2022-10-05"; version = "2021-10-06";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "org-roam"; owner = "org-roam";
repo = "org-roam-ui"; repo = "org-roam-ui";
rev = "5ac74960231db0bf7783c2ba7a19a60f582e91ab"; rev = "bae6487afd5e6eec9f04b38b235bbac24042ca62";
sha256 = "dCoEQRi86eMerkMQPy3Ow/Kj9kzHxXRSrDk4cl8uLHo="; sha256 = "14dbdvxf1l0dwbhc0ap3wr3ffafy4cxmwc9b7gm0gzzmcxvszisc";
}; };
packageRequires = [f websocket org-roam simple-httpd]; packageRequires = [f websocket org-roam simple-httpd];
postInstall = '' postInstall = ''
@ -23,12 +23,12 @@ in
ligatures = trivialBuild { ligatures = trivialBuild {
pname = "ligatures"; pname = "ligatures";
version = "unstable-2023-09-01"; version = "unstable-2021-08-27";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "mickeynp"; owner = "mickeynp";
repo = "ligature.el"; repo = "ligature.el";
rev = "0e5d0a8554622bcb0ec634e364795650ff4f2457"; rev = "d3426509cc5436a12484d91e48abd7b62429b7ef";
sha256 = "vmUWt7HcdaaM/lmyKJgEEPn/6xh+75TzMckl8ohCjI4="; sha256 = "baFDkfQLM2MYW2QhMpPnOMSfsLlcp9fO5xfyioZzOqg=";
}; };
}; };