kfm/niveum
1
0
Fork 0
mirror of https://github.com/kmein/niveum synced 2026-03-16 10:11:08 +01:00
Code Releases Activity

chore: move to <niveum/*>

Browse Source
This commit is contained in:
Kierán Meinhardt
2019-10-26 13:43:30 +02:00
parent 15cddf337e
commit 6591a39532
20 changed files with 133 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configs/cloud.nix
View File

@@ -1,9 +1,9 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
imports = [ imports = [
<modules/seafile.nix> <niveum/modules/seafile.nix>
<modules/google-drive.nix> <niveum/modules/google-drive.nix>
<modules/dropbox.nix> <niveum/modules/dropbox.nix>
]; ];
niveum.dropbox = { niveum.dropbox = {

142
configs/default.nix
View File

@@ -4,59 +4,59 @@ let
in in
{ {
imports = [ imports = [
<modules/constants.nix> <niveum/modules/constants.nix>
{ {
services.dbus.packages = [ pkgs.gnome3.dconf ]; services.dbus.packages = [ pkgs.gnome3.dconf ];
} }
<home-manager/nixos> <home-manager/nixos>
# <configs/mopidy.nix> # ./mopidy.nix
<configs/alacritty.nix> ./alacritty.nix
<configs/bash.nix> ./bash.nix
<configs/bluetooth.nix> ./bluetooth.nix
<configs/chromium.nix> ./chromium.nix
<configs/cloud.nix> ./cloud.nix
<configs/compton.nix> ./compton.nix
<configs/default.nix> ./default.nix
<configs/direnv.nix> ./direnv.nix
# <configs/home-assistant.nix> # ./home-assistant.nix
<configs/distrobump.nix> ./distrobump.nix
<configs/docker.nix> ./docker.nix
<configs/dunst.nix> ./dunst.nix
<configs/fonts.nix> ./fonts.nix
<configs/git.nix> ./git.nix
<configs/hledger.nix> ./hledger.nix
<configs/htop.nix> ./htop.nix
<configs/hu-berlin.nix> ./hu-berlin.nix
<configs/i3.nix> ./i3.nix
<configs/kdeconnect.nix> ./kdeconnect.nix
<configs/keybase.nix> ./keybase.nix
<configs/keyboard.nix> ./keyboard.nix
<configs/mail.nix> ./mail.nix
<configs/mpv.nix> ./mpv.nix
<configs/nano.nix> ./nano.nix
<configs/neovim.nix> ./neovim.nix
# <configs/newsboat.nix> (broken) # ./newsboat.nix (broken)
<configs/nixpkgs-unstable.nix> ./nixpkgs-unstable.nix
<configs/packages> ./packages
<configs/printing.nix> ./printing.nix
<configs/random-background.nix> ./random-background.nix
<configs/redshift.nix> ./redshift.nix
<configs/retiolum.nix> ./retiolum.nix
<configs/rofi.nix> ./rofi.nix
<configs/sncli.nix> ./sncli.nix
<configs/ssh.nix> ./ssh.nix
<configs/sudo.nix> ./sudo.nix
<configs/themes/mac-os.nix> ./themes/mac-os.nix
<configs/theming.nix> ./theming.nix
<configs/tmux.nix> ./tmux.nix
<configs/todo-txt.nix> ./todo-txt.nix
<configs/traadfri.nix> ./traadfri.nix
<configs/unclutter.nix> ./unclutter.nix
# <configs/urxvt.nix> # ./urxvt.nix
<configs/vscode.nix> ./vscode.nix
<configs/xautolock.nix> ./xautolock.nix
# <configs/xresources.nix> # ./xresources.nix
<configs/zsh.nix> ./zsh.nix
{ {
niveum.user = { niveum.user = {
github = "kmein"; github = "kmein";
@@ -83,40 +83,40 @@ in
packageOverrides = pkgs: { packageOverrides = pkgs: {
python3Packages = pkgs.python3Packages.override { python3Packages = pkgs.python3Packages.override {
overrides = new: old: { overrides = new: old: {
spotify-cli-linux = new.callPackage <packages/spotify-cli-linux.nix> {}; spotify-cli-linux = new.callPackage <niveum/packages/spotify-cli-linux.nix> {};
instaloader = new.callPackage <packages/instaloader.nix> {}; instaloader = new.callPackage <niveum/packages/instaloader.nix> {};
sncli = new.callPackage <packages/sncli.nix> {}; sncli = new.callPackage <niveum/packages/sncli.nix> {};
}; };
}; };
haskellPackages = pkgs.haskellPackages.override { haskellPackages = pkgs.haskellPackages.override {
overrides = new: old: { overrides = new: old: {
blessings = new.callPackage <packages/blessings.nix> {}; blessings = new.callPackage <niveum/packages/blessings.nix> {};
scanner = new.callPackage <stockholm/krebs/5pkgs/haskell/scanner.nix> {}; scanner = new.callPackage <stockholm/krebs/5pkgs/haskell/scanner.nix> {};
}; };
}; };
git-quick-stats = pkgs.callPackage <packages/git-quick-stats.nix> {}; git-quick-stats = pkgs.callPackage <niveum/packages/git-quick-stats.nix> {};
writeDash = pkgs.writers.writeDash; writeDash = pkgs.writers.writeDash;
writeDashBin = pkgs.writers.writeDashBin; writeDashBin = pkgs.writers.writeDashBin;
iolanguage = pkgs.callPackage <packages/iolanguage.nix> {}; iolanguage = pkgs.callPackage <niveum/packages/iolanguage.nix> {};
nix-git = pkgs.callPackage <packages/nix-git.nix> {}; nix-git = pkgs.callPackage <niveum/packages/nix-git.nix> {};
kmein = { kmein = {
autorenkalender = pkgs.callPackage <packages/autorenkalender.nix> {}; autorenkalender = pkgs.callPackage <niveum/packages/autorenkalender.nix> {};
bvg = pkgs.callPackage <packages/bvg.nix> {}; bvg = pkgs.callPackage <niveum/packages/bvg.nix> {};
daybook = pkgs.callPackage <packages/daybook.nix> {}; daybook = pkgs.callPackage <niveum/packages/daybook.nix> {};
genius = pkgs.callPackage <packages/genius.nix> {}; genius = pkgs.callPackage <niveum/packages/genius.nix> {};
instaget = pkgs.callPackage <packages/instaget.nix> {}; instaget = pkgs.callPackage <niveum/packages/instaget.nix> {};
literature-quote = pkgs.callPackage <packages/literature-quote.nix> {}; literature-quote = pkgs.callPackage <niveum/packages/literature-quote.nix> {};
n = pkgs.callPackage <packages/n.nix> {}; n = pkgs.callPackage <niveum/packages/n.nix> {};
depp = pkgs.callPackage <packages/depp.nix> {}; depp = pkgs.callPackage <niveum/packages/depp.nix> {};
odyssey = pkgs.callPackage <packages/odyssey.nix> {}; odyssey = pkgs.callPackage <niveum/packages/odyssey.nix> {};
wttr = pkgs.callPackage <packages/wttr.nix> {}; wttr = pkgs.callPackage <niveum/packages/wttr.nix> {};
nav = pkgs.callPackage <packages/nav.nix> {}; nav = pkgs.callPackage <niveum/packages/nav.nix> {};
dirmir = pkgs.callPackage <packages/dirmir.nix> {}; dirmir = pkgs.callPackage <niveum/packages/dirmir.nix> {};
favicon = pkgs.callPackage <packages/favicon.nix> {}; favicon = pkgs.callPackage <niveum/packages/favicon.nix> {};
tolino-screensaver = pkgs.callPackage <packages/tolino-screensaver.nix> {}; tolino-screensaver = pkgs.callPackage <niveum/packages/tolino-screensaver.nix> {};
# fzf-wrappers = pkgs.callPackage <packages/fzf-wrappers.nix> {}; (broken) # fzf-wrappers = pkgs.callPackage <niveum/packages/fzf-wrappers.nix> {}; (broken)
slide = slide =
let slide-package = pkgs.fetchFromGitHub { let slide-package = pkgs.fetchFromGitHub {
owner = "kmein"; owner = "kmein";

2
configs/hledger.nix
View File

@@ -1,6 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ <modules/hledger.nix> ]; imports = [ <niveum/modules/hledger.nix> ];
niveum.hledger = { niveum.hledger = {
enable = true; enable = true;

2
configs/i3.nix
View File

@@ -62,7 +62,7 @@ in with config.niveum; {
}; };
}; };
statusCommand = "${pkgs.unstable.i3status-rust}/bin/i3status-rs ${pkgs.writeText "i3status-rust.toml" ( statusCommand = "${pkgs.unstable.i3status-rust}/bin/i3status-rs ${pkgs.writeText "i3status-rust.toml" (
import <dot/i3status-rust.nix> { import <niveum/dot/i3status-rust.nix> {
wifi-interface = networkInterfaces.wireless; wifi-interface = networkInterfaces.wireless;
batteryBlock = batteryBlocks.default; batteryBlock = batteryBlocks.default;
inherit (config.niveum) colours; inherit (config.niveum) colours;

2
configs/keyboard.nix
View File

@@ -1,5 +1,5 @@
{ lib, ... }: { lib, ... }:
let inherit (import <lib> { inherit lib; }) commaSep; let inherit (import <niveum/lib> { inherit lib; }) commaSep;
in { in {
services.xserver = { services.xserver = {
layout = commaSep [ "de" "gr" "ru" ]; layout = commaSep [ "de" "gr" "ru" ];

2
configs/mopidy.nix
View File

@@ -1,5 +1,5 @@
{ pkgs, ... }: { pkgs, ... }:
let secrets = import <dot/secrets.nix>; let secrets = import <niveum/dot/secrets.nix>;
in { in {
services.mopidy = { services.mopidy = {
enable = true; enable = true;

16
configs/neovim.nix
View File

@@ -7,20 +7,20 @@
nixpkgs.config.packageOverrides = pkgs: { nixpkgs.config.packageOverrides = pkgs: {
vimPlugins = pkgs.vimPlugins // { vimPlugins = pkgs.vimPlugins // {
cheat-sh-vim = pkgs.callPackage <packages/vimPlugins/cheat-sh.nix> {}; cheat-sh-vim = pkgs.callPackage <niveum/packages/vimPlugins/cheat-sh.nix> {};
vim-fetch = pkgs.callPackage <packages/vimPlugins/vim-fetch.nix> {}; vim-fetch = pkgs.callPackage <niveum/packages/vimPlugins/vim-fetch.nix> {};
vim-colors-paramount = pkgs.callPackage <packages/vimPlugins/vim-colors-paramount.nix> {}; vim-colors-paramount = pkgs.callPackage <niveum/packages/vimPlugins/vim-colors-paramount.nix> {};
vim-256noir = pkgs.callPackage <packages/vimPlugins/vim-256noir.nix> {}; vim-256noir = pkgs.callPackage <niveum/packages/vimPlugins/vim-256noir.nix> {};
todo-txt-vim = pkgs.callPackage <packages/vimPlugins/todo-txt-vim.nix> {}; todo-txt-vim = pkgs.callPackage <niveum/packages/vimPlugins/todo-txt-vim.nix> {};
jq-vim = pkgs.callPackage <packages/vimPlugins/jq-vim.nix> {}; jq-vim = pkgs.callPackage <niveum/packages/vimPlugins/jq-vim.nix> {};
vim-fsharp = pkgs.callPackage <packages/vimPlugins/vim-fsharp.nix> {}; vim-fsharp = pkgs.callPackage <niveum/packages/vimPlugins/vim-fsharp.nix> {};
}; };
}; };
environment.systemPackages = [ environment.systemPackages = [
(pkgs.neovim.override { (pkgs.neovim.override {
configure = { configure = {
customRC = builtins.readFile <dot/init.vim>; customRC = builtins.readFile <niveum/dot/init.vim>;
packages.nvim = with pkgs.vimPlugins; { packages.nvim = with pkgs.vimPlugins; {
start = [ start = [
ale ale

2
configs/retiolum.nix
View File

@@ -1,6 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ <modules/retiolum.nix> ]; imports = [ <niveum/modules/retiolum.nix> ];
fileSystems."/mnt/lassulusflix" = { fileSystems."/mnt/lassulusflix" = {
device = "prism.r:/export"; device = "prism.r:/export";

2
configs/sncli.nix
View File

@@ -1,5 +1,5 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
let secrets = import <dot/secrets.nix>; let secrets = import <niveum/dot/secrets.nix>;
in { in {
environment.systemPackages = [ pkgs.python3Packages.sncli ]; environment.systemPackages = [ pkgs.python3Packages.sncli ];

4
configs/todoist.nix
View File

@@ -1,8 +1,8 @@
{ pkgs, ... }: { pkgs, ... }:
let let
secrets = import <dot/secrets.nix>; secrets = import <niveum/dot/secrets.nix>;
in { in {
imports = [ <modules/todoist.nix> ]; imports = [ <niveum/modules/todoist.nix> ];
niveum.todoist = { niveum.todoist = {
enable = true; enable = true;

2
configs/traadfri.nix
View File

@@ -1,6 +1,6 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
{ {
imports = [ <modules/traadfri.nix> ]; imports = [ <niveum/modules/traadfri.nix> ];
niveum.traadfri = { niveum.traadfri = {
enable = true; enable = true;

49
deploy.nix
View File

@@ -7,36 +7,29 @@ let
pkgs = import "${krops}/pkgs" {}; pkgs = import "${krops}/pkgs" {};
importJson = (import <nixpkgs> {}).lib.importJSON; importJson = (import <nixpkgs> {}).lib.importJSON;
niveum = {
lib.file = toString ./lib;
packages.file = toString ./packages;
configs.file = toString ./configs;
dot.file = toString ./dot;
modules.file = toString ./modules;
nixos-config.symlink = "system/configuration.nix";
nixpkgs.git = {
url = https://github.com/NixOS/nixpkgs-channels;
ref = (importJson ./nixpkgs.json).rev;
};
nixos-unstable.git = {
url = https://github.com/NixOS/nixpkgs-channels;
ref = "07d4df5";
};
home-manager.git = {
url = https://github.com/rycee/home-manager;
ref = "31e8494";
};
stockholm.git = {
url = https://cgit.krebsco.de/stockholm;
ref = "421a9792";
};
};
regularSystem = path: name: { regularSystem = path: name: {
source = lib.evalSource [ source = lib.evalSource [
(niveum // { {
niveum.file = toString ./.;
system.file = toString path; system.file = toString path;
nixos-config.symlink = "system/configuration.nix";
nixpkgs.git = {
url = https://github.com/NixOS/nixpkgs-channels;
ref = (importJson ./nixpkgs.json).rev;
};
nixos-unstable.git = {
url = https://github.com/NixOS/nixpkgs-channels;
ref = "07d4df5";
};
home-manager.git = {
url = https://github.com/rycee/home-manager;
ref = "31e8494";
};
stockholm.git = {
url = https://cgit.krebsco.de/stockholm;
ref = "421a9792";
};
secrets.pass = { secrets.pass = {
dir = toString ~/.password-store/systems; dir = toString ~/.password-store/systems;
inherit name; inherit name;
@@ -45,7 +38,7 @@ let
dir = toString ~/.password-store; dir = toString ~/.password-store;
name = "shared"; name = "shared";
}; };
}) }
]; ];
target = "root@${name}:22022"; target = "root@${name}:22022";
}; };

10
modules/default.nix
View File

@@ -1,9 +1,9 @@
{ {
imports = [ imports = [
<modules/constants.nix> ./constants.nix
<modules/dropbox.nix> ./dropbox.nix
<modules/google-drive.nix> ./google-drive.nix
<modules/retiolum.nix> ./retiolum.nix
<modules/seafile.nix> ./seafile.nix
]; ];
} }

2
modules/todoist.nix
View File

@@ -2,7 +2,7 @@
with lib; with lib;
let let
cfg = config.niveum.todoist; cfg = config.niveum.todoist;
todoist = pkgs.unstable.callPackage <packages/todoist.nix> {}; todoist = pkgs.unstable.callPackage <niveum/packages/todoist.nix> {};
in { in {
options.niveum.todoist = { options.niveum.todoist = {
enable = mkEnableOption "todoist CLI"; enable = mkEnableOption "todoist CLI";

2
modules/traadfri.nix
View File

@@ -10,7 +10,7 @@ let
sha256 = "0rvnc95yww4sc9qkg1pvdcgin3vx381fhx8kwcb6hlg30lpdhhrz"; sha256 = "0rvnc95yww4sc9qkg1pvdcgin3vx381fhx8kwcb6hlg30lpdhhrz";
}; };
in pkgs.python3Packages.callPackage traadfri-package { in pkgs.python3Packages.callPackage traadfri-package {
libcoap = pkgs.callPackage <packages/libcoap.nix> {}; libcoap = pkgs.callPackage <niveum/packages/libcoap.nix> {};
}; };
in in
{ {

18
systems/catullus/configuration.nix
View File

@@ -84,13 +84,13 @@ in {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
./containers.nix ./containers.nix
<configs/distrobump.nix> <niveum/configs/distrobump.nix>
<configs/nixpkgs-unstable.nix> <niveum/configs/nixpkgs-unstable.nix>
<configs/save-space.nix> <niveum/configs/save-space.nix>
<configs/tmux.nix> <niveum/configs/tmux.nix>
<configs/traadfri.nix> <niveum/configs/traadfri.nix>
<modules/retiolum.nix> <niveum/modules/retiolum.nix>
<modules/telegram-bot.nix> <niveum/modules/telegram-bot.nix>
{ {
nixpkgs.config.packageOverrides = pkgs: { nixpkgs.config.packageOverrides = pkgs: {
writeDash = pkgs.writers.writeDash; writeDash = pkgs.writers.writeDash;
@@ -103,7 +103,7 @@ in {
{ {
services.matterbridge = { services.matterbridge = {
enable = true; enable = true;
configPath = toString (pkgs.writeText "matterbridge.toml" (import <dot/matterbridge.nix> { configPath = toString (pkgs.writeText "matterbridge.toml" (import <niveum/dot/matterbridge.nix> {
token = lib.strings.removeSuffix "\n" (builtins.readFile <secrets/telegram/kmein.token>); token = lib.strings.removeSuffix "\n" (builtins.readFile <secrets/telegram/kmein.token>);
})); }));
}; };
@@ -151,7 +151,7 @@ in {
}; };
environment.variables.TERM = "linux"; environment.variables.TERM = "linux";
environment.variables.HTOPRC = toString <dot/htoprc>; environment.variables.HTOPRC = toString <niveum/dot/htoprc>;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
git git

4
systems/catullus/containers.nix
View File

@@ -14,8 +14,8 @@ let
}; };
in { in {
nixpkgs.config.packageOverrides = pkgs: { nixpkgs.config.packageOverrides = pkgs: {
autorenkalender = pkgs.callPackage <packages/autorenkalender.nix> {}; autorenkalender = pkgs.callPackage <niveum/packages/autorenkalender.nix> {};
literature-quote = pkgs.callPackage <packages/literature-quote.nix> {}; literature-quote = pkgs.callPackage <niveum/packages/literature-quote.nix> {};
telegram-proverb = pkgs.python3Packages.callPackage proverb-bot-package {}; telegram-proverb = pkgs.python3Packages.callPackage proverb-bot-package {};
telegram-reverse = pkgs.python3Packages.callPackage "${telebots-package}/telegram-reverse" {}; telegram-reverse = pkgs.python3Packages.callPackage "${telebots-package}/telegram-reverse" {};
telegram-odyssey = pkgs.python3Packages.callPackage "${telebots-package}/telegram-odyssey" {}; telegram-odyssey = pkgs.python3Packages.callPackage "${telebots-package}/telegram-odyssey" {};

2
systems/homeros/configuration.nix
View File

@@ -1,7 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ imports = [
<configs/default.nix> <niveum/configs/default.nix>
./hardware-configuration.nix ./hardware-configuration.nix
]; ];

2
systems/scardanelli/configuration.nix
View File

@@ -3,7 +3,7 @@ let
sshKey.rilke = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWRcTILWzSzOAWqwBjJC97K9wKm+pfxk15L5AiTUlUMyBzVQsU+d2jUEe1rmp+kjVXL0qgNMI+eBzEAzaafUMdCPeIkMyeiOlXaYxq8NHApcZUSYV9CmzWqePj8Dlu8uexoF3TJi6tj3mmGM8BY50qkwk4mlT/5xLPPnh/HHyFmoZlj6183Z4vJRnK8UZ6x2gevVaE36lP27MikZ/MQ6/PaHJ5TNZy63rQwzKXw6ZQMx4JU22CwyZqPn1wjlGEkpJFOBKtnypURdVBsPydaZd/I7b/13FMwso2hSUoXqeV6iaeno2FWOrB3cAaFogNWKPRkEacKEE5mQOvLGGdG1Xp u0_a138@localhost"; sshKey.rilke = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWRcTILWzSzOAWqwBjJC97K9wKm+pfxk15L5AiTUlUMyBzVQsU+d2jUEe1rmp+kjVXL0qgNMI+eBzEAzaafUMdCPeIkMyeiOlXaYxq8NHApcZUSYV9CmzWqePj8Dlu8uexoF3TJi6tj3mmGM8BY50qkwk4mlT/5xLPPnh/HHyFmoZlj6183Z4vJRnK8UZ6x2gevVaE36lP27MikZ/MQ6/PaHJ5TNZy63rQwzKXw6ZQMx4JU22CwyZqPn1wjlGEkpJFOBKtnypURdVBsPydaZd/I7b/13FMwso2hSUoXqeV6iaeno2FWOrB3cAaFogNWKPRkEacKEE5mQOvLGGdG1Xp u0_a138@localhost";
in { in {
imports = [ imports = [
<configs/default.nix> <niveum/configs/default.nix>
./hardware-configuration.nix ./hardware-configuration.nix
]; ];

2
systems/wilde/configuration.nix
View File

@@ -2,7 +2,7 @@
{ {
imports = [ imports = [
<configs/default.nix> <niveum/configs/default.nix>
./hardware-configuration.nix ./hardware-configuration.nix
<stockholm/krebs/2configs/hw/x220.nix> <stockholm/krebs/2configs/hw/x220.nix>
]; ];