Merge branch 'master' of git.spacekookie.de:git/libkookie into master

9 files changed, 50 insertions, 18 deletions

diff --git a/modules/base/fish/functions/gen-shell.fish b/modules/base/fish/functions/gen-shell.fish
index 0c48fe2a5c3..03ec597cd68 100644
--- a/modules/base/fish/functions/gen-shell.fish
+++ b/modules/base/fish/functions/gen-shell.fish
@@ -4,11 +4,13 @@ function gen-shell
         return 1
     end
     
-    if test -e default.nix
-        echo "Refusing to override existing `default.nix`!"
+    if test -e shell.nix
+        echo "Refusing to override existing `shell.nix`!"
         return 1
     end
 
+    echo 'eval "$(lorri direnv)"' > .envrc
+
     set name $argv[1]
     echo "with import <nixpkgs> {};
 
@@ -17,6 +19,6 @@ stdenv.mkDerivation {
   buildInputs = with pkgs; [
     # Hier könnte Ihre Werbung stehen
   ];
-}" > default.nix
+}" > shell.nix
     bat default.nix
 end
diff --git a/modules/workstation/devel/.gitconfig b/modules/workstation/devel/.gitconfig
new file mode 100644
index 00000000000..473e166c016
--- /dev/null
+++ b/modules/workstation/devel/.gitconfig
@@ -0,0 +1,19 @@
+[user]
+    email = kookie@spacekookie.de
+    name = Katharina Fey
+    signingKey = 555F2E4B6F87F91A4110669E90734A9E619C8A6C
+[gpg]
+    program = gpg2
+[commit]
+    gpgsign = false
+[alias]
+    prettylog = log --pretty=format:'%Cred%h%Creset - %Cgreen(%cr)%Creset%C(yellow)%d%Creset %s %C(bold blue)<%an>%Creset' --abbrev-commit --graph
+    update = pull --rebase --autostash
+    nmam = "!f() { git am -; }; f"
+    nmam3 = "!f() { notmuch show --format=raw $1 | git am -3 -; }; f"
+[help]
+    autocorrect = 1
+[sendemail]
+    smtpServer = /home/.nix-profile/bin/msmtp
+[merge]
+    renamelimit = 9999999
diff --git a/modules/workstation/devel/lorri/default.nix b/modules/workstation/devel/lorri/default.nix
index 74b0801e6b8..ab72c9b25ed 100644
--- a/modules/workstation/devel/lorri/default.nix
+++ b/modules/workstation/devel/lorri/default.nix
@@ -1,14 +1,5 @@
 { lib, pkgs, ... }:
 
-let
-  rev = "f20a3230bf7e93c4b5b41dff85740763d7ce02c8";
-  lorriSrc = fetchTarball {
-    url = "https://github.com/target/lorri/archive/${rev}.tar.gz";
-    sha256 = "1lp77rms6zlx04kz7nxar8ksay8xcl8bmi7nijgwyapzjy5q5cmq";
-  };
-in
 {
-  home.packages = [
-    (import lorriSrc { inherit pkgs; })
-  ];
+  services.lorri.enable = true; 
 }
diff --git a/modules/workstation/emacs/default.nix b/modules/workstation/emacs/default.nix
index dd5608f1abb..63135a56f51 100644
--- a/modules/workstation/emacs/default.nix
+++ b/modules/workstation/emacs/default.nix
@@ -17,24 +17,28 @@ let
       python-mode
       rust-mode
 
+      color-identifiers-mode
       color-theme-sanityinc-tomorrow
       company
       company-lsp
       direnv
       fzf
+      ido-vertical-mode
       ledger-mode
       lsp-ui
       magit
       monokai-theme
+      multiple-cursors
       notmuch
       org
+      protobuf-mode
       scad-mode
       smex
       sublimity
       undo-tree
       visual-fill-column
-      yasnippet
       which-key
+      yasnippet
     ]));
 in
 {
diff --git a/modules/workstation/emacs/init.el b/modules/workstation/emacs/init.el
index 4becf18a850..28b8146f632 100644
--- a/modules/workstation/emacs/init.el
+++ b/modules/workstation/emacs/init.el
@@ -6,6 +6,8 @@
 
 (require 'magit)
 
+(require 'multiple-cursors)
+
 (require 'org)
 (add-to-list 'auto-mode-alist '("\\.org$" . org-mode))
 
@@ -116,6 +118,7 @@
 ;; Better completion handling with lsp-mode
 (require 'company-lsp)
 (push 'company-lsp company-backends)
+(setq lsp-ui-doc-position 'top)
 (setq lsp-ui-doc-max-width 45)
 (setq lsp-ui-doc-max-height 10)
 
@@ -270,6 +273,14 @@
 (global-set-key (kbd "C-M-<up>") 'move-section-up)
 (global-set-key (kbd "C-M-<down>") 'move-section-down)
 
+;;; Multiple cursors bindings
+(global-set-key (kbd "C-H-c C-H-c") 'mc/edit-lines)
+(global-set-key (kbd "C->") 'mc/mark-next-like-this)
+(global-set-key (kbd "C-<") 'mc/mark-previous-like-this)
+(global-set-key (kbd "C-c C-<") 'mc/mark-all-like-this)
+
+
+
 ;;; Org mode bindings replicated here to make it easier for me
 (define-key org-mode-map "\C-c\C-o" 'org-open-at-point-in-current-window)
 (define-key org-mode-map "\C-S-<up>" nil)
diff --git a/modules/workstation/graphics/fonts.nix b/modules/workstation/graphics/fonts.nix
index 2e1a5fc0304..b0b874bc609 100644
--- a/modules/workstation/graphics/fonts.nix
+++ b/modules/workstation/graphics/fonts.nix
@@ -15,8 +15,8 @@
 {
   fonts.fonts = with pkgs; [
     google-fonts
-    inconsolata
     iosevka
+    inconsolata
     twitter-color-emoji
   ];
 
diff --git a/modules/workstation/graphics/fun.nix b/modules/workstation/graphics/fun.nix
index de934b80e06..91ec044332e 100644
--- a/modules/workstation/graphics/fun.nix
+++ b/modules/workstation/graphics/fun.nix
@@ -4,7 +4,6 @@
   home.packages = with pkgs; [
     spotify
     steam
-
     superTuxKart
   ];
 }
diff --git a/nixpkgs/pkgs/development/python-modules/pelican/default.nix b/nixpkgs/pkgs/development/python-modules/pelican/default.nix
index 30d6546d570..5092f77034a 100644
--- a/nixpkgs/pkgs/development/python-modules/pelican/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pelican/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     '';
   };
 
-  doCheck = true;
+  doCheck = false;
 
   # Exclude custom locale test, which files were removed above to fix the source checksum
   checkPhase = ''
diff --git a/roots/uwu.nix b/roots/uwu.nix
index d41634ca9e3..d53b6a66e48 100644
--- a/roots/uwu.nix
+++ b/roots/uwu.nix
@@ -13,11 +13,12 @@
 
 {
   nixpkgs.config.allowUnfree = true;
-
+  
   imports = [
     <home-manager/nixos>
     ../modules/nix
     ../modules/base
+    ../modules/docker
     ../modules/workstation
     ../modules/workstation/hardware/trackpoint
   ];
@@ -40,6 +41,8 @@
   boot.tmpOnTmpfs = true;
   boot.supportedFilesystems = [ "zfs" "exfat" ];
 
+  services.zfs.autoSnapshot.enable = true;
+  
   fileSystems."/" = {
     device = "zroot";
     fsType = "zfs";
@@ -63,6 +66,9 @@
   nix.maxJobs = lib.mkDefault 4;
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 
+  services.mullvad.enable = true;
+  programs.java.enable = true;
+  
   # owo
   networking.hostName = "uwu";
   networking.hostId = "a82ecf29";