Merge branch 'main' of https://git.xenia.me.uk/xenia/nixos
This commit is contained in:
commit
ca1e6f52b8
23
flake.lock
23
flake.lock
|
|
@ -203,6 +203,28 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"kmonad": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"dir": "nix",
|
||||
"lastModified": 1698213131,
|
||||
"narHash": "sha256-RPfi08g5DHvq5oEX57sJ1al2smBk0d9d8gAzL7jRnNQ=",
|
||||
"owner": "kmonad",
|
||||
"repo": "kmonad",
|
||||
"rev": "1b2ec006259ddbe6cda30db8eb783e8177a9f12b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"dir": "nix",
|
||||
"owner": "kmonad",
|
||||
"repo": "kmonad",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-index-database": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -242,6 +264,7 @@
|
|||
"root": {
|
||||
"inputs": {
|
||||
"home-manager": "home-manager",
|
||||
"kmonad": "kmonad",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"stylix": "stylix"
|
||||
|
|
|
|||
17
flake.nix
17
flake.nix
|
|
@ -15,10 +15,14 @@
|
|||
url = "github:danth/stylix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
kmonad = {
|
||||
url = "github:kmonad/kmonad?dir=nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs =
|
||||
{ self, nixpkgs, home-manager, nix-index-database, stylix, ... }@inputs:
|
||||
outputs = { self, nixpkgs, home-manager, nix-index-database, stylix, kmonad
|
||||
, ... }@inputs:
|
||||
let
|
||||
default = {
|
||||
hostName = "Atlas";
|
||||
|
|
@ -56,6 +60,7 @@
|
|||
home-manager.nixosModules.home-manager
|
||||
nix-index-database.nixosModules.nix-index
|
||||
stylix.nixosModules.stylix
|
||||
kmonad.nixosModules.default
|
||||
({ config, lib, pkgs, ... }: {
|
||||
boot.loader = {
|
||||
systemd-boot.enable = true;
|
||||
|
|
@ -167,15 +172,13 @@
|
|||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ/ZSSCN5sqrA+tdoIZr5EUm5DRuBV4dQ7J+QBEtUwUU xenia@Northstar"
|
||||
];
|
||||
in {
|
||||
root = {
|
||||
shell = pkgs.${shell};
|
||||
openssh = { inherit authorizedKeys; };
|
||||
};
|
||||
root.openssh = { inherit authorizedKeys; };
|
||||
${user} = {
|
||||
inherit group;
|
||||
isNormalUser = true;
|
||||
description = "Evie Litherland-Smith";
|
||||
extraGroups = [ "networkmanager" "wheel" "video" ];
|
||||
extraGroups =
|
||||
[ "networkmanager" "wheel" "video" "input" "uinput" ];
|
||||
shell = pkgs.${shell};
|
||||
initialHashedPassword =
|
||||
"$y$j9T$tHIPQt09Kf3KH2eIRze3g/$2mwSlcq27DTGvHNPJ5EP9/1CfL3bXP0F6oS/Vuffmn3";
|
||||
|
|
|
|||
|
|
@ -214,8 +214,6 @@
|
|||
;; Doom-Modeline
|
||||
(setq doom-modeline-icon t
|
||||
doom-modeline-mu4e nil ;; Use mu4e own formatting
|
||||
doom-modeline-modal nil
|
||||
doom-modeline-modal-icon nil
|
||||
doom-modeline-persp-name nil
|
||||
doom-modeline-persp-icon nil)
|
||||
(use-package doom-modeline
|
||||
|
|
@ -273,8 +271,10 @@
|
|||
(keymap-global-set "C-c o j n" #'org-journal-new-date-entry)
|
||||
(keymap-global-set "C-c o j s" #'org-journal-new-scheduled-entry)
|
||||
|
||||
(add-hook 'org-mode-hook #'org-modern-mode)
|
||||
(add-hook 'org-agenda-finalize-hook #'org-modern-agenda)
|
||||
(use-package org-modern
|
||||
:ensure t
|
||||
:hook ((org-mode . org-modern-mode)
|
||||
(org-agenda-finalize . org-modern-agenda)))
|
||||
|
||||
(setq org-agenda-span 'week
|
||||
org-agenda-start-on-weekday 1
|
||||
|
|
@ -378,10 +378,12 @@
|
|||
(ibuffer-do-sort-by-project-file-relative))))))
|
||||
|
||||
(use-package treesit-auto
|
||||
:ensure t
|
||||
:config (global-treesit-auto-mode +1))
|
||||
|
||||
(setq direnv-always-show-summary nil)
|
||||
(use-package direnv
|
||||
:ensure t
|
||||
:config (direnv-mode +1))
|
||||
|
||||
(when (require 'eglot nil :noerror)
|
||||
|
|
@ -498,15 +500,14 @@ manually with something like this:
|
|||
("<remap> <imenu>" . consult-imenu )
|
||||
("<remap> <switch-to-buffer>" . consult-buffer)
|
||||
("<remap> <project-switch-to-buffer>" . consult-project-buffer)
|
||||
("<remap> <org-goto>" . consult-org-heading)
|
||||
("C-c s s" . consult-line)
|
||||
("C-c s f" . consult-fd)
|
||||
("C-c s g" . consult-ripgrep)
|
||||
("C-c s e" . consult-flymake)
|
||||
("C-c s t" . consult-theme)
|
||||
:map minibuffer-local-map
|
||||
("C-r" . consult-history)
|
||||
:map org-mode-map
|
||||
("<remap> <org-goto>" . consult-org-heading))
|
||||
("C-r" . consult-history))
|
||||
:config (setq completion-in-region-function #'consult-completion-in-region))
|
||||
|
||||
(use-package embark
|
||||
|
|
|
|||
|
|
@ -245,8 +245,6 @@
|
|||
;; Doom-Modeline
|
||||
(setq doom-modeline-icon t
|
||||
doom-modeline-mu4e nil ;; Use mu4e own formatting
|
||||
doom-modeline-modal nil
|
||||
doom-modeline-modal-icon nil
|
||||
doom-modeline-persp-name nil
|
||||
doom-modeline-persp-icon nil)
|
||||
(use-package doom-modeline
|
||||
|
|
@ -314,8 +312,10 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
|
|||
(keymap-global-set "C-c o j n" #'org-journal-new-date-entry)
|
||||
(keymap-global-set "C-c o j s" #'org-journal-new-scheduled-entry)
|
||||
|
||||
(add-hook 'org-mode-hook #'org-modern-mode)
|
||||
(add-hook 'org-agenda-finalize-hook #'org-modern-agenda)
|
||||
(use-package org-modern
|
||||
:ensure t
|
||||
:hook ((org-mode . org-modern-mode)
|
||||
(org-agenda-finalize . org-modern-agenda)))
|
||||
#+end_src
|
||||
|
||||
** org-agenda
|
||||
|
|
@ -439,10 +439,12 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
|
|||
(ibuffer-do-sort-by-project-file-relative))))))
|
||||
|
||||
(use-package treesit-auto
|
||||
:ensure t
|
||||
:config (global-treesit-auto-mode +1))
|
||||
|
||||
(setq direnv-always-show-summary nil)
|
||||
(use-package direnv
|
||||
:ensure t
|
||||
:config (direnv-mode +1))
|
||||
#+END_SRC
|
||||
|
||||
|
|
@ -499,7 +501,7 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
|
|||
(use-package magit
|
||||
:ensure t)
|
||||
#+end_src
|
||||
** [5/7] Completion
|
||||
** [5/6] Completion
|
||||
*** DONE Vertico
|
||||
#+begin_src emacs-lisp
|
||||
(setq vertico-cycle t)
|
||||
|
|
@ -581,15 +583,14 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
|
|||
("<remap> <imenu>" . consult-imenu )
|
||||
("<remap> <switch-to-buffer>" . consult-buffer)
|
||||
("<remap> <project-switch-to-buffer>" . consult-project-buffer)
|
||||
("<remap> <org-goto>" . consult-org-heading)
|
||||
("C-c s s" . consult-line)
|
||||
("C-c s f" . consult-fd)
|
||||
("C-c s g" . consult-ripgrep)
|
||||
("C-c s e" . consult-flymake)
|
||||
("C-c s t" . consult-theme)
|
||||
:map minibuffer-local-map
|
||||
("C-r" . consult-history)
|
||||
:map org-mode-map
|
||||
("<remap> <org-goto>" . consult-org-heading))
|
||||
("C-r" . consult-history))
|
||||
:config (setq completion-in-region-function #'consult-completion-in-region))
|
||||
#+end_src
|
||||
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@
|
|||
accounts-daemon.enable = true;
|
||||
dbus.packages = with pkgs; [ gcr ];
|
||||
gnome.gnome-keyring.enable = true;
|
||||
kmonad.enable = true;
|
||||
pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
|
|
@ -43,6 +44,7 @@
|
|||
enable = true;
|
||||
layout = "gb";
|
||||
xkbVariant = "";
|
||||
xkbOptions = "compose:ralt";
|
||||
displayManager.lightdm = {
|
||||
enable = true;
|
||||
greeters.gtk = {
|
||||
|
|
|
|||
Loading…
Reference in a new issue