Cleanup

6 files changed, 26 insertions, 26 deletions

diff --git a/home.nix b/home.nix
index 8eafac1..089f431 100644
--- a/home.nix
+++ b/home.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 let
-  secrets = import ./secrets.nix;
+  # secrets = import ./secrets.nix;
   # wywozik = pkgs.nur.repos.pn.wywozik-todo.override {
   #   configFile = ''
   #     CITY = "Poznań"
@@ -11,13 +11,14 @@ let
   #   '';
   # };
 
-  common_packages = import ./platforms/common-packages.nix pkgs;
   platformSetup = [
       # ./platforms/linux
       # ./programs/rclone.nix
     ];
 in
 {
+  dconf.enable = true;
+
   programs.obs-studio = {
     enable = true;
     plugins = with pkgs; [ obs-wlrobs obs-v4l2sink ];
@@ -63,8 +64,7 @@ in
     pandoc
     texlive.combined.scheme-medium
     zathura
-  ]
-  ++ common_packages;
+  ];
 
   # This value determines the Home Manager release that your
   # configuration is compatible with. This helps avoid breakage
diff --git a/machines/base.nix b/machines/base.nix
index d71292e..209a9ac 100755
--- a/machines/base.nix
+++ b/machines/base.nix
@@ -26,6 +26,7 @@
     ga = "git add";
     gl = "git log";
     gd = "git diff";
+    clone = "cd ~/code && git clone";
     ls = "ls --color=auto -hN --group-directories-first";
     rm = "rm -vI";
     cp = "cp -iv";
diff --git a/machines/x220/configuration.nix b/machines/x220/configuration.nix
index 12c1bba..9fa9f99 100644
--- a/machines/x220/configuration.nix
+++ b/machines/x220/configuration.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 
 let
   busybox_utils = pkgs.stdenv.mkDerivation {
@@ -12,6 +12,7 @@ let
   };
 in
   {
+
     imports = [
       ../base.nix
       ../pl.nix
@@ -23,6 +24,7 @@ in
     ];
 
     boot.plymouth.enable = true;
+    boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
 
     networking = {
       hostName = "x220";
@@ -37,15 +39,15 @@ in
 
 
     environment.systemPackages = with pkgs; [
+      discord
     # Basic tools
     groff file ssh-ident busybox_utils
 
     # XORG perfs
-    dunst xclip
-    xwallpaper xdotool
+    dunst
 
     # UI apps
-    zathura brave sxiv pulsemixer
+    zathura sxiv pulsemixer
     lynx lf arandr wpa_supplicant_gui
     system-config-printer libreoffice
     vscodium abook
@@ -54,7 +56,6 @@ in
     mpd mpc_cli mpv ffmpeg youtube-dl
 
     # CLIs
-    lm_sensors
     gitAndTools.gh docker-compose xsel
     bc libnotify
     pamixer maim killall
@@ -83,7 +84,7 @@ in
   programs.dockd.enable = true;
 
   virtualisation.docker.enable = true;
-  systemd.services.docker.enable = false;
+  # systemd.services.docker.enable = false;
 
   services.udev.packages = [ pkgs.libu2f-host ];
 
diff --git a/modules/larbs.nix b/modules/larbs.nix
index 480ac5c..fc94655 100755
--- a/modules/larbs.nix
+++ b/modules/larbs.nix
@@ -1,5 +1,9 @@
 { pkgs, ... }:
 let
+  xwallpaper_fix = (import (pkgs.fetchTarball {
+    url = "https://github.com/IvarWithoutBones/nixpkgs/archive/xwallpaper-fix.tar.gz";
+    sha256 = "1jdlchn1x5gwdya9blqs85accr82f3y6j50av073d69mm7bfa1mn";
+  }) {}).xwallpaper;
   pnvim = import ../pkgs/nvim.nix pkgs;
   pndwm = import ../pkgs/dwm pkgs;
   pndwmblocks = import ../pkgs/dwmblocks pkgs;
@@ -31,6 +35,11 @@ in
     xdotool
     lm_sensors
     mpc_cli
+    python3Packages.pywal
+    xwallpaper
+    xcompmgr
+
+    playerctl
 
     todos
     brave
@@ -39,6 +48,7 @@ in
 
   environment.variables = {
     TERM = "st";
+    TERMINAL = "st";
     BROWSER = "brave";
   };
 
diff --git a/platforms/common-packages.nix b/platforms/common-packages.nix
deleted file mode 100644
index 0114a84..0000000
--- a/platforms/common-packages.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-pkgs:
-with pkgs;
-[
-  stdenv
-  curl
-  wget
-  vim
-  htop
-  zip
-  unzip
-  ripgrep
-  # jq
-  file
-]
diff --git a/users/pn.nix b/users/pn.nix
index cf59555..d80584c 100755
--- a/users/pn.nix
+++ b/users/pn.nix
@@ -3,8 +3,8 @@
 
 let
   home-manager = builtins.fetchTarball {
-    url = "https://github.com/nix-community/home-manager/archive/release-20.09.tar.gz";
-    sha256 = "0cxnh7g1nagmdkl40jsg5kvfq6mdpg21k7b9y0i713p6zsgd48jl";
+    url = "https://github.com/nix-community/home-manager/archive/63f299b3347aea183fc5088e4d6c4a193b334a41.tar.gz";
+    sha256 = "0iksjch94wfvyq0cgwv5wq52j0dc9cavm68wka3pahhdvjlxd3js";
   };
 in
   {
@@ -21,6 +21,8 @@ in
     home-manager.users.pn = {
       imports = [
         ../home.nix
+        ../platforms/linux/user-dirs.nix
+        # ../platforms/linux/gtk.nix
       ];
 
       xsession = {