Compare commits
No commits in common. "771b7b1a42960a37a3cad91a963be3d242839723" and "ab8d8f068d43330650ef900f3da40715f36cd8bb" have entirely different histories.
771b7b1a42
...
ab8d8f068d
@ -78,7 +78,6 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
nix = {
|
nix = {
|
||||||
nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
|
|
||||||
distributedBuilds = true;
|
distributedBuilds = true;
|
||||||
optimise.automatic = true;
|
optimise.automatic = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
|||||||
@ -451,17 +451,17 @@ later.
|
|||||||
Configurations to add linting support to specific languages by integrating linters with flycheck.
|
Configurations to add linting support to specific languages by integrating linters with flycheck.
|
||||||
|
|
||||||
#+begin_src emacs-lisp :tangle ./config.el
|
#+begin_src emacs-lisp :tangle ./config.el
|
||||||
;; (use-package! flycheck
|
(use-package! flycheck
|
||||||
;; :config
|
:config
|
||||||
;; (flycheck-define-checker deadnix
|
(flycheck-define-checker nix-statix
|
||||||
;; "A syntax checker for Nix using deadnix."
|
"A syntax checker for Nix using Statix."
|
||||||
;; :command ("deadnix" "--fail" source)
|
:command ("statix" "check" source)
|
||||||
;; :error-patterns
|
:error-patterns
|
||||||
;; ((warning line-start (file-name) ":" line ":" column
|
((warning line-start (file-name) ":" line ":" column
|
||||||
;; ": " (message) line-end))
|
": " (message) line-end))
|
||||||
;; :modes (nix-mode))
|
:modes (nix-mode))
|
||||||
|
|
||||||
;; (add-to-list 'flycheck-checkers 'deadnix))
|
(add-to-list 'flycheck-checkers 'nix-statix))
|
||||||
#+end_src
|
#+end_src
|
||||||
* GPT
|
* GPT
|
||||||
Integrate most AI agents with emacs on a way that through api keys it can do
|
Integrate most AI agents with emacs on a way that through api keys it can do
|
||||||
|
|||||||
@ -1,36 +1,13 @@
|
|||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
config,
|
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
# misc
|
startupScript = pkgs.pkgs.writeShellScriptBin "start" ''
|
||||||
mod = "SUPER";
|
${pkgs.waybar}/bin/waybar &
|
||||||
# waybar
|
${pkgs.swww}/bin/swww init &
|
||||||
inherit (config.lib.stylix) colors;
|
sleep 1
|
||||||
net-icons = [
|
'';
|
||||||
""
|
|
||||||
""
|
|
||||||
""
|
|
||||||
""
|
|
||||||
""
|
|
||||||
];
|
|
||||||
generic-percent-icons = [
|
|
||||||
"▁"
|
|
||||||
"▂"
|
|
||||||
"▃"
|
|
||||||
"▄"
|
|
||||||
"▅"
|
|
||||||
"▆"
|
|
||||||
"▇"
|
|
||||||
"█"
|
|
||||||
];
|
|
||||||
temp-icons = [
|
|
||||||
""
|
|
||||||
""
|
|
||||||
""
|
|
||||||
""
|
|
||||||
];
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
programs.hyprland.enable = true;
|
programs.hyprland.enable = true;
|
||||||
@ -45,144 +22,35 @@ in
|
|||||||
enable = true;
|
enable = true;
|
||||||
extraPortals = [
|
extraPortals = [
|
||||||
pkgs.xdg-desktop-portal-hyprland
|
pkgs.xdg-desktop-portal-hyprland
|
||||||
|
# pkgs.xdg-desktop-portal-gtk
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
users.users.jawz.packages = builtins.attrValues {
|
users.users.jawz.packages = builtins.attrValues {
|
||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
# Wayland utilities
|
# Wayland utilities
|
||||||
wl-clipboard-rs
|
wl-clipboard
|
||||||
wf-recorder
|
wf-recorder
|
||||||
grimblast # screenshots
|
grim
|
||||||
|
slurp
|
||||||
|
|
||||||
mako # notification daemon
|
wofi # Application launcher
|
||||||
|
mako # Notification daemon
|
||||||
libnotify # dependency of mako
|
libnotify # dependency of mako
|
||||||
swaylock-effects # screen locker
|
swaylock-effects # Screen locker
|
||||||
yazi # file manager
|
# nautilus # File manager
|
||||||
imv # images
|
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
home-manager.users.jawz = {
|
home-manager.users.jawz = {
|
||||||
programs = {
|
programs.kitty.enable = true;
|
||||||
wofi = {
|
|
||||||
enable = true;
|
|
||||||
settings = {
|
|
||||||
allow_images = true;
|
|
||||||
allow_markup = true;
|
|
||||||
insensitive = true;
|
|
||||||
width = "30%";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
waybar = {
|
|
||||||
enable = true;
|
|
||||||
systemd.enable = true;
|
|
||||||
settings.main-bar = {
|
|
||||||
layer = "top";
|
|
||||||
tray.spacing = 5;
|
|
||||||
clock.format = "{:%H:%M %F}";
|
|
||||||
modules-left = [
|
|
||||||
"niri/workspaces"
|
|
||||||
"custom/sep"
|
|
||||||
"niri/window"
|
|
||||||
];
|
|
||||||
modules-center = [
|
|
||||||
"mpris"
|
|
||||||
];
|
|
||||||
modules-right = [
|
|
||||||
"cpu"
|
|
||||||
"temperature"
|
|
||||||
"memory"
|
|
||||||
"backlight"
|
|
||||||
"pulseaudio"
|
|
||||||
"battery"
|
|
||||||
"custom/recorder"
|
|
||||||
"clock"
|
|
||||||
"tray"
|
|
||||||
];
|
|
||||||
"hyprland/window".icon = true;
|
|
||||||
"niri/window".icon = true;
|
|
||||||
"niri/workspaces" = {
|
|
||||||
format = "{icon}";
|
|
||||||
format-icons = {
|
|
||||||
active = "";
|
|
||||||
default = "";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
cava = {
|
|
||||||
format-icons = generic-percent-icons;
|
|
||||||
bars = 14;
|
|
||||||
method = "pulse";
|
|
||||||
framerate = 20;
|
|
||||||
bar_delimiter = 0;
|
|
||||||
stereo = false;
|
|
||||||
};
|
|
||||||
network = {
|
|
||||||
format = "{icon} {ipaddr}";
|
|
||||||
format-icons = net-icons;
|
|
||||||
};
|
|
||||||
# pulseaudio = {
|
|
||||||
# format = "{icon} {volume}%";
|
|
||||||
# format-muted = "vol: muted";
|
|
||||||
# format-icons.default = audio-icons;
|
|
||||||
# on-click = "pavucontrol";
|
|
||||||
# scroll-step = 1;
|
|
||||||
# };
|
|
||||||
cpu = {
|
|
||||||
interval = 1;
|
|
||||||
format = " {icon}";
|
|
||||||
format-icons = generic-percent-icons;
|
|
||||||
tooltip-format = "usage: {usage}%\nload: {load}";
|
|
||||||
};
|
|
||||||
memory = {
|
|
||||||
interval = 1;
|
|
||||||
format = " {icon}";
|
|
||||||
format-icons = generic-percent-icons;
|
|
||||||
tooltip-format = "{used} GiB / {total} GiB \n{percentage}%";
|
|
||||||
};
|
|
||||||
temperature = {
|
|
||||||
interval = 1;
|
|
||||||
critical-threshold = 80;
|
|
||||||
format = "{temperatureC}°C";
|
|
||||||
format-icons = temp-icons;
|
|
||||||
};
|
|
||||||
mpris = {
|
|
||||||
format = "{status_icon} {dynamic}";
|
|
||||||
dynamic-len = 60;
|
|
||||||
interval = 5;
|
|
||||||
status-icons = {
|
|
||||||
paused = "";
|
|
||||||
playing = "";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
style = ''
|
|
||||||
* {
|
|
||||||
border: none;
|
|
||||||
font-family: "${config.stylix.fonts.monospace.name}";
|
|
||||||
font-size: ${toString config.stylix.fonts.sizes.desktop}pt;
|
|
||||||
color: #${colors.base04};
|
|
||||||
}
|
|
||||||
window#waybar {
|
|
||||||
background: #${colors.base00};
|
|
||||||
}
|
|
||||||
.module {
|
|
||||||
background: #${colors.base00};
|
|
||||||
margin: 0px 5px 0px 5px;
|
|
||||||
padding: 0px 0px 0px 5px;
|
|
||||||
}
|
|
||||||
#workspaces button {
|
|
||||||
padding: 0px;
|
|
||||||
border-bottom: 0px none transparent;
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
wayland.windowManager.hyprland = {
|
wayland.windowManager.hyprland = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
"$mainMod" = "SUPER";
|
||||||
|
exec-once = "${startupScript}/bin/start";
|
||||||
general = {
|
general = {
|
||||||
gaps_in = 5;
|
gaps_in = 5;
|
||||||
gaps_out = 10;
|
gaps_out = 10;
|
||||||
border_size = 3;
|
border_size = 2;
|
||||||
layout = "dwindle";
|
layout = "dwindle";
|
||||||
};
|
};
|
||||||
dwindle = {
|
dwindle = {
|
||||||
@ -191,78 +59,49 @@ in
|
|||||||
force_split = 2;
|
force_split = 2;
|
||||||
};
|
};
|
||||||
bind = [
|
bind = [
|
||||||
"${mod}, return, exec, ghostty"
|
"$mainMod, return, exec, kitty"
|
||||||
"${mod}, Q, killactive,"
|
"$mainMod, Q, killactive,"
|
||||||
"${mod} SHIFT, F, togglefloating,"
|
"$mainMod SHIFT, F, togglefloating,"
|
||||||
"${mod}, F, fullscreen,"
|
"$mainMod, F, fullscreen,"
|
||||||
"${mod}, T, pin,"
|
"$mainMod, T, pin,"
|
||||||
"${mod}, G, togglegroup,"
|
"$mainMod, G, togglegroup,"
|
||||||
"${mod}, bracketleft, changegroupactive, b"
|
"$mainMod, bracketleft, changegroupactive, b"
|
||||||
"${mod}, bracketright, changegroupactive, f"
|
"$mainMod, bracketright, changegroupactive, f"
|
||||||
"${mod}, S, exec, wofi --show drun icons"
|
"$mainMod, S, exec, wofi --show drun icons"
|
||||||
"${mod}, P, pin, active"
|
"$mainMod, P, pin, active"
|
||||||
|
|
||||||
"${mod}, left, movefocus, l"
|
|
||||||
"${mod}, right, movefocus, r"
|
|
||||||
"${mod}, up, movefocus, u"
|
|
||||||
"${mod}, down, movefocus, d"
|
|
||||||
|
|
||||||
"${mod}, h, movefocus, l"
|
|
||||||
"${mod}, l, movefocus, r"
|
|
||||||
"${mod}, k, movefocus, u"
|
|
||||||
"${mod}, j, movefocus, d"
|
|
||||||
|
|
||||||
"${mod} SHIFT, left, movewindow, l"
|
|
||||||
"${mod} SHIFT, right, movewindow, r"
|
|
||||||
"${mod} SHIFT, up, movewindow, u"
|
|
||||||
"${mod} SHIFT, down, movewindow, d"
|
|
||||||
|
|
||||||
"${mod} SHIFT, h, movewindow, l"
|
|
||||||
"${mod} SHIFT, l, movewindow, r"
|
|
||||||
"${mod} SHIFT, k, movewindow, u"
|
|
||||||
"${mod} SHIFT, j, movewindow, d"
|
|
||||||
|
|
||||||
"${mod}, 1, workspace, 1"
|
|
||||||
"${mod}, 2, workspace, 2"
|
|
||||||
"${mod}, 3, workspace, 3"
|
|
||||||
"${mod}, 4, workspace, 4"
|
|
||||||
"${mod}, 5, workspace, 5"
|
|
||||||
"${mod}, 6, workspace, 6"
|
|
||||||
"${mod}, 7, workspace, 7"
|
|
||||||
"${mod}, 8, workspace, 8"
|
|
||||||
"${mod}, 9, workspace, 9"
|
|
||||||
"${mod}, 0, workspace, 10"
|
|
||||||
"${mod} SHIFT, 1, movetoworkspace, 1"
|
|
||||||
"${mod} SHIFT, 2, movetoworkspace, 2"
|
|
||||||
"${mod} SHIFT, 3, movetoworkspace, 3"
|
|
||||||
"${mod} SHIFT, 4, movetoworkspace, 4"
|
|
||||||
"${mod} SHIFT, 5, movetoworkspace, 5"
|
|
||||||
"${mod} SHIFT, 6, movetoworkspace, 6"
|
|
||||||
"${mod} SHIFT, 7, movetoworkspace, 7"
|
|
||||||
"${mod} SHIFT, 8, movetoworkspace, 8"
|
|
||||||
"${mod} SHIFT, 9, movetoworkspace, 9"
|
|
||||||
"${mod} SHIFT, 0, movetoworkspace, 10"
|
|
||||||
|
|
||||||
"${mod}, F3, exec, grimblast save area ~/Pictures/screenshots/$(date +'%Y-%m-%d_%H-%M-%S').png"
|
|
||||||
"${mod} SHIFT, F3, exec, grimblast save screen ~/Pictures/screenshots/$(date +'%Y-%m-%d_%H-%M-%S').png"
|
|
||||||
];
|
|
||||||
binde = [
|
|
||||||
"${mod} SHIFT, h, moveactive, -20 0"
|
|
||||||
"${mod} SHIFT, l, moveactive, 20 0"
|
|
||||||
"${mod} SHIFT, k, moveactive, 0 -20"
|
|
||||||
"${mod} SHIFT, j, moveactive, 0 20"
|
|
||||||
|
|
||||||
"${mod} CTRL, l, resizeactive, 30 0"
|
|
||||||
"${mod} CTRL, h, resizeactive, -30 0"
|
|
||||||
"${mod} CTRL, k, resizeactive, 0 -10"
|
|
||||||
"${mod} CTRL, j, resizeactive, 0 10"
|
|
||||||
|
|
||||||
",XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%+"
|
",XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%+"
|
||||||
",XF86AudioLowerVolume, exec, wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%-"
|
",XF86AudioLowerVolume, exec, wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%-"
|
||||||
|
|
||||||
|
"$mainMod, left, movefocus, l"
|
||||||
|
"$mainMod, right, movefocus, r"
|
||||||
|
"$mainMod, up, movefocus, u"
|
||||||
|
"$mainMod, down, movefocus, d"
|
||||||
|
|
||||||
|
"$mainMod, h, movefocus, l"
|
||||||
|
"$mainMod, l, movefocus, r"
|
||||||
|
"$mainMod, k, movefocus, u"
|
||||||
|
"$mainMod, j, movefocus, d"
|
||||||
|
|
||||||
|
"$mainMod SHIFT, h, movewindow, l"
|
||||||
|
"$mainMod SHIFT, l, movewindow, r"
|
||||||
|
"$mainMod SHIFT, k, movewindow, u"
|
||||||
|
"$mainMod SHIFT, j, movewindow, d"
|
||||||
|
];
|
||||||
|
binde = [
|
||||||
|
"$mainMod SHIFT, h, moveactive, -20 0"
|
||||||
|
"$mainMod SHIFT, l, moveactive, 20 0"
|
||||||
|
"$mainMod SHIFT, k, moveactive, 0 -20"
|
||||||
|
"$mainMod SHIFT, j, moveactive, 0 20"
|
||||||
|
|
||||||
|
"$mainMod CTRL, l, resizeactive, 30 0"
|
||||||
|
"$mainMod CTRL, h, resizeactive, -30 0"
|
||||||
|
"$mainMod CTRL, k, resizeactive, 0 -10"
|
||||||
|
"$mainMod CTRL, j, resizeactive, 0 10"
|
||||||
];
|
];
|
||||||
bindm = [
|
bindm = [
|
||||||
"${mod}, mouse:272, movewindow"
|
"$mainMod, mouse:272, movewindow"
|
||||||
"${mod}, mouse:273, resizewindow"
|
"$mainMod, mouse:273, resizewindow"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
12
flake.lock
generated
12
flake.lock
generated
@ -125,11 +125,11 @@
|
|||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759394468,
|
"lastModified": 1759221805,
|
||||||
"narHash": "sha256-mPbw6N6ERaUfaoXcuq7+pzbIiSYgymxw1ZU8dImHaQo=",
|
"narHash": "sha256-gKne7A7DWffiqdfUPdX4TK1/a4FU942LM7e6E8ORsTY=",
|
||||||
"owner": "marienz",
|
"owner": "marienz",
|
||||||
"repo": "nix-doom-emacs-unstraightened",
|
"repo": "nix-doom-emacs-unstraightened",
|
||||||
"rev": "84f91b8df69b7cb904fc6caae3a77d0742d70285",
|
"rev": "5697968fa38469d12012706d9322211de10309c9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -164,11 +164,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759370635,
|
"lastModified": 1759221279,
|
||||||
"narHash": "sha256-qX5Ot+d1Hh7wvpDnt41dwJC3VqzpG+Yue4d3fM/Xlmk=",
|
"narHash": "sha256-7EAByrl70kQ2gV0opDiNhySsk9KcJiRpnnL+BEaNOhc=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "e8a15f25bcbd4e29cd7a36e1fbc3df525cca9acb",
|
"rev": "6bbda1ce5dc002b22c95323b01d40518e843a00d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@ -21,7 +21,6 @@ in
|
|||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
../../config/base.nix
|
../../config/base.nix
|
||||||
../../config/stylix.nix
|
../../config/stylix.nix
|
||||||
../../environments/hyprland.nix
|
|
||||||
];
|
];
|
||||||
my = import ./toggles.nix // {
|
my = import ./toggles.nix // {
|
||||||
nix.cores = 8;
|
nix.cores = 8;
|
||||||
@ -48,6 +47,16 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
specialisation = {
|
||||||
|
gnome.configuration = {
|
||||||
|
imports = [ ../../environments/gnome.nix ];
|
||||||
|
services.flatpak.enable = true;
|
||||||
|
};
|
||||||
|
hyprland.configuration = {
|
||||||
|
imports = [ ../../environments/hyprland.nix ];
|
||||||
|
services.flatpak.enable = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
networking = {
|
networking = {
|
||||||
hostName = "workstation";
|
hostName = "workstation";
|
||||||
firewall =
|
firewall =
|
||||||
|
|||||||
@ -9,10 +9,8 @@ let
|
|||||||
packages = builtins.attrValues {
|
packages = builtins.attrValues {
|
||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
nixfmt-rfc-style # formatting
|
nixfmt-rfc-style # formatting
|
||||||
nixfmt-tree # formatting
|
|
||||||
cachix # binary cache management
|
cachix # binary cache management
|
||||||
nixd # language server for Nix
|
nixd # language server for Nix
|
||||||
deadnix # detext unused/uneeded dependencies
|
|
||||||
statix # linter for Nix expressions
|
statix # linter for Nix expressions
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
@ -36,9 +34,9 @@ in
|
|||||||
users.users.jawz = { inherit packages; };
|
users.users.jawz = { inherit packages; };
|
||||||
home-manager.users.jawz.programs.${shellType}.shellAliases = {
|
home-manager.users.jawz.programs.${shellType}.shellAliases = {
|
||||||
nixformat = ''
|
nixformat = ''
|
||||||
deadnix -- -e && \
|
nix run unstable#deadnix -- -e && \
|
||||||
nixfmt-tree && \
|
nix run unstable#nixfmt-tree && \
|
||||||
statix fix
|
nix run unstable#statix fix
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user