Compare commits
3 Commits
d92f5cd238
...
7dcd4ccc3b
Author | SHA1 | Date |
---|---|---|
Jill | 7dcd4ccc3b | |
Jill | 80ba85c354 | |
Jill | 0111a45a58 |
24
flake.lock
24
flake.lock
|
@ -36,11 +36,11 @@
|
|||
},
|
||||
"hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1704632650,
|
||||
"narHash": "sha256-83J/nd/NoLqo3vj0S0Ppqe8L+ijIFiGL6HNDfCCUD/Q=",
|
||||
"lastModified": 1705312285,
|
||||
"narHash": "sha256-rd+dY+v61Y8w3u9bukO/hB55Xl4wXv4/yC8rCGVnK5U=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "c478b3d56969006e015e55aaece4931f3600c1b2",
|
||||
"rev": "bee2202bec57e521e3bd8acd526884b9767d7fa0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -56,11 +56,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1704099619,
|
||||
"narHash": "sha256-QRVMkdxLmv+aKGjcgeEg31xtJEIsYq4i1Kbyw5EPS6g=",
|
||||
"lastModified": 1705476964,
|
||||
"narHash": "sha256-W5OK1fnj4qdn1HWOlxV2S3YiUvfaVjQM5ldWVpGV1fs=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "7e398b3d76bc1503171b1364c9d4a07ac06f3851",
|
||||
"rev": "85c3b600f660abd86e94cbcd1c46733943197a07",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -122,11 +122,11 @@
|
|||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1704161960,
|
||||
"narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=",
|
||||
"lastModified": 1705566941,
|
||||
"narHash": "sha256-CLNtVRDA8eUPk+bxsCCZtRO0Cp+SpHdn1nNOLoFypLs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "63143ac2c9186be6d9da6035fa22620018c85932",
|
||||
"rev": "b06ff4bf8f4ad900fe0c2a61fc2946edc3a84be7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -137,11 +137,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1704420045,
|
||||
"narHash": "sha256-C36QmoJd5tdQ5R9MC1jM7fBkZW9zBUqbUCsgwS6j4QU=",
|
||||
"lastModified": 1705331948,
|
||||
"narHash": "sha256-qjQXfvrAT1/RKDFAMdl8Hw3m4tLVvMCc8fMqzJv0pP4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c1be43e8e837b8dbee2b3665a007e761680f0c3d",
|
||||
"rev": "b8dd8be3c790215716e7c12b247f45ca525867e2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -66,7 +66,8 @@
|
|||
};
|
||||
software = {
|
||||
# system
|
||||
system.alacritty.enable = true;
|
||||
#system.alacritty.enable = true;
|
||||
system.wezterm.enable = true;
|
||||
system.fish.enable = true;
|
||||
system.syncthing.enable = true;
|
||||
# dev
|
||||
|
|
|
@ -25,8 +25,8 @@ in {
|
|||
"--enable-features=VaapiVideoDecoder"
|
||||
];
|
||||
discord = (pkgs.unstable.discord-canary.override {
|
||||
withOpenASAR = true;
|
||||
withVencord = true;
|
||||
withOpenASAR = false;
|
||||
withVencord = true;
|
||||
}).overrideAttrs (old: {
|
||||
preInstall = ''
|
||||
gappsWrapperArgs+=("--add-flags" "${concatStringsSep " " flags}")
|
||||
|
|
|
@ -12,6 +12,8 @@ in {
|
|||
config = mkIf cfg.enable {
|
||||
user.packages = [ pkgs.grc ];
|
||||
|
||||
environment.systemPackages = with pkgs.fishPlugins; [ fzf-fish tide ];
|
||||
|
||||
users.defaultUserShell = pkgs.fish;
|
||||
programs.fish.enable = true;
|
||||
hm.programs.fish = let
|
||||
|
|
|
@ -0,0 +1,50 @@
|
|||
{ lib, config, ... }:
|
||||
|
||||
with lib;
|
||||
let
|
||||
cfg = config.modules.software.system.wezterm;
|
||||
in {
|
||||
options.modules.software.system.wezterm = {
|
||||
enable = mkEnableOption "Enable wezterm";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
hm.programs.wezterm = {
|
||||
enable = true;
|
||||
# custom settings
|
||||
#settings = {
|
||||
# env.TERM = "xterm-256color";
|
||||
# window.resize_increments = true;
|
||||
# colors.draw_bold_text_with_bright_colors = true;
|
||||
# font = with config.modules.desktop.fonts.fonts.monospaceBitmap; {
|
||||
# normal = { inherit family; };
|
||||
# inherit size;
|
||||
# };
|
||||
#};
|
||||
extraConfig = let
|
||||
fonts = config.modules.desktop.fonts.fonts;
|
||||
in ''
|
||||
local wezterm = require 'wezterm'
|
||||
local config = {}
|
||||
|
||||
config.font = wezterm.font '${fonts.monospaceBitmap.family}'
|
||||
config.font_size = ${toString fonts.monospaceBitmap.size}
|
||||
config.freetype_load_flags = 'MONOCHROME'
|
||||
--config.window_decorations = 'INTEGRATED_BUTTONS|RESIZE'
|
||||
config.enable_wayland = false
|
||||
config.color_scheme = 'Catppuccin Mocha'
|
||||
config.use_fancy_tab_bar = false
|
||||
config.use_resize_increments = true
|
||||
config.initial_cols = 120
|
||||
config.initial_rows = 40
|
||||
|
||||
config.window_frame = {
|
||||
font = wezterm.font '${fonts.sans.family}',
|
||||
font_size = ${toString fonts.sans.size},
|
||||
}
|
||||
|
||||
return config
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
Loading…
Reference in New Issue