Compare commits

..

No commits in common. "e5143b7af05b95221b7b21f82f4be9b290b5be3a" and "160952445acbf78679688786163e1e2421412584" have entirely different histories.

10 changed files with 108 additions and 131 deletions

View file

@ -28,7 +28,9 @@ in
modules/manual.nix modules/manual.nix
modules/tig.nix modules/tig.nix
../secrets/ssh-config.nix ../secrets/ssh-config.nix
] ++ lib.optionals (config.networking.hostName == "smithers") [ ] ++ lib.optionals (config.networking.hostName == "jimbo") [
modules/kanshi.nix
] ++ lib.optionals (config.networking.hostName == "milhouse") [
modules/kanshi.nix modules/kanshi.nix
]; ];
@ -90,6 +92,7 @@ in
fzf fzf
ncmpcpp ncmpcpp
acpi acpi
joplin # cli
joplin-desktop # gui joplin-desktop # gui
unstable.prusa-slicer unstable.prusa-slicer
@ -104,13 +107,19 @@ in
gnome.gedit gnome.gedit
pwgen pwgen
nixpkgs-fmt # for coc
nodejs
#rnix-lsp
# kubernetes stuff # kubernetes stuff
kubectl kubectl
krew krew
kubectx kubectx
# from my overlay
studio-link
python3.pkgs.brother-ql
] ++ lib.optionals (config.my.isLaptop) [ ] ++ lib.optionals (config.my.isLaptop) [
networkmanager networkmanager
]; ];
@ -146,6 +155,11 @@ in
defaultTimeout = 5000; defaultTimeout = 5000;
}; };
services.kanshi = {
enable = true;
};
services.gammastep = { services.gammastep = {
enable = true; enable = true;
tray = true; tray = true;

View file

@ -26,8 +26,13 @@
subversionClient subversionClient
tig tig
freerdp freerdp
mattermost-desktop
firefox firefox
# for coc
nodejs
#rnix-lsp
# for zsh-fzf plugin # for zsh-fzf plugin
fzf fzf

View file

@ -17,12 +17,12 @@ let
status = "disable"; status = "disable";
} }
{ {
criteria = "DP-10"; criteria = "DP-9";
scale = 1.3; scale = 1.3;
position = "0,0"; position = "0,0";
} }
{ {
criteria = "DP-9"; criteria = "DP-10";
scale = 1.3; scale = 1.3;
position = "2952,0"; position = "2952,0";
} }

View file

@ -63,9 +63,6 @@
# show marks # show marks
vim-signature vim-signature
# Session management
auto-session
]; ];
extraConfig = '' extraConfig = ''
@ -144,7 +141,6 @@
let g:go_highlight_types = 1 let g:go_highlight_types = 1
let g:go_highlight_operators = 1 let g:go_highlight_operators = 1
let g:go_highlight_build_constraints = 1 let g:go_highlight_build_constraints = 1
" Don't use gopls from vim-go " Don't use gopls from vim-go
let g:go_gopls_enabled = 0 let g:go_gopls_enabled = 0
@ -158,29 +154,11 @@
let g:neoformat_enabled_python = ['black', 'isort'] let g:neoformat_enabled_python = ['black', 'isort']
lua << EOF lua << EOF
require("auto-session").setup {
auto_save_enabled = true;
auto_restore_enabled = true;
}
require("bufferline").setup{} require("bufferline").setup{}
require('lspconfig').gopls.setup{} require('lspconfig').gopls.setup{}
require('lspconfig').pyright.setup{} require('lspconfig').pyright.setup{}
require('lspconfig').nil_ls.setup {
autostart = true,
capabilities = caps,
cmd = { "nil" },
settings = {
['nil'] = {
testSetting = 42,
formatting = {
command = { "nixpkgs-fmt" },
},
},
},
}
vim.api.nvim_create_autocmd('LspAttach', { vim.api.nvim_create_autocmd('LspAttach', {
desc = 'LSP actions', desc = 'LSP actions',
callback = function() callback = function()

View file

@ -5,7 +5,6 @@ in
{ {
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
package = pkgs.swayfx;
wrapperFeatures.gtk = true; wrapperFeatures.gtk = true;
config = { config = {
@ -34,67 +33,21 @@ in
scale = "1.3"; scale = "1.3";
position = "2953,0"; position = "2953,0";
}; };
} // lib.optionalAttrs (nixosConfig.networking.hostName == "smithers") {
"eDP-1" = {
mode = "2256x1504";
scale = "1.3";
position = "0,0";
};
}; };
gaps = { inner = 10; }; gaps = { inner = 8; };
window.border = 2; window.border = 0;
window.hideEdgeBorders = "smart";
workspaceAutoBackAndForth = true; workspaceAutoBackAndForth = true;
terminal = "foot"; terminal = "foot";
colors = {
focused = {
border = "#4c7899";
background = "#285577";
text = "#ffffff";
indicator = "#2e9ef4";
childBorder = "#285577";
};
focusedInactive = {
border = "#333333";
background = "#5f676a";
text = "#ffffff";
indicator = "#484e50";
childBorder = "#5f676a";
};
unfocused = {
border = "#333333";
background = "#222222";
text = "#888888";
indicator = "#292d2e";
childBorder = "#900000";
};
urgent = {
border = "#2f343a";
background = "#900000";
text = "#ffffff";
indicator = "#900000";
childBorder = "#900000";
};
placeholder = {
border = "#000000";
background = "#0c0c0c";
text = "#ffffff";
indicator = "#000000";
childBorder = "#0c0c0c";
};
};
bars = [{ command = "${pkgs.waybar}/bin/waybar"; }]; bars = [{ command = "${pkgs.waybar}/bin/waybar"; }];
startup = [ startup = [
{ {
command = ''${pkgs.swayidle}/bin/swayidle -w \ command = ''${pkgs.swayidle}/bin/swayidle -w \
timeout 600 "${lockCmd}" \ timeout 600 "${lockCmd}" \
timeout 900 "${pkgs.swayfx}/bin/swaymsg output * dpms off" \ timeout 900 "${pkgs.sway}/bin/swaymsg output * dpms off" \
resume "${pkgs.swayfx}/bin/swaymsg output * dpms on" \ resume "${pkgs.sway}/bin/swaymsg output * dpms on" \
before-sleep "${lockCmd}"''; before-sleep "${lockCmd}"'';
} }
]; ];
@ -186,13 +139,6 @@ in
}; };
}; };
extraConfig = ''
blur enable
blur_radius 10
default_dim_inactive 0.2
corner_radius 15
'';
}; };
} }

View file

@ -1,3 +1,11 @@
/* =============================================================================
*
* Waybar configuration
*
* Configuration reference: https://github.com/Alexays/Waybar/wiki/Configuration
*
* =========================================================================== */
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* Keyframes * Keyframes
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
@ -47,34 +55,22 @@
@define-color teal #8ec07c; @define-color teal #8ec07c;
@define-color gray #928374; @define-color gray #928374;
/* Reset all styles */
* { * {
border: none; border: none;
font-family: Inconsolata, Inconsolata Nerd Font, FiraCode Nerd Font Mono; border-radius: 0;
font-weight: bold; min-height: 0;
font-size: 14pt; margin: 0;
color: @light; padding: 0;
border-radius: 20px;
background: transparent;
} }
/*-----module groups----*/ /* The whole bar */
.modules-right { #waybar {
padding: 3px; background: @dark;
background-color: @dark; color: @light;
margin: 0 5px 5px 0; font-family: Inconsolata, Inconsolata Nerd Font, FiraCode Nerd Font Mono;
border-radius: 10px; font-size: 14pt;
} font-weight: bold;
.modules-center {
padding: 3px;
background-color: @dark;
margin: 0 0 5px 0;
border-radius: 10px;
}
.modules-left {
padding: 3px;
margin: 0 0 5px 5px;
background-color: @dark;
border-radius: 10px;
} }
/* All modules */ /* All modules */
@ -86,8 +82,7 @@
#network, #network,
#pulseaudio, #pulseaudio,
#temperature, #temperature,
#tray, #tray {
#disk {
background: transparent; background: transparent;
color: @light; color: @light;
padding-left: 10px; padding-left: 10px;
@ -137,6 +132,7 @@
animation-duration: 3s; animation-duration: 3s;
} }
/* And now modules themselves in their respective order */
/* Workspaces stuff */ /* Workspaces stuff */
#workspaces button { #workspaces button {
@ -148,14 +144,60 @@
} }
#workspaces button.focused { #workspaces button.focused {
border: 1px solid @orange; border-bottom: 2px solid @orange;
} }
#workspaces button.visible:not(.focused) { #workspaces button.visible:not(.focused) {
border: 1px solid @gray; border-bottom: 2px solid @gray;
} }
#workspaces button.urgent { #workspaces button.urgent {
color: @orange; color: @orange;
} }
#mode { /* Shows current Sway mode (resize etc.) */
padding-left: 10px;
color: @light;
background: @red;
}
#window {
margin-right: 30px;
margin-left: 30px;
}
#pulseaudio {
border-bottom: 2px solid @red;
}
#network {
border-bottom: 2px solid @orange;
}
#memory {
border-bottom: 2px solid @yellow;
}
#cpu {
border-bottom: 2px solid @green;
}
#temperature {
border-bottom: 2px solid @teal;
}
#battery {
border-bottom: 2px solid @blue;
}
#tray {
}
#clock {
border-bottom: 2px solid @light;
}
#pulseaudio.muted {
/* No styles */
}

View file

@ -7,9 +7,9 @@
height = 28; height = 28;
modules-left = [ modules-left = [
"sway/workspaces" "sway/workspaces"
"sway/window"
]; ];
modules-center = [ modules-center = [
"clock"
]; ];
modules-right = [ modules-right = [
"disk" "disk"
@ -20,6 +20,7 @@
"temperature" "temperature"
"battery" "battery"
"tray" "tray"
"clock"
]; ];
modules = { modules = {
"battery" = { "battery" = {

View file

@ -1,3 +0,0 @@
{
services.fwupd.enable = true;
}

View file

@ -1,7 +1,6 @@
{ {
# enable sway, so we have a swaylock pam config # enable sway, so we have a swaylock pam config
programs.sway.enable = true; programs.sway.enable = true;
programs.sway.package = null;
# autologin # autologin
services.greetd = { services.greetd = {

View file

@ -1,6 +1,6 @@
{ pkgs, config, ... }: {pkgs, config, ...}:
let let
consoleFont = hiDPI: if hiDPI then "Lat2-Terminus16" else "Lat2-Terminus20"; consoleFont = hiDPI : if hiDPI then "Lat2-Terminus16" else "Lat2-Terminus20";
in in
{ {
imports = [ imports = [
@ -23,7 +23,6 @@ in
../modules/gc.nix ../modules/gc.nix
../modules/sway.nix ../modules/sway.nix
../modules/nixld.nix ../modules/nixld.nix
../modules/fwupd.nix
../secrets/remote-builder.nix ../secrets/remote-builder.nix
../users/fleaz.nix ../users/fleaz.nix
@ -60,11 +59,7 @@ in
# Look mum, I'm using all the new shiny stuff! # Look mum, I'm using all the new shiny stuff!
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
# TMP
networking.firewall = {
allowedTCPPorts = [ 3000 ];
};
networking.extraHosts = '' networking.extraHosts = ''
''; '';
} }