.
This commit is contained in:
parent
5d0dc18d47
commit
f769a25a96
GPG key ID:
B38976E82C9DAE42
7 changed files with 67 additions and 18 deletions
3
Makefile
3
Makefile
|
|
@ -32,6 +32,9 @@ install-system: configuration.nix
|
|||
setup-fido:
|
||||
systemd-cryptenroll --fido2-device=auto /dev/disk/by-partlabel/disk-main-luks
|
||||
|
||||
setup-desktop:
|
||||
bw config server https://vaultwarden.lyrion.ch
|
||||
|
||||
install:
|
||||
nix-collect-garbage --delete-old
|
||||
env NIXPKGS_ALLOW_BROKEN=1 nixos-rebuild switch --flake .#ziltis-desktop --impure --show-trace
|
||||
|
|
|
|||
|
|
@ -61,7 +61,16 @@
|
|||
};
|
||||
|
||||
services.displayManager = {
|
||||
sddm.enable = true;
|
||||
sddm = {
|
||||
enable = true;
|
||||
wayland.enable = true;
|
||||
settings = {
|
||||
Autologin = {
|
||||
User = "zilti";
|
||||
Session = "hyprland";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services.libinput.enable = true;
|
||||
|
|
@ -237,5 +246,8 @@
|
|||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "24.05"; # Did you read the comment?
|
||||
|
||||
# The following line is completely useless. I am leaving it here just to document
|
||||
# the idiocy of all the people who keep recommending it online.
|
||||
nix.settings.experimental-features = "nix-command flakes";
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -755,6 +755,20 @@ Point must be at the beginning of balanced expression (sexp)."
|
|||
|
||||
;;;; Git
|
||||
|
||||
;; The following snippet is a convenience function for git-commit to add the ticket number, if found
|
||||
;; in the branch name, to the commit message.
|
||||
(use-package git-commit
|
||||
:hook
|
||||
(git-commit-mode
|
||||
.
|
||||
(lambda ()
|
||||
(when-let ((branch (magit-get-current-branch)))
|
||||
(when (string-match "\\(ticket\\|feature\\)-\\([[:digit]]\\{3,\\}\\)" branch)
|
||||
(let ((prefix (format "[T-%s] \n" (match-string 2 branch))))
|
||||
(goto-char (point-min))
|
||||
(insert prefix)
|
||||
(forward-char -1)))))))
|
||||
|
||||
;; Magit requires 'transient' >= 0.5.0, but due to bad defaults, Emacs' package manager refuses to
|
||||
;; upgrade this and other built-in packages to higher releases from GNU Elpa.
|
||||
(use-package transient
|
||||
|
|
|
|||
16
flake.lock
16
flake.lock
|
|
@ -27,16 +27,16 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1720042825,
|
||||
"narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
|
||||
"lastModified": 1723986931,
|
||||
"narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
|
||||
"rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-24.05",
|
||||
"ref": "master",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -59,16 +59,16 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1720386169,
|
||||
"narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
|
||||
"lastModified": 1723991338,
|
||||
"narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
|
||||
"rev": "8a3354191c0d7144db9756a74755672387b702ba",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-24.05",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,9 +18,9 @@
|
|||
};
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-24.05";
|
||||
url = "github:nix-community/home-manager/master";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
flatpaks.url = "github:GermanBread/declarative-flatpak/stable";
|
||||
|
|
|
|||
29
home.nix
29
home.nix
|
|
@ -7,7 +7,8 @@ args@{ config, pkgs, split-monitor-workspaces, flatpaks, ... }:
|
|||
home.packages = with pkgs; [
|
||||
appimage-run
|
||||
binutils
|
||||
bitwarden
|
||||
bitwarden-desktop
|
||||
bitwarden-cli
|
||||
brightnessctl
|
||||
coreutils-full
|
||||
clojure-lsp
|
||||
|
|
@ -37,7 +38,7 @@ args@{ config, pkgs, split-monitor-workspaces, flatpaks, ... }:
|
|||
libuuid
|
||||
lm_sensors
|
||||
gnumake
|
||||
mattermost
|
||||
mattermost-desktop
|
||||
# (nerdfonts.override { fonts = [ "VictorMono" "MPlus" ]; })
|
||||
nerdfonts
|
||||
nixd
|
||||
|
|
@ -149,14 +150,32 @@ args@{ config, pkgs, split-monitor-workspaces, flatpaks, ... }:
|
|||
host = "lyrion.ch";
|
||||
tls = {
|
||||
enable = true;
|
||||
useStartTls = true;
|
||||
};
|
||||
};
|
||||
smtp = {
|
||||
host = "lyrion.ch";
|
||||
tls = {
|
||||
enable = true;
|
||||
useStartTls = true;
|
||||
};
|
||||
};
|
||||
thunderbird = { enable = true; };
|
||||
aerc = { enable = true; };
|
||||
};
|
||||
bevuta = {
|
||||
realName = "Daniel Ziltener";
|
||||
userName = "daniel.ziltener@bevuta.com";
|
||||
passwordCommand = "Bevuta/E-Mail | head -n 1";
|
||||
address = "daniel.ziltener@bevuta.com";
|
||||
imap = {
|
||||
host = "mail.networkname.de";
|
||||
tls = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
smtp = {
|
||||
host = "mail.networkname.de";
|
||||
tls = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
thunderbird = { enable = true; };
|
||||
|
|
@ -217,7 +236,7 @@ args@{ config, pkgs, split-monitor-workspaces, flatpaks, ... }:
|
|||
shopt -s extglob
|
||||
shopt -s globstar
|
||||
shopt -s checkjobs
|
||||
eval "$(${pkgs.liquidprompt}/share/liquidprompt/liquidprompt)"
|
||||
eval "$(${pkgs.liquidprompt}/bin/liquidprompt)"
|
||||
eval "$(${pkgs.liquidprompt}/share/liquidprompt/themes/alternate_vcs/alternate_vcs.theme)"
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -80,14 +80,15 @@
|
|||
master = {
|
||||
new_status = "slave";
|
||||
orientation = "center";
|
||||
workspace = "w[g2] layoutopt:orientation:left";
|
||||
workspace = "w[g2], layoutopt:orientation:left";
|
||||
always_center_master = true;
|
||||
mfact = 0.5;
|
||||
special_scale_factor = 0.8;
|
||||
};
|
||||
gestures = { workspace_swipe = false; };
|
||||
|
||||
"$lockscreen" = "${pkgs.swaylock-effects}/bin/swaylock";
|
||||
# "$lockscreen" = "${pkgs.swaylock-effects}/bin/swaylock";
|
||||
"$lockscreen" = "${pkgs.hyprlock}/bin/hyprlock";
|
||||
"$mainMod" = "SUPER";
|
||||
|
||||
bind = [
|
||||
|
|
|
|||
Loading…
Reference in a new issue