From 5af29443b334bd3986c06096e5fa23dc43b00722 Mon Sep 17 00:00:00 2001 From: kat witch Date: Wed, 12 May 2021 19:26:01 +0100 Subject: [PATCH] users/kat: rink+inputrc, niv: update --- nix/sources.json | 46 ++++++++++++++++++------------------- profiles/common/nix.nix | 4 ++++ users/kat/base/default.nix | 2 ++ users/kat/base/inputrc.nix | 21 +++++++++++++++++ users/kat/base/packages.nix | 1 - users/kat/base/rink.nix | 38 ++++++++++++++++++++++++++++++ users/kat/gui/gtk.nix | 4 ++-- 7 files changed, 90 insertions(+), 26 deletions(-) create mode 100644 users/kat/base/inputrc.nix create mode 100644 users/kat/base/rink.nix diff --git a/nix/sources.json b/nix/sources.json index 4c1115ea..b72ba1a5 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -5,10 +5,10 @@ "homepage": "https://nur.nix-community.org/", "owner": "nix-community", "repo": "NUR", - "rev": "e32dbd72c58775aece17857023459758d7cb6bb1", - "sha256": "0j63001fwmpkmqkb0v97bissz2sdvk8v74wj8zrpl67ssiim22yh", + "rev": "cdc73aa7b11e14dc5e8a41165fab88c249c485b5", + "sha256": "0b318hpnp0jya0firr4jxcpy2s3cjnl7xgmlmi6aqd4qhqhn4fav", "type": "tarball", - "url": "https://github.com/nix-community/NUR/archive/e32dbd72c58775aece17857023459758d7cb6bb1.tar.gz", + "url": "https://github.com/nix-community/NUR/archive/cdc73aa7b11e14dc5e8a41165fab88c249c485b5.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "arc-nixexprs": { @@ -17,10 +17,10 @@ "homepage": null, "owner": "arcnmx", "repo": "nixexprs", - "rev": "94d2436dcf035409da0c48cbe93ae9dcc33f5599", - "sha256": "03h8n7hd2h7zyb9xrp2m2vvvx5mwx49vqlwihyinvhwkdiw5mdwc", + "rev": "614d248d1ab66fab84903b8bd6d387a7530915c4", + "sha256": "0zyhv8r69l9cn64nfifn61h0iabsakzjzsp3nxxzzg6iizbrmjcp", "type": "tarball", - "url": "https://github.com/arcnmx/nixexprs/archive/94d2436dcf035409da0c48cbe93ae9dcc33f5599.tar.gz", + "url": "https://github.com/arcnmx/nixexprs/archive/614d248d1ab66fab84903b8bd6d387a7530915c4.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "home-manager": { @@ -29,10 +29,10 @@ "homepage": "https://nix-community.github.io/home-manager/", "owner": "nix-community", "repo": "home-manager", - "rev": "225bf275ba8ea3f23728685c12b902dedcd3a666", - "sha256": "1d7ndwdndklgyk6vgjch1zy323m3wpbxcp59x98q6d3l6jzlh1fv", + "rev": "23769994e8f7b212d9a257799173b120ed87736b", + "sha256": "13vw6dwnva6922ayzj0b0gpwgzz14202llv37pr8w8qfrrg83xxk", "type": "tarball", - "url": "https://github.com/nix-community/home-manager/archive/225bf275ba8ea3f23728685c12b902dedcd3a666.tar.gz", + "url": "https://github.com/nix-community/home-manager/archive/23769994e8f7b212d9a257799173b120ed87736b.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "niv": { @@ -41,10 +41,10 @@ "homepage": "https://github.com/nmattia/niv", "owner": "nmattia", "repo": "niv", - "rev": "af958e8057f345ee1aca714c1247ef3ba1c15f5e", - "sha256": "1qjavxabbrsh73yck5dcq8jggvh3r2jkbr6b5nlz5d9yrqm9255n", + "rev": "94080ae8286024820c570a2a24ed7c36d7ad04a9", + "sha256": "0wlk52zwlrq727x3z1vg9d9qq4zw62ab5jzg4068iqb6hyb0cr0w", "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/af958e8057f345ee1aca714c1247ef3ba1c15f5e.tar.gz", + "url": "https://github.com/nmattia/niv/archive/94080ae8286024820c570a2a24ed7c36d7ad04a9.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nix-doom-emacs": { @@ -53,16 +53,16 @@ "homepage": "", "owner": "vlaci", "repo": "nix-doom-emacs", - "rev": "51645030623075a50f0f2fb8e95d113336fa109f", - "sha256": "1f8lwcp99rga8ckyiad56dzyli0rd8mi48nw638gw069q6mfx3h3", + "rev": "746c847149f3d40ea952038f7fe78ce0d7808138", + "sha256": "10sqzjzr4zgijh61nsq9bxc66kh7na988297lnjaza9lcqzf02zv", "type": "tarball", - "url": "https://github.com/vlaci/nix-doom-emacs/archive/51645030623075a50f0f2fb8e95d113336fa109f.tar.gz", + "url": "https://github.com/vlaci/nix-doom-emacs/archive/746c847149f3d40ea952038f7fe78ce0d7808138.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nix-hexchen": { "branch": "main", "repo": "https://gitlab.com/hexchen/nixfiles", - "rev": "2dfbd032f05ad79176a5756cd76dbda4a828e4d8", + "rev": "1dee1474f147ce8d04ec4b200df1c6255ae59bdc", "type": "git" }, "nixos-mailserver": { @@ -81,10 +81,10 @@ "homepage": "", "owner": "nixos", "repo": "nixpkgs", - "rev": "4518794ee53d109d551c210a6d195b79e9995a90", - "sha256": "1h86bqrkiydn5nwpndg8k5apdjxff5qigbrrwfam3893vgb7hws2", + "rev": "3a9d159ed1b41ca18523b2c95c7edb3845c1b411", + "sha256": "0w55zfaz5gg0xs7aq8zx0w4igp5nrnzfvwhkmkwmr0qcvhbxdijm", "type": "tarball", - "url": "https://github.com/nixos/nixpkgs/archive/4518794ee53d109d551c210a6d195b79e9995a90.tar.gz", + "url": "https://github.com/nixos/nixpkgs/archive/3a9d159ed1b41ca18523b2c95c7edb3845c1b411.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-mozilla": { @@ -105,16 +105,16 @@ "homepage": "", "owner": "nixos", "repo": "nixpkgs", - "rev": "212c4e8f7327324debecb32dc773bbadda08c3d8", - "sha256": "0kx4sh20s37v7w0ygxwq080iscl3a3pzjlrvvw17621si1lprcwp", + "rev": "93123faae0281d2e97d12641a7cfad07c8028aff", + "sha256": "0kc8rwsfsirr784hh2w143cy2yaqq7in7n5rzjx3j77z7nwsab26", "type": "tarball", - "url": "https://github.com/nixos/nixpkgs/archive/212c4e8f7327324debecb32dc773bbadda08c3d8.tar.gz", + "url": "https://github.com/nixos/nixpkgs/archive/93123faae0281d2e97d12641a7cfad07c8028aff.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "pbb-nixfiles": { "branch": "main", "repo": "https://git.petabyte.dev/petabyteboy/nixfiles.git", - "rev": "fbb5aebfcc93383089e1f3d1b1cd07a6d3bab39f", + "rev": "66f890a5f66db574fad2967dab2ee6755bed056f", "type": "git" }, "qyliss-nixlib": { diff --git a/profiles/common/nix.nix b/profiles/common/nix.nix index 3a25cf1b..115750a2 100644 --- a/profiles/common/nix.nix +++ b/profiles/common/nix.nix @@ -21,4 +21,8 @@ gc.options = lib.mkDefault "--delete-older-than 1w"; trustedUsers = [ "root" "@wheel" ]; }; + + nixpkgs.config.permittedInsecurePackages = [ + "ffmpeg-2.8.17" + ]; } diff --git a/users/kat/base/default.nix b/users/kat/base/default.nix index 49f8715a..85f17079 100644 --- a/users/kat/base/default.nix +++ b/users/kat/base/default.nix @@ -12,5 +12,7 @@ ./ssh.nix ./packages.nix ./weechat.nix + ./inputrc.nix + ./rink.nix ]; } diff --git a/users/kat/base/inputrc.nix b/users/kat/base/inputrc.nix new file mode 100644 index 00000000..8950b4b1 --- /dev/null +++ b/users/kat/base/inputrc.nix @@ -0,0 +1,21 @@ +{ config, ... }: + +{ + xdg.configFile."inputrc".text = '' + set editing-mode vi + set keyseq-timeout 1 + set mark-symlinked-directories on + set completion-prefix-display-length 8 + set show-all-if-ambiguous on + set show-all-if-unmodified on + set visible-stats on + set colored-stats on + set bell-style audible + set meta-flag on + set input-meta on + set convert-meta off + set output-meta on + ''; + + home.sessionVariables.INPUTRC = "${config.xdg.configHome}/inputrc"; +} diff --git a/users/kat/base/packages.nix b/users/kat/base/packages.nix index 20080030..e1930303 100644 --- a/users/kat/base/packages.nix +++ b/users/kat/base/packages.nix @@ -21,7 +21,6 @@ whois niv dnsutils - rink borgbackup neofetch ]; diff --git a/users/kat/base/rink.nix b/users/kat/base/rink.nix new file mode 100644 index 00000000..984e72ae --- /dev/null +++ b/users/kat/base/rink.nix @@ -0,0 +1,38 @@ +{ config, lib, pkgs, ... }: + +{ + home.packages = with pkgs; [ + rink-readline + ]; + + xdg.configFile."rink/config.toml".text = lib.toTOML { + colors = { + enabled = true; + theme = "my_theme"; + }; + currency = { + cache_duration = "1h"; + enabled = true; + endpoint = "https://rinkcalc.app/data/currency.json"; + timeout = "2s"; + }; + rink = { + long_output = true; + prompt = "> "; + }; + themes = { + my_theme = { + date_time = "default"; + doc_string = "italic"; + error = "red"; + number = "default"; + plain = "default"; + pow = "default"; + prop_name = "cyan"; + quantity = "dimmed cyan"; + unit = "cyan"; + user_input = "bold"; + }; + }; + }; +} diff --git a/users/kat/gui/gtk.nix b/users/kat/gui/gtk.nix index 04cf8423..67af09dc 100644 --- a/users/kat/gui/gtk.nix +++ b/users/kat/gui/gtk.nix @@ -8,8 +8,8 @@ package = pkgs.numix-icon-theme-square; }; theme = { - name = "Arc-Dark"; - package = pkgs.arc-theme; + name = "Adementary Dark"; + package = pkgs.adementary-theme; }; }; }