Adds pin for google-music, update wayfire build strategy

JorelAli · Feb 16, 2020 · 4136af7 · 4136af7
1 parent 3003704
commit 4136af7
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 11 deletions.
diff --git a/configuration.nix b/configuration.nix
@@ -35,6 +35,13 @@ in let
     sha256 = "0x86w7lxhfdchnqfan6fqpj6j09mjz2sq1plmbwchnqfjg37akfa";
   }) {};
 
+  gMusicPin = import (pkgs.fetchFromGitHub {
+    owner = "NixOS";
+    repo = "nixpkgs";
+    rev = "c1b3b6f8b22fe11b894c236bcfe6522c6a46dc5d";
+    sha256 = "04i4iy26pa585bwy43487k27arigyrsdh6vv0khz5n58ixswgkfa";
+  }) {};
+
   #  https://github.com/NixOS/nixpkgs/archive/083d0890f50c7bff87419b88465af6589faffa2e.tar.gz
 
 ##### Nix expressions ##########################################################
@@ -62,7 +69,7 @@ in with lib; {
     ./modules/dunst.nix
 #    ./modules/emojione.nix
     ./modules/xcompmgr.nix
-    ./modules/wayfire.nix
+#    ./modules/wayfire.nix
   ];
 
 ##### Boot Settings ############################################################
@@ -132,7 +139,7 @@ in with lib; {
 
     TERMINAL = "kitty";
 
-    NIX_AUTO_RUN = "1";
+    #NIX_AUTO_RUN = "1";
   };
 
 ##### /etc/ Files ##############################################################
@@ -292,7 +299,7 @@ in with lib; {
     filelight                           # View disk usage
     gimp                                # Image editor
     gnome3.nautilus                     # File browser
-    google-play-music-desktop-player    # Google Play Music for desktop
+    gMusicPin.google-play-music-desktop-player    # Google Play Music for desktop
     inkscape                            # Vector artwork
     kitty                               # Terminal
     libsForQt5.vlc                      # Video player (VLC)
@@ -417,6 +424,23 @@ in with lib; {
     texlive.combined.scheme-full        # TeX + TeX packages
     texstudio                           # Solely as a backup. I use vim.
 
+      wayfire
+      wf-config
+      xwayland
+      #wf-recorder
+      #wl-clipboard
+      #waypipe
+      wofi
+      grim
+      #cage
+      oguri
+      #kanshi
+      dmenu
+      #wlay
+      #wldash
+      wlroots
+      #waybar
+
     ### Custom Bash Scripts ####################################################
 
     (writeShellScriptBin "nixdoc" "${ripgrep}/bin/rg $1 /etc/nixos/NixDoc.md")
@@ -822,6 +846,10 @@ in with lib; {
   nixpkgs.overlays = [
     (import ./overlays/programs.nix)
     (import ./overlays/wrappers)
+    (import (builtins.fetchTarball {
+      url = "https://github.com/colemickens/nixpkgs-wayland/archive/0ca16b137e0251c873af68d89c26078848ca8cc5.tar.gz";
+      sha256 = "00q9g6ab4rnf5w9jxsfj31s4jx0z84qmkivgnhbh1ilgmgv0fdwy";
+    }))
   ];
 
   nixpkgs.config = {

diff --git a/extrapackages/vim.nix b/extrapackages/vim.nix
@@ -192,6 +192,7 @@ in {
                   vim-latex-live-preview # LaTeX compiling for vim
 
                   vimtex
+                  swift-vim
 
                   vim-illuminate         # Highlights similar words
                 ];    

diff --git a/modules/wayfire.nix b/modules/wayfire.nix
@@ -37,8 +37,8 @@ in
       waybar
     ];
 
-    nixpkgs.overlays = [
-      (import (builtins.fetchTarball "https://github.com/colemickens/nixpkgs-wayland/archive/master.tar.gz"))
-    ];
+#    nixpkgs.overlays = [
+#      (import (builtins.fetchTarball "https://github.com/colemickens/nixpkgs-wayland/archive/master.tar.gz"))
+#    ];
   };
 }
diff --git a/overlays/wrappers/dunstconf.nix b/overlays/wrappers/dunstconf.nix
@@ -5,9 +5,9 @@ let color = id: (import ./../../programconfigs/configutil.nix).getColor id true;
 
     monitor = 0
     follow = mouse
-    geometry = "0x5-20+20"
+    geometry = "300x5-20+20"
     indicate_hidden = yes
-    shrink = no
+    shrink = yes
     transparency = 20
     notification_height = 0
     separator_height = 2

diff --git a/programconfigs/chromiumconf.nix b/programconfigs/chromiumconf.nix
@@ -0,0 +1,38 @@
+with import ./configutil.nix;
+let 
+  color = id: getColor id false;
+  rgb = hex: hexToDec (color hex);
+  getRGBColor = list: index: builtins.toString (builtins.elemAt list index);
+  rgbStr = list: "[ ${getRGBColor list 0}, ${getRGBColor list 1}, ${getRGBColor list 2} ]";
+in
+''
+{
+   "description": "An auto-generated theme using NixOS",
+   "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5/M9xmiDoe5+yNuIcGHIRhrrRjoMOhVHuI0+GkzuHLtZ6TICaOeJgiP79iVl62IW50wbz7GA7dxA4BV1jkulvWcM0q8ySCWEDg6/1kssWJb9KA1zYe4fFvDvIfFtzPXhkYd+P/XYrmcvYyYYdql0DJze9QO3nt6AcRAgU9lYdBfu2i7xPJ6tEjNL3TaYByd2N3i5hEy7gnpDUCA4izq4c/ASHvXVx32N5BFOB2W/PGU9Eqivi/ydu72+/6g0HSzFIdhXfreh5qBD28pC2mlOzeTT6AtSdOJ22mjykBXINVFub0u8WMHhqAVXoOElMeG1fwlkswOxcA4dza1YkU17TwIDAQAB",
+   "manifest_version": 2,
+   "name": "NixOS generated theme",
+   "theme": {
+      "colors": {
+         "bookmark_text": [ 255, 255, 255 ],
+         "frame": ${rgbStr (rgb "bg")},
+         "frame_inactive": ${rgbStr (rgb "bgl")},
+         "frame_incognito": ${rgbStr (rgb "bg")},
+         "frame_incognito_inactive": ${rgbStr (rgb "bgl")},
+         "ntp_background": ${rgbStr (rgb "bg")},
+         "ntp_text": [ 255, 255, 255 ],
+         "tab_background_text": [ 255, 255, 255 ],
+         "tab_text": [ 255, 255, 255 ],
+         "toolbar": ${rgbStr (rgb "bgl")}
+      },
+      "properties": {
+         "ntp_background_repeat": "repeat",
+         "ntp_logo_alternate": 1
+      },
+      "tints": {
+         "buttons": [ 0, 0, 1 ]
+      }
+   },
+   "update_url": "https://clients2.google.com/service/update2/crx",
+   "version": "1.0.0"
+}
+''
diff --git a/programthemes.nix b/programthemes.nix
@@ -39,9 +39,9 @@
     text = import ./programconfigs/gtk2theme.nix;
   };
 
-  #environment.etc."configs/chromiumtheme/manifest.json" = {
-  #  text = import ./programconfigs/chromiumconf.nix;
-  #};
+  environment.etc."configs/chromiumtheme/manifest.json" = {
+    text = import ./programconfigs/chromiumconf.nix;
+  };
 
   environment.etc."configs/nix_generated.rasi" = {
     text = import ./programconfigs/roficonf.nix;
-Original file line number
+Diff line change
@@ Expand Up / @@ -192,6 +192,7 @@ in { @@
                       vim-latex-live-preview # LaTeX compiling for vim
                       vimtex
+                      swift-vim
                       vim-illuminate         # Highlights similar words
                     ];
@@ Expand Down @@