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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flake.nix
View File

@ -17,9 +17,7 @@
nixosConfigurations.prismo = nixpkgs.lib.nixosSystem { nixosConfigurations.prismo = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs self user; }; specialArgs = { inherit inputs self user; };
modules = [ modules = [ ./hosts/prismo ];
./hosts/prismo
];
}; };
}; };
} }

6
home/default.nix
View File

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

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

@ -1,4 +1,4 @@
{ pkgs, ...}: { { pkgs, ... }: {
programs = { programs = {
neovim = { neovim = {
enable = true; enable = true;
@ -6,17 +6,17 @@
vimAlias = true; vimAlias = true;
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
vim-fugitive vim-fugitive
undotree undotree
telescope-nvim telescope-nvim
lsp-zero-nvim lsp-zero-nvim
(nvim-treesitter.withPlugins (p: [ (nvim-treesitter.withPlugins (p: [
p.tree-sitter-nix p.tree-sitter-nix
p.tree-sitter-go p.tree-sitter-go
p.tree-sitter-vim p.tree-sitter-vim
p.tree-sitter-bash p.tree-sitter-bash
p.tree-sitter-json p.tree-sitter-json
p.tree-sitter-python p.tree-sitter-python
])) ]))
]; ];
extraLuaConfig = '' extraLuaConfig = ''
${builtins.readFile ./options.lua} ${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"; options.hyprland.enable = lib.mkEnableOption "Hyprland";
config = { config = {
home.packages = with pkgs; [ home.packages = with pkgs; [ swww wl-clipboard cliphist ];
swww
wl-clipboard
cliphist
];
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
settings = { settings = {
"$mainMod" = "SUPER"; "$mainMod" = "SUPER";
"$term" = "alacritty"; "$term" = "alacritty";
monitor = [ "eDP-1,1920x1080@60,0x0,1" ]; monitor = [ "eDP-1,1920x1080@60,0x0,1" ];
input = { input = {
kb_layout = "no"; kb_layout = "no";
follow_mouse = 1; follow_mouse = 1;
}; };
decoration = { decoration = {
rounding = 0; rounding = 0;
drop_shadow = true; drop_shadow = true;
shadow_range = 4; shadow_range = 4;
shadow_render_power = 3; shadow_render_power = 3;
blur = { blur = {
enabled = true; enabled = true;
size = 3; size = 3;
passes = 1; passes = 1;
xray = true; xray = true;
}; };
}; };
general = { general = {
gaps_in = 4; gaps_in = 4;
gaps_out = 10; gaps_out = 10;
border_size = 2; border_size = 2;
layout = "dwindle"; layout = "dwindle";
}; };
animations = { animations = {
enabled = true; enabled = true;
bezier = "myBezier, 0.05, 0.9, 0.1, 1.05"; bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
animation = [ animation = [
"windows, 1, 7, myBezier" "windows, 1, 7, myBezier"
"windowsOut, 1, 7, default, popin 80%" "windowsOut, 1, 7, default, popin 80%"
"border, 1, 10, default" "border, 1, 10, default"
"borderangle, 1, 8, default" "borderangle, 1, 8, default"
"fade, 1, 7, default" "fade, 1, 7, default"
"workspaces, 1, 6, default" "workspaces, 1, 6, default"
]; ];
}; };
dwindle = { dwindle = {
pseudotile = true; pseudotile = true;
preserve_split = true; preserve_split = true;
}; };
master.new_is_master = true; master.new_is_master = true;
misc.force_default_wallpaper = -1; misc.force_default_wallpaper = -1;
bind = [ bind = [
# term # term
"$mainMod,Return,exec,$term" "$mainMod,Return,exec,$term"
# rofi # rofi
"$mainMod,D,exec,rofi -show drun" "$mainMod,D,exec,rofi -show drun"
# hyprland # hyprland
"$mainMod,Q,killactive," "$mainMod,Q,killactive,"
"CTRLALT,Delete,exit," "CTRLALT,Delete,exit,"
"$mainMod,Space,togglefloating," "$mainMod,Space,togglefloating,"
"$mainMod,F,fullscreen," "$mainMod,F,fullscreen,"
# focus # focus
"$mainMod,l,movefocus,l" "$mainMod,l,movefocus,l"
"$mainMod,h,movefocus,r" "$mainMod,h,movefocus,r"
"$mainMod,k,movefocus,u" "$mainMod,k,movefocus,u"
"$mainMod,j,movefocus,d" "$mainMod,j,movefocus,d"
# move # move
"$mainMod,h,movewindow,l" "$mainMod,h,movewindow,l"
"$mainMod,l,movewindow,r" "$mainMod,l,movewindow,r"
"$mainMod,k,movewindow,u" "$mainMod,k,movewindow,u"
"$mainMod,j,movewindow,d" "$mainMod,j,movewindow,d"
] ++ (builtins.concatLists (builtins.genList(x: ] ++ (builtins.concatLists (builtins.genList (x:
let let
ws = let c = (x + 1) / 10; in builtins.toString (x + 1 - (c * 10)); ws = let c = (x + 1) / 10; in builtins.toString (x + 1 - (c * 10));
in [ in [
"$mainMod, ${ws}, workspace, ${toString( x + 1)}" "$mainMod, ${ws}, workspace, ${toString (x + 1)}"
"ALT, ${ws}, workspace, ${toString( x + 1)}" "ALT, ${ws}, workspace, ${toString (x + 1)}"
]) 10)); ]) 10));
exec-once = [ exec-once = [ "waybar &" ];
"waybar &"
];
}; };
}; };
}; };

3
home/hyprland/waybar.nix
View File

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

2
home/packages/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, ...}: { { pkgs, ... }: {
home.packages = with pkgs; [ home.packages = with pkgs; [
# Generic tools # Generic tools
age age

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"; options.firefox.enable = lib.mkEnableOption "Firefox";
config = lib.mkIf config.firefox.enable { config =
programs.firefox = { lib.mkIf config.firefox.enable { programs.firefox = { enable = true; }; };
enable = true;
};
};
} }

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

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

2
home/zsh/default.nix
View File

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

19
hosts/prismo/configuration.nix
View File

@ -1,20 +1,11 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
imports = imports = [ ./hardware-configuration.nix ];
[
./hardware-configuration.nix
];
# Bootloader stuff # Bootloader stuff
boot.loader.systemd-boot = { boot.loader.systemd-boot = { enable = true; };
enable = true; boot.loader.efi = { canTouchEfiVariables = true; };
};
boot.loader.efi = {
canTouchEfiVariables = true;
};
# Networking stuff # Networking stuff
networking.hostName = "prismo"; # Define your hostname. networking.hostName = "prismo"; # Define your hostname.
@ -37,9 +28,7 @@
XDG_DATA_HOME = "$HOME/.local/share"; XDG_DATA_HOME = "$HOME/.local/share";
XDG_STATE_HOME = "$HOME/.local/state"; XDG_STATE_HOME = "$HOME/.local/state";
XDG_BIN_HOME = "$HOME/.local/bin"; XDG_BIN_HOME = "$HOME/.local/bin";
PATH = [ PATH = [ "${XDG_BIN_HOME}" ];
"${XDG_BIN_HOME}"
];
}; };
# Enable sudo # Enable sudo

2
hosts/prismo/default.nix
View File

@ -1,4 +1,4 @@
{ inputs, self, pks, ...}: { { inputs, self, pks, ... }: {
imports = [ imports = [
./configuration.nix ./configuration.nix
./hardware-configuration.nix ./hardware-configuration.nix

32
hosts/prismo/hardware-configuration.nix
View File

@ -4,30 +4,29 @@
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
{ {
imports = imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.availableKernelModules =
[ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/91a0dbc4-426f-4b7b-a49e-063d1d0e59fb"; device = "/dev/disk/by-uuid/91a0dbc4-426f-4b7b-a49e-063d1d0e59fb";
fsType = "xfs"; fsType = "xfs";
}; };
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/f71b0ace-f38f-435f-a07a-007f9cfe4919"; boot.initrd.luks.devices."cryptroot".device =
"/dev/disk/by-uuid/f71b0ace-f38f-435f-a07a-007f9cfe4919";
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/AF2D-FAD0"; device = "/dev/disk/by-uuid/AF2D-FAD0";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = swapDevices =
[ { device = "/dev/disk/by-uuid/67da36a8-69df-4541-88cd-cba7cbc40b4c"; } [{ device = "/dev/disk/by-uuid/67da36a8-69df-4541-88cd-cba7cbc40b4c"; }];
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's
@ -38,5 +37,6 @@
# networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

9
system/default.nix
View File

@ -1,8 +1 @@
{ { imports = [ ./podman.nix ./fonts.nix ./users.nix ./services.nix ]; }
imports = [
./podman.nix
./fonts.nix
./users.nix
./services.nix
];
}

3
system/fonts.nix
View File

@ -1,5 +1,4 @@
{ pkgs, ... }: { pkgs, ... }: {
{
environment.systemPackages = with pkgs; [ twemoji-color-font ]; environment.systemPackages = with pkgs; [ twemoji-color-font ];
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
fira-code fira-code

2
system/podman.nix
View File

@ -1,4 +1,4 @@
{ pkgs, ...}: { pkgs, ... }:
{ {
virtualisation = { virtualisation = {

2
system/users.nix
View File

@ -1,4 +1,4 @@
{ pkgs, ...}: { pkgs, ... }:
{ {
programs.zsh.enable = true; programs.zsh.enable = true;