palo/nixos-config
palo/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

23.05 -> 23.11

Browse source
This commit is contained in:
Ingolf Wagner 2023-12-08 21:27:13 +01:00
parent e54b1d50d2
commit 40f8d7f4be
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
2 changed files with 68 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

118
flake.lock
View file

@ -47,11 +47,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1699781810, "lastModified": 1701905325,
"narHash": "sha256-LD+PIUbm1yQmQmGIbSsc/PB1dtJtGqXFgxRc1C7LlfQ=", "narHash": "sha256-lda63LmEIlDMeCgWfjr3/wb487XPllBByfrGRieyEk4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "2d7d77878c5d70f66f3d676ff66708d8d4f9d7df", "rev": "1144887c6f4d2dcbb2316a24364ef53e25b0fcfe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -129,11 +129,11 @@
"ws-butler": "ws-butler" "ws-butler": "ws-butler"
}, },
"locked": { "locked": {
"lastModified": 1697814738, "lastModified": 1701264882,
"narHash": "sha256-mwQmykamvRuHmO6I2VTm8+TOIhhmgy2g5YrMjoCHawY=", "narHash": "sha256-MBXR7x7Ua8qystlGr+lenwjQd7dsFNFpEFmtHhh10zM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-doom-emacs", "repo": "nix-doom-emacs",
"rev": "c1c99cf41694440d76e31126dc394f52faeb691e", "rev": "f7413022370f24bb53cb450bfb2803233510113e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -175,22 +175,6 @@
"type": "github" "type": "github"
} }
}, },
"emacs-overlay_2": {
"flake": false,
"locked": {
"lastModified": 1700818747,
"narHash": "sha256-7oS3doGg7Y6nW0TU+ZdKxaDKm3A/dyGaGhE0GkDDuLI=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "312d910d5c8e738ed280ebcc7535d6cbc1c44f16",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "emacs-overlay",
"type": "github"
}
},
"emacs-so-long": { "emacs-so-long": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -515,16 +499,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700392168, "lastModified": 1700814205,
"narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=", "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e", "rev": "aeb2232d7a32530d3448318790534d196bf9427a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.05", "ref": "release-23.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -579,11 +563,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1700205230, "lastModified": 1701282310,
"narHash": "sha256-jF6Qb47maZHTwexI+eY4tL0QAnHJX+MVu74DEWeazA0=", "narHash": "sha256-9QaOSN4qiLqmb1auVSurPN1FrXAaZ7M324TQO0oggco=",
"owner": "kmonad", "owner": "kmonad",
"repo": "kmonad", "repo": "kmonad",
"rev": "cec7d4ac3644c96737da23124e473e13ace5156c", "rev": "0a761c5e2b7a71a5a203d5f04cd2f7c209e79322",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -648,11 +632,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1700559156, "lastModified": 1701656485,
"narHash": "sha256-gL4epO/qf+wo30JjC3g+b5Bs8UrpxzkhNBBsUYxpw2g=", "narHash": "sha256-xDFormrGCKKGqngHa2Bz1GTeKlFMMjLnHhTDRdMJ1hs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "c3abafb01cd7045dba522af29b625bd1e170c2fb", "rev": "fa194fc484fd7270ab324bb985593f71102e84d1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -685,11 +669,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1697026026, "lastModified": 1701682646,
"narHash": "sha256-kRkk8qpZkIxRj74nBtjnBR1ibQQZOkfCutHnWeWkxZo=", "narHash": "sha256-nT6RwwTzTnSbb+7YeC2jGO6evu33PyYX4XaBN5MaJ4g=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-fmt", "repo": "nixpkgs-fmt",
"rev": "f3fac47d6509e6b23c6103bb833353db348c634f", "rev": "305d6b64abe7118d85ee3279571918885b8ffaae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -746,13 +730,29 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-legacy_2305": {
"locked": {
"lastModified": 1701615100,
"narHash": "sha256-7VI84NGBvlCTduw2aHLVB62NvCiZUlALLqBe5v684Aw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e9f06adb793d1cca5384907b3b8a4071d5d7cb19",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1700342017, "lastModified": 1701568804,
"narHash": "sha256-HaibwlWH5LuqsaibW3sIVjZQtEM/jWtOHX4Nk93abGE=", "narHash": "sha256-iwr1fjOCvlirVL/xNvOTwY9kg3L/F3TC/7yh/QszaPI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "decdf666c833a325cb4417041a90681499e06a41", "rev": "dc01248a9c946953ad4d438b0a626f5c987a93e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -764,11 +764,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1700612854, "lastModified": 1701718080,
"narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", "narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", "rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -811,16 +811,16 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1700678569, "lastModified": 1701952659,
"narHash": "sha256-2Ki+2UvOidxEb3xB4ADqlbPQ2BZOF4uZMR094O8or2I=", "narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8f1180704ac35baded1a74164365ac7cdfba6f38", "rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-23.05", "ref": "nixos-23.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -857,11 +857,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1700108881, "lastModified": 1701336116,
"narHash": "sha256-+Lqybl8kj0+nD/IlAWPPG/RDTa47gff9nbei0u7BntE=", "narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7414e9ee0b3e9903c24d3379f577a417f0aae5f1", "rev": "f5c27c6136db4d76c30e533c20517df6864c46ee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -974,11 +974,11 @@
"pandoc_template": "pandoc_template" "pandoc_template": "pandoc_template"
}, },
"locked": { "locked": {
"lastModified": 1701464175, "lastModified": 1701775518,
"narHash": "sha256-TPITLC3vKtR2vX++k+QD5D7cRMHQneTYSmOvxBkiZNc=", "narHash": "sha256-qJ+lyo5/FY35bddRd26y/bpKzRd99lvUeX88iY2VctQ=",
"ref": "main", "ref": "main",
"rev": "f41b79dec8ee7c8fb22bdd971bc187ce2d768206", "rev": "13176fcd5b4689d1b15f1f9d19e946fff45dc3c3",
"revCount": 23, "revCount": 28,
"type": "git", "type": "git",
"url": "ssh://gitea@git.ingolf-wagner.de/palo/overviewer.git" "url": "ssh://gitea@git.ingolf-wagner.de/palo/overviewer.git"
}, },
@ -1077,11 +1077,11 @@
}, },
"retiolum": { "retiolum": {
"locked": { "locked": {
"lastModified": 1700313880, "lastModified": 1701943332,
"narHash": "sha256-EreRbIevMCD1AApX7V/jMH7iWBIG4hkBMsYJ8JSjdTY=", "narHash": "sha256-E7GpAlUcKDB4iXE1jh5s5xnU5m4Ew2TaC7gsuh3zsgw=",
"owner": "Mic92", "owner": "Mic92",
"repo": "retiolum", "repo": "retiolum",
"rev": "d64d84117ec57bb03e67a2f0b90be8b7fbbc424f", "rev": "bd87b89d8aed2e29920e604032937095ed0aef36",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1111,7 +1111,6 @@
"disko": "disko", "disko": "disko",
"dns": "dns", "dns": "dns",
"doom-emacs-nix": "doom-emacs-nix", "doom-emacs-nix": "doom-emacs-nix",
"emacs-overlay": "emacs-overlay_2",
"grocy-scanner": "grocy-scanner", "grocy-scanner": "grocy-scanner",
"home-manager": "home-manager", "home-manager": "home-manager",
"home-manager-utils": "home-manager-utils", "home-manager-utils": "home-manager-utils",
@ -1124,6 +1123,7 @@
"nixpkgs-legacy_2105": "nixpkgs-legacy_2105", "nixpkgs-legacy_2105": "nixpkgs-legacy_2105",
"nixpkgs-legacy_2205": "nixpkgs-legacy_2205", "nixpkgs-legacy_2205": "nixpkgs-legacy_2205",
"nixpkgs-legacy_2211": "nixpkgs-legacy_2211", "nixpkgs-legacy_2211": "nixpkgs-legacy_2211",
"nixpkgs-legacy_2305": "nixpkgs-legacy_2305",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"overviewer": "overviewer", "overviewer": "overviewer",
"permown": "permown", "permown": "permown",
@ -1208,11 +1208,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1700362823, "lastModified": 1701728052,
"narHash": "sha256-/H7XgvrYM0IbkpWkcdfkOH0XyBM5ewSWT1UtaLvOgKY=", "narHash": "sha256-7lOMc3PtW5a55vFReBJLLLOnopsoi1W7MkjJ93jPV4E=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "49a87c6c827ccd21c225531e30745a9a6464775c", "rev": "e91ece6d2cf5a0ae729796b8f0dedceab5107c3d",
"type": "github" "type": "github"
}, },
"original": { "original": {

26
flake.nix
View file

@ -5,28 +5,24 @@
url = "git+ssh://gitea@git.ingolf-wagner.de/palo/nixos-secrets.git?ref=main"; url = "git+ssh://gitea@git.ingolf-wagner.de/palo/nixos-secrets.git?ref=main";
flake = false; flake = false;
}; };
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-legacy_2305.url = "github:nixos/nixpkgs/nixos-23.05";
nixpkgs-legacy_2211.url = "github:nixos/nixpkgs/nixos-22.11"; nixpkgs-legacy_2211.url = "github:nixos/nixpkgs/nixos-22.11";
nixpkgs-legacy_2205.url = "github:nixos/nixpkgs/nixos-22.05"; nixpkgs-legacy_2205.url = "github:nixos/nixpkgs/nixos-22.05";
nixpkgs-legacy_2105.url = "github:nixos/nixpkgs/nixos-21.05"; nixpkgs-legacy_2105.url = "github:nixos/nixpkgs/nixos-21.05";
nixos-hardware.url = "github:nixos/nixos-hardware"; nixos-hardware.url = "github:nixos/nixos-hardware";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.05"; url = "github:nix-community/home-manager/release-23.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
polygon-art = { polygon-art = {
url = "git+https://git.ingolf-wagner.de/palo/polygon-art.git"; url = "git+https://git.ingolf-wagner.de/palo/polygon-art.git";
}; };
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
emacs-overlay = {
url = "github:nix-community/emacs-overlay";
flake = false;
};
doom-emacs-nix = { doom-emacs-nix = {
url = "github:nix-community/nix-doom-emacs"; url = "github:nix-community/nix-doom-emacs";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
#inputs.emacs-overlay.follows = "emacs-overlay";
}; };
home-manager-utils = { home-manager-utils = {
url = "github:mrvandalo/home-manager-utils"; url = "github:mrvandalo/home-manager-utils";
@ -88,7 +84,6 @@
, disko , disko
, dns , dns
, doom-emacs-nix , doom-emacs-nix
, emacs-overlay
, grocy-scanner , grocy-scanner
, home-manager , home-manager
, home-manager-utils , home-manager-utils
@ -101,6 +96,7 @@
, nixpkgs-legacy_2105 , nixpkgs-legacy_2105
, nixpkgs-legacy_2205 , nixpkgs-legacy_2205
, nixpkgs-legacy_2211 , nixpkgs-legacy_2211
, nixpkgs-legacy_2305
, nixpkgs-unstable , nixpkgs-unstable
, overviewer , overviewer
, permown , permown
@ -126,6 +122,7 @@
config.allowUnfree = true; config.allowUnfree = true;
config.permittedInsecurePackages = [ config.permittedInsecurePackages = [
"python-2.7.18.6" "python-2.7.18.6"
"python-2.7.18.7"
"electron-24.8.6" # for bitwarden "electron-24.8.6" # for bitwarden
]; ];
@ -135,15 +132,10 @@
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
legacy_2211 = import nixpkgs-legacy_2211 { legacy_2211 = import nixpkgs-legacy_2211 { inherit system; };
inherit system; legacy_2205 = import nixpkgs-legacy_2205 { inherit system; };
}; legacy_2105 = nixpkgs-legacy_2105 { inherit system; };
legacy_2205 = import nixpkgs-legacy_2205 { legacy_2305 = nixpkgs-legacy_2105 { inherit system; };
inherit system;
};
legacy_2105 = nixpkgs-legacy_2105 {
inherit system;
};
polygon-art = polygon-art.packages.${system}; polygon-art = polygon-art.packages.${system};
landingpage = landingpage.packages.${system}.plain; landingpage = landingpage.packages.${system}.plain;
trilium-server = nixpkgs-unstable.legacyPackages.${system}.trilium-server; trilium-server = nixpkgs-unstable.legacyPackages.${system}.trilium-server;