home/natto: changes

emacs: colemak related updates pkgs: random pkgs stuff secrets: add .gitconfig services: misc changes Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
flakes: update
2022-11-24 04:38:28 +05:30 · 2022-11-24 04:38:28 +05:30 · 2022-11-24 04:38:28 +05:30
12 changed files with 124 additions and 109 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -22,11 +22,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1663268366,
-        "narHash": "sha256-nQL25OVRJNxT5xdNjuz0W0HCZ4abd9gn96nJEYq1Fl8=",
+        "lastModified": 1668937370,
+        "narHash": "sha256-sxGxDs0YKR3bLzo989bERWgVlkVMirchMkSlP7qrWHQ=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
-        "rev": "19952866828a8d8a08e0e264ad1842e585eadc23",
+        "rev": "a385a268c2bd4a411caff28adc785f6ba479d79f",
        "type": "github"
      },
      "original": {
@@ -38,11 +38,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1650374568,
-        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
+        "lastModified": 1668681692,
+        "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
+        "rev": "009399224d5e398d03b22badca40a37ac85412a1",
        "type": "github"
      },
      "original": {
@@ -53,11 +53,11 @@
    },
    "flake-utils": {
      "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
        "type": "github"
      },
      "original": {
@@ -83,11 +83,11 @@
    },
    "flake-utils_3": {
      "locked": {
-        "lastModified": 1656928814,
-        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
        "type": "github"
      },
      "original": {
@@ -102,11 +102,11 @@
        "utils": "utils"
      },
      "locked": {
-        "lastModified": 1663227421,
-        "narHash": "sha256-8M2ZQPLQw0CUylKbF8pgDMQ5vxOH4i0rxwUhtPIsf7Q=",
+        "lastModified": 1668900402,
+        "narHash": "sha256-IhVlueHoQNoN0SOHZIceKU3LyEL00g2ei0aUlaNypbQ=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "5408e27961599b1350b651f88715daf6e67244a7",
+        "rev": "c0f9cbcf93ca22e4f0ca66843be61a4bdf6f0a44",
        "type": "github"
      },
      "original": {
@@ -157,11 +157,11 @@
    },
    "master": {
      "locked": {
-        "lastModified": 1667743400,
-        "narHash": "sha256-9HUiy03I9CGN1mQw5dL1wndiBzg7bKa7UV3UDKG8SjI=",
+        "lastModified": 1668942923,
+        "narHash": "sha256-mKFHBr5drA1Dp3l3Oay60ULVVg4DqyT/oXeoO1KW/4Q=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "6a36558f5227f728d4fa433ab8ec1b80bebe4f50",
+        "rev": "991053d8a0e1543475d09cb8272c42e8ebe66755",
        "type": "github"
      },
      "original": {
@@ -177,11 +177,11 @@
        "utils": "utils_3"
      },
      "locked": {
-        "lastModified": 1662138272,
-        "narHash": "sha256-qklVL7qFzyiIIm00AKRLE+uCYppTQ/S5C6exg0j2fSY=",
+        "lastModified": 1663533210,
+        "narHash": "sha256-it24pt41yHYhcpfqnEaws7utoNxFFrH/HwBCD/9omkY=",
        "owner": "nbfc-linux",
        "repo": "nbfc-linux",
-        "rev": "c6abef1b9f4ec4bb8a2eb4d7e70c1fccbb320677",
+        "rev": "0396c35b2afc02a705bb53c2fadb7b4f54915d97",
        "type": "github"
      },
      "original": {
@@ -200,11 +200,11 @@
      },
      "locked": {
        "dir": "contrib",
-        "lastModified": 1663212973,
-        "narHash": "sha256-d0dhVnwoWZEsEdtRIZiiadOcCNcddkdk4QHKg2Vnt9E=",
+        "lastModified": 1668865307,
+        "narHash": "sha256-Fwoalxq8UzocDeK5LIlAOT/JglG8SeGtH6yvvzHh/uU=",
        "owner": "neovim",
        "repo": "neovim",
-        "rev": "89b9eab638d5e6467156c25f0d54df48d861ca16",
+        "rev": "6e8ed5abaa9c33d1d78ab7ff5b07dd5bac623a1d",
        "type": "github"
      },
      "original": {
@@ -219,11 +219,11 @@
        "nixpkgs": "nixpkgs_6"
      },
      "locked": {
-        "lastModified": 1662742160,
-        "narHash": "sha256-zamqdHF0Pp0AkgfDnZdLnAZTfgrTV11dYO9rDsfqfW8=",
+        "lastModified": 1667666664,
+        "narHash": "sha256-MKtN2/8E22SGRf8wroj3qYvhQEBVcsZJjYeX9eu+bt0=",
        "owner": "fufexan",
        "repo": "nix-gaming",
-        "rev": "a37f98a7a81d5ffac328fac06c3f6ad17f90c7d7",
+        "rev": "cc8ece45d1987d5187e2528b59f9136f6aa8f465",
        "type": "github"
      },
      "original": {
@@ -234,11 +234,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1663235518,
-        "narHash": "sha256-q8zLK6rK/CLXEguaPgm9yQJcY0VQtOBhAT9EV2UFK/A=",
+        "lastModified": 1668912770,
+        "narHash": "sha256-Nzt7ALUl5PrUAYIH8aRbj+njkJZVQ4VQBkWx+qQvqyM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "2277e4c9010b0f27585eb0bed0a86d7cbc079354",
+        "rev": "862277ac9d34273cd953f42061e23d488d6b7e8b",
        "type": "github"
      },
      "original": {
@@ -263,11 +263,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1662996720,
-        "narHash": "sha256-XvLQ3SuXnDMJMpM1sv1ifPjBuRytiDYhB12H/BNTjgY=",
+        "lastModified": 1667629849,
+        "narHash": "sha256-P+v+nDOFWicM4wziFK9S/ajF2lc0N2Rg9p6Y35uMoZI=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "5f326e2a403e1cebaec378e72ceaf5725983376d",
+        "rev": "3bacde6273b09a21a8ccfba15586fb165078fb62",
        "type": "github"
      },
      "original": {
@@ -279,11 +279,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1663235518,
-        "narHash": "sha256-q8zLK6rK/CLXEguaPgm9yQJcY0VQtOBhAT9EV2UFK/A=",
+        "lastModified": 1668912770,
+        "narHash": "sha256-Nzt7ALUl5PrUAYIH8aRbj+njkJZVQ4VQBkWx+qQvqyM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "2277e4c9010b0f27585eb0bed0a86d7cbc079354",
+        "rev": "862277ac9d34273cd953f42061e23d488d6b7e8b",
        "type": "github"
      },
      "original": {
@@ -323,11 +323,11 @@
    },
    "nixpkgs_6": {
      "locked": {
-        "lastModified": 1656401090,
-        "narHash": "sha256-bUS2nfQsvTQW2z8SK7oEFSElbmoBahOPtbXPm0AL3I4=",
+        "lastModified": 1663491030,
+        "narHash": "sha256-MVsfBhE9US5DvLtBAaTRjwYdv1tLO8xjahM8qLXTgTo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "16de63fcc54e88b9a106a603038dd5dd2feb21eb",
+        "rev": "767542707d394ff15ac1981e903e005ba69528b5",
        "type": "github"
      },
      "original": {
@@ -339,11 +339,11 @@
    },
    "nixpkgs_7": {
      "locked": {
-        "lastModified": 1663235518,
-        "narHash": "sha256-q8zLK6rK/CLXEguaPgm9yQJcY0VQtOBhAT9EV2UFK/A=",
+        "lastModified": 1668912770,
+        "narHash": "sha256-Nzt7ALUl5PrUAYIH8aRbj+njkJZVQ4VQBkWx+qQvqyM=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "2277e4c9010b0f27585eb0bed0a86d7cbc079354",
+        "rev": "862277ac9d34273cd953f42061e23d488d6b7e8b",
        "type": "github"
      },
      "original": {
@@ -355,27 +355,27 @@
    },
    "nixpkgs_8": {
      "locked": {
-        "lastModified": 1663087123,
-        "narHash": "sha256-cNIRkF/J4mRxDtNYw+9/fBNq/NOA2nCuPOa3EdIyeDs=",
+        "lastModified": 1668882784,
+        "narHash": "sha256-L1mHACWrG83j8U/jDtAdQHmVZu+JwVUxRPf5mhuzr2s=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "9608ace7009ce5bc3aeb940095e01553e635cbc7",
+        "rev": "a1b4a562216eba8df3053bd869155dde4b5bca12",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixpkgs-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_9": {
      "locked": {
-        "lastModified": 1659102345,
-        "narHash": "sha256-Vbzlz254EMZvn28BhpN8JOi5EuKqnHZ3ujFYgFcSGvk=",
+        "lastModified": 1665296151,
+        "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "11b60e4f80d87794a2a4a8a256391b37c59a1ea7",
+        "rev": "14ccaaedd95a488dd7ae142757884d8e125b3363",
        "type": "github"
      },
      "original": {
@@ -387,11 +387,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1663266400,
-        "narHash": "sha256-6A/5qljK1pauDxSrHS8IR8ZS0raFB4UFwL7e+TjM3qU=",
+        "lastModified": 1668941054,
+        "narHash": "sha256-XIbMIkHOkTR6v9yRLTBaYujHsRqLQiNC2Ib9WCMUNkM=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "e77ed0cd9190592525937030c68fa487ce79e0e0",
+        "rev": "dc40ffbd076ef04a1608b10987c2eb308a189ac6",
        "type": "github"
      },
      "original": {
@@ -407,11 +407,11 @@
        "nixpkgs": "nixpkgs_8"
      },
      "locked": {
-        "lastModified": 1663230013,
-        "narHash": "sha256-te3ZzGAWGoWhbUmk8KTO+Tidn5nShRVcStpDAV167Fg=",
+        "lastModified": 1668932129,
+        "narHash": "sha256-DcGSEgs+q+JRQwrxdasedbMkYZ9g5jxkekd+td+dXxs=",
        "owner": "nix-community",
        "repo": "neovim-nightly-overlay",
-        "rev": "a11980308a32ec895bdc8a2ea3d6ed022d7a615d",
+        "rev": "543d1ddb6231aef08e4ce063d72d0822b9b60598",
        "type": "github"
      },
      "original": {
@@ -461,11 +461,11 @@
        "nixpkgs": "nixpkgs_9"
      },
      "locked": {
-        "lastModified": 1663210994,
-        "narHash": "sha256-CvuR+v3FClg/En4LDdLOhLQApAZ9xZZaxeDadfwIBkw=",
+        "lastModified": 1668912095,
+        "narHash": "sha256-3oGeJgeA4+8Wj2XZnbZKJYHoZziyJl36ZGU49I2VC8U=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "f34d44aef4ca7c11e66ed30ef46a93058a578c0f",
+        "rev": "5200195aa2a0cef1becc2ba6ff61cba65e1f90fe",
        "type": "github"
      },
      "original": {
@@ -476,11 +476,11 @@
    },
    "stable": {
      "locked": {
-        "lastModified": 1663067291,
-        "narHash": "sha256-1BTrqhLMamWf53sJobtMiUDI91PEw6xF8YEwg2VE8w4=",
+        "lastModified": 1668766498,
+        "narHash": "sha256-UjZlIrbHGlL3H3HZNPTxPSwJfr49jIfbPWCYxk0EQm4=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "d86a4619b7e80bddb6c01bc01a954f368c56d1df",
+        "rev": "f42a45c015f28ac3beeb0df360e50cdbf495d44b",
        "type": "github"
      },
      "original": {
@@ -492,11 +492,11 @@
    },
    "stable-small": {
      "locked": {
-        "lastModified": 1663209136,
-        "narHash": "sha256-camNbaOhv/AD6vDr51H9xNjA7ytPvo8uKVlH5Bc+ZWQ=",
+        "lastModified": 1668908668,
+        "narHash": "sha256-oimCE4rY7Btuo/VYmA8khIyTHSMV7qUWTpz9w8yc9LQ=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "01ec6cc8e9064f51f538428fdb7311bcc44927ea",
+        "rev": "b68a6a27adb452879ab66c0eaac0c133e32823b2",
        "type": "github"
      },
      "original": {
@@ -508,11 +508,11 @@
    },
    "utils": {
      "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
        "type": "github"
      },
      "original": {
@@ -553,11 +553,11 @@
    },
    "utils_4": {
      "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -48,10 +48,10 @@
              inputs.nvim.overlay
              inputs.rust.overlays.default
              inputs.emacs.overlay
+              inputs.nix-gaming.overlays.default
              channels
              (_: _: {
                nbfc-linux = inputs.nbfc.packages.${system}.nbfc-client-c;
-                games = inputs.nix-gaming.packages.${system};
              })
            ];
            config.allowUnfree = true;
--- a/home/natto/config/emacs/config.org
+++ b/home/natto/config/emacs/config.org
@@ -159,6 +159,8 @@ To undo and redo easily like vi
 *** Miscellaneous evil related packages
 #+begin_src emacs-lisp
 (use-package evil-terminal-cursor-changer)
+(use-package evil-anzu
+  :after evil)
 #+end_src

 ** Treemacs
@@ -246,6 +248,8 @@ For autocomplete

 ** Lang support
 #+begin_src emacs-lisp
+(use-package inform7)
+
 (use-package haskell-mode)

 (use-package rustic)
@@ -502,30 +506,21 @@ This returns the command to run in the terminal
 ** General
 *** Colemak translations
 #+begin_src emacs-lisp
+(use-package evil-colemak-basics
+  :init
+  (setq evil-colemak-basics-layout-mod 'mod-dh)
+  :config
+  (global-evil-colemak-basics-mode))
+#+end_src
+
+*** Misc binds
+#+begin_src emacs-lisp
 (use-package general)

 (setq evil-states
  '(visual normal motion))

 (with-eval-after-load 'general
-(general-translate-key evil-states 'global
-    "m" "h"
-    "n" "j"
-    "N" "J"
-    "e" "k"
-    "i" "l"
-    "u" "i"
-    "l" "u"
-    "k" "n"
-    "f" "e"
-    "t" "f"
-    "j" "t"
-    "K" "N"
-)
-#+end_src
-
-*** Misc binds
-#+begin_src emacs-lisp
 (general-define-key
  :states evil-states
  "M-c" 'comment-line
--- a/home/natto/pkgs.nix
+++ b/home/natto/pkgs.nix
@@ -5,8 +5,7 @@
    # A/V, codec and media stuff
    ffmpeg-full
    sox
-    pamixer
-    mpdas
+    pamixer mpdas
    mpv
    mpc_cli
    pulseaudio
@@ -62,17 +61,25 @@
    calibre
    gnome.zenity
    stalonetray
+    obs-studio

    # Wine and games and stuff
    wineWowPackages.stable
    master.winetricks
-    games.wine-discord-ipc-bridge
-    (games.osu-stable.overrideAttrs (_: {
-      tricks = [ "gdiplus" "dotnet48" "meiryo" ];
-    }))
    tlauncher
    lutris
    citra
+    (yuzu.overrideAttrs (_: rec {
+      version = "1245";
+      src = fetchFromGitHub {
+        owner = "yuzu-emu";
+        repo = "yuzu-mainline";
+        rev = "mainline-0-${version}";
+        sha256 = "sha256-lWXlY1KQC067MvCRUFhmr0c7KDrHDuwJOhIWMKw1f+A=";
+        fetchSubmodules = true;
+      };
+    }))
+    ryujinx

    # Dev shit
    rust-analyzer
@@ -95,6 +102,8 @@
        tcolorbox;
    })
    python3Packages.pygments
+    inform7
+    gnome-inform7

    # Misc
    teams
--- a/home/natto/secrets/.gitconfig.age
+++ b/home/natto/secrets/.gitconfig.age
--- a/home/natto/services.nix
+++ b/home/natto/services.nix
@@ -51,19 +51,28 @@ in
    };
  };

-  systemd.user.services.mpdas = {
-    Unit = {
-      After = [ "mpd.service" ];
-      Description = "Music Player Daemon AutoScrobbler";
+  systemd.user.services = {
+    mpd-discord-rpc = {
+      Service = {
+        Restart = "on-failure";
+        RestartSec = "15s";
+      };
    };

-    Install.WantedBy = [ "default.target" ];
+    mpdas = {
+      Unit = {
+        After = [ "mpd.service" ];
+        Description = "Music Player Daemon AutoScrobbler";
+      };

-    Service = {
-      Type = "simple";
-      Restart = "on-failure";
-      RestartSec = "15s";
-      ExecStart = "${pkgs.mpdas}/bin/mpdas -c ${config.age.secrets.mpdasrc.path}";
+      Install.WantedBy = [ "default.target" ];
+
+      Service = {
+        Type = "simple";
+        Restart = "on-failure";
+        RestartSec = "15s";
+        ExecStart = "${pkgs.mpdas}/bin/mpdas -c ${config.age.secrets.mpdasrc.path}";
+      };
    };
  };
 }
--- a/hosts/satori/boot.nix
+++ b/hosts/satori/boot.nix
@@ -18,7 +18,7 @@
    };
    kernelParams = [ "intel_pstate=active" "intel_iommu=on" ];
    kernelModules = [ "kvm-intel" "snd-seq" "snd-rawmidi" "joydev" ];
-    extraModulePackages = with config.boot.kernelPackages; [ nvidia_x11_vulkan_beta v4l2loopback ];
+    extraModulePackages = with config.boot.kernelPackages; [ nvidia_x11 v4l2loopback ];
    loader = {
      efi = {
        canTouchEfiVariables = true;
--- a/hosts/satori/graphics.nix
+++ b/hosts/satori/graphics.nix
@@ -20,7 +20,7 @@ in
      package32 = pkgs.master.pkgsi686Linux.mesa.drivers;
    };
    nvidia = {
-      package = config.boot.kernelPackages.nvidia_x11_vulkan_beta;
+      package = config.boot.kernelPackages.nvidia_x11;
      prime = {
        #      sync.enable = true;
        offload = { enable = true; };
--- a/hosts/satori/networking.nix
+++ b/hosts/satori/networking.nix
@@ -4,6 +4,7 @@
  networking = {
    hostName = "satori";
    hostId = "beca3df0";
+    defaultGateway = "192.168.1.1";
    wireless.enable = true;
    wireless.interfaces = [ "wlp0s20f3" ];
    firewall = {
--- a/hosts/satori/pkgs.nix
+++ b/hosts/satori/pkgs.nix
@@ -31,6 +31,7 @@
    msr-tools
    steam
    igrep
+    jq
  ];

  programs = {
--- a/hosts/satori/services.nix
+++ b/hosts/satori/services.nix
@@ -14,6 +14,7 @@
      ACTION=="add|change", KERNEL=="sda", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="bfq"
    '';
    zfs.autoScrub.enable = true;
+    logind.extraConfig = "RuntimeDirectorySize=30%";
  };
  systemd.services.tor.wantedBy = lib.mkForce [ ];
  systemd.enableUnifiedCgroupHierarchy = false;
--- a/modules/sound.nix
+++ b/modules/sound.nix
@@ -9,10 +9,9 @@
        support32Bit = true;
      };
      pulse.enable = true;
- #     jack.enable = true;
+      #     jack.enable = true;
      socketActivation = true;

-      #  https://nixos.wiki/wiki/PipeWire#Low-latency_setup
      config.pipewire = {
        context.objects = [
          {