1
0
Fork 0
forked from fabian/nix

Compare commits

..

No commits in common. "bcfc8bbe9607039ead39090e79f34d71f08563f1" and "4136bfe92db65c69d7e8943a0b7c9b08641a1d95" have entirely different histories.

10 changed files with 29 additions and 98 deletions

30
flake.lock generated
View file

@ -97,11 +97,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758463745, "lastModified": 1756679287,
"narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -162,11 +162,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1758589230, "lastModified": 1757244434,
"narHash": "sha256-zMTCFGe8aVGTEr2RqUi/QzC1nOIQ0N1HRsbqB4f646k=", "narHash": "sha256-AeqTqY0Y95K1Fgs6wuT1LafBNcmKxcOkWnm4alD9pqM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d1d883129b193f0b495d75c148c2c3a7d95789a0", "rev": "092c565d333be1e17b4779ac22104338941d913f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -178,11 +178,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1758427187, "lastModified": 1757068644,
"narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -198,11 +198,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1758770724, "lastModified": 1757345656,
"narHash": "sha256-ayj0RkDQ57roFRtqOuDaUk6493Yd2x2xJrfOz44s4jk=", "narHash": "sha256-ZvNfl8pu1iwJW0uUZKV8XHIM7JqJxoZX+EqzjayMDqU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "2147792a5e7b210162abdc6b318441737cd73da5", "rev": "9009f3b97f820b7b5c2732d423a08bb8d82d179a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -288,11 +288,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1758427187, "lastModified": 1757068644,
"narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -8,7 +8,7 @@
enable = true; enable = true;
defaultFonts = { defaultFonts = {
monospace = [ monospace = [
"JetBrainsMono Nerd Font" "JetBrains Mono"
"Noto Sans Mono CJK SC" "Noto Sans Mono CJK SC"
"Noto Sans Mono" "Noto Sans Mono"
"Noto Color Emoji" "Noto Color Emoji"
@ -31,10 +31,11 @@
# with fonts.packages buy im too lazy to check # with fonts.packages buy im too lazy to check
home.packages = with pkgs; [ home.packages = with pkgs; [
jetbrains-mono jetbrains-mono
nerd-fonts.jetbrains-mono
noto-fonts noto-fonts
noto-fonts-cjk-sans noto-fonts-cjk-sans
noto-fonts-emoji noto-fonts-emoji
noto-fonts-extra noto-fonts-extra
nerd-fonts.fira-code
nerd-fonts.droid-sans-mono
]; ];
} }

View file

@ -18,7 +18,7 @@ in {
progress-color = "over #FFFFFF"; progress-color = "over #FFFFFF";
border-radius = 0; border-radius = 0;
default-timeout = 7000; default-timeout = 7000;
font = "JetBrainsMono Nerd Font 10"; font = "JetBrains Mono 10";
icons = true; icons = true;
ignore-timeout = false; ignore-timeout = false;
layer = "top"; layer = "top";

View file

@ -62,7 +62,7 @@ in {
}; };
fonts = { fonts = {
names = ["JetBrainsMono Nerd Font"]; names = ["JetBrains Mono"];
style = "Regular"; style = "Regular";
size = 8.0; size = 8.0;
}; };
@ -136,7 +136,7 @@ in {
keybindings = let keybindings = let
mod = config.wayland.windowManager.sway.config.modifier; mod = config.wayland.windowManager.sway.config.modifier;
grimshot = getExe pkgs.sway-contrib.grimshot; grimshot = getExe pkgs.sway-contrib.grimshot;
bemenuCommand = ''bemenu-run --center --width-factor 0.2 --fixed-height --list 10 --scrollbar none --auto-select --accept-single --fn "JetBrainsMono Nerd Font 12" --prompt "" --tb "#000000" --tf "#EAEAEA" --fb "#000000" --ff "#EAEAEA" --cb "#EAEAEA" --cf "#000000" --nb "#000000" --nf "#EAEAEA" --sb "#000000" --sf "#EAEAEA" --hb "#000000" --hf "#EAEAEA" --fbb "#000000" --fbf "#000000" --ab "#000000" --af "#EAEAEA"''; bemenuCommand = ''bemenu-run --center --width-factor 0.2 --fixed-height --list 10 --scrollbar none --auto-select --accept-single --fn "JetBrains Mono 12" --prompt "" --tb "#000000" --tf "#EAEAEA" --fb "#000000" --ff "#EAEAEA" --cb "#EAEAEA" --cf "#000000" --nb "#000000" --nf "#EAEAEA" --sb "#000000" --sf "#EAEAEA" --hb "#000000" --hf "#EAEAEA" --fbb "#000000" --fbf "#000000" --ab "#000000" --af "#EAEAEA"'';
in in
mkOptionDefault { mkOptionDefault {
"${mod}+a" = "focus parent"; "${mod}+a" = "focus parent";

View file

@ -48,16 +48,16 @@ in {
tooltip = false; tooltip = false;
}; };
"cpu" = { "cpu" = {
format = " {usage}%"; format = "cpu {usage}%";
tooltip = false; tooltip = false;
}; };
"memory" = { "memory" = {
format = " {percentage}%"; format = "mem {percentage}%";
tooltip = true; tooltip = true;
tooltip-format = "{used}/{total}"; tooltip-format = "{used}/{total}";
}; };
"disk" = { "disk" = {
format = " {specific_used:0.0f}/{specific_total:0.0f}"; format = "disk {specific_used:0.0f}/{specific_total:0.0f}";
unit = "GiB"; unit = "GiB";
tooltip = false; tooltip = false;
}; };
@ -68,7 +68,7 @@ in {
}; };
style = '' style = ''
* { * {
font-family: "JetBrainsMono Nerd Font", monospace; font-family: "JetBrains Mono", monospace;
font-size: 12px; font-size: 12px;
font-weight: 500; font-weight: 500;
border: none; border: none;

View file

@ -40,66 +40,8 @@ in {
''; '';
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
barbar-nvim
nvim-web-devicons
vim-nix vim-nix
vim-visual-multi vim-visual-multi
{
plugin = nvim-tree-lua;
type = "lua";
config = ''
require("nvim-tree").setup({
renderer = {
icons = {
show = {
file = true,
folder = true,
folder_arrow = true,
git = true,
},
glyphs = {
git = {
unstaged = "",
staged = "",
unmerged = "",
renamed = "",
untracked = "",
deleted = "",
ignored = "",
},
},
},
},
view = {
width = 30,
side = 'left',
},
sync_root_with_cwd = true, --fix to open cwd with tree
respect_buf_cwd = true,
update_cwd = true,
update_focused_file = {
enable = true,
update_cwd = true,
update_root = true,
},
})
vim.g.nvim_tree_respect_buf_cwd = 1
-- use g? for bindings help while in tree
'';
}
{
plugin = gruvbox-nvim;
type = "lua";
config = ''
require("gruvbox").setup({
contrast = "high",
})
vim.o.background = "dark"
vim.cmd([[colorscheme gruvbox]])
'';
}
]; ];
}; };
home.sessionVariables = { home.sessionVariables = {

View file

@ -40,8 +40,8 @@ in {
}; };
autosave = "on_focus_change"; autosave = "on_focus_change";
auto_update = false; auto_update = false;
buffer_font_family = "JetBrainsMono Nerd Font"; buffer_font_family = "JetBrains Mono";
buffer_font_size = 22; buffer_font_size = 16;
hide_mouse = "never"; hide_mouse = "never";
minimap.show = "auto"; minimap.show = "auto";
tabs = { tabs = {

View file

@ -44,7 +44,7 @@
gui = { gui = {
enable = true; enable = true;
monitors = { monitors = {
HDMI-A-1 = { HDMI-A-4 = {
width = "1920"; width = "1920";
height = "1080"; height = "1080";
rate = "59.94"; rate = "59.94";
@ -67,7 +67,6 @@
qbittorrent qbittorrent
virt-manager virt-manager
vintagestory vintagestory
easyeffects
]; ];
username = "chem"; username = "chem";

View file

@ -53,17 +53,6 @@ in {
]; ];
}; };
fonts.packages = with pkgs; [
jetbrains-mono
nerd-fonts.jetbrains-mono
noto-fonts
noto-fonts-cjk-sans
noto-fonts-emoji
noto-fonts-extra
nerd-fonts.fira-code
nerd-fonts.droid-sans-mono
];
services = { services = {
openssh.enable = mkDefault true; openssh.enable = mkDefault true;

View file

@ -26,7 +26,7 @@ in {
window { window {
background-color: black; background-color: black;
color: #eaeaea; color: #eaeaea;
font-family: "JetBrainsMono Nerd Font", monospace; font-family: "JetBrains Mono", monospace;
font-size: 14px; font-size: 14px;
} }