Initial commit

users/pbsds/home/default.nix

@@ -6,6 +6,9 @@
     ./modules/jump.nix
     ./modules/micro.nix
   ];
+  disabledModules = [
+    "programs/micro.nix"
+  ];
 
   nixpkgs.config.allowUnfree = true;
 
@@ -73,6 +76,7 @@
     vgmstream
     gallery-dl
     yt-dlp
+    youtube-dl
     ffmpeg-full
 
     git
@@ -90,7 +94,7 @@
     #tldr
     entr
     axel aria
-    bat
+    bat bat-extras.batman # TODO: condition on programs.bat.enable
     xe # xargs alternative
     sd # sed alternative
     fd # find alternative
@@ -100,9 +104,12 @@
     jq
     yq
     htmlq
+    just
     sysz
     du-dust # du alternative
     ncdu # Disk usage analyzer with an ncurses interface
+    xplr # tui file explorer
+    aha
 
     mesa-demos
     cage
@@ -112,10 +119,12 @@
 
     librespeed-cli
 
+    cachix
     nix-template
     nix-output-monitor
     nixpkgs-review
     manix
+    comma
 
     (python3.withPackages (python-packages: with python-packages; [
       requests
@@ -176,6 +185,10 @@
     gfr = "git pull --rebase";
     gp = "git pull --rebase --autostash";
 
+    # bat - TODO: condition these on programs.bat.enable ?
+    cat = "bat --style=plain --paging=never";
+    man = "batman";
+
     python = "ptpython"; # this has too many problems...
     cpython = "python";
 
@@ -184,6 +197,8 @@
     http-server = "${pkgs.python3}/bin/python -m http.server";
 
     manix-fzf = ''manix "" 2>/dev/null | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview="manix '{}'" | xargs manix'';
+
+    nixpkgs-review = ''mkdir -p /dev/shm/nixpkgs-review && ln -sfn /dev/shm/nixpkgs-review $HOME/.cache/nixpkgs-review && nixpkgs-review'';
   };
   programs.bash.enable = true;
   #programs.bash.enableCompletion = true;
@@ -212,10 +227,28 @@
   programs.exa.enable = true;
   programs.exa.enableAliases = true;
   programs.direnv.enable = true;
-  programs.just.enable = true;
   #programs.mpv.bindings
   #programs.mpv.config
 
+  # TODO: implement programs.bat.enableAliases
+  programs.bat = {
+    enable = true;
+    themes.railscast = builtins.readFile (pkgs.fetchFromGitHub {
+        owner = "jeromedalbert";
+        repo = "sublime-text-railscasttextmate-theme";
+        rev = "0a4861f35e72f9ad4cc1cac42730ea563be2ffd3";
+        hash = "sha256-1Ml5vqP9r6oCfLhaNGPQJXS8e7utxQQycIm3Hk9wE3w=";
+      } + "/railscast-textmate.tmtheme");
+    config.theme = "railscast";
+    #config.style = "plain";
+    config.map-syntax = [
+      "poetry.toml:Toml"
+      "flake.lock:Json"
+    ];
+    # only in unstable as of 22.11:
+    #extraPackages = with pkgs.bat-extras; [ batdiff batman batgrep batwatch ];
+  };
+
   /**/
   # TODO: upstream this
   programs.micro.enable = true;
@@ -259,13 +292,21 @@
   #xdg.desktopEntries
 
   gtk.enable = true; # TODO: only if programs.dconf is enabled
-  gtk.theme.name = "vimix-dark-ruby";
-  gtk.theme.package = pkgs.vimix-gtk-themes;
+  #gtk.theme.name = "vimix-dark-ruby"; # TODO: keep vimix as gnome-shell theme?
+  #gtk.theme.package = pkgs.vimix-gtk-themes;
+  gtk.theme.name = "Colloid-Dark";
+  gtk.theme.package = pkgs.colloid-gtk-theme;
   gtk.iconTheme.name = "Flat-Remix-Blue-Dark";
   gtk.iconTheme.package = pkgs.flat-remix-icon-theme;
+  dconf.settings."org/gnome/desktop/background" = {
+    "picture-uri"      = "file:///mnt/reidun/Images/Wallpapers/1575232313831.jpg";
+    "picture-uri-dark" = "file:///mnt/reidun/Images/Wallpapers/1575232313831.jpg";
+  };
 
+  # TODO: upstream?
   programs.jump.enableBash = true;
 
+  /** /
   programs.beets = {
     enable = true;
     settings = {
@@ -278,5 +319,6 @@
       ##library = "/mnt/meconium/beets_music/data.db";
     };
   };
+  /**/
 
 }