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

Satori: misc changes

Browse Source 
Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
This commit is contained in:
Amneesh Singh
2022-05-30 16:05:26 +05:30
parent 423c2236b7
commit a66daf3ac6
15 changed files with 163 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

167
flake.lock generated
View File

@@ -17,12 +17,16 @@
} }
}, },
"emacs": { "emacs": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
},
"locked": { "locked": {
"lastModified": 1650973913, "lastModified": 1653045399,
"narHash": "sha256-Fa+P0FZ/PcU953NBqnz41PnvObjDw0LaS1Vg4LTc2aA=", "narHash": "sha256-olhvDOOmxoXhyrVHsPAifTuhHJCH0eyG4t1FzIBJgEs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "5f258dfdab8e58abe2e44b78a3ccf262041f7b74", "rev": "f2b5fc6846d69051b7a7b174f7a96aa57b195f6e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -48,6 +52,21 @@
} }
}, },
"flake-utils": { "flake-utils": {
"locked": {
"lastModified": 1652776076,
"narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"locked": { "locked": {
"lastModified": 1644229661, "lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
@@ -62,7 +81,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": { "flake-utils_3": {
"locked": { "locked": {
"lastModified": 1637014545, "lastModified": 1637014545,
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
@@ -79,14 +98,14 @@
}, },
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1650920743, "lastModified": 1652996682,
"narHash": "sha256-7xxdtLp295HswhyEjr991QJsBFeadUo43NiAsHnQ5+8=", "narHash": "sha256-7ZWyd5W2tM/uxXGn16AJUXenlGPUt/r6zitEcorz5j0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "223a73c2ba7d358b23666937cb13a59b31df511c", "rev": "02b15de8ad714409358cffdc6ed518ade03402c4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -97,14 +116,14 @@
}, },
"home-manager-stable": { "home-manager-stable": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1650841545, "lastModified": 1651519540,
"narHash": "sha256-AF3fk+p/mHbdtyrI3kpms+MoMVOdGIBGJ+7LT7WWdaU=", "narHash": "sha256-3k6p8VsTwwRPQjE8rrMh+o2AZACZn/eeYJ7ivdQ/Iro=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "236c6ec21420e44c38ec76de4fc3335bec1859b5", "rev": "d93d56ab8c1c6aa575854a79b9d2f69d491db7d0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -117,15 +136,15 @@
"mailserver": { "mailserver": {
"inputs": { "inputs": {
"blobs": "blobs", "blobs": "blobs",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_4",
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1650133068, "lastModified": 1652050932,
"narHash": "sha256-biHmW4DyRjydDUJ9bTqvUgVSSE/MzzAseQERT5yPjWI=", "narHash": "sha256-1lOa33Z2sC6CmNdqkCtplVHlMUWVZl4FLT6MYOM+WJQ=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "4ce864f52ae7e1733582a32d66c1f94ee11a52c8", "rev": "4396125ebbbaecbaba0f8e0afb25e492b3be5795",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@@ -136,11 +155,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1651001537, "lastModified": 1653050917,
"narHash": "sha256-c8EkxI11BMjTIcs9f1gbLbPNeqXprFrZV6NSGQVxxRw=", "narHash": "sha256-eZwDi0VjGt7hRvhFYaq+/olq+na2gEORPgWIj5qx43E=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d67c3c89620e5785a5d8600a3aea94320f7bb56d", "rev": "6501ee65b0493c880ba2e2b9d62766d6bb10cbca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -152,7 +171,7 @@
}, },
"nbfc": { "nbfc": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_5",
"utils": "utils_2" "utils": "utils_2"
}, },
"locked": { "locked": {
@@ -171,7 +190,7 @@
}, },
"neovim-flake": { "neovim-flake": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": [
"nvim", "nvim",
"nixpkgs" "nixpkgs"
@@ -179,11 +198,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1650946819, "lastModified": 1653002438,
"narHash": "sha256-96tABVv1Dauk0FH7Dvk1ZXoabCyIpmx3oJUMLaiF9Ww=", "narHash": "sha256-6V8vvZwRH7U/3NcfJQGTzy9KJKsfl/+1xVtbS+84M8M=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "a75efc237d8669ef12fdfc9a7c5c5cf0f77083dc", "rev": "eb0aa8bb0ebc3cc233af6a5281c553d14ee57183",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -195,14 +214,14 @@
}, },
"nix-gaming": { "nix-gaming": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1650903776, "lastModified": 1652398145,
"narHash": "sha256-6OWA4R9trOSkmSdsJXslYlQ+VklCIOLpZKfNTtrXHNg=", "narHash": "sha256-W6Nv8xXBApGXGq0XQXbH7rDrV3ZjaNv8WMV2Yk4YEzI=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "448bce69b5713a3da870c77bbd6610e4c5fca2a8", "rev": "ae98c45185cba42bf8b4d0a6922a491bf9faa090",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -213,11 +232,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1648065016, "lastModified": 1650970888,
"narHash": "sha256-H1+uesSA0vsSWaPey5KbYdE+D67gXBJNk3Z/HE00M3M=", "narHash": "sha256-K0Qk6YbkyxBbszkBKCxsLA+jrQpaecf0X8iIO8frS48=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c984213d12225fa5feb640136872da56d2e8f702", "rev": "27a62a9c603d0d832141682cb4f34964d7b48ebb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -227,11 +246,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1648065016, "lastModified": 1650970888,
"narHash": "sha256-H1+uesSA0vsSWaPey5KbYdE+D67gXBJNk3Z/HE00M3M=", "narHash": "sha256-K0Qk6YbkyxBbszkBKCxsLA+jrQpaecf0X8iIO8frS48=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c984213d12225fa5feb640136872da56d2e8f702", "rev": "27a62a9c603d0d832141682cb4f34964d7b48ebb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -240,6 +259,20 @@
} }
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": {
"lastModified": 1650970888,
"narHash": "sha256-K0Qk6YbkyxBbszkBKCxsLA+jrQpaecf0X8iIO8frS48=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "27a62a9c603d0d832141682cb4f34964d7b48ebb",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1642635915, "lastModified": 1642635915,
"narHash": "sha256-vabPA32j81xBO5m3+qXndWp5aqepe+vu96Wkd9UnngM=", "narHash": "sha256-vabPA32j81xBO5m3+qXndWp5aqepe+vu96Wkd9UnngM=",
@@ -254,7 +287,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_4": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1646811357, "lastModified": 1646811357,
"narHash": "sha256-JJdz8QJ8Gz9ZChGfl4P9Cm8C9mYJLRGVsXcY9gNPtuI=", "narHash": "sha256-JJdz8QJ8Gz9ZChGfl4P9Cm8C9mYJLRGVsXcY9gNPtuI=",
@@ -269,13 +302,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1650899852, "lastModified": 1651319551,
"narHash": "sha256-FNgHYq0LtGhvq1CniCg1RaH9Ngr7svm9iR6loPWCCNs=", "narHash": "sha256-sw4Bx5mdVej9nFEMS9qF6cOTIo6SdDI4V7Mvvdkg94Y=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ecc66a886eb7eec1d671ddfce2a0cccd12bc4807", "rev": "f153271f124108dc89c1bba2883adf782ad759ff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -284,13 +317,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_6": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1650970888, "lastModified": 1652840887,
"narHash": "sha256-K0Qk6YbkyxBbszkBKCxsLA+jrQpaecf0X8iIO8frS48=", "narHash": "sha256-gEK4NNa4GwIgTZE63kt/4WTFAWRTJVSa30+h4ZjFh9U=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "27a62a9c603d0d832141682cb4f34964d7b48ebb", "rev": "52dc75a4fee3fdbcb792cb6fba009876b912bfe0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -300,13 +333,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_7": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1650831523, "lastModified": 1652885393,
"narHash": "sha256-6pDZ08SAXsUx5rOP391x+TG39ENP/XA8VMa1tQvgEjc=", "narHash": "sha256-YIgvvlk4iQ1Hi7KD9o5gsojc+ApB+jiH1d5stK8uXiw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "87d34a6b8982e901b8e50096b8e79ebc0e66cda0", "rev": "48037fd90426e44e4bf03e6479e88a11453b9b66",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -316,7 +349,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_8": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1637453606, "lastModified": 1637453606,
"narHash": "sha256-Gy6cwUswft9xqsjWxFYEnx/63/qzaFUwatcbV5GF/GQ=", "narHash": "sha256-Gy6cwUswft9xqsjWxFYEnx/63/qzaFUwatcbV5GF/GQ=",
@@ -334,11 +367,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1650996920, "lastModified": 1653042409,
"narHash": "sha256-BkwCJRYkdQBfdr373bbr0aIukPilcIahWpLxRyz72oA=", "narHash": "sha256-P3h+rDxT1AScFhwc8MconD5AnhmWykoEMNDatP6IEMU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "ef4034d35ab9bfda6cf4670be2016a029e954f66", "rev": "f27711d8edb9480dfb1c3c899987df4b94aa2bed",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -351,14 +384,14 @@
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"neovim-flake": "neovim-flake", "neovim-flake": "neovim-flake",
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1650961252, "lastModified": 1653034615,
"narHash": "sha256-TYNm2ZRNg0TXI/IdKGSJ527MFaks+6aY2kL7NX7TpWo=", "narHash": "sha256-WbofGOnVjhFTKfC7WWwiWdrD5w/eRkm0o1A44vnfWbE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "184a46c1fc32d0b3c1a5aaad26249f1a970e4d3c", "rev": "1ff270f63d9179b83ed2aadbdba3d0880a091305",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -392,7 +425,7 @@
"master": "master", "master": "master",
"nbfc": "nbfc", "nbfc": "nbfc",
"nix-gaming": "nix-gaming", "nix-gaming": "nix-gaming",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_7",
"nur": "nur", "nur": "nur",
"nvim": "nvim", "nvim": "nvim",
"old": "old", "old": "old",
@@ -403,15 +436,15 @@
}, },
"rust": { "rust": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_9"
}, },
"locked": { "locked": {
"lastModified": 1650941217, "lastModified": 1653014441,
"narHash": "sha256-rWpp8pKM9jYcvG7JiNAw+ITOlY20h8K83S3RQc9pY74=", "narHash": "sha256-6TRk5POjjevXZUzBnQ7Nlac1It4l12mEAltw5sRfQg8=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "b4cc9abdd42655b61325f3feb062cacc51a54de2", "rev": "6ae180c1af192475b29e269f10d9da2d5abec4f0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -422,11 +455,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1650921206, "lastModified": 1652881001,
"narHash": "sha256-RGlfTC2ktqLVw0gBvZeCM//B4ig2CdQJm39sDvm0DBQ=", "narHash": "sha256-k9JmPCojaJnqGz4aRXXT1HZqJKHCXijoMfBAb24abXk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3a9e0f239d80fa134e8fcbdee4dfc793902da37e", "rev": "2d474d6a4a43a0348b78db68dc00c491032cf5cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -468,11 +501,11 @@
}, },
"utils_3": { "utils_3": {
"locked": { "locked": {
"lastModified": 1649676176, "lastModified": 1652776076,
"narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8",
"type": "github" "type": "github"
}, },
"original": { "original": {

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

@@ -26,6 +26,10 @@ c-cyan-2 "#93a1a1"
c-white-2 "#fdf6e3") c-white-2 "#fdf6e3")
#+end_src #+end_src
#+begin_src python
#+end_src
* Settings * Settings
** Setting the default face ** Setting the default face
#+begin_src emacs-lisp #+begin_src emacs-lisp
@@ -120,7 +124,6 @@ Add orderless for selectrum
:after selectrum :after selectrum
:config :config
(setq completion-styles '(orderless basic)) (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))
@@ -247,6 +250,7 @@ Configure treemacs-evil to get colemak-dh bindings
*** Language specific LSP packages *** Language specific LSP packages
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package lsp-haskell) (use-package lsp-haskell)
(use-package lsp-grammarly)
#+end_src #+end_src
*** Configure flycheck *** Configure flycheck
@@ -273,7 +277,8 @@ For autocomplete
(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)
(define-key company-search-map (kbd "C-e") 'company-select-previous)) (define-key company-search-map (kbd "C-e") 'company-select-previous)
(company-mode))
#+end_src #+end_src
*** Configure company-quickhelp *** Configure company-quickhelp
@@ -302,6 +307,12 @@ For autocomplete
(use-package nix-mode (use-package nix-mode
:mode "\\.nix\\'") :mode "\\.nix\\'")
(add-to-list 'lsp-language-id-configuration '(nix-mode . "nix"))
(lsp-register-client
(make-lsp-client :new-connection (lsp-stdio-connection '("rnix-lsp"))
:major-modes '(nix-mode)
:server-id 'nix))
(use-package hcl-mode (use-package hcl-mode
:mod :mod
@@ -342,8 +353,8 @@ For autocomplete
centaur-tabs-set-icons t) centaur-tabs-set-icons t)
(centaur-tabs-group-buffer-groups) (centaur-tabs-group-buffer-groups)
(add-hook 'server-after-make-frame-hook 'centaur-tabs-mode) (add-hook 'server-after-make-frame-hook 'centaur-tabs-mode)
(centaur-tabs-headline-match) (set-face-attribute 'tab-line nil :inherit 'centaur-tabs-unselected)
(set-face-attribute 'tab-line nil :inherit 'centaur-tabs-unselected)) (centaur-tabs-headline-match))
#+end_src #+end_src
** Misc packages ** Misc packages
@@ -418,6 +429,13 @@ For autocomplete
(add-hook 'haskell-literate-mode-hook #'lsp) (add-hook 'haskell-literate-mode-hook #'lsp)
#+end_src #+end_src
* Random eye candy stuff
#+begin_src emacs-lisp
(use-package pretty-mode
:config
(global-pretty-mode t))
#+end_src
* Custom mode line * Custom mode line
#+begin_src emacs-lisp #+begin_src emacs-lisp
(defface mode-line-buf-name (defface mode-line-buf-name

4
home/natto/config/xmonad/xmobar.hs
View File

@@ -16,7 +16,9 @@ white = "#eee8d5"
config :: Config config :: Config
config = config =
defaultConfig defaultConfig
{ font = "xft:Fira Mono:style=Regular:antialias=true:pixelsize,Font Awesome 5 Brands:pixelsize=16,Font Awesome 5 Free:pixelsize=16:style=Solid,Lohit Devanagari:style=Regular:pixelsize=16,Lohit Gurmukhi:style=Regular:pixelsize=16,Noto Sans CJK JP:style=Regular:pixelsize=16,Noto Sans CJK KR:style=Regular:pixelsize=16,Noto Sans CJK SC:style=Regular:pixelsize=16", {
--font = "xft:Fira Mono:style=Regular:antialias=true:pixelsize,Font Awesome 5 Brands:pixelsize=16,Font Awesome 5 Free:pixelsize=16:style=Solid,Lohit Devanagari:style=Regular:pixelsize=16,Lohit Gurmukhi:style=Regular:pixelsize=16,Noto Sans CJK JP:style=Regular:pixelsize=16,Noto Sans CJK KR:style=Regular:pixelsize=16,Noto Sans CJK SC:style=Regular:pixelsize=16",
font = "xft:Fira Mono:style=Regular:antialias=true:pixelsize,Font Awesome 5 Brands:pixelsize=16,Font Awesome 5 Free:pixelsize=16:style=Solid,Lohit Devanagari:style=Regular:pixelsize=16,Lohit Gurmukhi:style=Regular:pixelsize=16,HanaMinA:style=Regular:pixelsize=16,HanaMinB:style=Regular:pixelsize=16",
additionalFonts = additionalFonts =
[ "xft:Font Awesome 5 Free:pixelsize=15:style=Solid", [ "xft:Font Awesome 5 Free:pixelsize=15:style=Solid",
"xft:Font Awesome 5 Brands:pixelsize=15" "xft:Font Awesome 5 Brands:pixelsize=15"

4
home/natto/config/xmonad/xmonad.hs
View File

@@ -38,7 +38,7 @@ myManageHook = composeAll
, className =? "Anki" --> doFloat , className =? "Anki" --> doFloat
] ]
tabConfig = defaultTheme { tabConfig = def {
activeTextColor = bgColor, activeTextColor = bgColor,
activeColor = fgColor, activeColor = fgColor,
inactiveTextColor = fgColor, inactiveTextColor = fgColor,
@@ -55,7 +55,7 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
spawn $ XMonad.terminal conf) spawn $ XMonad.terminal conf)
, ((modMask, xK_d), , ((modMask, xK_d),
spawn "/usr/bin/env dmenu_run -l 20") spawn "dmenu_run -l 20")
, ((shiftMask, xK_Print), , ((shiftMask, xK_Print),
spawn "flameshot gui") spawn "flameshot gui")

1
home/natto/pkgs.nix
View File

@@ -84,6 +84,7 @@
(qjackctl.override { jackSession = true; }) (qjackctl.override { jackSession = true; })
stable.lmms stable.lmms
# stable.blender # stable.blender
thunderbird
neomutt neomutt
mailcap mailcap
element-desktop element-desktop

2
home/natto/services.nix
View File

@@ -97,7 +97,7 @@ in
type "httpd" type "httpd"
quality "9" quality "9"
name "Vorbis Stream" name "Vorbis Stream"
port "8000" port "8001"
max_clients "4" max_clients "4"
} }
filesystem_charset "UTF-8" filesystem_charset "UTF-8"

2
hosts/satori/networking.nix
View File

@@ -6,7 +6,7 @@
wireless.enable = true; wireless.enable = true;
wireless.interfaces = [ "wlp0s20f3" ]; wireless.interfaces = [ "wlp0s20f3" ];
firewall = { firewall = {
allowedTCPPorts = [ 22 18172 6600 8000 ]; allowedTCPPorts = [ 22 18172 6600 8001 ];
allowedUDPPorts = [ 22 17840 18172 ]; allowedUDPPorts = [ 22 17840 18172 ];
}; };
interfaces = { interfaces = {

1
hosts/satori/nix.nix
View File

@@ -10,7 +10,6 @@
substituters = [ substituters = [
"https://nix-gaming.cachix.org" "https://nix-gaming.cachix.org"
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
"https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store"
]; ];
trusted-public-keys = [ trusted-public-keys = [
"nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="

9
hosts/satori/pkgs.nix
View File

@@ -5,13 +5,13 @@
w3m w3m
tmux tmux
bc bc
ghc
gnumake gnumake
pciutils pciutils
ntfs3g ntfs3g
python3 python3
htop htop
nodejs nodejs
ghc
wget wget
ripgrep ripgrep
kbd kbd
@@ -24,15 +24,8 @@
docker-compose docker-compose
nodePackages.typescript nodePackages.typescript
rust-bin.nightly.latest.default rust-bin.nightly.latest.default
#language servers
rust-analyzer
ccls
clang-tools clang-tools
nodePackages.typescript-language-server
nodePackages.vscode-langservers-extracted
rnix-lsp rnix-lsp
python3Packages.python-lsp-server
haskell-language-server
vulkan-tools vulkan-tools
vulkan-headers vulkan-headers
msr-tools msr-tools

3
hosts/satori/services.nix
View File

@@ -3,11 +3,12 @@
{ {
services = { services = {
tor.enable = true; tor.enable = true;
logmein-hamachi.enable = true; logmein-hamachi.enable = false;
openssh = { openssh = {
enable = true; enable = true;
permitRootLogin = "yes"; permitRootLogin = "yes";
}; };
btrfs.autoScrub.enable = true; btrfs.autoScrub.enable = true;
udev.extraRules = '' udev.extraRules = ''
ACTION=="add|change", KERNEL=="sda", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="bfq" ACTION=="add|change", KERNEL=="sda", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="bfq"

3
hosts/satori/stuff.nix
View File

@@ -43,7 +43,8 @@
font-awesome font-awesome
monoid monoid
office-code-pro office-code-pro
noto-fonts-cjk hanazono
# noto-fonts-cjk
]; ];
users.users.natto = { users.users.natto = {
isNormalUser = true; isNormalUser = true;

4
modules/graphics.nix
View File

@@ -48,6 +48,10 @@ in
nvidiaBusId = "PCI:1:0:0"; nvidiaBusId = "PCI:1:0:0";
}; };
modesetting = { enable = true; }; modesetting = { enable = true; };
powerManagement = {
enable = true;
finegrained = true;
};
}; };
}; };
services.xserver = { services.xserver = {

2
modules/nvim/init.lua
View File

@@ -207,7 +207,7 @@ local on_attach = function(client, bufnr)
buf_set_keymap('n', "<M-f>", "<cmd>lua vim.lsp.buf.formatting()<CR>", {silent=true, noremap=true}) buf_set_keymap('n', "<M-f>", "<cmd>lua vim.lsp.buf.formatting()<CR>", {silent=true, noremap=true})
end end
local servers = { "ccls", "rust_analyzer", "tsserver", "hls", "pylsp", "texlab", "rnix", "terraform_lsp", "html", "cssls", "jsonls", "svelte", "gopls" } local servers = { "clangd", "rust_analyzer", "tsserver", "hls", "pylsp", "texlab", "rnix", "terraform_lsp", "html", "cssls", "jsonls", "svelte", "gopls" }
local capabilities = vim.lsp.protocol.make_client_capabilities() local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities.textDocument.completion.completionItem.snippetSupport = true capabilities.textDocument.completion.completionItem.snippetSupport = true
capabilities.textDocument.completion.completionItem.resolveSupport = { capabilities.textDocument.completion.completionItem.resolveSupport = {

2
modules/sound.nix
View File

@@ -9,7 +9,7 @@
support32Bit = true; support32Bit = true;
}; };
pulse.enable = true; pulse.enable = true;
jack.enable = true; # jack.enable = true;
socketActivation = true; socketActivation = true;
# https://nixos.wiki/wiki/PipeWire#Low-latency_setup # https://nixos.wiki/wiki/PipeWire#Low-latency_setup

50
overlays/emacs/default.nix
View File

@@ -17,54 +17,6 @@ emacsWithPackagesFromUsePackage {
alwaysTangle = true; alwaysTangle = true;
extraEmacsPackages = epkgs: with epkgs; [ extraEmacsPackages = epkgs: with epkgs; [
use-package use-package
tsc (epkgs.tree-sitter-langs.withPlugins (_: epkgs.tree-sitter-langs.plugins))
]; ];
#https://github.com/NixOS/nixpkgs/issues/108089
override = epkgs: epkgs // {
tsc = epkgs.melpaPackages.tsc.overrideAttrs (oa:
let
version = "0.18.0";
tsc-dyn = fetchurl {
url = "https://github.com/emacs-tree-sitter/elisp-tree-sitter/releases/download/${version}/tsc-dyn.so";
sha256 = "sha256-97KDzdYNJN4ceJeuQxZtQ/7iU0CYXEp6gcSM9rNwlyE=";
};
in
{
postInstall = ''
cp ${tsc-dyn} $out/share/emacs/site-lisp/elpa/tsc-${oa.version}/tsc-dyn.so
echo -n ${version} > $out/share/emacs/site-lisp/elpa/tsc-${oa.version}/DYN-VERSION
'';
});
tree-sitter-langs = epkgs.melpaPackages.tree-sitter-langs.overrideAttrs (oa:
let
version = "0.11.3";
tree-sitter-grammars = stdenv.mkDerivation rec {
inherit version;
name = "tree-sitter-grammars";
src = fetchzip {
url = "https://github.com/emacs-tree-sitter/tree-sitter-langs/releases/download/${version}/tree-sitter-grammars-linux-${version}.tar.gz";
sha256 = "sha256-85Yy6NuEVnibehmalz2qr0pCENYwmxsyyIf0TUYnDY8=";
stripRoot = false;
};
installPhase = ''
install -d $out/langs/bin
echo -n "${version}" > $out/langs/bin/BUNDLE-VERSION
install -m444 * $out/langs/bin
'';
};
in
{
src = fetchFromGitHub {
owner = "emacs-tree-sitter";
repo = "tree-sitter-langs";
rev = version;
sha256 = "sha256-Br+ON7a8FWoU75ySPSP2DkiyHjj80TP5XvcMMJrU9+k=";
};
postPatch = ''
substituteInPlace ./tree-sitter-langs-build.el \
--replace "tree-sitter-langs-grammar-dir tree-sitter-langs--dir" "tree-sitter-langs-grammar-dir \"${tree-sitter-grammars}/langs\""
'';
});
gruvbox-theme = epkgs.melpaPackages.gruvbox-theme.overrideAttrs (_: { patches = [ ./gruvbox-el.patch ]; });
};
} }