From da55a342e358780bf23f2cb9864e7b243029b321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Wed, 28 Oct 2020 22:05:33 +0100 Subject: [PATCH] chore: dot -> lib --- configs/i3.nix | 2 +- configs/neovim.nix | 2 +- dot/htoprc | 24 --------------------- dot/radio-stations.txt | 37 -------------------------------- {dot => lib}/i3status-rust.nix | 0 {dot => lib}/matterbridge.nix | 0 lib/radio-stations.nix | 39 ++++++++++++++++++++++++++++++++++ {dot => lib/vim}/init.vim | 0 systems/toum/configuration.nix | 3 +-- 9 files changed, 42 insertions(+), 65 deletions(-) delete mode 100644 dot/htoprc delete mode 100644 dot/radio-stations.txt rename {dot => lib}/i3status-rust.nix (100%) rename {dot => lib}/matterbridge.nix (100%) create mode 100644 lib/radio-stations.nix rename {dot => lib/vim}/init.vim (100%) diff --git a/configs/i3.nix b/configs/i3.nix index 1fc2029..01a6cf4 100644 --- a/configs/i3.nix +++ b/configs/i3.nix @@ -147,7 +147,7 @@ in with config.niveum; { }; }; statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ${ - pkgs.writeTOML (import { + pkgs.writeTOML (import { wifi-interface = networkInterfaces.wireless; batteryBlock = batteryBlocks.default; inherit (config.niveum) colours; diff --git a/configs/neovim.nix b/configs/neovim.nix index e287c8f..fdbf97a 100644 --- a/configs/neovim.nix +++ b/configs/neovim.nix @@ -22,7 +22,7 @@ environment.systemPackages = [ (pkgs.neovim.override { configure = { - customRC = builtins.readFile ; + customRC = builtins.readFile ; packages.nvim = with pkgs.vimPlugins; { start = [ # cheat-sh-vim diff --git a/dot/htoprc b/dot/htoprc deleted file mode 100644 index a194980..0000000 --- a/dot/htoprc +++ /dev/null @@ -1,24 +0,0 @@ -fields=0 48 17 18 38 39 40 2 46 47 49 1 -sort_key=46 -sort_direction=1 -hide_threads=0 -hide_kernel_threads=1 -hide_userland_threads=0 -shadow_other_users=1 -show_thread_names=1 -show_program_path=1 -highlight_base_name=1 -highlight_megabytes=1 -highlight_threads=1 -tree_view=1 -header_margin=1 -detailed_cpu_time=0 -cpu_count_from_zero=0 -update_process_names=0 -account_guest_in_cpu_meter=1 -color_scheme=0 -delay=15 -left_meters=LeftCPUs2 RightCPUs2 Memory Swap -left_meter_modes=1 1 1 1 -right_meters=Uptime Tasks LoadAverage Battery -right_meter_modes=2 2 2 2 diff --git a/dot/radio-stations.txt b/dot/radio-stations.txt deleted file mode 100644 index c3b012b..0000000 --- a/dot/radio-stations.txt +++ /dev/null @@ -1,37 +0,0 @@ -http://ice1.somafm.com/groovesalad-32-aac -http://ice1.somafm.com/dronezone-128-mp3 -http://ice1.somafm.com/groovesalad-32-aac -http://ice1.somafm.com/spacestation-128-aac -http://ice1.somafm.com/thetrip-128-mp3 -http://ice1.somafm.com/beatblender-128-aac -http://ice1.somafm.com/dronezone-128-mp3 -http://ice1.somafm.com/groovesalad-32-aac -http://ice1.somafm.com/beatblender-128-aac -http://ice1.somafm.com/spacestation-128-aac -http://ice1.somafm.com/thetrip-128-mp3 -http://ice1.somafm.com/defcon-128-aac -http://ice1.somafm.com/dubstep-128-aac -http://prem2.di.fm:80/glitchhop_hi?4527f2ba1755917 -http://prem2.di.fm:80/bassline_hi?4527f2ba1755917 -http://prem2.di.fm:80/progressivepsy_hi?4527f2ba1755917 -http://prem2.di.fm:80/minimal_hi?4527f2ba1755917 -http://prem2.di.fm:80/drumandbass_hi?4527f2ba1755917 -http://prem2.di.fm:80/dubstep_hi?4527f2ba1755917 -http://prem2.di.fm:80/liquiddnb_hi?4527f2ba1755917 -http://prem2.di.fm:80/progressive_hi?4527f2ba1755917 -http://prem2.di.fm:80/djmixes_hi?4527f2ba1755917 -http://prem2.di.fm:80/electrohouse_hi?4527f2ba1755917 -http://prem2.di.fm:80/breaks_hi?4527f2ba1755917 -http://prem2.di.fm:80/classicelectronica_hi?4527f2ba1755917 -http://prem2.di.fm:80/liquiddubstep_hi?4527f2ba1755917 -http://prem2.di.fm:80/techhouse_hi?4527f2ba1755917 -http://prem2.di.fm:80/chillout_hi?4527f2ba1755917 -http://prem2.di.fm:80/lounge_hi?4527f2ba1755917 -http://prem2.di.fm:80/hardtechno_hi?4527f2ba1755917 -http://prem2.di.fm:80/handsup_hi?4527f2ba1755917 -http://prem2.di.fm:80/deephouse_hi?4527f2ba1755917 -http://prem2.di.fm:80/drumstep_hi?4527f2ba1755917 -http://prem2.di.fm:80/electroswing_hi?4527f2ba1755917 -http://prem2.di.fm:80/dub_hi?4527f2ba1755917 -http://prem2.di.fm:80/trap_hi?4527f2ba1755917 -https://radio.lassul.us/radio.ogg diff --git a/dot/i3status-rust.nix b/lib/i3status-rust.nix similarity index 100% rename from dot/i3status-rust.nix rename to lib/i3status-rust.nix diff --git a/dot/matterbridge.nix b/lib/matterbridge.nix similarity index 100% rename from dot/matterbridge.nix rename to lib/matterbridge.nix diff --git a/lib/radio-stations.nix b/lib/radio-stations.nix new file mode 100644 index 0000000..c2c5ee7 --- /dev/null +++ b/lib/radio-stations.nix @@ -0,0 +1,39 @@ +[ + "http://ice1.somafm.com/beatblender-128-aac" + "http://ice1.somafm.com/beatblender-128-aac" + "http://ice1.somafm.com/defcon-128-aac" + "http://ice1.somafm.com/dronezone-128-mp3" + "http://ice1.somafm.com/dronezone-128-mp3" + "http://ice1.somafm.com/dubstep-128-aac" + "http://ice1.somafm.com/groovesalad-32-aac" + "http://ice1.somafm.com/groovesalad-32-aac" + "http://ice1.somafm.com/groovesalad-32-aac" + "http://ice1.somafm.com/spacestation-128-aac" + "http://ice1.somafm.com/spacestation-128-aac" + "http://ice1.somafm.com/thetrip-128-mp3" + "http://ice1.somafm.com/thetrip-128-mp3" + "http://prem2.di.fm:80/bassline_hi?4527f2ba1755917" + "http://prem2.di.fm:80/breaks_hi?4527f2ba1755917" + "http://prem2.di.fm:80/chillout_hi?4527f2ba1755917" + "http://prem2.di.fm:80/classicelectronica_hi?4527f2ba1755917" + "http://prem2.di.fm:80/deephouse_hi?4527f2ba1755917" + "http://prem2.di.fm:80/djmixes_hi?4527f2ba1755917" + "http://prem2.di.fm:80/drumandbass_hi?4527f2ba1755917" + "http://prem2.di.fm:80/drumstep_hi?4527f2ba1755917" + "http://prem2.di.fm:80/dub_hi?4527f2ba1755917" + "http://prem2.di.fm:80/dubstep_hi?4527f2ba1755917" + "http://prem2.di.fm:80/electrohouse_hi?4527f2ba1755917" + "http://prem2.di.fm:80/electroswing_hi?4527f2ba1755917" + "http://prem2.di.fm:80/glitchhop_hi?4527f2ba1755917" + "http://prem2.di.fm:80/handsup_hi?4527f2ba1755917" + "http://prem2.di.fm:80/hardtechno_hi?4527f2ba1755917" + "http://prem2.di.fm:80/liquiddnb_hi?4527f2ba1755917" + "http://prem2.di.fm:80/liquiddubstep_hi?4527f2ba1755917" + "http://prem2.di.fm:80/lounge_hi?4527f2ba1755917" + "http://prem2.di.fm:80/minimal_hi?4527f2ba1755917" + "http://prem2.di.fm:80/progressive_hi?4527f2ba1755917" + "http://prem2.di.fm:80/progressivepsy_hi?4527f2ba1755917" + "http://prem2.di.fm:80/techhouse_hi?4527f2ba1755917" + "http://prem2.di.fm:80/trap_hi?4527f2ba1755917" + "https://radio.lassul.us/radio.ogg" +] diff --git a/dot/init.vim b/lib/vim/init.vim similarity index 100% rename from dot/init.vim rename to lib/vim/init.vim diff --git a/systems/toum/configuration.nix b/systems/toum/configuration.nix index be9357f..c73975d 100644 --- a/systems/toum/configuration.nix +++ b/systems/toum/configuration.nix @@ -31,7 +31,7 @@ in { services.matterbridge = { enable = true; - configPath = toString (pkgs.writeTOML (import { + configPath = toString (pkgs.writeTOML (import { token = lib.strings.fileContents ; })); }; @@ -53,7 +53,6 @@ in { networking.hostName = "toum"; environment.variables.TERM = "linux"; - environment.variables.HTOPRC = toString ; environment.systemPackages = with pkgs; [ git vim htop wget reptyr