1
0
mirror of https://github.com/kmein/niveum synced 2026-03-20 03:51:07 +01:00

feat: depend less on nixpkgs-unstable

This commit is contained in:
Kierán Meinhardt
2020-10-16 08:23:27 +02:00
parent d6a2e05590
commit 838efd4093
8 changed files with 11 additions and 12 deletions

View File

@@ -35,9 +35,8 @@ let
in { in {
environment.variables.TERMINAL = "alacritty"; environment.variables.TERMINAL = "alacritty";
environment.systemPackages = with pkgs; [ environment.systemPackages = [
unstable.alacritty pkgs.unstable.alacritty
unstable.alacritty.terminfo
]; ];
home-manager.users.me.xdg.configFile = { home-manager.users.me.xdg.configFile = {

View File

@@ -23,7 +23,7 @@
source-sans-pro source-sans-pro
ubuntu_font_family ubuntu_font_family
gfs-fonts gfs-fonts
unstable.jetbrains-mono jetbrains-mono
twemoji-color-font twemoji-color-font
joypixels joypixels
]; ];

View File

@@ -7,8 +7,8 @@
server = { server = {
enable = false; enable = false;
user = config.users.users.me; user = config.users.users.me;
package = pkgs.unstable.hledger-web; package = pkgs.hledger-web;
}; };
package = pkgs.unstable.hledger; package = pkgs.hledger;
}; };
} }

View File

@@ -29,10 +29,10 @@ let
}; };
}; };
new-workspace = pkgs.unstable.writers.writeDash "new-workspace" '' new-workspace = pkgs.writers.writeDash "new-workspace" ''
i3-msg workspace $(($(i3-msg -t get_workspaces | tr , '\n' | grep '"num":' | cut -d : -f 2 | sort -rn | head -1) + 1)) i3-msg workspace $(($(i3-msg -t get_workspaces | tr , '\n' | grep '"num":' | cut -d : -f 2 | sort -rn | head -1) + 1))
''; '';
move-to-new-workspace = pkgs.unstable.writers.writeDash "new-workspace" '' move-to-new-workspace = pkgs.writers.writeDash "new-workspace" ''
i3-msg move container to workspace $(($(i3-msg -t get_workspaces | tr , '\n' | grep '"num":' | cut -d : -f 2 | sort -rn | head -1) + 1)) i3-msg move container to workspace $(($(i3-msg -t get_workspaces | tr , '\n' | grep '"num":' | cut -d : -f 2 | sort -rn | head -1) + 1))
''; '';
@@ -146,7 +146,7 @@ in with config.niveum; {
text = colours.foreground; text = colours.foreground;
}; };
}; };
statusCommand = "${pkgs.unstable.i3status-rust}/bin/i3status-rs ${ statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ${
pkgs.writeTOML (import <niveum/dot/i3status-rust.nix> { pkgs.writeTOML (import <niveum/dot/i3status-rust.nix> {
wifi-interface = networkInterfaces.wireless; wifi-interface = networkInterfaces.wireless;
batteryBlock = batteryBlocks.default; batteryBlock = batteryBlocks.default;

View File

@@ -100,6 +100,7 @@
pdfgrep # search in pdf pdfgrep # search in pdf
pdftk # pdf toolkit pdftk # pdf toolkit
evince # for viewing pdf annotations evince # for viewing pdf annotations
xournal # for annotating pdfs
youtubeDL youtubeDL
bc # calculator bc # calculator
scripts.default-gateway scripts.default-gateway

View File

@@ -71,7 +71,7 @@ in {
haskellPackages.pandoc-citeproc haskellPackages.pandoc-citeproc
# nur.repos.kmein.text2pdf # nur.repos.kmein.text2pdf
libreoffice libreoffice
pandoc unstable.pandoc
# proselint # proselint
asciidoctor asciidoctor
wordnet wordnet

View File

@@ -31,7 +31,7 @@ in {
server = { server = {
enable = mkEnableOption "hledger server"; enable = mkEnableOption "hledger server";
port = mkOption { port = mkOption {
type = pkgs.unstable.lib.types.port; type = types.port;
default = 5000; default = 5000;
}; };
host = mkOption { host = mkOption {

View File

@@ -8,7 +8,6 @@ let
wilde = wilde =
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDyTnGhFq0Q+vghNhrqNrAyY+CsN7nNz8bPfiwIwNpjk kfm@wilde"; "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDyTnGhFq0Q+vghNhrqNrAyY+CsN7nNz8bPfiwIwNpjk kfm@wilde";
}; };
unstable = import <nixos-unstable> { };
wtf-config = pkgs.writeJSON "config.yml" { wtf-config = pkgs.writeJSON "config.yml" {
wtf = { wtf = {
colors = { colors = {