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

Stuff

Browse source
This commit is contained in:
Erwin Boskma 2022-02-09 08:13:16 +01:00
parent f0fe297151
commit 40b01ad8f2
Signed by: erwin
GPG key ID: 270B20D17394F7E5
7 changed files with 549 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

510
flake.lock generated
View file

@ -1,5 +1,211 @@
{
"nodes": {
"cadquery-src": {
"flake": false,
"locked": {
"lastModified": 1640705539,
"narHash": "sha256-JEHVHhbuoX6fknZYCUBirxzuveRhgTjZr5QcvGUBKO8=",
"owner": "CadQuery",
"repo": "cadquery",
"rev": "4a156291880b3c9de6856aa807266aae4b9aa26f",
"type": "github"
},
"original": {
"owner": "CadQuery",
"repo": "cadquery",
"type": "github"
}
},
"cq-editor-src": {
"flake": false,
"locked": {
"lastModified": 1637964324,
"narHash": "sha256-sRA8t8CIQOatiA3nDbNRzLvk2xMyT07ti7droEALZeM=",
"owner": "CadQuery",
"repo": "CQ-editor",
"rev": "e5739c5a5c3ffcdf7afc293323cd819d04434946",
"type": "github"
},
"original": {
"owner": "CadQuery",
"repo": "CQ-editor",
"type": "github"
}
},
"cq-flake": {
"inputs": {
"cadquery-src": "cadquery-src",
"cq-editor-src": "cq-editor-src",
"flake-utils": [
"flake-utils"
],
"llvm-src": "llvm-src",
"nixpkgs": [
"nixpkgs"
],
"ocp-src": "ocp-src",
"ocp-stubs-src": "ocp-stubs-src",
"pybind11-stubgen-src": "pybind11-stubgen-src",
"pywrap-src": "pywrap-src"
},
"locked": {
"lastModified": 1644091479,
"narHash": "sha256-AyfwbYmWYex+VtArWaEHC0/eEch6LkWDPZe1zMgaHSU=",
"owner": "marcus7070",
"repo": "cq-flake",
"rev": "cf288ba8c30a734dfdd56699e8e623bad85ffba0",
"type": "github"
},
"original": {
"owner": "marcus7070",
"repo": "cq-flake",
"type": "github"
}
},
"doom-emacs": {
"flake": false,
"locked": {
"lastModified": 1643305420,
"narHash": "sha256-E4eVkyWdoUvBF904macERWkZ+Ox8dWLzoaRauerFcYg=",
"owner": "hlissner",
"repo": "doom-emacs",
"rev": "a5ebd0b04778409c2d513830791e919646e6f980",
"type": "github"
},
"original": {
"owner": "hlissner",
"ref": "develop",
"repo": "doom-emacs",
"type": "github"
}
},
"doom-snippets": {
"flake": false,
"locked": {
"lastModified": 1637750904,
"narHash": "sha256-zkKmbl9rros3IzMTX01l9eh1Uzg3E+eYgzuj8+VPBwM=",
"owner": "hlissner",
"repo": "doom-snippets",
"rev": "3083b2342f95fa55c1fd3b4a16229c5d867a02b0",
"type": "github"
},
"original": {
"owner": "hlissner",
"repo": "doom-snippets",
"type": "github"
}
},
"emacs-overlay": {
"locked": {
"lastModified": 1643913487,
"narHash": "sha256-HFu8OILXJAFSk7qZabytNybk96szIX55r81uPYF2DO8=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "a274c9d17d5e57b37a17135603e998b4ffcc6cf7",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "emacs-overlay",
"type": "github"
}
},
"emacs-overlay_2": {
"flake": false,
"locked": {
"lastModified": 1643308453,
"narHash": "sha256-SeOF8D+fYFR5GXOylwdDvj8AZNTgX6tgcLWeCzMkfz4=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "011ec0706fa17de340c96d7d393c00af41f65cab",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "emacs-overlay",
"type": "github"
}
},
"emacs-so-long": {
"flake": false,
"locked": {
"lastModified": 1575031854,
"narHash": "sha256-xIa5zO0ZaToDrec1OFjBK6l39AbA4l/CE4LInVu2hi0=",
"owner": "hlissner",
"repo": "emacs-so-long",
"rev": "ed666b0716f60e8988c455804de24b55919e71ca",
"type": "github"
},
"original": {
"owner": "hlissner",
"repo": "emacs-so-long",
"type": "github"
}
},
"evil-markdown": {
"flake": false,
"locked": {
"lastModified": 1626852210,
"narHash": "sha256-HBBuZ1VWIn6kwK5CtGIvHM1+9eiNiKPH0GUsyvpUVN8=",
"owner": "Somelauw",
"repo": "evil-markdown",
"rev": "8e6cc68af83914b2fa9fd3a3b8472573dbcef477",
"type": "github"
},
"original": {
"owner": "Somelauw",
"repo": "evil-markdown",
"type": "github"
}
},
"evil-org-mode": {
"flake": false,
"locked": {
"lastModified": 1607203864,
"narHash": "sha256-JxwqVYDN6OIJEH15MVI6XOZAPtUWUhJQWHyzcrUvrFg=",
"owner": "hlissner",
"repo": "evil-org-mode",
"rev": "a9706da260c45b98601bcd72b1d2c0a24a017700",
"type": "github"
},
"original": {
"owner": "hlissner",
"repo": "evil-org-mode",
"type": "github"
}
},
"evil-quick-diff": {
"flake": false,
"locked": {
"lastModified": 1575189609,
"narHash": "sha256-oGzl1ayW9rIuq0haoiFS7RZsS8NFMdEA7K1BSozgnJU=",
"owner": "rgrinberg",
"repo": "evil-quick-diff",
"rev": "69c883720b30a892c63bc89f49d4f0e8b8028908",
"type": "github"
},
"original": {
"owner": "rgrinberg",
"repo": "evil-quick-diff",
"type": "github"
}
},
"explain-pause-mode": {
"flake": false,
"locked": {
"lastModified": 1595842060,
"narHash": "sha256-++znrjiDSx+cy4okFBBXUBkRFdtnE2x+trkmqjB3Njs=",
"owner": "lastquestion",
"repo": "explain-pause-mode",
"rev": "2356c8c3639cbeeb9751744dbe737267849b4b51",
"type": "github"
},
"original": {
"owner": "lastquestion",
"repo": "explain-pause-mode",
"type": "github"
}
},
"flake-utils": {
"locked": {
"lastModified": 1642700792,
@ -15,6 +221,23 @@
"type": "github"
}
},
"format-all": {
"flake": false,
"locked": {
"lastModified": 1581716637,
"narHash": "sha256-ul7LCe60W8TIvUmUtZtZRo8489TK9iTPDsLHmzxY57M=",
"owner": "lassik",
"repo": "emacs-format-all-the-code",
"rev": "47d862d40a088ca089c92cd393c6dca4628f87d3",
"type": "github"
},
"original": {
"owner": "lassik",
"repo": "emacs-format-all-the-code",
"rev": "47d862d40a088ca089c92cd393c6dca4628f87d3",
"type": "github"
}
},
"ha-now-playing": {
"inputs": {
"naersk": [
@ -52,11 +275,11 @@
]
},
"locked": {
"lastModified": 1643579427,
"narHash": "sha256-tV4M4+Aqd/3ZjEz1Q07j89KIlkt1oFH34RzpBkUeO/0=",
"lastModified": 1643837728,
"narHash": "sha256-iW/5eMRQmzdctv2dAUlIaZnVWwcmaznNajS+ft1MXHg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "a52aed72c84a2a10102a92397339fa01fc0fe9cf",
"rev": "9d369c75ce2fdeb296ad42bcdc8c1a523c494550",
"type": "github"
},
"original": {
@ -65,6 +288,23 @@
"type": "github"
}
},
"llvm-src": {
"flake": false,
"locked": {
"lastModified": 1594138897,
"narHash": "sha256-YOVIaKo/DJ4ugHOk9l5y8YLDmhtZD7WWOBbEbexjYqs=",
"owner": "llvm",
"repo": "llvm-project",
"rev": "ef32c611aa214dea855364efd7ba451ec5ec3f74",
"type": "github"
},
"original": {
"owner": "llvm",
"ref": "llvmorg-10.0.1",
"repo": "llvm-project",
"type": "github"
}
},
"naersk": {
"inputs": {
"nixpkgs": [
@ -85,6 +325,63 @@
"type": "github"
}
},
"nix-doom-emacs": {
"inputs": {
"doom-emacs": "doom-emacs",
"doom-snippets": "doom-snippets",
"emacs-overlay": "emacs-overlay_2",
"emacs-so-long": "emacs-so-long",
"evil-markdown": "evil-markdown",
"evil-org-mode": "evil-org-mode",
"evil-quick-diff": "evil-quick-diff",
"explain-pause-mode": "explain-pause-mode",
"flake-utils": [
"flake-utils"
],
"format-all": "format-all",
"nix-straight": "nix-straight",
"nixpkgs": [
"nixpkgs"
],
"nose": "nose",
"ob-racket": "ob-racket",
"org": "org",
"org-contrib": "org-contrib",
"org-yt": "org-yt",
"php-extras": "php-extras",
"revealjs": "revealjs",
"rotate-text": "rotate-text"
},
"locked": {
"lastModified": 1643476335,
"narHash": "sha256-UR04A3cc0Oi9wbVuyNvTQnSgxjkuB3rdGyZYWsKu28Q=",
"owner": "nix-community",
"repo": "nix-doom-emacs",
"rev": "ba6ef3c7d5c8b236fb06ddde1c513af804d72f45",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-doom-emacs",
"type": "github"
}
},
"nix-straight": {
"flake": false,
"locked": {
"lastModified": 1643475817,
"narHash": "sha256-NpExq5nbPbj/ppkBX3SnETEJuOne1MKJxen8vVHsDFg=",
"owner": "nix-community",
"repo": "nix-straight.el",
"rev": "08d75e5651cb52f8a07e03408ed19e04bee07505",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-straight.el",
"type": "github"
}
},
"nixlib": {
"locked": {
"lastModified": 1636849918,
@ -123,11 +420,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1643524588,
"narHash": "sha256-Qh5AazxdOQRORbGkkvpKoovDl6ej/4PhDabFsqnueqw=",
"lastModified": 1643805626,
"narHash": "sha256-AXLDVMG+UaAGsGSpOtQHPIKB+IZ0KSd9WS77aanGzgc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "efeefb2af1469a5d1f0ae7ca8f0dfd9bb87d5cfb",
"rev": "554d2d8aa25b6e583575459c297ec23750adb6cb",
"type": "github"
},
"original": {
@ -137,6 +434,118 @@
"type": "github"
}
},
"nose": {
"flake": false,
"locked": {
"lastModified": 1400604510,
"narHash": "sha256-daEi8Kta1oGaDEmUUDDQMahTTPOpvNpDKk22rlr7cB0=",
"owner": "emacsattic",
"repo": "nose",
"rev": "f8528297519eba911696c4e68fa88892de9a7b72",
"type": "github"
},
"original": {
"owner": "emacsattic",
"repo": "nose",
"type": "github"
}
},
"ob-racket": {
"flake": false,
"locked": {
"lastModified": 1584656173,
"narHash": "sha256-rBUYDDCXb+3D4xTPQo9UocbTPZ32kWV1Uya/1DmZknU=",
"owner": "xchrishawk",
"repo": "ob-racket",
"rev": "83457ec9e1e96a29fd2086ed19432b9d75787673",
"type": "github"
},
"original": {
"owner": "xchrishawk",
"repo": "ob-racket",
"type": "github"
}
},
"ocp-src": {
"flake": false,
"locked": {
"lastModified": 1640273405,
"narHash": "sha256-wk+ct4sHu2cLDA+3rz09rJR3D3XFF9383wWQPiqoul8=",
"owner": "cadquery",
"repo": "ocp",
"rev": "787d6cb7a43626b845a9c1fffa09042493591ea2",
"type": "github"
},
"original": {
"owner": "cadquery",
"repo": "ocp",
"type": "github"
}
},
"ocp-stubs-src": {
"flake": false,
"locked": {
"lastModified": 1614280796,
"narHash": "sha256-/x82W4thZlzY1Qw6iBplq21zqgUopp6vTyABqVlCzeI=",
"owner": "cadquery",
"repo": "ocp-stubs",
"rev": "51932c145b16af53fed202ea4d6896263249d8b4",
"type": "github"
},
"original": {
"owner": "cadquery",
"repo": "ocp-stubs",
"type": "github"
}
},
"org": {
"flake": false,
"locked": {
"lastModified": 1643227669,
"narHash": "sha256-9tLMILwN8/YwsFCnDg01OQ3IdTm8b1+I0cBmb7cSydc=",
"owner": "emacs-straight",
"repo": "org-mode",
"rev": "22e6ed6b89755047b44f8666ac20aac0c50afc34",
"type": "github"
},
"original": {
"owner": "emacs-straight",
"repo": "org-mode",
"type": "github"
}
},
"org-contrib": {
"flake": false,
"locked": {
"lastModified": 1639727892,
"narHash": "sha256-+T6Y87aSAx7kMpigm8d1ODDQIyPBM6a+4qGolXjCEXs=",
"ref": "master",
"rev": "5766ff1088191e4df5fecd55007ba4271e609bcc",
"revCount": 2611,
"type": "git",
"url": "https://git.sr.ht/~bzg/org-contrib"
},
"original": {
"type": "git",
"url": "https://git.sr.ht/~bzg/org-contrib"
}
},
"org-yt": {
"flake": false,
"locked": {
"lastModified": 1527381913,
"narHash": "sha256-dzQ6B7ryzatHCTLyEnRSbWO0VUiX/FHYnpHTs74aVUs=",
"owner": "TobiasZawada",
"repo": "org-yt",
"rev": "40cc1ac76d741055cbefa13860d9f070a7ade001",
"type": "github"
},
"original": {
"owner": "TobiasZawada",
"repo": "org-yt",
"type": "github"
}
},
"pamedia": {
"inputs": {
"naersk": [
@ -164,12 +573,79 @@
"url": "https://git.datarift.nl/erwin/pamedia-rs.git"
}
},
"php-extras": {
"flake": false,
"locked": {
"lastModified": 1573312690,
"narHash": "sha256-r4WyVbzvT0ra4Z6JywNBOw5RxOEYd6Qe2IpebHXkj1U=",
"owner": "arnested",
"repo": "php-extras",
"rev": "d410c5af663c30c01d461ac476d1cbfbacb49367",
"type": "github"
},
"original": {
"owner": "arnested",
"repo": "php-extras",
"type": "github"
}
},
"pybind11-stubgen-src": {
"flake": false,
"locked": {
"lastModified": 1614498937,
"narHash": "sha256-AR/LQcuUswP426ZgNeLBODRVtfP+XhWdXg9idd5BrLU=",
"owner": "CadQuery",
"repo": "pybind11-stubgen",
"rev": "18da5410b35b775a25f15a7a68210f2e4818be43",
"type": "github"
},
"original": {
"owner": "CadQuery",
"repo": "pybind11-stubgen",
"type": "github"
}
},
"pywrap-src": {
"flake": false,
"locked": {
"lastModified": 1637947456,
"narHash": "sha256-ktyIDnmF+gGLtBquGJ4wgxU2bjPe85Yv6na99ZIUC7k=",
"owner": "CadQuery",
"repo": "pywrap",
"rev": "07f85fc5d1c05a56d4121c9daa369e842b1c5ac3",
"type": "github"
},
"original": {
"owner": "CadQuery",
"repo": "pywrap",
"type": "github"
}
},
"revealjs": {
"flake": false,
"locked": {
"lastModified": 1642612088,
"narHash": "sha256-h/G2+UhyPxW1t0Z7nqIAOXr3lvR4b5dzA5tCgCI6+oE=",
"owner": "hakimel",
"repo": "reveal.js",
"rev": "61055ed02bd7dbff30ea827591084cce7c22303c",
"type": "github"
},
"original": {
"owner": "hakimel",
"repo": "reveal.js",
"type": "github"
}
},
"root": {
"inputs": {
"cq-flake": "cq-flake",
"emacs-overlay": "emacs-overlay",
"flake-utils": "flake-utils",
"ha-now-playing": "ha-now-playing",
"home-manager": "home-manager",
"naersk": "naersk",
"nix-doom-emacs": "nix-doom-emacs",
"nixos-generators": "nixos-generators",
"nixpkgs": "nixpkgs",
"pamedia": "pamedia",
@ -177,6 +653,22 @@
"sops": "sops"
}
},
"rotate-text": {
"flake": false,
"locked": {
"lastModified": 1322962747,
"narHash": "sha256-SOeOgSlcEIsKhUiYDJv0p+mLUb420s9E2BmvZQvZ0wk=",
"owner": "debug-ito",
"repo": "rotate-text.el",
"rev": "48f193697db996855aee1ad2bc99b38c6646fe76",
"type": "github"
},
"original": {
"owner": "debug-ito",
"repo": "rotate-text.el",
"type": "github"
}
},
"rust-overlay": {
"inputs": {
"flake-utils": [
@ -187,11 +679,11 @@
]
},
"locked": {
"lastModified": 1642838864,
"narHash": "sha256-pHnhm3HWwtvtOK7NdNHwERih3PgNlacrfeDwachIG8E=",
"lastModified": 1643890196,
"narHash": "sha256-tRnuR2qoILwKzSkiIlQe0B5OR6CAQbJxhpt9jYHQD08=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "9fb49daf1bbe1d91e6c837706c481f9ebb3d8097",
"rev": "d480bb17451c57cf4ef67a14f6772f752ced382c",
"type": "github"
},
"original": {

16
flake.nix
View file

@ -32,6 +32,22 @@
inputs.nixpkgs.follows = "nixpkgs";
};
emacs-overlay = {
url = "github:nix-community/emacs-overlay";
};
nix-doom-emacs = {
url = "github:nix-community/nix-doom-emacs";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
cq-flake = {
url = "github:marcus7070/cq-flake";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
ha-now-playing = {
url = "git+https://@git.datarift.nl/erwin/ha-now-playing.git?ref=main";
inputs.nixpkgs.follows = "nixpkgs";

8
home-manager/modules/emacs/default.nix
View file

@ -6,9 +6,17 @@ in
{
options.eboskma.programs.emacs = { enable = mkEnableOption "activate emacs"; };
# imports = [ inputs.nix-doom-emacs.hmModule ];
config = mkIf (cfg.enable) {
programs.emacs = {
enable = true;
package = pkgs.emacsPgtkGcc;
};
# programs.doom-emacs = {
# enable = true;
# emacsPackage = pkgs.emacs-nox;
# doomPrivateDir = ./doom.d;
# };
};
}

15
home-manager/modules/vscode/default.nix
View file

@ -57,6 +57,21 @@ in
zxh404.vscode-proto3
];
keybindings = [
{
"key" = "ctrl+t";
"command" = "-workbench.action.showAllSymbols";
}
{
"key" = "ctrl+t";
"command" = "workbench.action.quickOpen";
}
{
"key" = "ctrl+p";
"command" = "-workbench.action.quickOpen";
}
];
userSettings = (builtins.fromJSON (builtins.readFile ./settings.json));
};

2
machines/loki/configuration.nix
View file

@ -14,7 +14,7 @@
home-manager = true;
};
docker.enable = true;
element-web.enable = true;
element-web.enable = false;
fonts.enable = true;
gnome.enable = true;
greetd.enable = true;

3
modules/base/default.nix
View file

@ -42,10 +42,11 @@ in
dig
dogdns
file
usbutils
ht-rust
jq
nix-template
nvd
usbutils
];
services.udev = {

10
modules/desktop/default.nix
View file

@ -77,6 +77,7 @@ in
bandwhich
bitwarden
bottom
inputs.cq-flake.packages.${pkgs.system}.cq-editor
fd
ffmpeg
ffmpeg.bin
@ -136,10 +137,10 @@ in
};
};
# i18n.inputMethod = {
# enabled = "fcitx5";
# fcitx5.addons = with pkgs; [ fcitx5-m17n fcitx5-gtk fcitx5-configtool ];
# };
i18n.inputMethod = {
enabled = "fcitx5";
fcitx5.addons = with pkgs; [ fcitx5-m17n fcitx5-gtk fcitx5-configtool ];
};
gtk = {
enable = true;
@ -170,6 +171,7 @@ in
self-overlay
inputs.ha-now-playing.overlays.${pkgs.system}
inputs.pamedia.overlays.${pkgs.system}
inputs.emacs-overlay.overlay
];
}
../../home-manager/modules/alacritty