faukah/nichts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'main' of github.com:bloxx12/nichts

Browse source
This commit is contained in:
LarsZauberer 2024-04-13 19:16:59 +02:00
commit c34b880959
25 changed files with 1272 additions and 263 deletions
Download patch file Download diff file Expand all files Collapse all files

35
hosts/dragyx/flocke/configuration.nix
View file

@ -5,6 +5,7 @@
../../../options/common/pin-registry.nix
../../../options/common/preserve-system.nix
../../../options/desktop/fonts.nix
./packages.nix
];
@ -12,18 +13,16 @@
time.timeZone = "Europe/Zurich";
security.sudo.package = pkgs.sudo.override { withInsults = true; };
services.xserver = {
enable = true;
displayManager = {
services.displayManager = {
sessionPackages = [ pkgs.hyprland ]; # pkgs.gnome.gnome-session.sessions ];
defaultSession = "hyprland";
sddm = {
enable = true;
};
wayland.enable = true;
};
windowManager.hypr.enable = true;
};
hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true;
@ -110,18 +109,22 @@
modules = {
other = {
system = {
system = rec {
hostname = "flocke";
username = "dragyx";
monitors = {
name = "LaptopMain";
resolution = {
x = 2256;
y = 1504;
};
scale = 1.0;
refresh_rate = 60;
};
gitPath = "/home/${username}/repos/nichts";
monitors = [
{
name = "LaptopMain";
device = "eDP-1";
resolution = {
x = 2256;
y = 1504;
};
scale = 1.175;
refresh_rate = 60;
}
];
};
home-manager = {
enable = true;
@ -134,7 +137,7 @@
mpv.enable = true;
schizofox.enable = true;
obs.enable = true;
neovim.enable = true;
# neovim.enable = true;
git = {
enable = true;
userName = "Dragyx";

2
hosts/dragyx/flocke/packages.nix
View file

@ -28,7 +28,7 @@ in
android-tools
signal-desktop
nextcloud-client
etcher
# etcher
vlc
audacity
thunderbird

29
hosts/vali/mars/configuration.nix
View file

@ -1,11 +1,39 @@
{ config, inputs, pkgs, ... }:
{
nixpkgs.config.allowUnfree = true;
# Time Zone
time.timeZone = "Europe/Zurich";
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
console.keyMap = "de";
# enable flakes
nix.settings.experimental-features = [ "nix-command" "flakes" ];
# reduce file size used & automatic garbage collector
nix.settings.auto-optimise-store = true;
nix.gc = {
automatic = true;
options = "--delete-older-than 14d";
};
# required for nix-direnv to work and have environments not garbage collected
nix.extraOptions = ''
keep-outputs = true
keep-derivations = true
'';
security.sudo.package = pkgs.sudo.override { withInsults = true; };
security.polkit.enable = true;
programs.kdeconnect.enable = true;
services.mpd = {
enable = true;
musicDirectory = "/home/vali/Nextcloud/Media/Music/";
startWhenNeeded = true;
extraConfig = ''
audio_output {
type "pipewire"
name "My PipeWire Output"
}
'';
};
modules = {
other = {
system = {
@ -20,6 +48,7 @@
};
programs = {
vesktop.enable = true;
ncmpcpp.enable = true;
ssh.enable = true;
btop.enable = true;
mpv.enable = true;

4
hosts/vali/mars/default.nix
View file

@ -4,8 +4,6 @@ _: {
./programs.nix
./hardware-configuration.nix
./profile.nix
./i3.nix
./awesome.nix
./hypr/default.nix
./i3
];
}

190
hosts/vali/mars/i3/config Normal file
View file

@ -0,0 +1,190 @@
# This file has been auto-generated by i3-config-wizard(1).
# It will not be overwritten, so edit it as you like.
#
# Should you change your keyboard layout some time, delete
# this file and re-run i3-config-wizard(1).
#
# i3 config file (v4)
#
# Please see https://i3wm.org/docs/userguide.html for a complete reference!
set $mod Mod4
# Font for window titles. Will also be used by the bar unless a different font
# is used in the bar {} block below.
font pango:monospace 12
# This font is widely installed, provides lots of unicode glyphs, right-to-left
# text rendering and scalability on retina/hidpi displays (thanks to pango).
#font pango:DejaVu Sans Mono 8
# Start XDG autostart .desktop files using dex. See also
# https://wiki.archlinux.org/index.php/XDG_Autostart
exec --no-startup-id dex --autostart --environment i3
exec --no-startup-id xrandr --output HDMI-1 --rotate normal --output DP-2 --rotate normal --left-of HDMI-1 --output HDMI-0 --right-of HDMI-1
# The combination of xss-lock, nm-applet and pactl is a popular choice, so
# they are included here as an example. Modify as you see fit.
# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
# screen before suspend. Use loginctl lock-session to lock your screen.
exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
# NetworkManager is the most popular way to manage wireless networks on Linux,
# and nm-applet is a desktop environment-independent system tray GUI for it.
exec --no-startup-id nm-applet
# Use pactl to adjust volume in PulseAudio.
set $refresh_i3status killall -SIGUSR1 i3status
bindsym 123 exec --no-startup-id wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+ && $refresh_i3status
bindsym 122 exec --no-startup-id wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+ && $refresh_i3status
bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
bindsym 198 exec --no-startup-id pamixer --default-source -t && $refresh_i3status
# Use Mouse+$mod to drag floating windows to their wanted position
floating_modifier $mod
# move tiling windows via drag & drop by left-clicking into the title bar,
# or left-clicking anywhere into the window while holding the floating modifier.
tiling_drag modifier titlebar
# start a terminal
bindsym $mod+Return exec --no-startup-id alacritty
# kill focused window
bindsym $mod+Shift+q kill
# start dmenu (a program launcher)
bindsym $mod+d exec --no-startup-id dmenu_run
# A more modern dmenu replacement is rofi:
# There also is i3-dmenu-desktop which only displays applications shipping a
# .desktop file. It is a wrapper around dmenu, so you need that installed.
# bindcode $mod+40 exec --no-startup-id i3-dmenu-desktop
# change focus
bindsym $mod+h focus left
bindsym $mod+j focus down
bindsym $mod+k focus up
bindsym $mod+l focus right
# alternatively, you can use the cursor keys:
bindsym $mod+Left focus left
bindsym $mod+Down focus down
bindsym $mod+Up focus up
bindsym $mod+Right focus right
# move focused window
bindsym $mod+Shift+h move left
bindsym $mod+Shift+j move down
bindsym $mod+Shift+k move up
bindsym $mod+Shift+l move right
# alternatively, you can use the cursor keys:
bindsym $mod+Shift+Left move left
bindsym $mod+Shift+Down move down
bindsym $mod+Shift+Up move up
bindsym $mod+Shift+Right move right
# split in horizontal orientation
bindsym $mod+x split h
# split in vertical orientation
bindsym $mod+y split v
# enter fullscreen mode for the focused container
bindsym $mod+f fullscreen toggle
# change container layout (stacked, tabbed, toggle split)
bindsym $mod+w layout tabbed
bindsym $mod+s layout splith
# toggle tiling / floating
bindsym $mod+Shift+space floating toggle
# change focus between tiling / floating windows
bindsym $mod+space focus mode_toggle
# focus the parent container
bindsym $mod+a focus parent
# focus the child container
#bindsym $mod+d focus child
default_border pixel 3
#smart_borders on
hide_edge_borders smart_no_gaps
# Define names for default workspaces for which we configure key bindings later on.
# We use variables to avoid repeating the names in multiple places.
set $ws1 "1"
set $ws2 "2"
set $ws3 "3"
set $ws4 "4"
set $ws5 "5"
set $ws6 "6"
set $ws7 "7"
set $ws8 "8"
set $ws9 "9"
set $ws10 "10"
# switch to workspace
bindsym $mod+1 workspace number $ws1
bindsym $mod+2 workspace number $ws2
bindsym $mod+3 workspace number $ws3
bindsym $mod+4 workspace number $ws4
bindsym $mod+5 workspace number $ws5
bindsym $mod+6 workspace number $ws6
bindsym $mod+7 workspace number $ws7
bindsym $mod+8 workspace number $ws8
bindsym $mod+9 workspace number $ws9
bindsym $mod+0 workspace number $ws10
# move focused container to workspace
bindsym $mod+Shift+1 move container to workspace number $ws1
bindsym $mod+Shift+2 move container to workspace number $ws2
bindsym $mod+Shift+3 move container to workspace number $ws3
bindsym $mod+Shift+4 move container to workspace number $ws4
bindsym $mod+Shift+5 move container to workspace number $ws5
bindsym $mod+Shift+6 move container to workspace number $ws6
bindsym $mod+Shift+7 move container to workspace number $ws7
bindsym $mod+Shift+8 move container to workspace number $ws8
bindsym $mod+Shift+9 move container to workspace number $ws9
bindsym $mod+Shift+0 move container to workspace number $ws10
# reload the configuration file
bindsym $mod+Shift+c reload
# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
bindsym $mod+Shift+r restart
# exit i3 (logs you out of your X session)
bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'xfce-session-logout'"
# resize window (you can also use the mouse for that)
mode "resize" {
# These bindings trigger as soon as you enter the resize mode
# Pressing left will shrink the window’s width.
# Pressing right will grow the window’s width.
# Pressing up will shrink the window’s height.
# Pressing down will grow the window’s height.
bindsym l resize shrink width 10 px or 10 ppt
bindsym k resize grow height 10 px or 10 ppt
bindsym j resize shrink height 10 px or 10 ppt
bindsym h resize grow width 10 px or 10 ppt
# same bindings, but for the arrow keys
bindsym Left resize shrink width 10 px or 10 ppt
bindsym Down resize grow height 10 px or 10 ppt
bindsym Up resize shrink height 10 px or 10 ppt
bindsym Right resize grow width 10 px or 10 ppt
# back to normal: Enter or Escape or $mod+r
bindsym Return mode "default"
bindsym Escape mode "default"
bindsym $mod+r mode "default"
}
bindsym $mod+r mode "resize"
# Start i3bar to display a workspace bar (plus the system information i3status
# finds out, if available)
bar {
status_command i3status
}

6
hosts/vali/mars/i3/default.nix Normal file
View file

@ -0,0 +1,6 @@
_: {
imports = [
./i3.nix
# ./i3-new.nix
];
}

68
hosts/vali/mars/i3/i3-new.nix Normal file
View file

@ -0,0 +1,68 @@
{pkgs, lib, config, ... }:
with lib; let
cfg = config.modules.programs.i3;
username = config.modules.other.system.username;
mod = "Mod4";
in {
options.modules.programs.i3.enable = mkEnableOption "i3";
config = mkIf cfg.enable {
services.xserver = {
enable = true;
xkb.layout = "de";
};
xsession.windowManager.i3 = {
enable = true;
config = {
modifier = mod;
terminal = "alacritty";
fonts ={
names = [ "JetBrains Mono" "pango:monospace"];
size = 12;
style = "Bold Semi-Condensed";
};
keybindings = lib.mkOptionDefault {
# Run stuff
"${mod}+d" = "exec --no-startup-id ${pkgs.dmenu}/bin/dmenu_run";
"${mod}+Return" = "exec --no-startup-id alacritty";
"${mod}+Shift+q" = "kill";
# Focus
"${mod}+h" = "focus left";
"${mod}+j" = "focus down";
"${mod}+k" = "focus up";
"${mod}+l" = "focus right";
# Move
"${mod}+Shift+h" = "move left";
"${mod}+Shift+j" = "move down";
"${mod}+Shift+k" = "move up";
"${mod}+Shift+l" = "move right";
"XF86RaiseVolume" = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ && $refresh_i3status";
# Toggle stuff
"${mod}+f" = "fullscreen toggle";
};
window = {
titlebar = false;
border = 3;
hideEdgeBorders = true;
};
floating = {
titlebar = false;
};
bars = [
{
position = "bottom";
statusCommand = "${pkgs.i3status}/bin/i3status";
}
];
startup ={
command =
"xrandr --output HDMI-1 --rotate normal --output DP-2 --rotate normal --left-of HDMI-1 --output HDMI-0 --right-of HDMI-1";
#"dex --autostart --environment i3";
#"nm-applet";
#"keepassxc";
};
};
};
};
}

9
hosts/vali/mars/i3.nix → hosts/vali/mars/i3/i3.nix
View file

@ -1,10 +1,12 @@
{ pkgs, lib, config, callPackage, ... }:
with lib; let
username = config.modules.other.system.username;
cfg = config.modules.programs.i3;
in {
options.modules.programs.i3.enable = mkEnableOption "i3";
config = mkIf cfg.enable {
home-manager.users.${username}.xdg.configFile."i3/config".source = ./config;
services.xserver = {
enable = true;
xkb.layout = "de";
@ -14,13 +16,6 @@ in {
displayManager = {
gdm.enable = true;
defaultSession = "none+i3";
setupCommands = ''
LEFT='DP-2'
CENTER='HDMI-1'
RIGHT='HDMI-0'
${pkgs.xorg.xrandr}/bin/xrandr --output $CENTER --rotate left --output $LEFT --rotate left --left-of $CENTER --output $RIGHT --right-of $CENTER
'';
# ❯ xrandr --output HDMI-1 --rotate normal --output DP-2 --rotate normal --left-of HDMI-1 --output HDMI-0 --right-of HDMI-1
};
};
};

0
hosts/vali/mars/i3/polybar.sh Normal file
View file

4
hosts/vali/mars/profile.nix
View file

@ -5,8 +5,8 @@ _: {
../../../options/common/networking.nix
../../../options/common/gpu/nvidia.nix
# ../../../overlay.nix
# ../../options/common/pin-registry.nix
# ../../options/common/preserve-system.nix
../../../options/common/pin-registry.nix
../../../options/common/preserve-system.nix
#../../options/
];
}

21
hosts/vali/mars/programs.nix
View file

@ -1,23 +1,18 @@
{ config, inputs, pkgs, ... }:
let
fenix = inputs.fenix.packages.${pkgs.system};
username = config.modules.other.system.username;
in {
home-manager.users.${username} = {
home.packages = let
fenix = inputs.fenix.packages.${pkgs.system};
in with pkgs; [
environment.systemPackages = with pkgs; [
alacritty
alsa-utils
asciinema
betterbird
# betterbird
bibata-cursors
chromium
dig
easyeffects
element-desktop
eza
ripgrep
fastfetch
(fenix.complete.withComponents [
"cargo"
@ -27,6 +22,7 @@ in {
"rustfmt"
])
ffmpeg_6-full
flameshot
foot
gcc
gdb
@ -38,6 +34,8 @@ in {
krita
lazygit
libreoffice-fresh
moc
ncmpcpp
neofetch
neovim
networkmanagerapplet
@ -46,17 +44,21 @@ in {
pavucontrol
pcmanfm
pfetch
playerctl
polkit
python3
qbittorrent
ripgrep
rustdesk
rofi
scc
sherlock
signal-desktop-beta
smartmontools
spotube
st
steam
strawberry-qt6
strawberry
telegram-desktop
texliveFull
thunderbird
@ -72,5 +74,4 @@ in {
zathura
zip
];
};
}

78
hosts/vali/mars/temp Normal file
View file

@ -0,0 +1,78 @@
{ config, inputs, pkgs, ... }:
let
username = config.myOptions.other.system.username;
in {
home-manager.users.${username} = {
home.packages = let
fenix = inputs.fenix.packages.${pkgs.system};
in with pkgs; [
alacritty
alsa-utils
asciinema
betterbird
bibata-cursors
dig
easyeffects
element-desktop
eza
fastfetch
(fenix.complete.withComponents [
"cargo"
"clippy"
"rust-src"
"rustc"
"rustfmt"
])
ffmpeg_6-full
flameshot
foot
gcc
gdb
grimblast
git
httpie
imagemagick
keepassxc
krita
lazygit
libreoffice-fresh
neofetch
neovim
networkmanagerapplet
nextcloud-client
pamixer
pavucontrol
pcmanfm
pfetch
playerctl
polkit
python3
qbittorrent
ripgrep
rustdesk
rofi
scc
sherlock
signal-desktop-beta
smartmontools
st
steam
strawberry.strawberry-wrapped
telegram-desktop
texliveFull
thunderbird
tor-browser-bundle-bin
trash-cli
tree
unzip
ventoy-full
vesktop
vlc
xclip
yt-dlp
zathura
zip
];
};
}