Simmer/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove attempt to add display manager

Browse Source
This commit is contained in:
Ethan Simmons
2024-07-22 14:43:43 -05:00
parent cd9a2df603
commit 444726af6c
8 changed files with 286 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
flake.lock generated
View File

@@ -64,11 +64,11 @@
]
},
"locked": {
"lastModified": 1720734513,
"narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=",
"lastModified": 1721534365,
"narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "90ae324e2c56af10f20549ab72014804a3064c7f",
"rev": "635563f245309ef5320f80c7ebcb89b2398d2949",
"type": "github"
},
"original": {
@@ -83,11 +83,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1721047697,
"narHash": "sha256-Qj2jktWmYosvGMxYPiSG9ZxN3TQV3nFmYcFXTdqGOkg=",
"lastModified": 1721569510,
"narHash": "sha256-NOJlbyWDiAKL71BsCWRu3GUQN/BJtz2PBwT6q8tkFDA=",
"owner": "ggerganov",
"repo": "llama.cpp",
"rev": "8fac431b0692e88cdc55250f29f8d4386be82c5d",
"rev": "45f2c19cc57286eead7b232ce8028273a817aa4d",
"type": "github"
},
"original": {
@@ -98,11 +98,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1720768451,
"narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=",
"lastModified": 1721379653,
"narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9",
"rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374",
"type": "github"
},
"original": {
@@ -126,11 +126,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1720954236,
"narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=",
"lastModified": 1721409541,
"narHash": "sha256-b6PLr0Ty7JPDBtJtjnYzlBf02bbH9alWMAgispMkTwk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27",
"rev": "0c53b6b8c2a3e46c68e04417e247bba660689c9d",
"type": "github"
},
"original": {
@@ -142,11 +142,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1720915306,
"narHash": "sha256-6vuViC56+KSr+945bCV8akHK+7J5k6n/epYg/W3I5eQ=",
"lastModified": 1721524707,
"narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "74348da2f3a312ee25cea09b98cdba4cb9fa5d5d",
"rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
"type": "github"
},
"original": {
@@ -158,11 +158,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1720957393,
"narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
"lastModified": 1721379653,
"narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
"rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374",
"type": "github"
},
"original": {
@@ -174,11 +174,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1720781449,
"narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=",
"lastModified": 1721466660,
"narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8b5a3d5a1d951344d683b442c0739010b80039db",
"rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100",
"type": "github"
},
"original": {
@@ -205,11 +205,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1720926522,
"narHash": "sha256-eTpnrT6yu1vp8C0B5fxHXhgKxHoYMoYTEikQx///jxY=",
"lastModified": 1721531171,
"narHash": "sha256-AsvPw7T0tBLb53xZGcUC3YPqlIpdxoSx56u8vPCr6gU=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "0703ba03fd9c1665f8ab68cc3487302475164617",
"rev": "909e8cfb60d83321d85c8d17209d733658a21c95",
"type": "github"
},
"original": {

4
flake.nix
View File

@@ -89,7 +89,7 @@
resolution = "3440x1440";
refreshRate = 144;
x = 1920;
wallpaper = "ship_moon.png";
wallpaper = "solar_system.png";
})
(utils.mkMonitor {
monitor = "HDMI-A-1";
@@ -233,7 +233,7 @@
];
};
})
configs
configs
);
};
}

247
hosts/ankaa/dotfiles/lemurs/config.toml Normal file
View File

@@ -0,0 +1,247 @@
# Lemurs configuration file.
# Contains all the customization options of lemurs.
#
# Note: that as of now you need to have all options in the selected
# configuration file. Otherwise Lemurs will not work.
#
# Colors:
# ---------
# There is a list of predefined colors. These include:
# - black
# - white
# - (dark) gray
# - (light) red
# - (light) blue
# - (light) green
# - (light) magenta
# - (light) cyan
# - (light) yellow
# - orange
#
# You can also utilize custom colors with hex color codes.
# "#87CEEB" will create a Sky Blue color.
#
# Note: If the color wasn't recognized, it will default to white.
# ---------
#
# Modifiers:
# ---------
# There is a number of modifiers you can use. These can be combined by
# delimiting them with a comma (e.g. "bold,italic"). The modifiers are:
# - bold
# - dim
# - italic
# - underlined
# - reverse
# - crossed out
# - hidden
# ---------
#
# The tty which contains lemurs. This has to be mirrored in the lemurs.service
tty = 2
# The PAM service that should be used to login
pam_service = "lemurs"
# Focus behaviour of fields when Lemurs is initially started
#
# Possible values:
# - default: Initially focus on first non-cached value
# - no-focus: No initial focus
# - environment: Initially focus on the environment selector
# - username: Initially focus on the username field
# - password: Initially focus on the password field
focus_behaviour = "default"
[power_controls]
# Allow for the shutdown option to be used
allow_shutdown = true
# The text in the top-left to display how to shutdown. The text '%key%' will be
# replaced with the shutdown_key.
shutdown_hint = "Shutdown %key%"
# The color and modifiers of the hint in the top-left corner
shutdown_hint_color = "dark gray"
shutdown_hint_modifiers = ""
# The key used to shutdown. Possibilities are F1 to F12.
shutdown_key = "F1"
# The command that is executed when the key is pressed
shutdown_cmd = "systemctl poweroff -l"
# Allow for the reboot option to be used
allow_reboot = true
# The text in the top-left to display how to reboot. The text '%key%' will be
# replaced with the shutdown_key.
reboot_hint = "Reboot %key%"
# The color and modifiers of the hint in the top-left corner
reboot_hint_color = "dark gray"
reboot_hint_modifiers = ""
# The key used to reboot. Possibilities are F1 to F12.
reboot_key = "F2"
# The command that is executed when the key is pressed
reboot_cmd = "systemctl reboot -l"
# The margin between the shutdown and reboot hints
hint_margin = 2
# Setting for the selector of the desktop environment you are using.
[environment_switcher]
# Terms:
# ---------
# Movers: indicators which show which direction one can move whilst selecting
# the desktop environment
# Selected: The currently selected desktop environment.
# Neighbours: The adjacent desktop environment to the one current selected
#
# Visualisation:
#
# < i3 bspwm awesome >
#
# ^ ^ ^ ^ ^
# | | | | |
# mover | selected | mover
# | |
# neighbour neighbour
# ---------
#
# Show an option for the TTY shell when logging in as one of the environments.
# NOTE: it is always shown when no viable options are found.
include_tty_shell = false
# Remember the selected environment after logging in for the next time
remember = true
# Enables showing the movers
show_movers = true
# Mover's color and modifiers whilst the selector is unfocused
mover_color = "dark gray"
mover_modifiers = ""
# Mover's color and modifiers whilst the selector is focused
mover_color_focused = "orange"
mover_modifiers_focused = "bold"
# The characters used to display the movers. Suggestions are:
# - "<" ">"
# - "<-" "->"
# - "<<" ">>"
# - "[" "]"
left_mover = "<"
right_mover = ">"
# The margin between the movers and the neighbours or selected (depending on
# `show_neighbours`)
mover_margin = 1
# Enables showing the neighbours
show_neighbours = true
# Neighbours' color and modifiers whilst the selector is unfocused
neighbour_color = "dark gray"
neighbour_modifiers = ""
# Neighbours' color and modifiers whilst the selector is focused
neighbour_color_focused = "gray"
neighbour_modifiers_focused = ""
# Margin between neighbours and selected
neighbour_margin = 1
# Selected's color and modifiers whilst the selector is unfocused
selected_color = "gray"
selected_modifiers = "underlined"
# Selected's color and modifiers whilst the selector is focused
selected_color_focused = "white"
selected_modifiers_focused = "bold"
# The length of the name of the desktop environment which is displayed.
max_display_length = 8
# The text used when no desktop environments are available
no_envs_text = "No environments..."
# The color and modifiers of the 'no desktop environments available text'
# whilst the selector is unfocused
no_envs_color = "white"
no_envs_modifiers = ""
# The color and modifiers of the 'no desktop environments available text'
# whilst the selector is focused
no_envs_color_focused = "red"
no_envs_modifiers_focused = ""
[username_field]
# Remember the username for the next time after a successful login attempt.
remember = true
[username_field.style]
# Enables showing a title
show_title = true
# The text used within the title
title = "Login"
# The title's color and modifiers whilst the username field is unfocused
title_color = "white"
content_color = "white"
# The title's color and modifiers whilst the username field is focused
title_color_focused = "orange"
content_color_focused = "orange"
# Enables showing the borders
show_border = true
# The borders' color and modifiers whilst the username field is unfocused
border_color = "white"
# The borders' color and modifiers whilst the username field is focused
border_color_focused = "orange"
# Constrain the width of the username field
use_max_width = true
# The contraint of the username field's width
max_width = 48
[password_field]
# The character used for replacement when typing a password. Leave empty for no
# feedback.
# Note: Only one character is accepted.
content_replacement_character = "*"
[password_field.style]
# Enables showing a title
show_title = true
# The text used within the title
title = "Password"
# The title's color and modifiers whilst the password field is unfocused
title_color = "white"
content_color = "white"
# The title's color and modifiers whilst the password field is focused
title_color_focused = "orange"
content_color_focused = "orange"
# Enables showing the borders
show_border = true
# The borders' color and modifiers whilst the username field is unfocused
border_color = "white"
# The borders' color and modifiers whilst the username field is focused
border_color_focused = "orange"
# Constrain the width of the password field
use_max_width = true
# The contraint of the password field's width
max_width = 48
[wayland]
scripts_path = "/etc/lemurs/wayland"

5
hosts/ankaa/system.nix
View File

@@ -18,8 +18,11 @@
environment.systemPackages = with pkgs; [
localPackages.x86_64-linux.jhelioviewer
lemurs
];
services.hardware.openrgb.enable = true;
hardware.graphics.extraPackages = with pkgs; [
rocmPackages.clr.icd
];
@@ -54,7 +57,7 @@
# Define a user account.
users.users.eesim = {
isNormalUser = true;
extraGroups = [ "wheel" "video" "audo" "networkmanager" ];
extraGroups = [ "wheel" "video" "audio" "networkmanager" "dialout" ];
packages = with pkgs; [];
shell = pkgs.fish;
openssh.authorizedKeys.keys = [

2
hosts/shared/dotfiles/fish/cli-config.fish
View File

@@ -1,6 +1,8 @@
if status is-interactive
fish_add_path "/home/eesim/.cargo/bin/"
abbr ll 'eza'
set fish_greeting
set -g fish_key_bindings fish_vi_key_bindings

2
hosts/shared/dotfiles/fish/gui-config.fish
View File

@@ -1,6 +1,8 @@
if status is-interactive
fish_add_path "/home/eesim/.cargo/bin/"
abbr ll 'eza'
set fish_greeting
set -g fish_key_bindings fish_vi_key_bindings

4
modules/nix/common.nix
View File

@@ -44,7 +44,9 @@ in
};
};
programs.fish.enable = mkIf (cfg.shell == "fish") true;
programs.fish = mkIf (cfg.shell == "fish") {
enable = true;
};
};
}

4
pkgs/jhelioviewer.nix
View File

@@ -54,14 +54,14 @@ stdenv.mkDerivation {
install -Dm644 JHelioviewer.jar $out/share/java/
cp -r lib/* $out/share/java/lib/
cp -rv lib/* $out/share/java/lib/
rm $out/share/java/lib/jogl/*.jar
cp -v ${jogl}/share/java/jogl*.jar ${jogl}/share/java/glue*.jar $out/share/java/lib/jogl
mkdir $out/bin
makeWrapper ${jre}/bin/java $out/bin/jhelioviewer \
--prefix LD_LIBRARY_PATH : ${libGL}/lib/ \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]} \
--add-flags "-cp $out/share/java/JHelioviewer.jar" \
--add-flags "--add-exports java.desktop/sun.awt=ALL-UNNAMED" \
--add-flags "--add-exports java.desktop/sun.swing=ALL-UNNAMED" \