Made a bunch of changes to bring de-lacadie more in line with randolph.
This commit is contained in:
vorboyvo
parent
04fa7e4ab9
commit
470e507242
|
|
@ -119,12 +119,26 @@
|
|||
];
|
||||
|
||||
# TODO Steam goes here
|
||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
||||
"steam" "steam-original" "steam-unwrapped" "steam-run"
|
||||
];
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
remotePlay.openFirewall = true;
|
||||
};
|
||||
|
||||
# Enable x server
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
displayManager.gdm.enable = true;
|
||||
desktopManager.gnome.enable = true;
|
||||
# displayManager.gdm.enable = true;
|
||||
# desktopManager.gnome.enable = true;
|
||||
desktopManager = {
|
||||
xterm.enable = false;
|
||||
};
|
||||
displayManager = {
|
||||
defaultSession = "none+i3";
|
||||
};
|
||||
windowManager.i3.enable = true;
|
||||
};
|
||||
|
||||
# Enable dconf; necessary for some programs
|
||||
|
|
|
|||
|
|
@ -6,9 +6,13 @@ let
|
|||
terminal = pkgs.alacritty;
|
||||
in {
|
||||
imports = [
|
||||
../../programs/gammastep.nix
|
||||
../../programs/kdeconnect.nix
|
||||
../../programs/ssh.nix
|
||||
../../programs/zsh.nix
|
||||
../../programs/taskwarrior.nix
|
||||
../../programs/clifm.nix
|
||||
../../programs/git.nix
|
||||
];
|
||||
home.username = "alice";
|
||||
home.homeDirectory = "/home/alice";
|
||||
|
|
@ -19,7 +23,7 @@ in {
|
|||
home.pointerCursor = {
|
||||
package = pkgs.vanilla-dmz;
|
||||
name = "Vanilla-DMZ";
|
||||
size = 128;
|
||||
size = 64;
|
||||
};
|
||||
|
||||
# Configure icon theme
|
||||
|
|
@ -31,62 +35,45 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
# Configure internationalization
|
||||
# i18n.inputMethod.enabled = "fcitx5";
|
||||
|
||||
# Configure xdg-desktop-portal (for file picker, etc.)
|
||||
# xdg.portal = {
|
||||
# enable = true;
|
||||
# };
|
||||
|
||||
# # Configure gammastep (night shift)
|
||||
# services.gammastep = {
|
||||
# enable = true;
|
||||
# temperature.day = 6500;
|
||||
# temperature.night = 4000;
|
||||
# # boul robert-bourassa/boul rené-lévesque : 45.498743909804354, -73.5703457606738
|
||||
# latitude = 45.4987;
|
||||
# longitude = -73.5703;
|
||||
# # tray = true;
|
||||
# };
|
||||
|
||||
# Install packages
|
||||
home.packages = with pkgs;
|
||||
let
|
||||
xdg-terminal-exec =
|
||||
callPackage ../../pkgs/xdg-terminal-exec/xdg-terminal-exec.nix { };
|
||||
mons = callPackage ../../pkgs/mons/mons.nix { };
|
||||
archivo = callPackage ../../pkgs/archivo/archivo.nix { };
|
||||
highway-gothic = callPackage ../../pkgs/highway-gothic/highway-gothic.nix { };
|
||||
olympus = callPackage ../../pkgs/olympus/olympus.nix { };
|
||||
in [ gcc tree-sitter ] ++ # Basic dev tools
|
||||
[ marksman nil ] ++ # Language servers except those installed through package sections
|
||||
[ texliveFull texlab ] ++ # LaTeX
|
||||
(with ocamlPackages; [
|
||||
ocaml
|
||||
opam
|
||||
dune_3
|
||||
dune-release
|
||||
merlin
|
||||
ocaml-lsp
|
||||
odoc
|
||||
ocamlformat
|
||||
utop
|
||||
]) ++ # OCaml
|
||||
[ rustup ] ++ # Rust
|
||||
[ go gopls ] ++ # Golang
|
||||
(with elmPackages; [ elm elm-language-server elm-format elm-test ]) ++
|
||||
# (with ocamlPackages; [
|
||||
# ocaml
|
||||
# opam
|
||||
# dune_3
|
||||
# dune-release
|
||||
# merlin
|
||||
# ocaml-lsp
|
||||
# odoc
|
||||
# ocamlformat
|
||||
# utop
|
||||
# ]) ++ # OCaml
|
||||
# [ rustup ] ++ # Rust
|
||||
# [ go gopls ] ++ # Golang
|
||||
# (with elmPackages; [ elm elm-language-server elm-format elm-test ]) ++
|
||||
[ python3 ] ++ # I guess.....
|
||||
[
|
||||
kak-lsp
|
||||
brightnessctl
|
||||
grim
|
||||
slurp
|
||||
jq
|
||||
xdg-terminal-exec
|
||||
blueman
|
||||
upower
|
||||
glib # provides trash and mount (latter may supplant udisks2?)
|
||||
] ++ # Basic utilities
|
||||
[ bitwarden-cli htop snore hledger hledger-ui ]
|
||||
[ bitwarden-cli htop snore hledger hledger-ui clifm ]
|
||||
++ # Personalized selection of command-line (CLI/TUI) apps
|
||||
[ terminal ] ++ # Terminal emulator
|
||||
[
|
||||
|
|
@ -109,8 +96,9 @@ in {
|
|||
zulip
|
||||
filezilla
|
||||
bitwarden
|
||||
activate-linux
|
||||
] ++ # Personalized selection of graphical apps
|
||||
[ mons shticker-book-unwritten ] ++ # Games
|
||||
[ olympus shticker-book-unwritten ] ++ # Games
|
||||
[ bemenu j4-dmenu-desktop xclip xdotool ] ++ # i3 and x11 related packages
|
||||
[
|
||||
noto-fonts
|
||||
|
|
@ -122,84 +110,66 @@ in {
|
|||
highway-gothic
|
||||
font-awesome
|
||||
] ++ # Fonts
|
||||
# [ papirus-icon-theme ] ++ # Icons
|
||||
# [ vanilla-dmz ] ++ # Cursor
|
||||
[ ] ++ # Temp
|
||||
[ ];
|
||||
|
||||
programs.home-manager.enable = true;
|
||||
|
||||
programs.git = {
|
||||
|
||||
# programs.swaylock = {
|
||||
# enable = true;
|
||||
# settings = { font-size = 14; };
|
||||
# };
|
||||
# services.swayidle = {
|
||||
# enable = true;
|
||||
# events = [{
|
||||
# event = "before-sleep";
|
||||
# command = "${pkgs.lib.getExe pkgs.swaylock} -f";
|
||||
# }];
|
||||
# };
|
||||
|
||||
xsession = let
|
||||
term = terminal;
|
||||
dmenuCommand = builtins.readFile "${scripts}/dmenu.sh";
|
||||
in {
|
||||
enable = true;
|
||||
userName = "vorboyvo";
|
||||
userEmail = "mrsirofvibe@outlook.com";
|
||||
extraConfig = {
|
||||
init.defaultBranch = "main";
|
||||
core.editor = "kak";
|
||||
windowManager.i3 = {
|
||||
enable = true;
|
||||
package = pkgs.i3-gaps;
|
||||
config = rec {
|
||||
terminal = "${pkgs.lib.getExe term}";
|
||||
modifier = "Mod4";
|
||||
fonts = {
|
||||
names = [ "Red Hat Display" ];
|
||||
style = "Regular";
|
||||
size = 12.0;
|
||||
};
|
||||
# input = {
|
||||
# "type:keyboard" = {
|
||||
# xkb_layout = "ca,ca";
|
||||
# xkb_variant = ",eng";
|
||||
# };
|
||||
# };
|
||||
# leaving bars out for now
|
||||
# bars = ...
|
||||
window = {
|
||||
border = 2;
|
||||
titlebar = true;
|
||||
};
|
||||
menu = "j4-dmenu-desktop --no-generic --term=${pkgs.lib.getExe term} --dmenu='${dmenuCommand}'";
|
||||
focus.followMouse = false;
|
||||
# keybindings and extraConfig go here
|
||||
keybindings = {
|
||||
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# wayland.windowManager.sway = import ../../programs/sway.nix {
|
||||
# inherit scripts extra config lib pkgs terminal;
|
||||
#};
|
||||
|
||||
#programs.waybar =
|
||||
# import ../../programs/waybar.nix { inherit scripts config lib pkgs terminal; };
|
||||
|
||||
#programs.swaylock = {
|
||||
# enable = true;
|
||||
# settings = { font-size = 14; };
|
||||
#};
|
||||
#services.swayidle = {
|
||||
# enable = true;
|
||||
# events = [{
|
||||
# event = "before-sleep";
|
||||
# command = "${pkgs.lib.getExe pkgs.swaylock} -f";
|
||||
# }];
|
||||
#};
|
||||
#
|
||||
|
||||
# xsession = let
|
||||
# term = terminal;
|
||||
# dmenuCommand = builtins.readFile "${scripts}/dmenu.sh";
|
||||
# in {
|
||||
# enable = true;
|
||||
# windowManager.i3 = {
|
||||
# enable = true;
|
||||
# config = rec {
|
||||
# terminal = "${pkgs.lib.getExe term}";
|
||||
# modifier = "Mod4";
|
||||
# fonts = {
|
||||
# names = [ "Red Hat Display" ];
|
||||
# style = "Regular";
|
||||
# size = 12.0;
|
||||
# };
|
||||
# # input = {
|
||||
# # "type:keyboard" = {
|
||||
# # xkb_layout = "ca,ca";
|
||||
# # xkb_variant = ",eng";
|
||||
# # };
|
||||
# # };
|
||||
# # leaving bars out for now
|
||||
# # bars = ...
|
||||
# window = {
|
||||
# border = 2;
|
||||
# titlebar = true;
|
||||
# };
|
||||
# menu = "j4-dmenu-desktop --no-generic --term=${pkgs.lib.getExe term} --dmenu='${dmenuCommand}'";
|
||||
# focus.followMouse = false;
|
||||
# # keybindings and extraConfig go here
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
|
||||
# Fixes electron apps
|
||||
# home.sessionVariables = { NIXOS_OZONE_WL = "1"; };
|
||||
|
||||
# configure fonts correctly
|
||||
# fonts.fontconfig.enable = true;
|
||||
# xdg.configFile."fontconfig/conf.d/5-default.fonts.conf".source =
|
||||
# "${extra}/20-default-fonts.conf";
|
||||
fonts.fontconfig.enable = true;
|
||||
xdg.configFile."fontconfig/conf.d/5-default.fonts.conf".source =
|
||||
"${extra}/20-default-fonts.conf";
|
||||
|
||||
# terminal emulator
|
||||
programs.alacritty.enable = true;
|
||||
|
|
@ -236,24 +206,24 @@ in {
|
|||
categories = [ "Utility" "TextEditor" ];
|
||||
};
|
||||
|
||||
# programs.zathura = {
|
||||
# enable = true;
|
||||
# };
|
||||
programs.zathura = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
programs.pandoc = { enable = true; };
|
||||
|
||||
# Configure notifications
|
||||
# services.dunst = {
|
||||
# enable = true;
|
||||
# settings = {
|
||||
# global = {
|
||||
# font = "Red Hat Display 12";
|
||||
# mouse_left_click = "do_action, close_current";
|
||||
# mouse_middle_click = "close_all";
|
||||
# mouse_right_click = "close_current";
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
services.dunst = {
|
||||
enable = true;
|
||||
settings = {
|
||||
global = {
|
||||
font = "Red Hat Display 12";
|
||||
mouse_left_click = "do_action, close_current";
|
||||
mouse_middle_click = "close_all";
|
||||
mouse_right_click = "close_current";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
programs.firefox = import ../../programs/firefox.nix { inherit pkgs; };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue