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

Compare commits

base: palo:3ffa8ea003b652228f83c3738f5a916733608afd
Branches Tags
palo:main
palo:feature/bugwarrior3
palo:update
palo:refactor/component/ssh
palo:orbi-ssh-unlock-works
...
compare: palo:b68cba4fe3bac3bedbbfafdbfc13019e5cd69db7
Branches Tags
palo:main
palo:feature/bugwarrior3
palo:update
palo:refactor/component/ssh
palo:orbi-ssh-unlock-works

2 commits
3ffa8ea003 ... b68cba4fe3

Author SHA1 Message Date
Ingolf Wagner
b68cba4fe3
get rid of dnsmasq which crashes quite often 2022-07-18 19:11:20 +02:00
Ingolf Wagner
c4a862387b
flake update 2022-07-18 19:11:03 +02:00
4 changed files with 149 additions and 82 deletions
Show stats Expand all files Collapse all files

226
flake.lock
View file

@ -42,11 +42,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1656117277,
"narHash": "sha256-C/CtDsy4K8r2JQOaqZ01GWbW1yC5hTwGBt77jiRcExE=",
"lastModified": 1657701943,
"narHash": "sha256-ji+KCzZX59bxu1tsY8IaWC/Q9MgkCDpBsGzW+zxu0NA=",
"owner": "zhaofengli",
"repo": "colmena",
"rev": "432d4212fc14d846c1de0c0dd90a694c8d36a861",
"rev": "07efd5818df1465ec488b86ab80cb7ffdaf4df06",
"type": "github"
},
"original": {
@ -58,11 +58,11 @@
"doom-emacs": {
"flake": false,
"locked": {
"lastModified": 1654347726,
"narHash": "sha256-B4N+UQ0SvnCH0Hqc62Wl1KS6WcTBGLag0BoH3UZGbgo=",
"lastModified": 1657023376,
"narHash": "sha256-huKtA8twjW3GkfA6NRvCjWMWUEN58ju4sL89rRQxOes=",
"owner": "doomemacs",
"repo": "doomemacs",
"rev": "bea3cc161c0a803dcf574f32ee555dccf565a5ce",
"rev": "9ec60d9ab9eb5d9b098e2452395156b622cce624",
"type": "github"
},
"original": {
@ -78,10 +78,12 @@
"doom-snippets": "doom-snippets",
"emacs-overlay": "emacs-overlay",
"emacs-so-long": "emacs-so-long",
"evil-escape": "evil-escape",
"evil-markdown": "evil-markdown",
"evil-org-mode": "evil-org-mode",
"evil-quick-diff": "evil-quick-diff",
"explain-pause-mode": "explain-pause-mode",
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils",
"format-all": "format-all",
"nix-straight": "nix-straight",
@ -95,14 +97,17 @@
"org-yt": "org-yt",
"php-extras": "php-extras",
"revealjs": "revealjs",
"rotate-text": "rotate-text"
"rotate-text": "rotate-text",
"sln-mode": "sln-mode",
"ts-fold": "ts-fold",
"ws-butler": "ws-butler"
},
"locked": {
"lastModified": 1655429822,
"narHash": "sha256-g1uW2GybLSL0vrBOZWrdket7IHBuWu2S1ev++1WUxuA=",
"lastModified": 1657569368,
"narHash": "sha256-95ZnI1wNpWBf68iJHgMtFFVV3ceJhiwD+JrSv8/8nMY=",
"owner": "nix-community",
"repo": "nix-doom-emacs",
"rev": "d296d6d44b27a5090c4096ff9a7ded37803a558d",
"rev": "281b1f2a6ca12b0469bd557f6d9848ecbfaee28b",
"type": "github"
},
"original": {
@ -114,11 +119,11 @@
"doom-snippets": {
"flake": false,
"locked": {
"lastModified": 1651768501,
"narHash": "sha256-55mHNFfn3N8k4aWgswX9buATsOhQTJ0L05UaUNNMgDg=",
"lastModified": 1655900328,
"narHash": "sha256-fEYwFxW2sdzNK14DrS92OCGy8KDPZKewrHljnE/RlzQ=",
"owner": "doomemacs",
"repo": "snippets",
"rev": "f74b11b1e0fe8481e20f3065e355efe627e635de",
"rev": "6b2bd5a77c536ed414794ecf71d37a60ebd4663e",
"type": "github"
},
"original": {
@ -130,11 +135,11 @@
"emacs-overlay": {
"flake": false,
"locked": {
"lastModified": 1655408680,
"narHash": "sha256-E6s17Wg3NExV3cxFnVzTEHjcRyBBwvbx6acNEttU40A=",
"lastModified": 1657275959,
"narHash": "sha256-pg8FB1DRImBpqXHCp/0Y7bIphpVqGmkWgWOcFDMwdTg=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "270d5e914b4c0425a4982cf585c91d6760e78777",
"rev": "22448c09bae21969ca14d1558a120dafe9853c73",
"type": "github"
},
"original": {
@ -146,11 +151,11 @@
"emacs-overlay_2": {
"flake": false,
"locked": {
"lastModified": 1656214117,
"narHash": "sha256-CiU7ZFnecxm1pWK/VWU+xD6vLnuT/N9Mf6TzYmSfn04=",
"lastModified": 1657739074,
"narHash": "sha256-s7qlR7HyMrbDywk5RAJQ/YEXaMqcePSq9oOdYlUpCSA=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "057f91fc4ed58b5deeb8319c82bdb0b737e952f0",
"rev": "6608997ad0224f59cae68b0c9db0eeb8c4c32e8f",
"type": "github"
},
"original": {
@ -175,6 +180,22 @@
"type": "github"
}
},
"evil-escape": {
"flake": false,
"locked": {
"lastModified": 1588439096,
"narHash": "sha256-aB2Ge5o/93B18tPf4fN1c+O46CNh/nOqwLJbox4c8Gw=",
"owner": "hlissner",
"repo": "evil-escape",
"rev": "819f1ee1cf3f69a1ae920e6004f2c0baeebbe077",
"type": "github"
},
"original": {
"owner": "hlissner",
"repo": "evil-escape",
"type": "github"
}
},
"evil-markdown": {
"flake": false,
"locked": {
@ -277,13 +298,29 @@
"type": "github"
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1650374568,
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b4a34015c698c7793d592d66adbab377907a2be8",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": {
"locked": {
"lastModified": 1653893745,
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
"lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"type": "github"
},
"original": {
@ -455,11 +492,11 @@
"nix-straight": {
"flake": false,
"locked": {
"lastModified": 1643475817,
"narHash": "sha256-NpExq5nbPbj/ppkBX3SnETEJuOne1MKJxen8vVHsDFg=",
"lastModified": 1656684255,
"narHash": "sha256-ZefQiv4Ipu2VkLjs1oyelTLU7kBVJgkcQd+yBpJU0yo=",
"owner": "nix-community",
"repo": "nix-straight.el",
"rev": "08d75e5651cb52f8a07e03408ed19e04bee07505",
"rev": "fb8dd5c44cde70abd13380766e40af7a63888942",
"type": "github"
},
"original": {
@ -470,11 +507,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1654230545,
"narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=",
"lastModified": 1656372800,
"narHash": "sha256-1u9SDLXvKix/QejNb2sY2J2QZXnbe/14MnLtn+ln9j0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec",
"rev": "020c74014b9e2fa905bb4059c979965816cd9118",
"type": "github"
},
"original": {
@ -484,29 +521,13 @@
"type": "github"
}
},
"nixpkgs-21_11": {
"locked": {
"lastModified": 1656198488,
"narHash": "sha256-xe81o3Kin6a0jXA3mTxcR+jeA1jLKw3TCar5LUo/B5c=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "46af3303651699dc58cfc251d9b18c0f59d857da",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-21.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-22_05": {
"locked": {
"lastModified": 1656199498,
"narHash": "sha256-/BCpM7j7y1G4het6Z3idlnv9A87/s0O1glVmH7fnWvk=",
"lastModified": 1657399715,
"narHash": "sha256-7YX+I8FP3/iJTRs33VhIbdx91YWlZQf8zaEEeM97964=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "72a1f167077060a1a7b6e0104863245d0483fa7f",
"rev": "0ad6eae04953060dff8ba28af158799c3e13878d",
"type": "github"
},
"original": {
@ -525,11 +546,11 @@
]
},
"locked": {
"lastModified": 1655463281,
"narHash": "sha256-vkxECKrCjywR13hd+mV3naglzBUSemU2uKW7qXETquo=",
"lastModified": 1657716877,
"narHash": "sha256-VZrLebgC/0lioEYh8oqJAhbfMyGtVNp6ASevf6t11IE=",
"owner": "nix-community",
"repo": "nixpkgs-fmt",
"rev": "9e8bde571902a3cf0f5a725f27fcf11cb25921c1",
"rev": "3c4addcc0aa9a6eb9fb64d9206733110d1153a52",
"type": "github"
},
"original": {
@ -540,11 +561,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1655983783,
"narHash": "sha256-0h1FzkYWei24IdKNpCX93onkF/FMiXQG8SdEbTc0r8A=",
"lastModified": 1657533762,
"narHash": "sha256-/cxTFSMmpAb8tBp1yVga1fj+i8LB9aAxnMjYFpRMuVs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6141b8932a5cf376fe18fcd368cecd9ad946cb68",
"rev": "38860c9e91cb00f4d8cd19c7b4e36c45680c89b5",
"type": "github"
},
"original": {
@ -571,11 +592,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1656007306,
"narHash": "sha256-MsC44YZ6wuBwn5Bu8T+RVoQWlp2l5BR6hhmNoAAHIEw=",
"lastModified": 1657654771,
"narHash": "sha256-uIGbt+rU89aTlSx8+4g9vKioWc8nmCCcaaFCNPHM07c=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ccf8bdf72624521358be6bb7d9b524c4cbcf7aff",
"rev": "4aceab3cadf9fef6f70b9f6a9df964218650db0a",
"type": "github"
},
"original": {
@ -601,11 +622,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1656130826,
"narHash": "sha256-g5Wo75ddDQmWnL70rJCMm+JJlvHbzPFUePUpuMNn5qk=",
"lastModified": 1657292830,
"narHash": "sha256-ldfVSTveWceDCmW6gf3B4kR6vwmz/XS80y5wsLLHFJU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "72d1b0d0fac131df1ea254b65413c85609bdd2ee",
"rev": "334ec8b503c3981e37a04b817a70e8d026ea9e84",
"type": "github"
},
"original": {
@ -650,11 +671,11 @@
"org": {
"flake": false,
"locked": {
"lastModified": 1655383862,
"narHash": "sha256-WZLa8ly+WjLVIhiKf0m1hwJ3c1BJVwBZgr9AHAJ6zQw=",
"lastModified": 1657029612,
"narHash": "sha256-enwqnerhZVpyQbeX0uKdZ4IVmZieq9ZgCbkDWy1HlNQ=",
"owner": "emacs-straight",
"repo": "org-mode",
"rev": "e9da29b6fafe63abbc2774e9d485ac13d2811b65",
"rev": "71359820221ec18d27fab28403d4fd3537ca0491",
"type": "github"
},
"original": {
@ -666,17 +687,17 @@
"org-contrib": {
"flake": false,
"locked": {
"lastModified": 1654411077,
"narHash": "sha256-ywXAI+s+D701PvuDEQljDmFWrTPymqustSYVyf3NYRk=",
"ref": "refs/heads/master",
"rev": "c6aef31ccfc7c4418c3b51e98f7c3bd8e255f5e6",
"revCount": 2622,
"type": "git",
"url": "https://git.sr.ht/~bzg/org-contrib"
"lastModified": 1652646857,
"narHash": "sha256-IWIShWyVnbwXqGLQaDNvJ0KoepxhIrXWTjPyGPEkQ14=",
"owner": "emacsmirror",
"repo": "org-contrib",
"rev": "c1e0980fd7a57ca2042fd78acfb1dfb5c3bc03fa",
"type": "github"
},
"original": {
"type": "git",
"url": "https://git.sr.ht/~bzg/org-contrib"
"owner": "emacsmirror",
"repo": "org-contrib",
"type": "github"
}
},
"org-yt": {
@ -832,18 +853,33 @@
"url": "ssh://gitea@git.ingolf-wagner.de/palo/nixos-secrets.git"
}
},
"sln-mode": {
"flake": false,
"locked": {
"lastModified": 1423727528,
"narHash": "sha256-XqkqPyEJuTtFslOz1fpTf/Klbd/zA7IGpzpmum/MGao=",
"owner": "sensorflo",
"repo": "sln-mode",
"rev": "0f91d1b957c7d2a7bab9278ec57b54d57f1dbd9c",
"type": "github"
},
"original": {
"owner": "sensorflo",
"repo": "sln-mode",
"type": "github"
}
},
"sops-nix": {
"inputs": {
"nixpkgs": "nixpkgs_5",
"nixpkgs-21_11": "nixpkgs-21_11",
"nixpkgs-22_05": "nixpkgs-22_05"
},
"locked": {
"lastModified": 1656215886,
"narHash": "sha256-67fkBb4GUbuMZTHs08mNycg0hBzboy+5boMD76wLpj4=",
"lastModified": 1657695756,
"narHash": "sha256-5eeq7Itk9gMK6E5u3IrooFd3KswlheIO/L2Cs7Wwj9k=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "aff5d8542c9eb566a000302b22fcc10715bc2feb",
"rev": "912514e60a6e0227d6a2e0ecc8524752337fcde2",
"type": "github"
},
"original": {
@ -854,20 +890,36 @@
},
"stable": {
"locked": {
"lastModified": 1653996475,
"narHash": "sha256-r/UA7h3Dfgf4dlOCkakpqejf1Tagfb+6T+9OdT0qBgU=",
"lastModified": 1656433693,
"narHash": "sha256-m29hSYsu2U+tnBo5v1/2RGo3lYY6KKb52MHV/89NeCs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ec6eaba9dfcfdd11547d75a193e91e26701bf7e3",
"rev": "babb041b7167008af3faca4c78f9dd8c6e83ef3a",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-21.11",
"ref": "nixos-22.05",
"repo": "nixpkgs",
"type": "github"
}
},
"ts-fold": {
"flake": false,
"locked": {
"lastModified": 1657091443,
"narHash": "sha256-yr/aW7sYoOxajVb2gTgRrwaDwwg2gtHuP3wdrwjiaxo=",
"owner": "jcs-elpa",
"repo": "ts-fold",
"rev": "dcd5b9fe5c2cb72261ff6c714beb8d0198b8522b",
"type": "github"
},
"original": {
"owner": "jcs-elpa",
"repo": "ts-fold",
"type": "github"
}
},
"utils": {
"locked": {
"lastModified": 1653893745,
@ -882,6 +934,22 @@
"repo": "flake-utils",
"type": "github"
}
},
"ws-butler": {
"flake": false,
"locked": {
"lastModified": 1634511126,
"narHash": "sha256-c0y0ZPtxxICPk+eaNbbQf6t+FRCliNY54CCz9QHQ8ZI=",
"owner": "hlissner",
"repo": "ws-butler",
"rev": "572a10c11b6cb88293de48acbb59a059d36f9ba5",
"type": "github"
},
"original": {
"owner": "hlissner",
"repo": "ws-butler",
"type": "github"
}
}
},
"root": "root",

1
nixos/configs/sterni/packages.nix
View file

@ -39,7 +39,6 @@ in
'')
valentina
pythonPackages.pdfposter
sweethome3d.application
pkgs.polygon-art.polygon-art

2
nixos/system/desktop/default.nix
View file

@ -10,7 +10,7 @@
./cachix.nix
./direnv.nix
./hoard.nix
./dnsmasq.nix
#./dnsmasq.nix
./home-manager.nix
./mail-stuff.nix
#./mc.nix

2
nixos/system/desktop/home-manager/doom-emacs.nix
View file

@ -1,7 +1,7 @@
{ pkgs, lib, ... }: {
home-manager.users.mainUser = {
programs.doom-emacs = {
enable = lib.mkDefault true;
enable = false;
doomPrivateDir = ./doom.d;
emacsPackagesOverlay = self: super: {