natto1784/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

regulatory updates

Browse Source 
home/natto/programs/emacs: update config to use org-babel and some other keybind related changes
hosts/satori: misc changes
modules/graphics: dont use the vulkan layer override for mesa

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
This commit is contained in:
Amneesh Singh
2022-04-27 01:16:54 +05:30
parent c805f3e58a
commit d13815136b
12 changed files with 204 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.org
View File

@@ -22,13 +22,12 @@ warning: │ └───x86_64-linux: omitted (use '--legacy' to show)
Either do Either do
#+begin_src sh #+begin_src sh
cd dotfiles cd dotfiles
nixos-rebuild switch --flake .#Satori nixos-rebuild switch --flake .
#+end_src #+end_src
or or
#+begin_src sh #+begin_src sh
nixos-rebuild switch --flake "git+https://git.weirdnatto.in/natto1784/dotfiles?ref=nixos" nixos-rebuild switch --flake "git+https://git.weirdnatto.in/natto1784/dotfiles?ref=nixos"
#+end_src #+end_src
Replace ~Satori~ with whatever system you want or replace with whatever hostname you want in the config
* How home-manager workey * How home-manager workey
Just do Just do

150
flake.lock generated
View File

@@ -18,11 +18,11 @@
}, },
"emacs": { "emacs": {
"locked": { "locked": {
"lastModified": 1647914335, "lastModified": 1650973913,
"narHash": "sha256-6DcYfyQYb5chJkm3KPWvMTZrs1JtG4WMCtta1ocvlmg=", "narHash": "sha256-Fa+P0FZ/PcU953NBqnz41PnvObjDw0LaS1Vg4LTc2aA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "023ce0b1e29732c6d26a380ad5dc8298c298f99b", "rev": "5f258dfdab8e58abe2e44b78a3ccf262041f7b74",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -34,11 +34,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1641205782, "lastModified": 1650374568,
"narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -63,21 +63,6 @@
} }
}, },
"flake-utils_2": { "flake-utils_2": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"locked": { "locked": {
"lastModified": 1637014545, "lastModified": 1637014545,
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
@@ -97,11 +82,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1647903177, "lastModified": 1650920743,
"narHash": "sha256-9aWSpW/F8POA/7cuVpoqhVGfjAgcGRIinwxUaXmUpkk=", "narHash": "sha256-7xxdtLp295HswhyEjr991QJsBFeadUo43NiAsHnQ5+8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "80b4360678fa7890964ba8e40a722985bf8d107e", "rev": "223a73c2ba7d358b23666937cb13a59b31df511c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -115,11 +100,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1647175256, "lastModified": 1650841545,
"narHash": "sha256-7H+veXPM7IwdN1DoZqliwb9sghlN56koV5dnCu1kpsc=", "narHash": "sha256-AF3fk+p/mHbdtyrI3kpms+MoMVOdGIBGJ+7LT7WWdaU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a8d00f5c038cf7ec54e7dac9c57b171c1217f008", "rev": "236c6ec21420e44c38ec76de4fc3335bec1859b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -136,11 +121,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1646481600, "lastModified": 1650133068,
"narHash": "sha256-TBJu0BjWpp9737sqC5E4Iz48t3AatDUcBtXKuVJEQVg=", "narHash": "sha256-biHmW4DyRjydDUJ9bTqvUgVSSE/MzzAseQERT5yPjWI=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "75728d2686dec5ef2a73cdf80174311587413392", "rev": "4ce864f52ae7e1733582a32d66c1f94ee11a52c8",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@@ -151,11 +136,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1647935800, "lastModified": 1651001537,
"narHash": "sha256-RluNemNWfuwj0o4uPi1whjFSl0v/x+7aNi8mdPYaQro=", "narHash": "sha256-c8EkxI11BMjTIcs9f1gbLbPNeqXprFrZV6NSGQVxxRw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "74c1fd0b5ee7d2a0bf9754dd2bc0f41a73ed32a7", "rev": "d67c3c89620e5785a5d8600a3aea94320f7bb56d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -186,7 +171,7 @@
}, },
"neovim-flake": { "neovim-flake": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": [
"nvim", "nvim",
"nixpkgs" "nixpkgs"
@@ -194,11 +179,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1647877279, "lastModified": 1650946819,
"narHash": "sha256-uvQvyj0XS4pOIkpfApDaMFVWClmVpsTLQRQxvTJcBLA=", "narHash": "sha256-96tABVv1Dauk0FH7Dvk1ZXoabCyIpmx3oJUMLaiF9Ww=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "0c02e8a62b1570be15db01d45969d2759a7f37bf", "rev": "a75efc237d8669ef12fdfc9a7c5c5cf0f77083dc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -210,15 +195,14 @@
}, },
"nix-gaming": { "nix-gaming": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5"
"utils": "utils_3"
}, },
"locked": { "locked": {
"lastModified": 1647879455, "lastModified": 1650903776,
"narHash": "sha256-BYZKNwl8DV+PRqLeCyY1ambhd4jxCAQeQSNG0dprtLY=", "narHash": "sha256-6OWA4R9trOSkmSdsJXslYlQ+VklCIOLpZKfNTtrXHNg=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "5258eb84d2b275f336a3b93026d406c8e1ebde04", "rev": "448bce69b5713a3da870c77bbd6610e4c5fca2a8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -229,11 +213,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1647350163, "lastModified": 1648065016,
"narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=", "narHash": "sha256-H1+uesSA0vsSWaPey5KbYdE+D67gXBJNk3Z/HE00M3M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3eb07eeafb52bcbf02ce800f032f18d666a9498d", "rev": "c984213d12225fa5feb640136872da56d2e8f702",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -243,11 +227,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1647350163, "lastModified": 1648065016,
"narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=", "narHash": "sha256-H1+uesSA0vsSWaPey5KbYdE+D67gXBJNk3Z/HE00M3M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3eb07eeafb52bcbf02ce800f032f18d666a9498d", "rev": "c984213d12225fa5feb640136872da56d2e8f702",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -287,11 +271,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1647734733, "lastModified": 1650899852,
"narHash": "sha256-LFYY+NhTgx++EtehrktrY4ZcsEIgd3+8dd1ZYb9NyQo=", "narHash": "sha256-FNgHYq0LtGhvq1CniCg1RaH9Ngr7svm9iR6loPWCCNs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b8f8b90b90ac713eb7f5cc7eb2100141ee29751d", "rev": "ecc66a886eb7eec1d671ddfce2a0cccd12bc4807",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -302,11 +286,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1647350163, "lastModified": 1650970888,
"narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=", "narHash": "sha256-K0Qk6YbkyxBbszkBKCxsLA+jrQpaecf0X8iIO8frS48=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3eb07eeafb52bcbf02ce800f032f18d666a9498d", "rev": "27a62a9c603d0d832141682cb4f34964d7b48ebb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -318,11 +302,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1647800324, "lastModified": 1650831523,
"narHash": "sha256-rjwoxrk16zfrcO5Torh6CbAd5GHsHrXw+EwxOvh9AUI=", "narHash": "sha256-6pDZ08SAXsUx5rOP391x+TG39ENP/XA8VMa1tQvgEjc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9bc841fec1c0e8b9772afa29f934d2c7ce57da8e", "rev": "87d34a6b8982e901b8e50096b8e79ebc0e66cda0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -350,11 +334,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1647935829, "lastModified": 1650996920,
"narHash": "sha256-a255Dx1BygB18ZMeD72KAsm0mDqX8rCwZw6dlc/ngrc=", "narHash": "sha256-BkwCJRYkdQBfdr373bbr0aIukPilcIahWpLxRyz72oA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "d96e19df518dd14a873c1c2d09a77324bc26dcfe", "rev": "ef4034d35ab9bfda6cf4670be2016a029e954f66",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -370,11 +354,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1647936981, "lastModified": 1650961252,
"narHash": "sha256-GhtaXevrBE/iMQ400UZZZWnGt8QEosO9HN2o13CSmNE=", "narHash": "sha256-TYNm2ZRNg0TXI/IdKGSJ527MFaks+6aY2kL7NX7TpWo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "7d3571d6adc7968db62c9e78b039bd295c3ff33f", "rev": "184a46c1fc32d0b3c1a5aaad26249f1a970e4d3c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -414,20 +398,20 @@
"old": "old", "old": "old",
"rust": "rust", "rust": "rust",
"stable": "stable", "stable": "stable",
"utils": "utils_4" "utils": "utils_3"
} }
}, },
"rust": { "rust": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1647916392, "lastModified": 1650941217,
"narHash": "sha256-xiZ4Bzj2KLzphnBh6zMBKm/Icc7grN8CcaFepXhx8y4=", "narHash": "sha256-rWpp8pKM9jYcvG7JiNAw+ITOlY20h8K83S3RQc9pY74=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "a4ba09b440c10a45124aa75667c36549ddadac4d", "rev": "b4cc9abdd42655b61325f3feb062cacc51a54de2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -438,11 +422,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1647624696, "lastModified": 1650921206,
"narHash": "sha256-6u7WHfTGPbo21p3j23hJmkE0CtJCklrRE/aHm0uavIg=", "narHash": "sha256-RGlfTC2ktqLVw0gBvZeCM//B4ig2CdQJm39sDvm0DBQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "60779b2fde21d3d48bc1999fc0ce6540eba07924", "rev": "3a9e0f239d80fa134e8fcbdee4dfc793902da37e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -483,30 +467,12 @@
} }
}, },
"utils_3": { "utils_3": {
"inputs": {
"flake-utils": "flake-utils"
},
"locked": { "locked": {
"lastModified": 1647259887, "lastModified": 1649676176,
"narHash": "sha256-yEkMbEHVO9qydluQ3uHGWX1PkfZhgDKxnd1rhZYZ72w=", "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"rev": "06dba5f3b4fa2cc0bfc98ce9cd6f9a4d8db11d46",
"type": "github"
},
"original": {
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"type": "github"
}
},
"utils_4": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View File

@@ -84,7 +84,9 @@
imports = [ imports = [
./home/natto ./home/natto
] ++ homeModules; ] ++ homeModules;
home.packages = [ inputs.home-manager.defaultPackage.${system} ]; home.packages = [
inputs.home-manager.defaultPackage.${system}
];
nixpkgs = { nixpkgs = {
overlays = self.legacyPackages.${system}.overlays; overlays = self.legacyPackages.${system}.overlays;
config.allowUnfree = true; config.allowUnfree = true;

90
home/natto/config/emacs/config.org
View File

@@ -45,7 +45,6 @@ c-white-2 "#fdf6e3")
#+end_src #+end_src
** Setting some variables ** Setting some variables
SCHEDULED: <2022-03-19 Sat>
#+begin_src emacs-lisp #+begin_src emacs-lisp
(setq initial-major-mode 'emacs-lisp-mode (setq initial-major-mode 'emacs-lisp-mode
frame-resize-pixelwise t frame-resize-pixelwise t
@@ -96,7 +95,7 @@ SCHEDULED: <2022-03-19 Sat>
#+end_src #+end_src
** Configure Selectrum ** Configure Selectrum
Enable selectrum and remap keys to Colemak-DH Enable selectrum
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package selectrum (use-package selectrum
:config :config
@@ -120,7 +119,8 @@ Add orderless for selectrum
(use-package orderless (use-package orderless
:after selectrum :after selectrum
:config :config
(setq completion-styles '(orderless)) (setq completion-styles '(orderless basic))
(add-to-list 'orderless-matching-styles 'orderless-flex)
(savehist-mode) (savehist-mode)
(setq orderless-skip-highlighting (lambda () selectrum-is-active)) (setq orderless-skip-highlighting (lambda () selectrum-is-active))
(setq selectrum-highlight-candidates-function #'orderless-highlight-matches)) (setq selectrum-highlight-candidates-function #'orderless-highlight-matches))
@@ -129,15 +129,34 @@ Add orderless for selectrum
** Evil ** Evil
*** Configure evil mode *** Configure evil mode
#+begin_src emacs-lisp #+begin_src emacs-lisp
(defun my/evil-shift-right ()
(interactive)
(evil-shift-right evil-visual-beginning evil-visual-end)
(evil-normal-state)
(evil-visual-restore))
(defun my/evil-shift-left ()
(interactive)
(evil-shift-left evil-visual-beginning evil-visual-end)
(evil-normal-state)
(evil-visual-restore))
(use-package evil (use-package evil
:init :init
(setq-default evil-shift-width 2) (setq-default evil-shift-width 2)
:config :config
(setq org-src-fontify-natively t
org-src-strip-leading-and-trailing-blank-lines t
org-src-preserve-indentation t
org-src-tab-acts-natively t)
(evil-set-initial-state 'vterm-mode 'insert) (evil-set-initial-state 'vterm-mode 'insert)
(evil-set-undo-system 'undo-tree) (evil-set-undo-system 'undo-tree)
(evil-define-key 'visual global-map (kbd ">") 'my/evil-shift-right)
(evil-define-key 'visual global-map (kbd "<") 'my/evil-shift-left)
(evil-mode 1)) (evil-mode 1))
#+end_src #+end_src
*** Configure undo tree *** Configure undo tree
To undo and redo easily like vi To undo and redo easily like vi
#+begin_src emacs-lisp #+begin_src emacs-lisp
@@ -156,6 +175,11 @@ To get colemak-dh bindings in evil mode
(global-evil-colemak-basics-mode 1)) (global-evil-colemak-basics-mode 1))
#+end_src #+end_src
*** Miscellaneous evil related packages
#+begin_src emacs-lisp
(use-package evil-terminal-cursor-changer)
#+end_src
** Treemacs ** Treemacs
*** Dependencies *** Dependencies
#+begin_src emacs-lisp #+begin_src emacs-lisp
@@ -176,15 +200,17 @@ To get colemak-dh bindings in evil mode
Configure treemacs-evil to get colemak-dh bindings Configure treemacs-evil to get colemak-dh bindings
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package treemacs-evil :config (use-package treemacs-evil :config
(define-key evil-treemacs-state-map (kbd "j") nil)
(define-key evil-treemacs-state-map (kbd "k") nil)
(define-key evil-treemacs-state-map (kbd "n") #'treemacs-next-line) (define-key evil-treemacs-state-map (kbd "n") #'treemacs-next-line)
(define-key evil-treemacs-state-map (kbd "e") #'treemacs-previous-line) (define-key evil-treemacs-state-map (kbd "e") #'treemacs-previous-line)
(define-key evil-treemacs-state-map (kbd "M-n") #'treemacs-next-neighbour) (define-key evil-treemacs-state-map (kbd "M-n") #'treemacs-next-neighbour)
(define-key evil-treemacs-state-map (kbd "M-e") #'treemacs-previous-neighbour) (define-key evil-treemacs-state-map (kbd "M-e") #'treemacs-previous-neighbour)
(define-key evil-treemacs-state-map (kbd "M-N") #'treemacs-next-line-other-window) (define-key evil-treemacs-state-map (kbd "M-N") #'treemacs-next-line-other-window)
(define-key evil-treemacs-state-map (kbd "M-E") #'treemacs-previous-line-other-window) (define-key evil-treemacs-state-map (kbd "M-E") #'treemacs-previous-line-other-window)
; (define-key evil-treemacs-state-map (kbd "M") #'treemacs-collapse-parent-node) (define-key evil-treemacs-state-map (kbd "M") #'treemacs-collapse-parent-node)
(define-key evil-treemacs-state-map (kbd "m") #'treemacs-COLLAPSE-action) (evil-define-key 'treemacs treemacs-mode-map (kbd "m") #'treemacs-COLLAPSE-action)
(define-key evil-treemacs-state-map (kbd "i") #'treemacs-RET-action) (evil-define-key 'treemacs treemacs-mode-map (kbd "i") #'treemacs-RET-action)
) )
#+end_src #+end_src
@@ -218,14 +244,21 @@ Configure treemacs-evil to get colemak-dh bindings
(lsp-ui-doc-enable 1)) (lsp-ui-doc-enable 1))
#+end_src #+end_src
*** Language specific LSP packages
#+begin_src emacs-lisp
(use-package lsp-haskell)
#+end_src
*** Configure flycheck *** Configure flycheck
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package flycheck) (use-package flycheck)
#+end_src #+end_src
*** Configure dap-mode *** Configure dap-mode
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package dap-mode) (use-package dap-mode)
#+end_src #+end_src
** Company ** Company
*** Configure company *** Configure company
For autocomplete For autocomplete
@@ -234,6 +267,9 @@ For autocomplete
:defer 0 :defer 0
:after lsp-mode :after lsp-mode
:config :config
(add-to-list 'company-backends 'company-dabbrev)
(setq company-backends (cons 'company-files (remove 'company-files company-backends)))
(company-mode 1)
(define-key company-active-map (kbd "C-n") 'company-select-next) (define-key company-active-map (kbd "C-n") 'company-select-next)
(define-key company-active-map (kbd "C-e") 'company-select-previous) (define-key company-active-map (kbd "C-e") 'company-select-previous)
(define-key company-search-map (kbd "C-n") 'company-select-next) (define-key company-search-map (kbd "C-n") 'company-select-next)
@@ -260,6 +296,8 @@ For autocomplete
** Lang support ** Lang support
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package haskell-mode)
(use-package rustic) (use-package rustic)
(use-package nix-mode (use-package nix-mode
@@ -349,15 +387,35 @@ For autocomplete
(add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))) (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))))
#+end_src #+end_src
** Add helper packages for exporting ** Babel and exports
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package htmlize) (use-package htmlize)
(add-to-list 'org-latex-packages-alist '("" "minted"))
(setq org-latex-listings 'minted)
(setq org-latex-pdf-process
'("pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f"
"pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f"
"pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f"))
(setq org-src-fontify-natively t)
(org-babel-do-load-languages
'org-babel-load-languages
'((awk . t)
(python . t)
(C . t)
(shell . t)
(sql . t)
(latex . t)))
#+end_src #+end_src
* Mode specific hooks * Mode specific hooks
#+begin_src emacs-lisp #+begin_src emacs-lisp
(add-hook 'c-mode-hook 'lsp) (add-hook 'c-mode-hook 'lsp)
(add-hook 'c++-mode-hook 'lsp) (add-hook 'c++-mode-hook 'lsp)
(add-hook 'haskell-mode-hook #'lsp)
(add-hook 'haskell-literate-mode-hook #'lsp)
#+end_src #+end_src
* Custom mode line * Custom mode line
@@ -396,8 +454,7 @@ For autocomplete
'((:propertize " %b " face mode-line-buf-name) '((:propertize " %b " face mode-line-buf-name)
(vc-mode (:propertize ("" vc-mode " " ) face mode-line-vc)) (vc-mode (:propertize ("" vc-mode " " ) face mode-line-vc))
(:propertize (" " mode-name " ") face mode-line-maj-mode) (:propertize (" " mode-name " ") face mode-line-maj-mode)
(:propertize ("[[ %l | %c || %p . %+%@ ]]") face mode-line-info) (:propertize (" [[ %l | %c || %p . %+%@ ]] ") face mode-line-info)))
("%-")))
(setq exclude-ln '(term-mode-hook eshell-mode-hook shell-mode-hook)) (setq exclude-ln '(term-mode-hook eshell-mode-hook shell-mode-hook))
(while exclude-ln (while exclude-ln
@@ -450,14 +507,12 @@ This returns the command to run in the terminal
(let ((full buffer-file-name) (let ((full buffer-file-name)
(file (file-name-sans-extension buffer-file-name))) (file (file-name-sans-extension buffer-file-name)))
(pcase (file-name-extension full) (pcase (file-name-extension full)
("c" (concat "gcc " full " -o " file " && " file " && rm " file)) ("c" (concat "gcc " full "-lm -pthread -o " file " && " file " && rm " file))
("java" (concat "java" full)) ("java" (concat "java" full))
("py" (concat "python" full)) ("py" (concat "python" full))
("cpp" (concat "g++ " full " -o " file " && " file " && rm " file)) ("cpp" (concat "g++ " full " -o " file " && " file " && rm " file))
("hs" (concat "ghc -dynamic" full " && " file " && rm " file " " file ".o")) ("hs" (concat "ghc -dynamic" full " && " file " && rm " file " " file ".o"))
("sh" (concat "sh" full)) ("sh" (concat "sh" full))
("bash" (concat "bash" full))
("zsh" (concat "zsh" full))
("js" (concat "node" full)) ("js" (concat "node" full))
("ts" (concat "tsc" full " && node " file ".js && rm " file ".js" )) ("ts" (concat "tsc" full " && node " file ".js && rm " file ".js" ))
("rs" (concat "rustc" full " -o " file " && " file " && rm " file))))) ("rs" (concat "rustc" full " -o " file " && " file " && rm " file)))))
@@ -480,8 +535,8 @@ This returns the command to run in the terminal
"C-i" 'windmove-right "C-i" 'windmove-right
"C-n" 'windmove-down "C-n" 'windmove-down
"C-e" 'windmove-up "C-e" 'windmove-up
"M-," 'previous-buffer "M-," 'centaur-tabs-backward
"M-." 'next-buffer "M-." 'centaur-tabs-forward
"C-q" 'delete-window "C-q" 'delete-window
"M-C-S-q" 'kill-buffer-and-window "M-C-S-q" 'kill-buffer-and-window
"M-w" 'centaur-tabs--kill-this-buffer-dont-ask "M-w" 'centaur-tabs--kill-this-buffer-dont-ask
@@ -519,10 +574,13 @@ Toggle Appearance
(load-theme 'doom-solarized-light t)) (load-theme 'doom-solarized-light t))
(progn (disable-theme 'doom-solarized-light) (progn (disable-theme 'doom-solarized-light)
(load-theme 'doom-solarized-dark t))) (load-theme 'doom-solarized-dark t)))
(setq-local dark-theme (not dark-theme))) (setq-local dark-theme (not dark-theme))
(centaur-tabs-display-update)
(centaur-tabs-headline-match)
)
(general-define-key (general-define-key
:states '(normal insert emacs) :states '(normal)
"<f7>" (lambda () (interactive) (toggle-theme-shade))) "<f7>" (lambda () (interactive) (toggle-theme-shade)))
) )
#+end_src #+end_src

22
home/natto/pkgs.nix
View File

@@ -55,7 +55,23 @@
(master.tauon.override { withDiscordRPC = true; }) (master.tauon.override { withDiscordRPC = true; })
nbfc-linux nbfc-linux
pulseaudio pulseaudio
(texlive.combine { inherit (texlive) scheme-small babel lm graphics-def url mhchem wrapfig capt-of; }) (texlive.combine {
inherit (texlive)
scheme-small
babel
lm
graphics-def
url
mhchem
wrapfig
capt-of
minted
fvextra
xstring
catchfile
framed
upquote;
})
# carla # carla
# electrum # electrum
anki-bin anki-bin
@@ -73,5 +89,9 @@
element-desktop element-desktop
syncplay syncplay
betterdiscordctl betterdiscordctl
python3Packages.pygments
calibre
easyeffects
noisetorch
]; ];
} }

6
home/natto/programs.nix
View File

@@ -10,10 +10,10 @@
# userContent = builtins.readFile ./config/firefox/userContent.css; # userContent = builtins.readFile ./config/firefox/userContent.css;
}; };
}; };
/* chromium = { chromium = {
enable = true; enable = true;
package = pkgs.ungoogled-chromium; package = pkgs.ungoogled-chromium;
}; */ };
zathura = { zathura = {
enable = true; enable = true;
extraConfig = builtins.readFile ./config/zathura/zathurarc; extraConfig = builtins.readFile ./config/zathura/zathurarc;
@@ -38,7 +38,7 @@
enable = true; enable = true;
mpdMusicDir = ~/Music; mpdMusicDir = ~/Music;
settings = { settings = {
albumart = "yes"; # albumart = "yes";
locked_screen_width_part = 25; locked_screen_width_part = 25;
autocenter_mode = "yes"; autocenter_mode = "yes";
follow_now_playing_lyrics = "yes"; follow_now_playing_lyrics = "yes";

2
hosts/satori/hardware.nix
View File

@@ -14,7 +14,7 @@
fileSystems."/boot/efi" = fileSystems."/boot/efi" =
{ {
device = "/dev/disk/by-uuid/ACBA-9B3F"; device = "/dev/disk/by-uuid/2424-5639";
fsType = "vfat"; fsType = "vfat";
}; };
fileSystems."/mnt/Games" = fileSystems."/mnt/Games" =

1
hosts/satori/pkgs.nix
View File

@@ -17,6 +17,7 @@
kbd kbd
cachix cachix
gcc gcc
glibc.static
stable.openjdk stable.openjdk
virtmanager virtmanager
tree-sitter tree-sitter

2
hosts/satori/stuff.nix
View File

@@ -22,7 +22,7 @@
}; };
}; };
security = { security = {
sudo.enable = false; sudo.enable = true;
doas = { doas = {
enable = true; enable = true;
extraRules = [ extraRules = [

6
modules/graphics.nix
View File

@@ -13,7 +13,7 @@ in
nvidia-offload nvidia-offload
]; ];
hardware = { hardware = {
opengl = /* opengl =
let let
fn = oa: with lib; { fn = oa: with lib; {
nativeBuildInputs = oa.nativeBuildInputs ++ singleton pkgs.glslang; nativeBuildInputs = oa.nativeBuildInputs ++ singleton pkgs.glslang;
@@ -35,6 +35,10 @@ in
enable = true; enable = true;
package = (mesa.overrideAttrs fn).drivers; package = (mesa.overrideAttrs fn).drivers;
package32 = (pkgsi686Linux.mesa.overrideAttrs fn).drivers; package32 = (pkgsi686Linux.mesa.overrideAttrs fn).drivers;
};*/
opengl = {
driSupport32Bit = true;
enable = true;
}; };
nvidia = { nvidia = {
prime = { prime = {

4
overlays/overridesandshit.nix
View File

@@ -29,7 +29,7 @@ final: prev: {
clockSupport = true; clockSupport = true;
}; };
picom = prev.picom.overrideAttrs (oldAttrs: rec{ /*picom = prev.picom.overrideAttrs (oldAttrs: rec{
src = prev.fetchFromGitHub { src = prev.fetchFromGitHub {
owner = "jonaburg"; owner = "jonaburg";
repo = "picom"; repo = "picom";
@@ -37,7 +37,7 @@ final: prev: {
sha256 = "sha256-R+YUGBrLst6CpUgG9VCwaZ+LiBSDWTp0TLt1Ou4xmpQ="; sha256 = "sha256-R+YUGBrLst6CpUgG9VCwaZ+LiBSDWTp0TLt1Ou4xmpQ=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
}); });*/
proxychains = prev.proxychains.overrideAttrs (_: { proxychains = prev.proxychains.overrideAttrs (_: {
postInstall = ":"; postInstall = ":";