From 1a9ff8cf3f1d895d9bb60bb7553a5325813d39ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Fri, 24 Jul 2020 22:54:17 +0100
Subject: [PATCH] edging towards sway

---
 .vimrc.plugins-settings                  |  8 ++--
 nixos/boxes/foureighty/configuration.nix |  7 ++++
 nixos/cli.nix                            | 49 ++++++++++++++++--------
 nixos/common-services.nix                |  1 -
 nixos/gnome/system.nix                   |  1 +
 nixos/sway/home.nix                      | 28 ++++++++++++++
 nixos/sway/system.nix                    |  7 ++++
 7 files changed, 81 insertions(+), 20 deletions(-)
 create mode 100644 nixos/sway/home.nix
 create mode 100644 nixos/sway/system.nix

diff --git a/.vimrc.plugins-settings b/.vimrc.plugins-settings
index 8ab582a1..323a1210 100644
--- a/.vimrc.plugins-settings
+++ b/.vimrc.plugins-settings
@@ -9,12 +9,12 @@ au BufWrite * :Autoformat
 let g:rustfmt_autosave = 1
 
 " searching
-let $FZF_DEFAULT_COMMAND = 'rga --files --no-messages "" .'
-set grepprg=rga\ --vimgrep
+let $FZF_DEFAULT_COMMAND = 'rg --files --no-messages "" .'
+set grepprg=rg\ --vimgrep
 let g:fzf_command_prefix = 'Fzf'
-command! -bang -nargs=* Find call fzf#vim#grep('rga --column --line-number --no-heading --fixed-strings --ignore-case --no-ignore --hidden --follow --glob "!.git/*" --color "always" '.shellescape(<q-args>), 1, <bang>0)
+command! -bang -nargs=* Find call fzf#vim#grep('rg --column --line-number --no-heading --fixed-strings --ignore-case --no-ignore --hidden --follow --glob "!.git/*" --color "always" '.shellescape(<q-args>), 1, <bang>0)
 let g:ctrlp_show_hidden = 1
-let g:ctrlp_user_command = 'rga %s --files --hidden --color=never --glob ""'
+let g:ctrlp_user_command = 'rg %s --files --hidden --color=never --glob ""'
 
 " nerdtree startup
 autocmd StdinReadPre * let s:std_in=1
diff --git a/nixos/boxes/foureighty/configuration.nix b/nixos/boxes/foureighty/configuration.nix
index 03259a7f..18fce4cb 100644
--- a/nixos/boxes/foureighty/configuration.nix
+++ b/nixos/boxes/foureighty/configuration.nix
@@ -39,6 +39,13 @@
     enable = true;
   };
 
+  nix.nixPath = [
+    "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos"
+    "nixos-config=/etc/nixos/configuration.nix"
+    "/nix/var/nix/profiles/per-user/root/channels"
+    "home-manager=https://github.com/rycee/home-manager/archive/master.tar.gz"
+  ];
+
   imports = [
     ./hardware-configuration.nix
     ../../boot.nix
diff --git a/nixos/cli.nix b/nixos/cli.nix
index e0327e9c..a993f3c2 100644
--- a/nixos/cli.nix
+++ b/nixos/cli.nix
@@ -1,22 +1,41 @@
 { config, pkgs, ... }:
 {
   home.packages = with pkgs; [
-    genpass bitwarden-cli
-    gdb lldb
-    wget git gnupg curl tmux htop atop pciutils powertop ripgrep fd dnsutils du-dust
     ( pass.withExtensions (ext: [ ext.pass-otp ext.pass-import ext.pass-genphrase ext.pass-audit ext.pass-update ]))
-    hsetroot lm_sensors
-    wirelesstools ranger apvlv
+    apvlv
+    aria
+    atop
+    binutils
+    bitwarden-cli
+    curl
+    dnsutils
+    docker-compose
+    du-dust
+    fd
+    file
     fontconfig
-    binutils veracrypt gitAndTools.diff-so-fancy
-    restic jq
-    hugo mercurial terraform
-    unzip aria
-    calcurse file python37Packages.binwalk-full
-    nixops imagemagick
-    docker-compose rustup
-    knockknock
-    python38Packages.pygments
-    canto-curses
+    genpass
+    git
+    gitAndTools.diff-so-fancy
+    gnupg
+    hsetroot
+    htop
+    imagemagick
+    jq
+    lm_sensors
+    mercurial
+    nixops
+    pciutils
+    powertop
+    ranger
+    restic
+    ripgrep
+    rustup
+    terraform
+    tmux
+    unzip
+    veracrypt
+    wget
+    wirelesstools
   ];
 }
diff --git a/nixos/common-services.nix b/nixos/common-services.nix
index f419bb77..3730007a 100644
--- a/nixos/common-services.nix
+++ b/nixos/common-services.nix
@@ -8,7 +8,6 @@
   services = {
     udev.packages = [ pkgs.android-udev-rules ];
     ratbagd.enable = true;
-    flatpak.enable = true;
 
     fwupd = {
       enable = true;
diff --git a/nixos/gnome/system.nix b/nixos/gnome/system.nix
index 2a1fa0b5..1be092d8 100644
--- a/nixos/gnome/system.nix
+++ b/nixos/gnome/system.nix
@@ -7,6 +7,7 @@
     displayManager.gdm.nvidiaWayland = true;
     desktopManager.gnome3.enable = true;
   };
+  services.flatpak.enable = true;
   services.dbus.packages = with pkgs; [ gnome2.GConf gnome3.dconf ];
   users.users.cyryl.packages = with pkgs.gnomeExtensions; [
     caffeine clipboard-indicator sound-output-device-chooser gsconnect
diff --git a/nixos/sway/home.nix b/nixos/sway/home.nix
new file mode 100644
index 00000000..bae5b9ba
--- /dev/null
+++ b/nixos/sway/home.nix
@@ -0,0 +1,28 @@
+{ config, pkgs, ... }:
+{
+
+  programs.mako.enable = true;
+
+  imports = [
+  ];
+
+  home.sessionVariables = {
+  };
+
+  wayland.windowManager.sway.enable = true;
+  wayland.windowManager.sway.wrapperFeatures.base = true;
+  wayland.windowManager.sway.wrapperFeatures.gtk = true;
+
+
+  services = {
+    kdeconnect = {
+      enable = true;
+      indicator = true;
+    };
+    network-manager-applet.enable = true;
+    pasystray.enable = true;
+  };
+
+  services.udiskie.enable = true;
+
+}
diff --git a/nixos/sway/system.nix b/nixos/sway/system.nix
new file mode 100644
index 00000000..33a6f9e3
--- /dev/null
+++ b/nixos/sway/system.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+{
+  services.dbus.packages = with pkgs; [ gnome2.GConf gnome3.dconf ];
+  programs.sway.enable = true;
+  systemd.defaultUnit = "graphical.target";
+}
+