torjus/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Run nixfmt

Browse Source
This commit is contained in:
Torjus Håkestad
2024-02-27 22:20:00 +01:00
parent 4d82957b22
commit 5eb076d8d4
17 changed files with 126 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
home/default.nix
View File

@@ -1,8 +1,8 @@
{ inputs, self, user, ...}: {
{ inputs, self, user, ... }: {
imports = [ inputs.home-manager.nixosModules.home-manager ];
home-manager = {
useUserPackages = true;
useGlobalPkgs= true;
useGlobalPkgs = true;
extraSpecialArgs = { inherit inputs user; };
users.${user} = {
imports = [
@@ -11,7 +11,7 @@
./programs/tmux
./zsh
./packages
./hyprland
./hyprland
];
firefox.enable = true;
tmux.enable = true;

24
home/editor/neovim/default.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, ...}: {
{ pkgs, ... }: {
programs = {
neovim = {
enable = true;
@@ -6,17 +6,17 @@
vimAlias = true;
plugins = with pkgs.vimPlugins; [
vim-fugitive
undotree
telescope-nvim
lsp-zero-nvim
(nvim-treesitter.withPlugins (p: [
p.tree-sitter-nix
p.tree-sitter-go
p.tree-sitter-vim
p.tree-sitter-bash
p.tree-sitter-json
p.tree-sitter-python
]))
undotree
telescope-nvim
lsp-zero-nvim
(nvim-treesitter.withPlugins (p: [
p.tree-sitter-nix
p.tree-sitter-go
p.tree-sitter-vim
p.tree-sitter-bash
p.tree-sitter-json
p.tree-sitter-python
]))
];
extraLuaConfig = ''
${builtins.readFile ./options.lua}

7
home/hyprland/default.nix
View File

@@ -1,6 +1 @@
{
imports = [
./hyprland.nix
./waybar.nix
];
}
{ imports = [ ./hyprland.nix ./waybar.nix ]; }

150
home/hyprland/hyprland.nix
View File

@@ -1,95 +1,89 @@
{ inputs, pkgs, lib, ...}: {
{ inputs, pkgs, lib, ... }: {
options.hyprland.enable = lib.mkEnableOption "Hyprland";
config = {
home.packages = with pkgs; [
swww
wl-clipboard
cliphist
];
home.packages = with pkgs; [ swww wl-clipboard cliphist ];
wayland.windowManager.hyprland = {
enable = true;
settings = {
"$mainMod" = "SUPER";
"$term" = "alacritty";
"$term" = "alacritty";
monitor = [ "eDP-1,1920x1080@60,0x0,1" ];
input = {
kb_layout = "no";
follow_mouse = 1;
};
monitor = [ "eDP-1,1920x1080@60,0x0,1" ];
input = {
kb_layout = "no";
follow_mouse = 1;
};
decoration = {
rounding = 0;
drop_shadow = true;
shadow_range = 4;
shadow_render_power = 3;
blur = {
enabled = true;
size = 3;
passes = 1;
xray = true;
};
};
decoration = {
rounding = 0;
drop_shadow = true;
shadow_range = 4;
shadow_render_power = 3;
blur = {
enabled = true;
size = 3;
passes = 1;
xray = true;
};
};
general = {
gaps_in = 4;
gaps_out = 10;
border_size = 2;
layout = "dwindle";
};
general = {
gaps_in = 4;
gaps_out = 10;
border_size = 2;
layout = "dwindle";
};
animations = {
enabled = true;
bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
animation = [
"windows, 1, 7, myBezier"
"windowsOut, 1, 7, default, popin 80%"
"border, 1, 10, default"
"borderangle, 1, 8, default"
"fade, 1, 7, default"
"workspaces, 1, 6, default"
];
};
dwindle = {
pseudotile = true;
preserve_split = true;
};
master.new_is_master = true;
misc.force_default_wallpaper = -1;
animations = {
enabled = true;
bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
animation = [
"windows, 1, 7, myBezier"
"windowsOut, 1, 7, default, popin 80%"
"border, 1, 10, default"
"borderangle, 1, 8, default"
"fade, 1, 7, default"
"workspaces, 1, 6, default"
];
};
dwindle = {
pseudotile = true;
preserve_split = true;
};
master.new_is_master = true;
misc.force_default_wallpaper = -1;
bind = [
# term
"$mainMod,Return,exec,$term"
# rofi
"$mainMod,D,exec,rofi -show drun"
# hyprland
"$mainMod,Q,killactive,"
"CTRLALT,Delete,exit,"
"$mainMod,Space,togglefloating,"
"$mainMod,F,fullscreen,"
bind = [
# term
"$mainMod,Return,exec,$term"
# rofi
"$mainMod,D,exec,rofi -show drun"
# hyprland
"$mainMod,Q,killactive,"
"CTRLALT,Delete,exit,"
"$mainMod,Space,togglefloating,"
"$mainMod,F,fullscreen,"
# focus
"$mainMod,l,movefocus,l"
"$mainMod,h,movefocus,r"
"$mainMod,k,movefocus,u"
"$mainMod,j,movefocus,d"
# focus
"$mainMod,l,movefocus,l"
"$mainMod,h,movefocus,r"
"$mainMod,k,movefocus,u"
"$mainMod,j,movefocus,d"
# move
"$mainMod,h,movewindow,l"
"$mainMod,l,movewindow,r"
"$mainMod,k,movewindow,u"
"$mainMod,j,movewindow,d"
] ++ (builtins.concatLists (builtins.genList(x:
let
ws = let c = (x + 1) / 10; in builtins.toString (x + 1 - (c * 10));
in [
"$mainMod, ${ws}, workspace, ${toString( x + 1)}"
"ALT, ${ws}, workspace, ${toString( x + 1)}"
]) 10));
exec-once = [
"waybar &"
];
# move
"$mainMod,h,movewindow,l"
"$mainMod,l,movewindow,r"
"$mainMod,k,movewindow,u"
"$mainMod,j,movewindow,d"
] ++ (builtins.concatLists (builtins.genList (x:
let
ws = let c = (x + 1) / 10; in builtins.toString (x + 1 - (c * 10));
in [
"$mainMod, ${ws}, workspace, ${toString (x + 1)}"
"ALT, ${ws}, workspace, ${toString (x + 1)}"
]) 10));
exec-once = [ "waybar &" ];
};
};
};

3
home/hyprland/waybar.nix
View File

@@ -130,8 +130,7 @@
settings = [{
"layer" = "top";
"position" = "top";
modules-left =
[ "custom/launcher" "hyprland/workspaces" ];
modules-left = [ "custom/launcher" "hyprland/workspaces" ];
modules-center = [ "clock" ];
modules-right =
[ "pulseaudio" "pulseaudio#microphone" "memory" "cpu" "tray" ];

4
home/packages/default.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, ...}: {
{ pkgs, ... }: {
home.packages = with pkgs; [
# Generic tools
age
@@ -21,7 +21,7 @@
# Editors
vscode
# Go stuff
go
delve

9
home/programs/firefox/default.nix
View File

@@ -1,9 +1,6 @@
{ pkgs, config, lib, inputs, user, ...}: {
{ pkgs, config, lib, inputs, user, ... }: {
options.firefox.enable = lib.mkEnableOption "Firefox";
config = lib.mkIf config.firefox.enable {
programs.firefox = {
enable = true;
};
};
config =
lib.mkIf config.firefox.enable { programs.firefox = { enable = true; }; };
}

2
home/programs/tmux/default.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, lib, config, ...}:
{ pkgs, lib, config, ... }:
with lib;
let cfg = config.tmux.enable;
in {

2
home/zsh/default.nix
View File

@@ -1,4 +1,4 @@
{ user, pkgs, ...}: {
{ user, pkgs, ... }: {
home.packages = with pkgs; [ fd ];
programs.zsh = {
enable = true;