From 0630c992379aea8d4c4a23192e125725768a2536 Mon Sep 17 00:00:00 2001 From: atagen Date: Thu, 25 Aug 2022 19:36:28 +1000 Subject: [PATCH] localtime, cachix, clementine --- home/home.nix | 26 ++++++++--------- system/configuration.nix | 62 +++++++++++++++++++++++++++++++++++----- 2 files changed, 68 insertions(+), 20 deletions(-) diff --git a/home/home.nix b/home/home.nix index 54bb325..4ba7dc2 100644 --- a/home/home.nix +++ b/home/home.nix @@ -15,13 +15,12 @@ nixpkgs.config.allowUnfree = true; - nixpkgs.overlays = [ - (import "${fetchTarball "https://github.com/nix-community/fenix/archive/main.tar.gz"}/overlay.nix") - ]; home.packages = with pkgs; [ kitty thunderbird + + clementine btop bat @@ -31,15 +30,6 @@ latte-dock - # rust-analyzer-nightly - # (fenix.complete.withComponents [ - # "cargo" - # "clippy" - # "rust-src" - # "rustc" - # "rustfmt" - # ]) - kdeconnect keepassxc @@ -81,6 +71,11 @@ }; }; }; + + programs.broot = { + enable = true; + modal = true; + }; services.syncthing = { enable = true; @@ -104,6 +99,11 @@ userName = "atagen"; userEmail = "atagen@boss.co"; }; + + programs.zoxide = { + enable = true; + enableZshIntegration = true; + }; programs.zsh = { enable = true; @@ -113,7 +113,7 @@ enableVteIntegration = true; autocd = true; defaultKeymap = "viins"; - initExtra = "\n[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh\neval \"$(zoxide init zsh)\"\n"; + initExtra = "\n[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh\n"; plugins = [ { name = "powerlevel10k"; diff --git a/system/configuration.nix b/system/configuration.nix index fa7ff47..27aa50a 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -4,13 +4,23 @@ { - imports = - [ - # where are we ? - # ./wollomi.nix - # ./adrift.nix - ]; + imports = [ + # where are we ? + # ./wollomi.nix + # ./adrift.nix + + # home manager should exist for users + + + ./cachix.nix + + # declarative cachix + (import (builtins.fetchTarball "https://github.com/jonascarpay/declarative-cachix/archive/master.tar.gz")) + ]; + cachix = [ + "nix-community" + ]; nix.extraOptions = '' experimental-features = nix-command flakes @@ -27,7 +37,22 @@ networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. + # timezone only needs setting so localtimed has something to work off + services.geoclue2.enable = true; time.timeZone = "Australia/Sydney"; + services.chrony = { + enable = true; + enableNTS = true; + }; + services.localtimed.enable = true; + networking.timeServers = [ + "0.au.pool.ntp.org" + "1.au.pool.ntp.org" + "2.au.pool.ntp.org" + "3.au.pool.ntp.org" + "pool.ntp.org" + ]; + # Select internationalisation properties. i18n.defaultLocale = "en_US.UTF-8"; @@ -35,7 +60,6 @@ font = "Lat2-Terminus16"; useXkbConfig = true; # use xkbOptions in tty. }; - nixpkgs.config.allowUnfree = true; hardware.opengl.enable = true; @@ -74,8 +98,32 @@ programs.zsh.enable = true; users.defaultUserShell = pkgs.zsh; + # rust + nixpkgs.overlays = [ + (import "${fetchTarball "https://github.com/nix-community/fenix/archive/main.tar.gz"}/overlay.nix") + ]; + + # List packages installed in system profile. To search, run: environment.systemPackages = with pkgs; [ + + # this isn't enough to use rust, but it allows us + # to keep the compilers in a nix shell appropriate to the project + # maybe we should just move it all to a project shell.nix idk + rust-analyzer-nightly + (fenix.complete.withComponents [ + # "cargo" + "clippy" + # "rust-src" + # "rustc" + "rustfmt" + ]) + # llvmPackages_14.clangUseLLVM + + # gcc12 + + cachix + helix rnix-lsp ark