cream: 22.11 -> 23.05
This commit is contained in:
parent
0f1fb837b9
commit
7c10538858
12 changed files with 129 additions and 105 deletions
166
flake.lock
166
flake.lock
|
@ -49,11 +49,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1684783210,
|
"lastModified": 1687968164,
|
||||||
"narHash": "sha256-hxRbwwBTu1G1u1EdI9nEo/n4HIsQIfNi+2BQ1nEoj/o=",
|
"narHash": "sha256-L9jr2zCB6NIaBE3towusjGBigsnE2pMID8wBGkYbTS4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "f0b9f374bb42fdcd57baa7d4448ac5d4788226bd",
|
"rev": "8002e7cb899bc2a02a2ebfb7f999fcd7c18b92a1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -85,6 +85,7 @@
|
||||||
"doom-snippets": "doom-snippets",
|
"doom-snippets": "doom-snippets",
|
||||||
"emacs-overlay": "emacs-overlay",
|
"emacs-overlay": "emacs-overlay",
|
||||||
"emacs-so-long": "emacs-so-long",
|
"emacs-so-long": "emacs-so-long",
|
||||||
|
"evil-collection": "evil-collection",
|
||||||
"evil-escape": "evil-escape",
|
"evil-escape": "evil-escape",
|
||||||
"evil-markdown": "evil-markdown",
|
"evil-markdown": "evil-markdown",
|
||||||
"evil-org-mode": "evil-org-mode",
|
"evil-org-mode": "evil-org-mode",
|
||||||
|
@ -110,11 +111,11 @@
|
||||||
"ws-butler": "ws-butler"
|
"ws-butler": "ws-butler"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1683249650,
|
"lastModified": 1686959076,
|
||||||
"narHash": "sha256-NwBzz2CHNtT0oDqAGewByQ5OFnAWf+ewHUrK0F44xZk=",
|
"narHash": "sha256-tzwHJ8q9CMpIwxcyCM51i88arntNMARi1mFkAppMgqk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-doom-emacs",
|
"repo": "nix-doom-emacs",
|
||||||
"rev": "588ccf37fa9eb9d2ec787b91c989dcd6892983e9",
|
"rev": "2c4ba0d77fdfa4495929c8aee814936e722715c5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -159,11 +160,11 @@
|
||||||
"emacs-overlay_2": {
|
"emacs-overlay_2": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1685293468,
|
"lastModified": 1688019553,
|
||||||
"narHash": "sha256-weksQQ0YGFk6pjW4Ms5eC1HURH8otWjIb8lJhkvKkZE=",
|
"narHash": "sha256-zoRQUZaBSDRx7CvxI+JlzqcishY0DgMRlzwI6i4IXg8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "8b10f751e48ae0e48b3f037a352c7447dc7d1afe",
|
"rev": "a296b6e6d151351589f643b656f7c92188cabadb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -188,6 +189,22 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"evil-collection": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1686801899,
|
||||||
|
"narHash": "sha256-wGJWF9t8yaxLyYQRf3hK+5/AIYYAS8qWXPDEvatzBlc=",
|
||||||
|
"owner": "emacs-evil",
|
||||||
|
"repo": "evil-collection",
|
||||||
|
"rev": "4a7d924dbd851ef1b2ccb85778be6e7a6a81ebd4",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "emacs-evil",
|
||||||
|
"repo": "evil-collection",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"evil-escape": {
|
"evil-escape": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
@ -457,20 +474,19 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
]
|
||||||
"utils": "utils"
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681092193,
|
"lastModified": 1687871164,
|
||||||
"narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=",
|
"narHash": "sha256-bBFlPthuYX322xOlpJvkjUBz0C+MOBjZdDOOJJ+G2jU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af",
|
"rev": "07c347bb50994691d7b0095f45ebd8838cf6bc38",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-22.11",
|
"ref": "release-23.05",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -503,11 +519,11 @@
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "nix",
|
"dir": "nix",
|
||||||
"lastModified": 1685177663,
|
"lastModified": 1687153676,
|
||||||
"narHash": "sha256-T3WC47AyxwPxwCmukrwE/alZLU3bu7ZuBrCW5DMefI8=",
|
"narHash": "sha256-Q0VJWVBxmmKe55V7Lb+oqoOWWr5vhB46kEzU7v4jVD8=",
|
||||||
"owner": "kmonad",
|
"owner": "kmonad",
|
||||||
"repo": "kmonad",
|
"repo": "kmonad",
|
||||||
"rev": "97ac050f9818e942a706194adb7374f7b10ee339",
|
"rev": "2c658f6fddca39686a5448a0207a4aba215f3be5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -554,11 +570,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1684899633,
|
"lastModified": 1686838567,
|
||||||
"narHash": "sha256-NtwerXX8UFsoNy6k+DukJMriWtEjQtMU/Urbff2O2Dg=",
|
"narHash": "sha256-aqKCUD126dRlVSKV6vWuDCitfjFrZlkwNuvj5LtjRRU=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "4cc688ee711159b9bcb5a367be44007934e1a49d",
|
"rev": "429f232fe1dc398c5afea19a51aad6931ee0fb89",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -591,11 +607,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1678089153,
|
"lastModified": 1687333264,
|
||||||
"narHash": "sha256-Kr6EDc4RZuUHUu4rP+gh4CQSMH35RDJJ9600vAPZVzo=",
|
"narHash": "sha256-tSfLls1bg2oelCQky8QCgpniFDH2OTG/2NycpBkNJKE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs-fmt",
|
"repo": "nixpkgs-fmt",
|
||||||
"rev": "398c5226d3402ec075d36c504a4575c40d01cf0c",
|
"rev": "6d2dee8954cc4e790dede82ddff2aeac4a32da46",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -606,11 +622,43 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-legacy": {
|
"nixpkgs-legacy": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1682600000,
|
"lastModified": 1687666471,
|
||||||
"narHash": "sha256-ha4BehR1dh8EnXSoE1m/wyyYVvHI9txjW4w5/oxsW5Y=",
|
"narHash": "sha256-88VoE8jLzjRhH38mUUrom+zJ7GVMjuW4M321Iri5C/w=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "50fc86b75d2744e1ab3837ef74b53f103a9b55a0",
|
"rev": "6610eb320efb234025e477e51ae7625ccd65a2e8",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixos-22.11",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs-legacy_2105": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1659914493,
|
||||||
|
"narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixos-21.05",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs-legacy_2205": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1685573264,
|
||||||
|
"narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "380be19fbd2d9079f677978361792cb25e8a3635",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -622,27 +670,27 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1685215858,
|
"lastModified": 1687031877,
|
||||||
"narHash": "sha256-IRMFoDXA6cYx3ifVw3B2JcC4JrjT5v7tRAx2vro2Ffs=",
|
"narHash": "sha256-yMFcVeI+kZ6KD2QBrFPNsvBrLq2Gt//D0baHByMrjFY=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ba6e4ddeb3e8ad3f3e3bec63dafbc9fe558729bb",
|
"rev": "e2e2059d19668dab1744301b8b0e821e3aae9c99",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "release-22.11",
|
"ref": "release-23.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1685168767,
|
"lastModified": 1687898314,
|
||||||
"narHash": "sha256-wQgnxz0PdqbyKKpsWl/RU8T8QhJQcHfeC6lh1xRUTfk=",
|
"narHash": "sha256-B4BHon3uMXQw8ZdbwxRK1BmxVOGBV4viipKpGaIlGwk=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e10802309bf9ae351eb27002c85cfdeb1be3b262",
|
"rev": "e18dc963075ed115afb3e312b64643bf8fd4b474",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -669,16 +717,16 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1685215858,
|
"lastModified": 1687829761,
|
||||||
"narHash": "sha256-IRMFoDXA6cYx3ifVw3B2JcC4JrjT5v7tRAx2vro2Ffs=",
|
"narHash": "sha256-QRe1Y8SS3M4GeC58F/6ajz6V0ZLUVWX3ZAMgov2N3/g=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ba6e4ddeb3e8ad3f3e3bec63dafbc9fe558729bb",
|
"rev": "9790f3242da2152d5aa1976e3e4b8b414f4dd206",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-22.11",
|
"ref": "nixos-23.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -699,11 +747,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1685012353,
|
"lastModified": 1686979235,
|
||||||
"narHash": "sha256-U3oOge4cHnav8OLGdRVhL45xoRj4Ppd+It6nPC9nNIU=",
|
"narHash": "sha256-gBlBtk+KrezFkfMrZw6uwTuA7YWtbFciiS14mEoTCo0=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "aeb75dba965e790de427b73315d5addf91a54955",
|
"rev": "7cc30fd5372ddafb3373c318507d9932bd74aafe",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -852,24 +900,25 @@
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1682948724,
|
"lastModified": 1682948724,
|
||||||
"narHash": "sha256-hTSiqRTpKuPksq5vsAO0pIuHdYIaL5EGrmN0T6C3oog=",
|
"narHash": "sha256-hTSiqRTpKuPksq5vsAO0pIuHdYIaL5EGrmN0T6C3oog=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "main",
|
||||||
"rev": "84460fabef41115fa12323c9eaf89abfbe76f22f",
|
"rev": "84460fabef41115fa12323c9eaf89abfbe76f22f",
|
||||||
"revCount": 10,
|
"revCount": 10,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "file:///home/palo/dev/nixos/nixos-private-assets"
|
"url": "ssh://gitea@git.ingolf-wagner.de/palo/nixos-private-assets.git"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
"ref": "main",
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "file:///home/palo/dev/nixos/nixos-private-assets"
|
"url": "ssh://gitea@git.ingolf-wagner.de/palo/nixos-private-assets.git"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"retiolum": {
|
"retiolum": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1682697608,
|
"lastModified": 1686076643,
|
||||||
"narHash": "sha256-SGhjlOQx9vDRrIxm+kyZzDjpiZDTzM3zLCLNgqWPmPY=",
|
"narHash": "sha256-midjyNXeGAqXzwXKnHNsTnRwPIbturlq2FcHOh9fivg=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "retiolum",
|
"repo": "retiolum",
|
||||||
"rev": "e0a7f5bf65c7097949d4e07aafd24aabec8d5852",
|
"rev": "f79b533caf30820d93a79878d871c08faa35b3f4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -909,6 +958,8 @@
|
||||||
"nixpkgs": "nixpkgs_3",
|
"nixpkgs": "nixpkgs_3",
|
||||||
"nixpkgs-fmt": "nixpkgs-fmt",
|
"nixpkgs-fmt": "nixpkgs-fmt",
|
||||||
"nixpkgs-legacy": "nixpkgs-legacy",
|
"nixpkgs-legacy": "nixpkgs-legacy",
|
||||||
|
"nixpkgs-legacy_2105": "nixpkgs-legacy_2105",
|
||||||
|
"nixpkgs-legacy_2205": "nixpkgs-legacy_2205",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
"permown": "permown",
|
"permown": "permown",
|
||||||
"polygon-art": "polygon-art",
|
"polygon-art": "polygon-art",
|
||||||
|
@ -990,11 +1041,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1685242617,
|
"lastModified": 1687398569,
|
||||||
"narHash": "sha256-UBPXGfGwGMJm2Wj9kDj8+TMMK2PTouSM/TpiXYtaqtQ=",
|
"narHash": "sha256-e/umuIKFcFtZtWeX369Hbdt9r+GQ48moDmlTcyHWL28=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "3e016341d4dca6ce7c62316f90e66341841a30f9",
|
"rev": "2ff6973350682f8d16371f8c071a304b8067f192",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1050,21 +1101,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"utils": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1667395993,
|
|
||||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"ws-butler": {
|
"ws-butler": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
|
25
flake.nix
25
flake.nix
|
@ -8,20 +8,23 @@
|
||||||
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-22.11";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
|
||||||
|
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
|
nixpkgs-legacy.url = "github:nixos/nixpkgs/nixos-22.11";
|
||||||
|
nixpkgs-legacy_2205.url = "github:nixos/nixpkgs/nixos-22.05";
|
||||||
|
nixpkgs-legacy_2105.url = "github:nixos/nixpkgs/nixos-21.05";
|
||||||
nixos-hardware = {
|
nixos-hardware = {
|
||||||
url = "github:nixos/nixos-hardware";
|
url = "github:nixos/nixos-hardware";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
home-manager = {
|
||||||
# colmena
|
url = "github:nix-community/home-manager/release-23.05";
|
||||||
# -------
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
colmena = {
|
colmena = {
|
||||||
url = "github:zhaofengli/colmena";
|
url = "github:zhaofengli/colmena";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
|
||||||
nixpkgs-legacy.url = "github:nixos/nixpkgs/nixos-22.05";
|
|
||||||
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";
|
||||||
};
|
};
|
||||||
|
@ -35,10 +38,6 @@
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
#inputs.emacs-overlay.follows = "emacs-overlay";
|
#inputs.emacs-overlay.follows = "emacs-overlay";
|
||||||
};
|
};
|
||||||
home-manager = {
|
|
||||||
url = "github:nix-community/home-manager/release-22.11";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
home-manager-utils = {
|
home-manager-utils = {
|
||||||
url = "github:mrvandalo/home-manager-utils";
|
url = "github:mrvandalo/home-manager-utils";
|
||||||
inputs.home-manager.follows = "home-manager";
|
inputs.home-manager.follows = "home-manager";
|
||||||
|
@ -57,8 +56,8 @@
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
private_assets = {
|
private_assets = {
|
||||||
url = "git+file:///home/palo/dev/nixos/nixos-private-assets";
|
#url = "git+file:///home/palo/dev/nixos/nixos-private-assets";
|
||||||
#url = "git+ssh://gitea@git.ingolf-wagner.de/palo/nixos-private-assets.git?ref=main";
|
url = "git+ssh://gitea@git.ingolf-wagner.de/palo/nixos-private-assets.git?ref=main";
|
||||||
flake = true;
|
flake = true;
|
||||||
};
|
};
|
||||||
retiolum = {
|
retiolum = {
|
||||||
|
@ -99,6 +98,8 @@
|
||||||
, nixpkgs
|
, nixpkgs
|
||||||
, nixpkgs-fmt
|
, nixpkgs-fmt
|
||||||
, nixpkgs-legacy
|
, nixpkgs-legacy
|
||||||
|
, nixpkgs-legacy_2105
|
||||||
|
, nixpkgs-legacy_2205
|
||||||
, nixpkgs-unstable
|
, nixpkgs-unstable
|
||||||
, permown
|
, permown
|
||||||
, polygon-art
|
, polygon-art
|
||||||
|
|
|
@ -1,16 +0,0 @@
|
||||||
{ ... }:
|
|
||||||
{
|
|
||||||
services.bind = {
|
|
||||||
enable = false;
|
|
||||||
zones = {
|
|
||||||
private = {
|
|
||||||
name = "*.private";
|
|
||||||
extraConfig = "";
|
|
||||||
file = "/var/dns/tinc.private";
|
|
||||||
master = true;
|
|
||||||
#masters = [ "192.168.0.1" ];
|
|
||||||
#slaves = [ ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -15,7 +15,6 @@ with types;
|
||||||
./hosts.nix
|
./hosts.nix
|
||||||
./wifi.nix
|
./wifi.nix
|
||||||
#./avahi.nix
|
#./avahi.nix
|
||||||
#./bind9.nix
|
|
||||||
];
|
];
|
||||||
|
|
||||||
config = mkIf config.components.network.enable { };
|
config = mkIf config.components.network.enable { };
|
||||||
|
|
|
@ -40,8 +40,8 @@ in
|
||||||
|
|
||||||
services.openssh = {
|
services.openssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
forwardX11 = false;
|
settings.X11Forwarding = false;
|
||||||
passwordAuthentication = false;
|
settings.PasswordAuthentication = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
users.users.root.openssh.authorizedKeys.keyFiles = cfg.rootKeyFiles ++ defaultRootKeyFiles;
|
users.users.root.openssh.authorizedKeys.keyFiles = cfg.rootKeyFiles ++ defaultRootKeyFiles;
|
||||||
|
|
|
@ -27,7 +27,7 @@ with types;
|
||||||
hardware.enableRedistributableFirmware = true;
|
hardware.enableRedistributableFirmware = true;
|
||||||
|
|
||||||
# because Networkd-wait-online is just failing.
|
# because Networkd-wait-online is just failing.
|
||||||
systemd.services.systemd-networkd-wait-online.enable = false;
|
# systemd.services.systemd-networkd-wait-online.enable = false;
|
||||||
systemd.services.NetworkManager-wait-online.enable = false;
|
systemd.services.NetworkManager-wait-online.enable = false;
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
|
|
|
@ -6,6 +6,8 @@
|
||||||
../../system/desktop
|
../../system/desktop
|
||||||
../../system/server/netdata.nix
|
../../system/server/netdata.nix
|
||||||
|
|
||||||
|
./strange_2305_upgrade.nix
|
||||||
|
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
./packages.nix
|
./packages.nix
|
||||||
./syncthing.nix
|
./syncthing.nix
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
# Use the systemd-boot EFI boot loader, not grub
|
# Use the systemd-boot EFI boot loader, not grub
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
boot.tmpOnTmpfs = true; # make /tmp a tmpfs (performance!)
|
boot.tmp.useTmpfs = true; # make /tmp a tmpfs (performance!)
|
||||||
|
|
||||||
boot.initrd.luks.devices = {
|
boot.initrd.luks.devices = {
|
||||||
pool = {
|
pool = {
|
||||||
|
@ -68,7 +68,4 @@
|
||||||
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
|
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
|
||||||
# high-resolution display
|
|
||||||
hardware.video.hidpi.enable = lib.mkDefault true;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,7 +55,7 @@ in
|
||||||
blueberry
|
blueberry
|
||||||
|
|
||||||
nextcloud-client
|
nextcloud-client
|
||||||
gimp
|
#gimp
|
||||||
inkscape
|
inkscape
|
||||||
imagemagick
|
imagemagick
|
||||||
|
|
||||||
|
|
5
nixos/machines/cream/strange_2305_upgrade.nix
Normal file
5
nixos/machines/cream/strange_2305_upgrade.nix
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
nixpkgs.config.permittedInsecurePackages = [
|
||||||
|
"python-2.7.18.6"
|
||||||
|
];
|
||||||
|
}
|
|
@ -10,8 +10,8 @@ in {
|
||||||
emo = callPackage ./emoji { };
|
emo = callPackage ./emoji { };
|
||||||
light-control = callPackage ./light-control { };
|
light-control = callPackage ./light-control { };
|
||||||
otpmenu = callPackage ./otpmenu { };
|
otpmenu = callPackage ./otpmenu { };
|
||||||
sononym = callPackage ./sononym { };
|
#sononym = callPackage ./sononym { };
|
||||||
sononym-crawler = callPackage ./sononym-crawler { };
|
#sononym-crawler = callPackage ./sononym-crawler { };
|
||||||
taskwarrior-hooks = callPackage ./taskwarrior-hooks { };
|
taskwarrior-hooks = callPackage ./taskwarrior-hooks { };
|
||||||
terminal-tools = callPackage ./terminal-tools { };
|
terminal-tools = callPackage ./terminal-tools { };
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
#./icecast.nix
|
#./icecast.nix
|
||||||
#./audio.nix
|
#./audio.nix
|
||||||
./mail-stuff.nix
|
#./mail-stuff.nix
|
||||||
./packages.nix
|
./packages.nix
|
||||||
./size.nix
|
./size.nix
|
||||||
#./user.nix
|
#./user.nix
|
||||||
|
|
Loading…
Reference in a new issue