ellmau/nixos
1
0
Fork 0
mirror of https://github.com/ellmau/nixos.git synced 2026-11-03 13:54:54 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: ellmau:c81d0d3d04f5d4a8ad232738c98f9ab583876426
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:85c4714285372f6bdb54b2b3626f2ed9adbde75f
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. "c81d0d3d04f5d4a8ad232738c98f9ab583876426" and "85c4714285372f6bdb54b2b3626f2ed9adbde75f" have entirely different histories.
c81d0d3d04 ... 85c4714285

4 changed files with 63 additions and 121 deletions
Show Stats Expand all files Collapse all files

147
flake.lock generated
View File

@ -29,11 +29,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1790351001, "lastModified": 1759163198,
"narHash": "sha256-yI8V3XX8vVVyMx7+yp4MEn/AWP9E14AaIklVXJAEVNE=", "narHash": "sha256-+iEF1sJaJtDXhzQcPG9IL9we7W0hfuG3lmqKIjxRVqA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "comma", "repo": "comma",
"rev": "e73b22dc00d74adfed9ac534867caaa40563a065", "rev": "0ba771882bb07a769c04de4e2a9209e811eabab9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -42,21 +42,6 @@
"type": "github" "type": "github"
} }
}, },
"dried-nix-flakes": {
"locked": {
"lastModified": 1756139350,
"narHash": "sha256-pObQv94NclXVXjJV8sTiKwFes4fGEWpkNzDsXw5DqnY=",
"owner": "cyberus-technology",
"repo": "dried-nix-flakes",
"rev": "1b2ba62710c6c1d9eba0e8e3adc029cc2e9291a4",
"type": "github"
},
"original": {
"owner": "cyberus-technology",
"repo": "dried-nix-flakes",
"type": "github"
}
},
"emacs-overlay": { "emacs-overlay": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -65,11 +50,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1792763954, "lastModified": 1761150419,
"narHash": "sha256-CpL4HvFgJdmMCNZki2A9MDGKh6V0QVKe1aFmQGqol7M=", "narHash": "sha256-oiXbhsUQ9Dd4zu1MTNQW7dq6kodiCPli0LtbXaSyFPY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "46e212732a78ac53e0b9792c457dee9e3a15fe91", "rev": "d25fc7e60a935d562b5b0dac8c79554a5eed9d67",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -104,11 +89,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1767039857, "lastModified": 1747046372,
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -156,11 +141,11 @@
"flake-utils": "flake-utils" "flake-utils": "flake-utils"
}, },
"locked": { "locked": {
"lastModified": 1779563444, "lastModified": 1738591040,
"narHash": "sha256-+rEagECcF6BhWfLs8VCkPqsBuxxSSIRxMlgjXj6G8UQ=", "narHash": "sha256-4WNeriUToshQ/L5J+dTSWC5OJIwT39SEP7V7oylndi8=",
"owner": "gytis-ivaskevicius", "owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus", "repo": "flake-utils-plus",
"rev": "a00f6f51907b5c74d2fde086b10b19d446d15717", "rev": "afcb15b845e74ac5e998358709b2b5fe42a948d1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -252,17 +237,19 @@
}, },
"glpi-inventory": { "glpi-inventory": {
"inputs": { "inputs": {
"dried-nix-flakes": "dried-nix-flakes",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
],
"utils": [
"flake-utils-plus"
] ]
}, },
"locked": { "locked": {
"lastModified": 1779975055, "lastModified": 1748281236,
"narHash": "sha256-xQbn3lL8xj25wRXswN0c4CnIk88rEV/wjP3YKnP6GN0=", "narHash": "sha256-t8/FElqfjCJy0spewRK0IjC+Y+K6bkprMjpA6Uy2Nws=",
"owner": "mmarx", "owner": "mmarx",
"repo": "glpi-inventory", "repo": "glpi-inventory",
"rev": "24b5ced6766fa6d712cb5b07c3a7fd580745a850", "rev": "23c74136a320804c3f737219cf3522b3ebb4b4cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -278,11 +265,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1763992789, "lastModified": 1758463745,
"narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -295,11 +282,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1777914952, "lastModified": 1753306924,
"narHash": "sha256-H94I3Z9PgI0utJ56Ma+DLNPNjVyKfIrOBLYDQkw+zUU=", "narHash": "sha256-jLCEW0FvjFhC+c4RHzH+xbkSOxrnpFHnhjOw6sudhx0=",
"rev": "c2dbb0f5bfffa2562ae9f84040e5bb3503c6b011", "rev": "1a4393d0aac31aba21f5737ede1b171e11336d77",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/c2dbb0f5bfffa2562ae9f84040e5bb3503c6b011.tar.gz?rev=c2dbb0f5bfffa2562ae9f84040e5bb3503c6b011" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1a4393d0aac31aba21f5737ede1b171e11336d77.tar.gz?rev=1a4393d0aac31aba21f5737ede1b171e11336d77"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -316,11 +303,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1778183118, "lastModified": 1756125859,
"narHash": "sha256-fWYOWhACIzdj8YC4pG9yjaH1B4kjKT/RdH7lxwTr9MQ=", "narHash": "sha256-6a+PWILmqHCs9B5eIBLg6HSZ8jYweZpgOWO8FlyVwYI=",
"rev": "573e44683c02018534d1d9c281518d62db9efa67", "rev": "d3292125035b04df00d01549a26e948631fabe1e",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/573e44683c02018534d1d9c281518d62db9efa67.tar.gz?rev=573e44683c02018534d1d9c281518d62db9efa67" "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/d3292125035b04df00d01549a26e948631fabe1e.tar.gz?rev=d3292125035b04df00d01549a26e948631fabe1e"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -336,11 +323,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1782220280, "lastModified": 1752689277,
"narHash": "sha256-thLTFbp9D5Qknmh8q/v4FRpLGphUSijT3E86cbLYTXo=", "narHash": "sha256-uldUBFkZe/E7qbvxa3mH1ItrWZyT6w1dBKJQF/3ZSsc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "naersk", "repo": "naersk",
"rev": "9aa07bb0256d300219b30622d2454e85f7f3667e", "rev": "0e72363d0938b0208d6c646d10649164c43f4d64",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -351,15 +338,12 @@
} }
}, },
"nixos-hardware": { "nixos-hardware": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": { "locked": {
"lastModified": 1792697326, "lastModified": 1760958188,
"narHash": "sha256-2UBK0jdmPANGaeAIoVOZY+hSPB2Gy13ZuZeSxP3vF8k=", "narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "1b418b8f203e49a92f250f8babdd19af1b6f7a7f", "rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -371,15 +355,18 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1789546076, "lastModified": 1761016216,
"narHash": "sha256-vWkSk5bbfTqdtMoSgD9FshACO8JCvXTFi+3cqEp0mH0=", "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=",
"rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3", "owner": "NixOS",
"type": "tarball", "repo": "nixpkgs",
"url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1074753.b1b875982b17/nixexprs.tar.xz" "rev": "481cf557888e05d3128a76f14c76397b7d7cc869",
"type": "github"
}, },
"original": { "original": {
"type": "tarball", "owner": "NixOS",
"url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" "ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-25_05": { "nixpkgs-25_05": {
@ -400,27 +387,27 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1792615934, "lastModified": 1760862643,
"narHash": "sha256-MlvRfa1O5Cqc2/a+gG+l9TSuowEoCKCmrJ1d9oAVm0I=", "narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "da6dc0e7b26060f2f71ce3ef7088fb56ee44fa36", "rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-26.05", "ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1792502884, "lastModified": 1760878510,
"narHash": "sha256-IoNisKcGbUjdd45qCqywGMCYmZ5EnkxezvLII0FWwNA=", "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "02c087f3fe673c9e317f206a627cb6b910336dbe", "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -430,22 +417,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1767313136,
"narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"comma": "comma", "comma": "comma",
@ -455,7 +426,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"lix-module": "lix-module", "lix-module": "lix-module",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"simple-nixos-mailserver": "simple-nixos-mailserver", "simple-nixos-mailserver": "simple-nixos-mailserver",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
@ -489,11 +460,11 @@
"nixpkgs-25_05": "nixpkgs-25_05" "nixpkgs-25_05": "nixpkgs-25_05"
}, },
"locked": { "locked": {
"lastModified": 1763302796, "lastModified": 1755110674,
"narHash": "sha256-mEc3SBjRYfMcbNFLxmCc5tRtlu3j+1q7zRz+nRraSFE=", "narHash": "sha256-PigqTAGkdBYXVFWsJnqcirrLeFqRFN4PFigLA8FzxeI=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "5b38fb599f50e9d78325d1d2706e36303c166047", "rev": "f5936247dbdb8501221978562ab0b302dd75456c",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -510,11 +481,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1792655475, "lastModified": 1760998189,
"narHash": "sha256-4ChDjNgJM5uKwTuecLHxGlafAtoyKo5a7ip23J5IG3M=", "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "e80b8b733d8452a751a25d0063abc9683b6c8185", "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
"type": "github" "type": "github"
}, },
"original": { "original": {

31
flake.nix
View File

@ -36,7 +36,7 @@
}; };
sops-nix = { sops-nix = {
url = "github:Mic92/sops-nix/5a7d18b5c55642df5c432aadb757140edfeb70b3"; url = "github:Mic92/sops-nix/master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -103,7 +103,6 @@
channels.nixpkgs.overlaysBuilder = channels: channels.nixpkgs.overlaysBuilder = channels:
[ [
(final: prev: {unstable = channels.nixpkgs-unstable;}) (final: prev: {unstable = channels.nixpkgs-unstable;})
inputs.self.outputs.overlays.php-security-fix
(flake-utils-plus.lib.genPkgOverlay inputs.comma "comma") (flake-utils-plus.lib.genPkgOverlay inputs.comma "comma")
#inputs.nix.overlay #inputs.nix.overlay
inputs.emacs-overlay.overlay inputs.emacs-overlay.overlay
@ -160,34 +159,6 @@
emacs-overlay = inputs.emacs-overlay.overlay; emacs-overlay = inputs.emacs-overlay.overlay;
flake-utils-plus = genPkgOverlay inputs.flake-utils-plus "fup-repl"; flake-utils-plus = genPkgOverlay inputs.flake-utils-plus "fup-repl";
glpi-inventory = inputs.glpi-inventory.overlays.default; glpi-inventory = inputs.glpi-inventory.overlays.default;
php-security-fix = final: prev: let
lib = prev.lib;
patchPhp = php: version: sha256:
(php.override {
packageOverrides = pfinal: pprev: {
extensions = pprev.extensions // (lib.mapAttrs
(name: ext:
if lib.isDerivation ext
then ext.overrideAttrs (_: { doCheck = false; })
else ext)
pprev.extensions);
};
}).overrideAttrs (old: {
inherit version;
doCheck = false;
src = prev.fetchurl {
url = "https://www.php.net/distributions/php-${version}.tar.xz";
inherit sha256;
};
});
in {
php83 = patchPhp prev.php83 "8.3.36"
"1zcj2qxkmjc9aw81sv4al583fiy2haq9dvls5vbw9i9llcx6jm6x";
php84 = patchPhp prev.php84 "8.4.4"
"1b41jr2v7ncdcjn6zjq21ig6v20inchv5jlyf6zdhkc9rjick9h5";
php = final.php83;
};
}; };
outputsBuilder = channels: { outputsBuilder = channels: {

1
machines/metis/default.nix
View File

@ -42,7 +42,6 @@
enable = true; enable = true;
acme.staging = false; acme.staging = false;
wordpress.enable = false; wordpress.enable = false;
grocy.enable = false;
}; };
# enable wireguard # enable wireguard

5
packages/emacs/default.nix
View File

@ -87,7 +87,7 @@ with lib; let
diminish diminish
direnv direnv
dockerfile-mode dockerfile-mode
#docker-compose-mode docker-compose-mode
flycheck flycheck
free-keys free-keys
haskell-mode haskell-mode
@ -101,7 +101,7 @@ with lib; let
helm-projectile helm-projectile
helm-rg helm-rg
json-mode json-mode
#less-css-mode less-css-mode
lsp-haskell lsp-haskell
lsp-mode lsp-mode
lsp-ui lsp-ui
@ -140,3 +140,4 @@ in
# url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz; # url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
# })) # }))
#]; #];