about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatryk Niedźwiedziński <pniedzwiedzinski19@gmail.com>2020-12-26 22:41:15 +0100
committerPatryk Niedźwiedziński <pniedzwiedzinski19@gmail.com>2020-12-26 22:41:15 +0100
commite82083214514df714bc5a5d1f3a30e9914b3561a (patch)
treeeadf6d126059b31e4cc02538c79089dc6c901ee1
parent607e1bae574753079cff9820fa102885436ed30f (diff)
downloaddots-e82083214514df714bc5a5d1f3a30e9914b3561a.tar.gz
dots-e82083214514df714bc5a5d1f3a30e9914b3561a.zip
Add old home-manager config
-rw-r--r--home.nix43
-rwxr-xr-xmodules/larbs.nix2
-rwxr-xr-xusers/pn.nix31
3 files changed, 18 insertions, 58 deletions
diff --git a/home.nix b/home.nix
index acd7a74..08bf15d 100644
--- a/home.nix
+++ b/home.nix
@@ -1,38 +1,31 @@
 { config, pkgs, ... }:
 let
   secrets = import ./secrets.nix;
-  wywozik = pkgs.nur.repos.pn.wywozik-todo.override {
-    configFile = ''
-      CITY = "Poznań"
-      STREET = "${secrets.street}"
-      NUMBER = "${secrets.number}"
-      HOUSING = "zamieszkana"
-      TOKEN = "${secrets.todoist}"
-    '';
-  };
+  # wywozik = pkgs.nur.repos.pn.wywozik-todo.override {
+  #   configFile = ''
+  #     CITY = "Poznań"
+  #     STREET = "${secrets.street}"
+  #     NUMBER = "${secrets.number}"
+  #     HOUSING = "zamieszkana"
+  #     TOKEN = "${secrets.todoist}"
+  #   '';
+  # };
 
-  pnvim = import ./programs/nvim.nix pkgs;
   common_packages = import ./platforms/common-packages.nix pkgs;
   isDarwin = builtins.currentSystem == "x86_64-darwin";
   platformSetup =
     if isDarwin then [
       ./platforms/darwin
     ] else [
-      ./platforms/linux
+      # ./platforms/linux
       # ./programs/rclone.nix
     ];
-
-  music = pkgs.nur.repos.pn.larbs-music.override {
-    musicDir = "~/music";
-  };
 in
 {
   # Errors on linux
   manual.manpages.enable = if isDarwin then true else false;
   dconf.enable = if isDarwin then true else false;
 
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
   programs.obs-studio = {
     enable = true;
     plugins = with pkgs; [ obs-wlrobs obs-v4l2sink ];
@@ -46,7 +39,7 @@ in
 
   imports = [
     # Platform specific config
-    ./programs/zsh
+    # ./programs/zsh
     ./programs/newsboat
     ./programs/git.nix
     ./programs/mpv.nix
@@ -54,17 +47,10 @@ in
   ] ++ platformSetup;
 
   home.packages = with pkgs; [
-    wywozik
+    # wywozik
     # Basic
-    gnupg
-    pnvim
-    (lowPrio nur.repos.pn.larbs-mail)
-    (lowPrio nur.repos.pn.larbs-news)
-    (lowPrio music)
-    nur.repos.pn.larbs-scripts
     slop
     xlibs.xdpyinfo
-    nur.repos.pn.dmenu
     amfora
     translate-shell
     nix-index
@@ -76,16 +62,13 @@ in
 
 
     # Misc
-    zoom-us
     weechat
     todoist
     browserpass
-    minecraft
+    #minecraft
     spotify-tui
     spotifyd
     # gimp
-    slack-dark
-    signal-desktop
     pandoc
     texlive.combined.scheme-medium
     zathura
diff --git a/modules/larbs.nix b/modules/larbs.nix
index 993776c..480ac5c 100755
--- a/modules/larbs.nix
+++ b/modules/larbs.nix
@@ -8,7 +8,7 @@ let
     pnvim
     larbs-mail
     larbs-news
-    larbs-music
+    (larbs-music.override { musicDir = "~/music"; })
     dmenu
     pndwm
     pndwmblocks
diff --git a/users/pn.nix b/users/pn.nix
index 4876323..cf59555 100755
--- a/users/pn.nix
+++ b/users/pn.nix
@@ -19,6 +19,10 @@ in
     };
 
     home-manager.users.pn = {
+      imports = [
+        ../home.nix
+      ];
+
       xsession = {
         enable = true;
         windowManager.command = "dbus-run-session -- dwm";
@@ -46,33 +50,6 @@ in
         scriptPath = ".xinitrc";
       };
 
-      programs.git = {
-        enable = true;
-        package = pkgs.gitAndTools.gitFull;
-        userName = "Patryk Niedźwiedziński";
-        userEmail = "pniedzwiedzinski19@gmail.com";
-        signing = {
-          key = "pniedzwiedzinski19@gmail.com";
-          signByDefault = true;
-        };
-        aliases = {
-          lg = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative";
-        };
-
-        extraConfig = {
-          url."ssh://git@github.com/".insteadOf = "https://github.com/";
-          url."ssh://git@github.com/pniedzwiedzinski/".insteadOf = "pn:";
-          url."ssh://git@gitlab.com/".insteadOf = "https://gitlab.com/";
-          url."ssh://git@bitbucket.org/".insteadOf = "https://bitbucket.org/";
-
-          sendemail = {
-            smtpserver = "${pkgs.msmtp}/bin/msmtp";
-            smtpserveroption  = [ "-a" "pniedzwiedzinski19@gmail.com" ];
-          };
-        };
-      };
-
-
     };
 
   ## Although it's less secure I tend not to have sensitive data on my machines