emacs, waybar, wallpapers.

Moved to doom emacs. Changed wallpapers. hextorgba working. Waybar now
uses nix templated CSS pulling from colors.nix.

config/profiles/common/default.nix

@@ -26,7 +26,7 @@ in {
   nix.gc.options = lib.mkDefault "--delete-older-than 1w";
   nix.trustedUsers = [ "root" "@wheel" ];
   environment.variables = {
-    EDITOR = "kak";
+    EDITOR = "emacs";
     TERMINFO_DIRS = "${pkgs.kitty.terminfo.outPath}/share/terminfo";
   };
   

config/profiles/sway/default.nix

@@ -1,7 +1,6 @@
 { config, pkgs, lib, ... }:
 
-let colors = import ./colors.nix;
-in {
+let colors = import ./colors.nix; in {
   config = lib.mkIf (lib.elem "sway" config.meta.deploy.profiles) {
     fonts.fonts = with pkgs; [
       font-awesome
@@ -18,6 +17,8 @@ in {
         [ config.home-manager.users.kat.xdg.configFile."mako/config".source ];
     };
 
+    services.tumbler.enable = true;
+
     home-manager.users.kat = {
       programs.kitty = {
         enable = true;
@@ -25,8 +26,8 @@ in {
         settings = {
           font_size = "10.0";
           background = colors.black;
+          background_opacity = "0.7";
           foreground = colors.white;
-          background_opacity = "0.8";
           selection_background = colors.white;
           selection_foreground = colors.black;
           url_color = colors.yellow;
@@ -249,39 +250,48 @@ in {
           seat seat0 xcursor_theme breeze_cursors 20
         '';
       };
+
       programs.waybar = {
         enable = true;
-        #       style = ''
-        #         * {
-        #           font-family: "Iosevka";
-        #         }
-        #       '';
+        style = import ./waybar.css.nix { inherit colors; hextorgba = pkgs.colorhelpers.hextorgba; };
         settings = [{
-          modules-left = [ "sway/workspaces" "sway/mode" ];
-          modules-center = [ "sway/window" ];
+          modules-left = [ "sway/workspaces" "sway/mode" "sway/window" ];
+          modules-center = [  "clock" ];
           modules-right = [
             "pulseaudio"
             "network"
             "cpu"
             "memory"
             "temperature"
-            "clock"
             "tray"
+            "battery"
           ];
 
           modules = {
+            cpu = {
+              format = "  {usage}%";
+            };
+            memory = {
+              format = "  {percentage}%";
+            };
+            battery = {
+              format = "  {capacity}%";
+            };
+            temperature = {
+              format = "﨎 {temperatureC}°C";
+            };
             pulseaudio = {
-              format = "{volume}%";
+              format = "  {volume}%";
               on-click = "pavucontrol";
             };
             network = {
-              format-wifi = "{essid} ({signalStrength}%) ";
-              format-ethernet = "{ifname}: {ipaddr}/{cidr} ";
-              format-linked = "{ifname} (No IP) ";
-              format-disconnected = "Disconnected ⚠";
+              format-wifi = "  {essid} ({signalStrength}%)";
+              format-ethernet = "  {ifname}: {ipaddr}/{cidr}";
+              format-linked = "  {ifname} (No IP)";
+              format-disconnected = "  Disconnected ";
               format-alt = "{ifname}: {ipaddr}/{cidr}";
             };
-            clock = { format = "{:%A, %F %T %Z}"; };
+            clock = { format = "  {:%A, %F %T %Z}"; };
           };
         }];
       };

config/profiles/sway/waybar.css.nix

@@ -0,0 +1,65 @@
+{ hextorgba, colors }:
+
+''
+ * {
+	border: none;
+	border-radius: 0;
+	font-family: "Hack Nerd Font";
+	font-size: 12px;
+  min-height: 14px
+}
+
+#clock, #memory, #cpu, #temperature, #pulseaudio, #network, #mpd {
+  margin-left: 8px;
+	margin-right: 8px;
+	padding-left: 8px;
+	padding-right: 8px;
+  transition: none;
+  border-bottom: 2px solid ${colors.base16.color7};
+  color: ${colors.base16.color7}
+}
+
+window#waybar {	background: ${hextorgba colors.base16.color0} }
+
+#window {
+  color: ${colors.base16.color7};
+  padding-left: 16px;
+  padding-right: 16px
+}
+
+#workspaces {	padding: 0px 4px 0px 4px }
+
+#workspaces button {
+	color: ${colors.base16.color7};
+	background: ${hextorgba colors.base16.color11};
+	font-size: 16px;
+	margin: 0px 4px 0px 4px;
+	border-bottom: 2px solid transparent;
+	border-left: 1px solid ${colors.base16.color7};
+	border-right: 1px solid ${colors.base16.color7}
+}
+
+#workspaces button:last-child { margin-right: 0px }
+
+#workspaces button.focused {
+    color: ${colors.base16.color1};
+    border-bottom-color: ${colors.base16.color1}
+}
+
+#workspaces button:hover {
+	transition: none;
+	box-shadow: inherit;
+	text-shadow: inherit;
+  color: ${colors.base16.color3};
+  border-bottom-color: ${colors.base16.color3}
+}
+
+#mpd { border-color: #5af78e }
+#mpd.disconnected, #mpd.stopped { border-color: #282a36 }
+#network { border-color: ${colors.base16.color3} }
+#pulseaudio { border-color: ${colors.base16.color2} }
+#temperature { border-color: ${colors.base16.color4} }
+#cpu { border-color: ${colors.base16.color5} }
+#memory { border-color: ${colors.base16.color17} }
+#clock { border-color: ${colors.base16.color7} }
+''

config/users/kat/default.nix

@@ -1,6 +1,10 @@
 { config, pkgs, ... }:
 
 {
+  imports = [
+    ./emacs.nix
+  ];
+  
   users.users.kat = {
     uid = 1000;
     isNormalUser = true;

config/users/kat/doom.d/config.el

@@ -0,0 +1,54 @@
+;;; $DOOMDIR/config.el -*- lexical-binding: t; -*-
+
+;; Place your private configuration here! Remember, you do not need to run 'doom
+;; sync' after modifying this file!
+
+
+;; Some functionality uses this to identify you, e.g. GPG configuration, email
+;; clients, file templates and snippets.
+(setq user-full-name "kat"
+      user-mail-address "kat@kittywit.ch")
+
+;; Doom exposes five (optional) variables for controlling fonts in Doom. Here
+;; are the three important ones:
+;;
+;; + `doom-font'
+;; + `doom-variable-pitch-font'
+;; + `doom-big-font' -- used for `doom-big-font-mode'; use this for
+;;   presentations or streaming.
+;;
+;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd
+;; font string. You generally only need these two:
+(setq doom-font (font-spec :family "Hack Nerd Font" :size 13))
+;;       doom-variable-pitch-font (font-spec :family "sans" :size 13))
+
+;; There are two ways to load a theme. Both assume the theme is installed and
+;; available. You can either set `doom-theme' or manually load a theme with the
+;; `load-theme' function. This is the default:
+(setq doom-theme 'doom-one)
+
+;; If you use `org' and don't want your org files in the default location below,
+;; change `org-directory'. It must be set before org loads!
+(setq org-directory "~/org/")
+
+;; This determines the style of line numbers in effect. If set to `nil', line
+;; numbers are disabled. For relative line numbers, set this to `relative'.
+(setq display-line-numbers-type t)
+
+
+;; Here are some additional functions/macros that could help you configure Doom:
+;;
+;; - `load!' for loading external *.el files relative to this one
+;; - `use-package!' for configuring packages
+;; - `after!' for running code after a package has loaded
+;; - `add-load-path!' for adding directories to the `load-path', relative to
+;;   this file. Emacs searches the `load-path' when you load packages with
+;;   `require' or `use-package'.
+;; - `map!' for binding new keys
+;;
+;; To get information about any of these functions/macros, move the cursor over
+;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k').
+;; This will open documentation for it, including demos of how they are used.
+;;
+;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how
+;; they are implemented.

config/users/kat/doom.d/init.el

@@ -0,0 +1,180 @@
+;;; init.el -*- lexical-binding: t; -*-
+
+;; This file controls what Doom modules are enabled and what order they load
+;; in. Remember to run 'doom sync' after modifying it!
+
+;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's
+;;      documentation. There you'll find a "Module Index" link where you'll find
+;;      a comprehensive list of Doom's modules and what flags they support.
+
+;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or
+;;      'C-c c k' for non-vim users) to view its documentation. This works on
+;;      flags as well (those symbols that start with a plus).
+;;
+;;      Alternatively, press 'gd' (or 'C-c c d') on a module to browse its
+;;      directory (for easy access to its source code).
+
+(doom! :input
+       ;;chinese
+       ;;japanese
+
+       :completion
+       company           ; the ultimate code completion backend
+       ;;helm              ; the *other* search engine for love and life
+       ;;ido               ; the other *other* search engine...
+       ivy               ; a search engine for love and life
+
+       :ui
+       ;;deft              ; notational velocity for Emacs
+       doom              ; what makes DOOM look the way it does
+       doom-dashboard    ; a nifty splash screen for Emacs
+       doom-quit         ; DOOM quit-message prompts when you quit Emacs
+       ;;fill-column       ; a `fill-column' indicator
+       hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
+       ;;hydra
+       indent-guides     ; highlighted indent columns
+       ;;(ligatures +iosevka)
+       minimap           ; show a map of the code on the side
+       modeline          ; snazzy, Atom-inspired modeline, plus API
+       ;;nav-flash         ; blink cursor line after big motions
+       ;;neotree           ; a project drawer, like NERDTree for vim
+       ophints           ; highlight the region an operation acts on
+       (popup +defaults)   ; tame sudden yet inevitable temporary windows
+       ;;pretty-code       ; ligatures or substitute text with pretty symbols
+       ;;tabs              ; a tab bar for Emacs
+       ;;treemacs          ; a project drawer, like neotree but cooler
+       ;;unicode           ; extended unicode support for various languages
+       vc-gutter         ; vcs diff in the fringe
+       vi-tilde-fringe   ; fringe tildes to mark beyond EOB
+       ;;window-select     ; visually switch windows
+       workspaces        ; tab emulation, persistence & separate workspaces
+       ;;zen               ; distraction-free coding or writing
+
+       :editor
+       (evil +everywhere); come to the dark side, we have cookies
+       file-templates    ; auto-snippets for empty files
+       fold              ; (nigh) universal code folding
+       ;;(format +onsave)  ; automated prettiness
+       ;;god               ; run Emacs commands without modifier keys
+       ;;lispy             ; vim for lisp, for people who don't like vim
+       ;;multiple-cursors  ; editing in many places at once
+       ;;objed             ; text object editing for the innocent
+       ;;parinfer          ; turn lisp into python, sort of
+       ;;rotate-text       ; cycle region at point between text candidates
+       snippets          ; my elves. They type so I don't have to
+       ;;word-wrap         ; soft wrapping with language-aware indent
+
+       :emacs
+       dired             ; making dired pretty [functional]
+       electric          ; smarter, keyword-based electric-indent
+       ;;ibuffer         ; interactive buffer management
+       undo              ; persistent, smarter undo for your inevitable mistakes
+       vc                ; version-control and Emacs, sitting in a tree
+
+       :term
+       ;;eshell            ; the elisp shell that works everywhere
+       ;;shell             ; simple shell REPL for Emacs
+       ;;term              ; basic terminal emulator for Emacs
+       ;;vterm             ; the best terminal emulation in Emacs
+
+       :checkers
+       syntax              ; tasing you for every semicolon you forget
+       ;;spell             ; tasing you for misspelling mispelling
+       ;;grammar           ; tasing grammar mistake every you make
+
+       :tools
+       ;;ansible
+       ;;debugger          ; FIXME stepping through code, to help you add bugs
+       ;;direnv
+       docker
+       ;;editorconfig      ; let someone else argue about tabs vs spaces
+       ;;ein               ; tame Jupyter notebooks with emacs
+       (eval +overlay)     ; run code, run (also, repls)
+       ;;gist              ; interacting with github gists
+       lookup              ; navigate your code and its documentation
+       ;;lsp
+       ;;macos             ; MacOS-specific commands
+       magit             ; a git porcelain for Emacs
+       ;;make              ; run make tasks from Emacs
+       ;;pass              ; password manager for nerds
+       pdf               ; pdf enhancements
+       ;;prodigy           ; FIXME managing external services & code builders
+       ;;rgb               ; creating color strings
+       ;;taskrunner        ; taskrunner for all your projects
+       ;;terraform         ; infrastructure as code
+       ;;tmux              ; an API for interacting with tmux
+       ;;upload            ; map local to remote projects via ssh/ftp
+
+       :lang
+       ;;agda              ; types of types of types of types...
+       ;;cc                ; C/C++/Obj-C madness
+       ;;clojure           ; java with a lisp
+       ;;common-lisp       ; if you've seen one lisp, you've seen them all
+       ;;coq               ; proofs-as-programs
+       ;;crystal           ; ruby at the speed of c
+       ;;csharp            ; unity, .NET, and mono shenanigans
+       data              ; config/data formats
+       ;;(dart +flutter)   ; paint ui and not much else
+       elixir            ; erlang done right
+       ;;elm               ; care for a cup of TEA?
+       emacs-lisp        ; drown in parentheses
+       erlang            ; an elegant language for a more civilized age
+       ;;ess               ; emacs speaks statistics
+       ;;faust             ; dsp, but you get to keep your soul
+       ;;fsharp            ; ML stands for Microsoft's Language
+       ;;fstar             ; (dependent) types and (monadic) effects and Z3
+       ;;gdscript          ; the language you waited for
+       ;;(go +lsp)         ; the hipster dialect
+       ;;(haskell +dante)  ; a language that's lazier than I am
+       ;;hy                ; readability of scheme w/ speed of python
+       ;;idris             ;
+       json              ; At least it ain't XML
+       ;;(java +meghanada) ; the poster child for carpal tunnel syndrome
+       ;;javascript        ; all(hope(abandon(ye(who(enter(here))))))
+       ;;julia             ; a better, faster MATLAB
+       ;;kotlin            ; a better, slicker Java(Script)
+       ;;latex             ; writing papers in Emacs has never been so fun
+       ;;lean
+       ;;factor
+       ;;ledger            ; an accounting system in Emacs
+       ;;lua               ; one-based indices? one-based indices
+       markdown          ; writing docs for people to ignore
+       ;;nim               ; python + lisp at the speed of c
+       nix               ; I hereby declare "nix geht mehr!"
+       ;;ocaml             ; an objective camel
+       org               ; organize your plain life in plain text
+       ;;php               ; perl's insecure younger brother
+       ;;plantuml          ; diagrams for confusing people more
+       ;;purescript        ; javascript, but functional
+       python            ; beautiful is better than ugly
+       ;;qt                ; the 'cutest' gui framework ever
+       ;;racket            ; a DSL for DSLs
+       ;;raku              ; the artist formerly known as perl6
+       ;;rest              ; Emacs as a REST client
+       ;;rst               ; ReST in peace
+       ;;(ruby +rails)     ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
+       rust              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
+       ;;scala             ; java, but good
+       ;;scheme            ; a fully conniving family of lisps
+       sh                ; she sells {ba,z,fi}sh shells on the C xor
+       ;;sml
+       ;;solidity          ; do you need a blockchain? No.
+       ;;swift             ; who asked for emoji variables?
+       ;;terra             ; Earth and Moon in alignment for performance.
+       ;;web               ; the tubes
+       yaml              ; JSON, but readable
+
+       :email
+       ;;(mu4e +gmail)
+       ;;notmuch
+       ;;(wanderlust +gmail)
+
+       :app
+       ;;calendar
+       ;;irc               ; how neckbeards socialize
+       ;;(rss +org)        ; emacs as an RSS reader
+       ;;twitter           ; twitter client https://twitter.com/vnought
+
+       :config
+       ;;literate
+       (default +bindings +smartparens))

config/users/kat/doom.d/packages.el

@@ -0,0 +1,50 @@
+;; -*- no-byte-compile: t; -*-
+;;; $DOOMDIR/packages.el
+
+;; To install a package with Doom you must declare them here and run 'doom sync'
+;; on the command line, then restart Emacs for the changes to take effect -- or
+;; use 'M-x doom/reload'.
+
+
+;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror:
+;(package! some-package)
+
+;; To install a package directly from a remote git repo, you must specify a
+;; `:recipe'. You'll find documentation on what `:recipe' accepts here:
+;; https://github.com/raxod502/straight.el#the-recipe-format
+;(package! another-package
+;  :recipe (:host github :repo "username/repo"))
+
+;; If the package you are trying to install does not contain a PACKAGENAME.el
+;; file, or is located in a subdirectory of the repo, you'll need to specify
+;; `:files' in the `:recipe':
+;(package! this-package
+;  :recipe (:host github :repo "username/repo"
+;           :files ("some-file.el" "src/lisp/*.el")))
+
+;; If you'd like to disable a package included with Doom, you can do so here
+;; with the `:disable' property:
+;(package! builtin-package :disable t)
+
+;; You can override the recipe of a built in package without having to specify
+;; all the properties for `:recipe'. These will inherit the rest of its recipe
+;; from Doom or MELPA/ELPA/Emacsmirror:
+;(package! builtin-package :recipe (:nonrecursive t))
+;(package! builtin-package-2 :recipe (:repo "myfork/package"))
+
+;; Specify a `:branch' to install a package from a particular branch or tag.
+;; This is required for some packages whose default branch isn't 'master' (which
+;; our package manager can't deal with; see raxod502/straight.el#279)
+;(package! builtin-package :recipe (:branch "develop"))
+
+;; Use `:pin' to specify a particular commit to install.
+;(package! builtin-package :pin "1a2b3c4d5e")
+
+
+;; Doom's packages are pinned to a specific commit and updated from release to
+;; release. The `unpin!' macro allows you to unpin single packages...
+;(unpin! pinned-package)
+;; ...or multiple packages
+;(unpin! pinned-package another-pinned-package)
+;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
+;(unpin! t)

config/users/kat/emacs.nix

@@ -0,0 +1,19 @@
+{ config, lib, pkgs, ... }:
+let
+  sources = import ../../../nix/sources.nix;
+  emacs = pkgs.callPackage sources.nix-doom-emacs {
+    doomPrivateDir = "${./doom.d}";
+    emacsPackagesOverlay = self: super: {
+      magit-delta = super.magit-delta.overrideAttrs (esuper: {
+        buildInputs = esuper.buildInputs ++ [ pkgs.git ];
+      });
+    };
+  };
+in {
+  users.users.kat.packages = [ emacs ];
+  home-manager.users.kat = {
+    home.file.".emacs.d/init.el".text = ''
+      (load "default.el")
+    '';
+  };
+}

lib/colorhelpers.nix

@@ -0,0 +1,19 @@
+{ lib }:
+rec {
+  hexChars = [ "0" "1" "2" "3" "4" "5" "6" "7" "8" "9" "a" "b" "c" "d" "e" "f" ];
+  hexCharToInt = char: let
+    pairs = lib.imap0 (lib.flip lib.nameValuePair) hexChars;
+    idx = builtins.listToAttrs pairs;
+  in idx.${lib.toLower char};
+  hexToInt = str:
+    lib.foldl (value: chr: value * 16 + hexCharToInt chr) 0 (lib.stringToCharacters str);
+  hextorgba = hex: (
+    let r_hex = lib.substring 1 2 hex;
+    g_hex = lib.substring 3 2 hex;
+    b_hex = lib.substring 5 2 hex;
+    r_dec = hexToInt r_hex;
+    g_dec = hexToInt g_hex;
+    b_dec = hexToInt b_hex;
+    in "rgba(${toString r_dec}, ${toString g_dec}, ${toString b_dec}, 0.75)"
+  );
+}

nix/sources.json

@@ -32,6 +32,18 @@
         "url": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/fb1cc04c0a517d4200237b02c3472bcaf9104afb/nixos-mailserver-fb1cc04c0a517d4200237b02c3472bcaf9104afb.tar.gz",
         "url_template": "<repo>/-/archive/<rev>.tar.gz"
     },
+    "nix-doom-emacs": {
+        "branch": "master",
+        "description": "doom-emacs packaged for Nix",
+        "homepage": "",
+        "owner": "vlaci",
+        "repo": "nix-doom-emacs",
+        "rev": "b182af7d10aa8394f12ecc2c53fd942fa30de060",
+        "sha256": "1mn01cvax8dmgxv68f9hv4l5i1p2xms0dlzmp30jmf7g31jfbrdy",
+        "type": "tarball",
+        "url": "https://github.com/vlaci/nix-doom-emacs/archive/b182af7d10aa8394f12ecc2c53fd942fa30de060.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
     "nixpkgs": {
         "branch": "release-20.09",
         "description": "Nix Packages collection",

pkgs/default.nix

@@ -21,6 +21,8 @@ let
           (callPackage ./vendor-reset { kernel = ksuper.kernel; }).out;
       });
 
+    colorhelpers = import ../lib/colorhelpers.nix { inherit (pkgs) lib; };
+    
     inherit callPackage;
     appendOverlays = overlays: (pkgs.appendOverlays overlays) // newpkgs;
   };