snaki
/
nixfiles
1
0
Fork 0
Code Issues Pull Requests Activity

Compare commits

base: snaki:fe69cf30474c3b0d4cba20399ce33b404817bd4f
Branches Tags
snaki:main
...
compare: snaki:bbe2030d61c884815bfd50bc4a648f2434448eb2
Branches Tags
snaki:main

2 Commits
fe69cf3047 ... bbe2030d61

Author SHA1 Message Date
emily bbe2030d61
fixes 1 month ago
emily b3b7a49123
flake.lock: Update 
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/a13f36255cf4ce99cc4236a34251c2e7106e101d?narHash=sha256-cTuJVlOm05aQFIgGuYikgkrI61P2vTO2OfXwIRWEzUg%3D' (2024-02-26)
  → 'github:nix-community/disko/5d2d3e421ade554b19b4dbb0d11a04023378a330?narHash=sha256-5DUNQl9BSmLxgGLbF05G7hi/UTk9DyZq8AuEszhQA7Q%3D' (2024-03-24)
• Updated input 'flake-utils':
    'github:numtide/flake-utils/d465f4819400de7c8d874d50b982301f28a84605?narHash=sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8%3D' (2024-02-28)
  → 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a?narHash=sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ%3D' (2024-03-11)
• Updated input 'home-manager':
    'github:nix-community/home-manager/1d085ea4444d26aa52297758b333b449b2aa6fca?narHash=sha256-RCz7Xe64tN2zgWk%2BMVHkzg224znwqknJ1RnB7rVqUWw%3D' (2024-02-26)
  → 'github:nix-community/home-manager/1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb?narHash=sha256-WJOahf%2B6115%2BGMl3wUfURu8fszuNeJLv9qAWFQl3Vmo%3D' (2024-03-22)
• Updated input 'kyouma-www':
    'git+https://git.bsd.gay/snaki/kyouma-net.git?ref=refs/heads/main&rev=c1e8e9fc90be19ce1f610f0b13082b6066b28f7d' (2024-01-23)
  → 'git+https://git.bsd.gay/snaki/kyouma-net.git?ref=refs/heads/main&rev=aff69d79e11cbfb40ea41636e882331499dab41a' (2024-03-24)
• Updated input 'nixos-hardware':
    'github:nixos/nixos-hardware/3f7d0bca003eac1a1a7f4659bbab9c8f8c2a0958?narHash=sha256-c/gH7iXS/IYH9NrFOT%2BaJqTq%2BiEBkvAkpWuUHGU3%2Bf0%3D' (2024-02-22)
  → 'github:nixos/nixos-hardware/7559df1e4af972d5f1de87975b5ef6a8d7559db2?narHash=sha256-19KQXya5VERUXOdeEJJN%2BzOqtvuE6MV3qTk9Gr4J9Uo%3D' (2024-03-24)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/73de017ef2d18a04ac4bfd0c02650007ccb31c2a?narHash=sha256-sRTRkhMD4delO/hPxxi%2BXwLqPn8BuUq6nnj4JqLwOu0%3D' (2024-02-24)
  → 'github:nixos/nixpkgs/44d0940ea560dee511026a53f0e2e2cde489b4d4?narHash=sha256-YN/Ciidm%2BA0fmJPWlHBGvVkcarYWSC%2Bs3NTPk/P%2Bq3c%3D' (2024-03-23)
• Updated input 'nixvim':
    'github:nix-community/nixvim/8b013707cc1be375ae06fadd0ccb9eb1df277a10?narHash=sha256-pXi4kgnGTjwyFWENr/er4nEfzEoBFMkyeXC4d4a5Y3k%3D' (2024-02-27)
  → 'github:nix-community/nixvim/e7a3461fefd983ae3443e9aa849e9d1566ab47e4?narHash=sha256-DTzi4ujZoxM3ZXStCwD6Lph3FdGtkBlvfYsDCRITjfA%3D' (2024-03-24)
• Added input 'nixvim/devshell':
    'github:numtide/devshell/2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8?narHash=sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk%3D' (2024-03-22)
• Added input 'nixvim/devshell/flake-utils':
    'github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725?narHash=sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8%3D' (2023-12-04)
• Added input 'nixvim/devshell/flake-utils/systems':
    'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e?narHash=sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768%3D' (2023-04-09)
• Added input 'nixvim/devshell/nixpkgs':
    follows 'nixvim/nixpkgs'
• Updated input 'nixvim/flake-parts':
    'github:hercules-ci/flake-parts/b253292d9c0a5ead9bc98c4e9a26c6312e27d69f?narHash=sha256-a0NYyp%2Bh9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg%3D' (2024-02-01)
  → 'github:hercules-ci/flake-parts/f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2?narHash=sha256-Dt/wOWeW6Sqm11Yh%2B2%2Bt0dfEWxoMxGBvv3JpIocFl9E%3D' (2024-03-01)
• Updated input 'nixvim/home-manager':
    'github:nix-community/home-manager/4ee704cb13a5a7645436f400b9acc89a67b9c08a?narHash=sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI%3D' (2024-02-24)
  → 'github:nix-community/home-manager/1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb?narHash=sha256-WJOahf%2B6115%2BGMl3wUfURu8fszuNeJLv9qAWFQl3Vmo%3D' (2024-03-22)
• Updated input 'nixvim/nix-darwin':
    'github:lnl7/nix-darwin/bbde06bed1b72eddff063fa42f18644e90a0121e?narHash=sha256-sR/1cYjpgr71ZSrt6Kp5Dg4Ul3mo6pZIG400tuzYks8%3D' (2024-02-24)
  → 'github:lnl7/nix-darwin/bcc8afd06e237df060c85bad6af7128e05fd61a3?narHash=sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A%3D' (2024-03-17)
• Updated input 'nixvim/pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/5df5a70ad7575f6601d91f0efec95dd9bc619431?narHash=sha256-M%2BNg6%2BSePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM%3D' (2024-02-15)
  → 'github:cachix/pre-commit-hooks.nix/e611897ddfdde3ed3eaac4758635d7177ff78673?narHash=sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI%2BJMJuLo45aG3cKc%3D' (2024-03-20)
• Updated input 'nixvim/pre-commit-hooks/flake-utils':
    'github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725?narHash=sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8%3D' (2023-12-04)
  → 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a?narHash=sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ%3D' (2024-03-11)
• Updated input 'nixvim/pre-commit-hooks/gitignore':
    'github:hercules-ci/gitignore.nix/43e1aa1308018f37118e34d3a9cb4f5e75dc11d5?narHash=sha256-gGPa9qWNc6eCXT/%2BZ5/zMkyYOuRZqeFZBDbopNZQkuY%3D' (2023-12-29)
  → 'github:hercules-ci/gitignore.nix/637db329424fd7e46cf4185293b9cc8c88c95394?narHash=sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs%3D' (2024-02-28)
• Updated input 'stylix':
    'github:danth/stylix/fcff15ac5ffbe81f1c66e352f3167c270d79cdab?narHash=sha256-oMjkMjeNhDUEpKIofo9%2B9RdUnmmZ4h0sm%2Bkf6XKdy6k%3D' (2024-02-25)
  → 'github:danth/stylix/53d3e5d5b36a5227b906e00d7e884dcfb7852403?narHash=sha256-RyOvyQASi5lvKLH5ISiGGkdX1eJxYF25aQALGfN9U0k%3D' (2024-03-23)
 1 month ago
7 changed files with 244 additions and 317 deletions
Show Stats

2
config/common/users/emily/default.nix
Unescape Escape View File

@ -45,6 +45,7 @@
imagemagick_light
#ubuntu_font_family
libsForQt5.breeze-icons
(nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
jetbrains-mono
font-awesome
@ -58,7 +59,6 @@
programs.eza = {
enable = true;
enableAliases = true;
icons = true;
git = true;
extraOptions = [

2
config/hosts/ryuuko/configuration.nix
Unescape Escape View File

@ -60,7 +60,7 @@
publish.enable = true;
publish.userServices = true;
};
services.fprintd.enable = true;
services.fprintd.enable = lib.mkForce false;
services.fstrim.enable = true;
services.openssh.enable = true;
services.pcscd.enable = true;

75
config/profiles/graphical/default.nix
Unescape Escape View File

@ -32,6 +32,7 @@
MOZ_ENABLE_WAYLAND = "1";
CLUTTER_BACKEND = "wayland";
};
xdg.icons.enable = true;
xdg.portal = {
enable = true;
wlr.enable = true;
@ -145,6 +146,7 @@
passes = 2;
};
};
dwindle.no_gaps_when_only = 1;
animations = {
bezier = [
"wind, 0.05, 0.9, 0.1, 1.05"
@ -174,15 +176,15 @@
float_switch_override_focus = 2;
touchpad = {
natural_scroll = true;
scroll_factor = 0;
tap-to-click = false;
drag_lock = true;
};
};
gestures = {
workspace_swipe = true;
workspace_swipe_min_speed_to_force = 15;
workspace_swipe_cancel_ratio = 0.3;
workspace_swipe_distance = 3200;
workspace_swipe_min_speed_to_force = 40;
workspace_swipe_cancel_ratio = 0.15;
workspace_swipe_forever = true;
};
group = {
@ -198,28 +200,37 @@
};
misc = {
disable_hyprland_logo = true;
disable_splash_rendering = true;
vrr = 1;
};
"device:syna8013:00-06cb:ce69-touchpad" = {
sensitivity = 0.3;
};
"device:logitech-m705" = {
sensitivity = 0.1;
accel_profile = "flat";
};
"device:tpps/2-ibm-trackpoint" = {
sensitivity = 0.2;
scroll_method = "on_button_down";
accel_profile = "flat";
};
"device:tpps/2-elan-trackpoint" = {
sensitivity = 0;
scroll_method = "on_button_down";
accel_profile = "flat";
};
device = [
{
name = "syna8013:00-06cb:ce69-touchpad";
sensitivity = 0.3;
}
{
name = "logitech-m705";
sensitivity = 0.1;
accel_profile = "flat";
}
{
name = "tpps/2-ibm-trackpoint";
sensitivity = 0.2;
scroll_method = "on_button_down";
accel_profile = "flat";
}
{
name = "tpps/2-elan-trackpoint";
sensitivity = 0;
scroll_method = "on_button_down";
accel_profile = "flat";
}
];
layerrule = [ "blur, waybar" ];
monitor = [
"eDP-1, 3840x2400@60, 0x0, 1, bitdepth, 10"
"eDP-1, addreserved,-8,0,0,0"
#"eDP-1, 2560x1600@60, 0x0, 1, bitdepth, 10"
#"eDP-1, 1920x1200@60, 0x0, 1, bitdepth, 10"
"desc:ASUSTek COMPUTER INC ASUS VA24E M7LMTF021529, 1920x1080@60, -320x-1080, 1"
"desc:ASUSTek COMPUTER INC ASUS VA24E M7LMTF021525, 1920x1080@60, 1600x-1080, 1"
",preferred,auto,1"
@ -254,8 +265,8 @@
"$mod, F2, exec, ${firefox}"
# Rofi
"$mod, D, exec, ${rofi} -show drun -theme $XDG_CONFIG_HONE/rofi/launcher.rasi"
"$mod, R, exec, ${rofi} -show run -theme $XDG_CONFIG_HOME/rofi/runner.rasi"
"$mod, D, exec, ${rofi} -show drun -theme ~/.config/rofi/launcher.rasi"
"$mod, R, exec, ${rofi} -show run -theme ~/.config/rofi/runner.rasi"
"$mod, X, exec, ~/.local/bin/hypr/rofi_powermenu.sh"
"$mod, A, exec, ~/.local/bin/hypr/rofi_screenshot.sh"
@ -528,7 +539,7 @@
};
programs.kitty = {
enable = true;
font.size = 11;
font.size = 13;
font.name = "JetBrains Mono";
settings = {
enable_audio_bell = false;
@ -555,6 +566,12 @@
enable = true;
package = pkgs.rofi-wayland;
};
programs.zoxide = {
enable = true;
options = [ "--cmd cd" ];
};
programs.fzf.enable = true;
qt = {
enable = true;
@ -562,10 +579,12 @@
style.name = "kvantum-dark";
style.package = with pkgs; [
libsForQt5.qtstyleplugin-kvantum
qt6Packagee.qtstyleplugin-kvantum
qt6Packages.qtstyleplugin-kvantum
(catppuccin-kvantum.override { accent = "Mauve"; variant = "Macchiato"; })
];
};
gtk.iconTheme.name = "Adwaita";
gtk.iconTheme.package = pkgs.gnome.adwaita-icon-theme;
services.gammastep = {
enable = true;
@ -625,8 +644,8 @@
enable = true;
systemdTarget = "hyprland-session.target";
events = [
{ event = "before-sleep"; command = "${swaylock} -f -i ${config.home-manager.users.emily.xdg.userDirs.pictures}/wallpapers/lockscreen.png"; }
{ event = "lock"; command = "${swaylock} -f -i ${config.home-manager.users.emily.xdg.userDirs.pictures}/wallpapers/lockscreen.png"; }
{ event = "before-sleep"; command = "${swaylock} -f -i $XDG_PICTURES_DIR/wallpapers/lockscreen.png"; }
{ event = "lock"; command = "${swaylock} -f -i $XDG_PICTURES_DIR/wallpapers/lockscreen.png"; }
];
};
@ -671,7 +690,7 @@
enable = true;
desktop = null;
documents = "${home}/docs";
downloads = "${home}/Downloads";
download = "${home}/Downloads";
music = "${home}/music";
pictures = "${home}/Pictures";
publicShare = null;

158
config/profiles/graphical/files/waybar-style.css
Unescape Escape View File

@ -41,20 +41,11 @@
}
window#waybar {
/* border-bottom: 4px solid shade(@base, 1.1); */
/* border-radius: 10px; */
/* background:#2d2a2e; */
/* background-color: rgba(36, 39, 58, 0.60); */
/* background-color: rgba(0, 0, 0, 0); */
/* background-color: shade(#1e1e2e, 0.95); */
/* background-color: rgba(9, 3, 18, 0.70); */
background: none;
background-color: rgba(9, 3, 18, 0.70);
}
#workspaces button {
color: @base;
border-radius: 50%;
/* background-color: @base; */
margin: 0px 8px 0px 8px;
padding: 2px 6px 2px 0px;
}
@ -65,7 +56,6 @@ window#waybar {
#workspaces button:hover {
color: @mauve;
/* border-radius: 20px; */
box-shadow: none; /* Remove predefined box-shadow */
text-shadow: none; /* Remove predefined text-shadow */
border: 0px;
@ -77,17 +67,11 @@ window#waybar {
}
#workspaces {
border-style: solid;
background-color: shade(@base, 0.7);
opacity: 1;
border-radius: 10px;
margin: 9px 8px 8px 8px;
}
#workspaces button.active {
color: @mauve;
border-radius: 20px;
/* background-color: @flamingo; */
}
#workspaces button.active * {
@ -109,51 +93,25 @@ window#waybar {
#pulseaudio,
#mode,
#tray,
#custom-pacman,
#custom-playerctl,
#mpd {
padding: 6px 8px;
border-style: solid;
background-color: shade(@base, 0.70);
padding: 7px 8px;
opacity: 1;
margin: 9px 0px 8px 0px;
}
#mpd {
border-radius: 10px;
color: @mauve;
margin-left: 5px;
background-color: rgba(0, 0, 0, 0);
}
#custom-background {
border-radius: 0px 10px 10px 0px;
background-color: @base;
color: white;
padding: 5px 14px 5px 5px;
margin: 2px 0px;
}
#clock,
#custom-playerctl {
color: @mauve;
border-radius: 10px;
margin: 9px 8px 8px 0px;
}
#clock {
color: @mauve;
border-radius: 10px;
margin: 9px 10px 8px 10px;
}
#backlight {
color: @yellow;
border-radius: 10px 0 0 10px;
}
#battery {
color: @sky;
/* border-bottom: 2px solid #d8dee9; */
border-radius: 0 10px 10px 0;
margin-right: 10px;
color: @sky;
}
#battery.charging {
@ -163,13 +121,11 @@ window#waybar {
@keyframes blink {
to {
color: @red;
/* border-bottom: 2px solid @red; */
}
}
#battery.critical:not(.charging) {
color: #bf616a;
/* border-bottom: 2px solid #bf616a; */
animation-name: blink;
animation-duration: 0.5s;
animation-timing-function: linear;
@ -177,56 +133,39 @@ window#waybar {
animation-direction: alternate;
}
#cpu {
color: @sky;
/* border-bottom: 2px solid @sky; */
}
#cpu #cpu-icon {
color: @sky;
}
#cpu,
#memory {
color: @sky;
}
#network.disabled {
color: #bf616a;
/* border-bottom: 2px solid #bf616a; */
}
#network {
color: @green;
/* border-bottom: 2px solid @green; */
border-radius: 10px;
margin-right: 8px;
}
#network.disconnected {
color: #bf616a;
/* border-bottom: 2px solid #bf616a; */
}
#pulseaudio {
color: @flamingo;
border-radius: 0 10px 10px 0;
margin-right: 10px;
/* border-bottom: 2px solid @flamingo; */
}
#pulseaudio.muted {
color: #3b4252;
/* border-bottom: 2px solid #3b4252; */
}
#temperature {
color: @teal;
border-radius: 10px 0 0 10px;
}
#temperature.critical {
color: @red;
/* border-bottom: 2px solid @red; */
}
#custom-pacman {
@ -238,16 +177,9 @@ window#waybar {
color: @base;
}
#tray {
/* background-color: @base; */
border-radius: 10px;
}
#window {
border-style: hidden;
margin-left: 10px;
/* margin-top:1px;
padding: 8px 1rem; */
margin-right: 10px;
color: #eceff4;
}
@ -255,81 +187,3 @@ window#waybar {
#mode {
margin-bottom: 4px;
}
/* window#waybar {
background: #2d2a2e;
}
* {
color: #c8b9a9;
font-family: Ubuntu Mono, sans-serif;
font-size: 12px;
}
#workspaces button.focused {
color: #f2e5bc;
}
#workspaces button {
color: #c8b9a9;
}
.separator {
background-color: #c8b9a9;
}
#mode {
color: #ebcb8b;
}
#clock {
color: #a3be8c;
}
#battery {
color: #d8dee9;
}
#battery.charging {
color: #b48ead;
}
#battery.critical:not(.charging) {
color: #bf616a;
}
#cpu {
color: #a3be8c;
}
#memory {
color: #d3869b;
}
#network {
color: #8fbcbb;
}
#network.disabled {
color: #bf616a;
}
#network.disconnected {
color: #bf616a;
}
#pulseaudio {
color: #b48ead;
}
#pulseaudio.muted {
color: #bf616a;
}
#temperature {
color: #8fbcbb;
}
#temperature.critical {
color: #bf616a;
} */

67
config/profiles/graphical/nixvim.nix
Unescape Escape View File

@ -4,9 +4,9 @@
];
home-manager.users.emily.programs.nixvim = {
enable = true;
extraPlugins = with pkgs; [
vimPlugins.molokai
vimPlugins.vim-airline-themes
extraPlugins = [
pkgs.vimPlugins.molokai
pkgs.vimPlugins.vim-airline-themes
];
colorscheme = "molokai";
vimAlias = true;
@ -41,16 +41,16 @@
mode = "t";
}
];
plugins.nvim-cmp = {
plugins.cmp = {
enable = true;
sources = [
settings.sources = [
{ name = "nvim_lsp"; }
{ name = "luasnip"; }
{ name = "buffer"; }
{ name = "nvim_lua"; }
{ name = "path"; }
];
formatting = {
settings.formatting = {
fields = [ "abbr" "kind" "menu" ];
format = ''
function(_, item)
@ -103,8 +103,8 @@
end
'';
};
snippet = { expand = "luasnip"; };
window = {
settings.snippet.expand = "function(args) require('luasnip').lsp_expand(args.body) end";
settings.window = {
completion = {
winhighlight = "FloatBorder:CmpBorder,Normal:CmpPmenu,CursorLine:CmpSel,Search:PmenuSel";
scrollbar = false;
@ -116,7 +116,7 @@
winhighlight = "FloatBorder:CmpBorder,Normal:CmpPmenu,CursorLine:CmpSel,Search:PmenuSel";
};
};
mapping = {
settings.mapping = {
"<C-n>" = "cmp.mapping.select_next_item()";
"<C-p>" = "cmp.mapping.select_prev_item()";
"<C-j>" = "cmp.mapping.select_next_item()";
@ -126,34 +126,28 @@
"<C-Space>" = "cmp.mapping.complete()";
"<C-e>" = "cmp.mapping.close()";
"<CR>" = "cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Insert, select = true })";
"<Tab>" = {
modes = [ "i" "s" ];
action = ''
function(fallback)
if cmp.visible() then
cmp.select_next_item()
elseif require("luasnip").expand_or_jumpable() then
vim.fn.feedkeys(vim.api.nvim_replace_termcodes("<Plug>luasnip-expand-or-jump", true, true, true), "")
else
fallback()
end
"<Tab>" = ''
cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_next_item()
elseif require("luasnip").expand_or_jumpable() then
vim.fn.feedkeys(vim.api.nvim_replace_termcodes("<Plug>luasnip-expand-or-jump", true, true, true), "")
else
fallback()
end
'';
};
"<S-Tab>" = {
modes = [ "i" "s" ];
action = ''
function(fallback)
if cmp.visible() then
cmp.select_prev_item()
elseif require("luasnip").jumpable(-1) then
vim.fn.feedkeys(vim.api.nvim_replace_termcodes("<Plug>luasnip-jump-prev", true, true, true), "")
else
fallback()
end
end,{"i","s"})
'';
"<S-Tab>" = ''
cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_prev_item()
elseif require("luasnip").jumpable(-1) then
vim.fn.feedkeys(vim.api.nvim_replace_termcodes("<Plug>luasnip-jump-prev", true, true, true), "")
else
fallback()
end
'';
};
end,{"i","s"})
'';
};
};
plugins.lsp = {
@ -178,19 +172,18 @@
};
};
ruff-lsp.enable = true;
rust-analyzer.enable = true;
};
};
plugins.none-ls = {
enable = true;
sources.diagnostics = {
pylint.enable = true;
shellcheck.enable = true;
statix.enable = true;
};
sources.formatting = {
nixfmt.enable = true;
markdownlint.enable = true;
rustfmt.enable = true;
};
};
plugins.neo-tree = {

213
flake.lock
Unescape Escape View File

@ -163,6 +163,28 @@
"type": "github"
}
},
"devshell": {
"inputs": {
"flake-utils": "flake-utils_4",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1711099426,
"narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=",
"owner": "numtide",
"repo": "devshell",
"rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"disko": {
"inputs": {
"nixpkgs": [
@ -170,11 +192,11 @@
]
},
"locked": {
"lastModified": 1708910350,
"narHash": "sha256-cTuJVlOm05aQFIgGuYikgkrI61P2vTO2OfXwIRWEzUg=",
"lastModified": 1711261295,
"narHash": "sha256-5DUNQl9BSmLxgGLbF05G7hi/UTk9DyZq8AuEszhQA7Q=",
"owner": "nix-community",
"repo": "disko",
"rev": "a13f36255cf4ce99cc4236a34251c2e7106e101d",
"rev": "5d2d3e421ade554b19b4dbb0d11a04023378a330",
"type": "github"
},
"original": {
@ -257,11 +279,11 @@
]
},
"locked": {
"lastModified": 1706830856,
"narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
"lastModified": 1709336216,
"narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
"rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
"type": "github"
},
"original": {
@ -292,6 +314,24 @@
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
@ -306,9 +346,9 @@
"type": "github"
}
},
"flake-utils_3": {
"flake-utils_4": {
"inputs": {
"systems": "systems_3"
"systems": "systems_4"
},
"locked": {
"lastModified": 1701680307,
@ -324,6 +364,24 @@
"type": "github"
}
},
"flake-utils_5": {
"inputs": {
"systems": "systems_5"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"fromYaml": {
"flake": false,
"locked": {
@ -349,11 +407,11 @@
]
},
"locked": {
"lastModified": 1703887061,
"narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=",
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
@ -386,11 +444,11 @@
]
},
"locked": {
"lastModified": 1708988456,
"narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=",
"lastModified": 1711133180,
"narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "1d085ea4444d26aa52297758b333b449b2aa6fca",
"rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
"type": "github"
},
"original": {
@ -407,11 +465,11 @@
]
},
"locked": {
"lastModified": 1708806879,
"narHash": "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI=",
"lastModified": 1711133180,
"narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "4ee704cb13a5a7645436f400b9acc89a67b9c08a",
"rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
"type": "github"
},
"original": {
@ -443,21 +501,21 @@
},
"kyouma-www": {
"inputs": {
"flake-utils": "flake-utils_2",
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1706043676,
"narHash": "sha256-yZKOLGKhwAvJl4iKkcTl08bNT4I0ul2w1WoejkeAGdY=",
"lastModified": 1711306151,
"narHash": "sha256-yLEHVNd78QTl0Gw8kNpjYwjvAWZk9gCYErH6YVxX3Ys=",
"ref": "refs/heads/main",
"rev": "c1e8e9fc90be19ce1f610f0b13082b6066b28f7d",
"revCount": 14,
"rev": "aff69d79e11cbfb40ea41636e882331499dab41a",
"revCount": 15,
"type": "git",
"url": "ssh://git@git.bsd.gay/snaki/kyouma-net.git"
"url": "https://git.bsd.gay/snaki/kyouma-net.git"
},
"original": {
"type": "git",
"url": "ssh://git@git.bsd.gay/snaki/kyouma-net.git"
"url": "https://git.bsd.gay/snaki/kyouma-net.git"
}
},
"nix-darwin": {
@ -468,11 +526,11 @@
]
},
"locked": {
"lastModified": 1708737761,
"narHash": "sha256-sR/1cYjpgr71ZSrt6Kp5Dg4Ul3mo6pZIG400tuzYks8=",
"lastModified": 1710717205,
"narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "bbde06bed1b72eddff063fa42f18644e90a0121e",
"rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3",
"type": "github"
},
"original": {
@ -483,11 +541,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1708594753,
"narHash": "sha256-c/gH7iXS/IYH9NrFOT+aJqTq+iEBkvAkpWuUHGU3+f0=",
"lastModified": 1711274671,
"narHash": "sha256-19KQXya5VERUXOdeEJJN+zOqtvuE6MV3qTk9Gr4J9Uo=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "3f7d0bca003eac1a1a7f4659bbab9c8f8c2a0958",
"rev": "7559df1e4af972d5f1de87975b5ef6a8d7559db2",
"type": "github"
},
"original": {
@ -530,11 +588,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1708807242,
"narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=",
"lastModified": 1711163522,
"narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a",
"rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
"type": "github"
},
"original": {
@ -545,22 +603,6 @@
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1694959747,
"narHash": "sha256-CXQ2MuledDVlVM5dLC4pB41cFlBWxRw4tCBsFrq3cRk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "970a59bd19eff3752ce552935687100c46e820a5",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1700856099,
"narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=",
@ -578,6 +620,7 @@
},
"nixvim": {
"inputs": {
"devshell": "devshell",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts",
"home-manager": "home-manager_2",
@ -588,11 +631,11 @@
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1709038245,
"narHash": "sha256-pXi4kgnGTjwyFWENr/er4nEfzEoBFMkyeXC4d4a5Y3k=",
"lastModified": 1711284540,
"narHash": "sha256-DTzi4ujZoxM3ZXStCwD6Lph3FdGtkBlvfYsDCRITjfA=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "8b013707cc1be375ae06fadd0ccb9eb1df277a10",
"rev": "e7a3461fefd983ae3443e9aa849e9d1566ab47e4",
"type": "github"
},
"original": {
@ -604,7 +647,7 @@
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_3",
"flake-utils": "flake-utils_5",
"gitignore": "gitignore",
"nixpkgs": [
"nixvim",
@ -616,11 +659,11 @@
]
},
"locked": {
"lastModified": 1708018599,
"narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=",
"lastModified": 1710923068,
"narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431",
"rev": "e611897ddfdde3ed3eaac4758635d7177ff78673",
"type": "github"
},
"original": {
@ -633,33 +676,15 @@
"inputs": {
"disko": "disko",
"fernglas": "fernglas",
"flake-utils": "flake-utils_2",
"home-manager": "home-manager",
"kyouma-www": "kyouma-www",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3",
"nixvim": "nixvim",
"secrix": "secrix",
"stylix": "stylix"
}
},
"secrix": {
"inputs": {
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1701493419,
"narHash": "sha256-Aa6uQcHp1vABB0FlMsMVMI0Vhk91VozLoSkAT7L7PMU=",
"owner": "Platonic-Systems",
"repo": "secrix",
"rev": "c5d193ae564b93ffa3e5a950fb7666760e0ae324",
"type": "github"
},
"original": {
"owner": "Platonic-Systems",
"repo": "secrix",
"type": "github"
}
},
"stylix": {
"inputs": {
"base16": "base16",
@ -674,14 +699,14 @@
"flake-compat": "flake-compat_3",
"gnome-shell": "gnome-shell",
"home-manager": "home-manager_3",
"nixpkgs": "nixpkgs_5"
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1708896938,
"narHash": "sha256-oMjkMjeNhDUEpKIofo9+9RdUnmmZ4h0sm+kf6XKdy6k=",
"lastModified": 1711224130,
"narHash": "sha256-RyOvyQASi5lvKLH5ISiGGkdX1eJxYF25aQALGfN9U0k=",
"owner": "danth",
"repo": "stylix",
"rev": "fcff15ac5ffbe81f1c66e352f3167c270d79cdab",
"rev": "53d3e5d5b36a5227b906e00d7e884dcfb7852403",
"type": "github"
},
"original": {
@ -734,6 +759,36 @@
"repo": "default",
"type": "github"
}
},
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",

44
flake.nix
Unescape Escape View File

@ -4,8 +4,8 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixos-hardware.url = "github:nixos/nixos-hardware";
fernglas.url = "github:wobcom/fernglas";
kyouma-www.url = "git+ssh://git@git.bsd.gay/snaki/kyouma-net.git";
secrix.url = "github:Platonic-Systems/secrix";
flake-utils.url = "github:numtide/flake-utils";
kyouma-www.url = "git+https://git.bsd.gay/snaki/kyouma-net.git";
stylix.url = "github:danth/stylix";
disko = {
url = "github:nix-community/disko";
@ -21,23 +21,20 @@
};
};
outputs = { self, nixpkgs, secrix, ... }@inputs: {
colmena = {
outputs = { self, nixpkgs, flake-utils, ... }@inputs: {
colmena = let
hosts = [ "web-dus" "crime" "ryuuko" ];
hostCfg = hostname: {
imports = [ (./config/hosts/${hostname}/configuration.nix) ];
};
in {
meta = {
allowApplyAll = false;
nixpkgs = nixpkgs.legacyPackages.x86_64-linux;
specialArgs = { inherit inputs; };
};
web-dus = {
imports = [ ./config/hosts/web-dus/configuration.nix ];
};
crime = {
imports = [ ./config/hosts/crime/configuration.nix ];
};
ryuuko = {
imports = [ ./config/hosts/ryuuko/configuration.nix ];
};
};
} // (builtins.listToAttrs (builtins.map (hosts: nixpkgs.lib.attrsets.nameValuePair hosts (hostCfg hosts)) hosts));
nixosConfigurations = {
ryuuko = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
@ -48,11 +45,20 @@
];
};
};
apps.x86_64-linux.secrix = inputs.secrix.secrix self;
devShells.x86_64-linux.default = let
pkgs = nixpkgs.legacyPackages.x86_64-linux;
in pkgs.mkShell {
} // flake-utils.lib.eachDefaultSystem (system: let
pkgs = nixpkgs.legacyPackages.${system};
in {
# packages = rec {
# newhost = pkgs.stdenv.mkDerivation {
# name = "newhost";
# };
# };
# apps = rec {
# newhost = self.packages.${system}.newhost;
# default = newhost;
# };
devShells.default = pkgs.mkShell {
packages = [ pkgs.colmena ];
};
};
});
}

Write Preview
Loading…
Cancel
Save