vorboyvo/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: vorboyvo:4dea4752ba8f3ff8a799746f1b6f190001ed12e9
Branches Tags
vorboyvo:main
vorboyvo:kde
..
compare: vorboyvo:b7261af069912c3aa2a04906ee89b8fc0cc64493
Branches Tags
vorboyvo:main
vorboyvo:kde

No commits in common. "4dea4752ba8f3ff8a799746f1b6f190001ed12e9" and "b7261af069912c3aa2a04906ee89b8fc0cc64493" have entirely different histories.
4dea4752ba ... b7261af069

2 changed files with 121 additions and 111 deletions
Show stats Expand all files Collapse all files

18
hosts/de-lacadie/configuration.nix
View file

@ -119,26 +119,12 @@
]; ];
# TODO Steam goes here # 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 # Enable x server
services.xserver = { services.xserver = {
enable = true; enable = true;
# displayManager.gdm.enable = true; displayManager.gdm.enable = true;
# desktopManager.gnome.enable = true; desktopManager.gnome.enable = true;
desktopManager = {
xterm.enable = false;
};
displayManager = {
defaultSession = "none+i3";
};
windowManager.i3.enable = true;
}; };
# Enable dconf; necessary for some programs # Enable dconf; necessary for some programs

186
hosts/de-lacadie/home.nix
View file

@ -6,19 +6,9 @@ let
terminal = pkgs.alacritty; terminal = pkgs.alacritty;
in { in {
imports = [ imports = [
<<<<<<< HEAD
../../programs/gammastep.nix
../../programs/kdeconnect.nix
../../programs/ssh.nix
../../programs/zsh.nix
../../programs/taskwarrior.nix
../../programs/clifm.nix
../../programs/git.nix
=======
../../snippets/kdeconnect.nix ../../snippets/kdeconnect.nix
../../snippets/ssh.nix ../../snippets/ssh.nix
../../snippets/zsh.nix ../../snippets/zsh.nix
>>>>>>> refs/remotes/origin/main
]; ];
home.username = "alice"; home.username = "alice";
home.homeDirectory = "/home/alice"; home.homeDirectory = "/home/alice";
@ -29,7 +19,7 @@ in {
home.pointerCursor = { home.pointerCursor = {
package = pkgs.vanilla-dmz; package = pkgs.vanilla-dmz;
name = "Vanilla-DMZ"; name = "Vanilla-DMZ";
size = 64; size = 128;
}; };
# Configure icon theme # Configure icon theme
@ -41,45 +31,62 @@ in {
}; };
}; };
# Configure internationalization
# i18n.inputMethod.enabled = "fcitx5";
# Configure xdg-desktop-portal (for file picker, etc.) # Configure xdg-desktop-portal (for file picker, etc.)
# xdg.portal = { # xdg.portal = {
# enable = true; # 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 # Install packages
home.packages = with pkgs; home.packages = with pkgs;
let let
xdg-terminal-exec =
callPackage ../../pkgs/xdg-terminal-exec/xdg-terminal-exec.nix { };
mons = callPackage ../../pkgs/mons/mons.nix { }; mons = callPackage ../../pkgs/mons/mons.nix { };
archivo = callPackage ../../pkgs/archivo/archivo.nix { }; archivo = callPackage ../../pkgs/archivo/archivo.nix { };
highway-gothic = callPackage ../../pkgs/highway-gothic/highway-gothic.nix { }; highway-gothic = callPackage ../../pkgs/highway-gothic/highway-gothic.nix { };
olympus = callPackage ../../pkgs/olympus/olympus.nix { };
in [ gcc tree-sitter ] ++ # Basic dev tools in [ gcc tree-sitter ] ++ # Basic dev tools
[ marksman nil ] ++ # Language servers except those installed through package sections [ marksman nil ] ++ # Language servers except those installed through package sections
[ texliveFull texlab ] ++ # LaTeX [ texliveFull texlab ] ++ # LaTeX
# (with ocamlPackages; [ (with ocamlPackages; [
# ocaml ocaml
# opam opam
# dune_3 dune_3
# dune-release dune-release
# merlin merlin
# ocaml-lsp ocaml-lsp
# odoc odoc
# ocamlformat ocamlformat
# utop utop
# ]) ++ # OCaml ]) ++ # OCaml
# [ rustup ] ++ # Rust [ rustup ] ++ # Rust
# [ go gopls ] ++ # Golang [ go gopls ] ++ # Golang
# (with elmPackages; [ elm elm-language-server elm-format elm-test ]) ++ (with elmPackages; [ elm elm-language-server elm-format elm-test ]) ++
[ python3 ] ++ # I guess..... [ python3 ] ++ # I guess.....
[ [
kak-lsp kak-lsp
brightnessctl brightnessctl
grim
slurp
jq jq
xdg-terminal-exec
blueman blueman
upower upower
glib # provides trash and mount (latter may supplant udisks2?)
] ++ # Basic utilities ] ++ # Basic utilities
[ bitwarden-cli htop snore hledger hledger-ui clifm ] [ bitwarden-cli htop snore hledger hledger-ui ]
++ # Personalized selection of command-line (CLI/TUI) apps ++ # Personalized selection of command-line (CLI/TUI) apps
[ terminal ] ++ # Terminal emulator [ terminal ] ++ # Terminal emulator
[ [
@ -102,9 +109,8 @@ in {
zulip zulip
filezilla filezilla
bitwarden bitwarden
activate-linux
] ++ # Personalized selection of graphical apps ] ++ # Personalized selection of graphical apps
[ olympus shticker-book-unwritten ] ++ # Games [ mons shticker-book-unwritten ] ++ # Games
[ bemenu j4-dmenu-desktop xclip xdotool ] ++ # i3 and x11 related packages [ bemenu j4-dmenu-desktop xclip xdotool ] ++ # i3 and x11 related packages
[ [
noto-fonts noto-fonts
@ -116,11 +122,29 @@ in {
highway-gothic highway-gothic
font-awesome font-awesome
] ++ # Fonts ] ++ # Fonts
# [ papirus-icon-theme ] ++ # Icons
# [ vanilla-dmz ] ++ # Cursor
[ ] ++ # Temp [ ] ++ # Temp
[ ]; [ ];
programs.home-manager.enable = true; programs.home-manager.enable = true;
programs.git = {
enable = true;
userName = "vorboyvo";
userEmail = "mrsirofvibe@outlook.com";
extraConfig = {
init.defaultBranch = "main";
core.editor = "kak";
};
};
# wayland.windowManager.sway = import ../../snippets/sway.nix {
# inherit scripts extra config lib pkgs terminal;
#};
#programs.waybar =
# import ../../snippets/waybar.nix { inherit scripts config lib pkgs terminal; };
#programs.swaylock = { #programs.swaylock = {
# enable = true; # enable = true;
@ -133,49 +157,49 @@ in {
# command = "${pkgs.lib.getExe pkgs.swaylock} -f"; # command = "${pkgs.lib.getExe pkgs.swaylock} -f";
# }]; # }];
#}; #};
#
xsession = let # xsession = let
term = terminal; # term = terminal;
dmenuCommand = builtins.readFile "${scripts}/dmenu.sh"; # dmenuCommand = builtins.readFile "${scripts}/dmenu.sh";
in { # in {
enable = true; # enable = true;
windowManager.i3 = { # windowManager.i3 = {
enable = true; # enable = true;
package = pkgs.i3-gaps; # config = rec {
config = rec { # terminal = "${pkgs.lib.getExe term}";
terminal = "${pkgs.lib.getExe term}"; # modifier = "Mod4";
modifier = "Mod4"; # fonts = {
fonts = { # names = [ "Red Hat Display" ];
names = [ "Red Hat Display" ]; # style = "Regular";
style = "Regular"; # size = 12.0;
size = 12.0; # };
}; # # input = {
# input = { # # "type:keyboard" = {
# "type:keyboard" = { # # xkb_layout = "ca,ca";
# xkb_layout = "ca,ca"; # # xkb_variant = ",eng";
# 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
# };
# }; # };
# }; # };
# 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 = {
}; # Fixes electron apps
}; # home.sessionVariables = { NIXOS_OZONE_WL = "1"; };
};
};
# configure fonts correctly # configure fonts correctly
fonts.fontconfig.enable = true; # fonts.fontconfig.enable = true;
xdg.configFile."fontconfig/conf.d/5-default.fonts.conf".source = # xdg.configFile."fontconfig/conf.d/5-default.fonts.conf".source =
"${extra}/20-default-fonts.conf"; # "${extra}/20-default-fonts.conf";
# terminal emulator # terminal emulator
programs.alacritty.enable = true; programs.alacritty.enable = true;
@ -212,24 +236,24 @@ in {
categories = [ "Utility" "TextEditor" ]; categories = [ "Utility" "TextEditor" ];
}; };
programs.zathura = { # programs.zathura = {
enable = true; # enable = true;
}; # };
programs.pandoc = { enable = true; }; programs.pandoc = { enable = true; };
# Configure notifications # Configure notifications
services.dunst = { # services.dunst = {
enable = true; # enable = true;
settings = { # settings = {
global = { # global = {
font = "Red Hat Display 12"; # font = "Red Hat Display 12";
mouse_left_click = "do_action, close_current"; # mouse_left_click = "do_action, close_current";
mouse_middle_click = "close_all"; # mouse_middle_click = "close_all";
mouse_right_click = "close_current"; # mouse_right_click = "close_current";
}; # };
}; # };
}; # };
programs.firefox = import ../../snippets/firefox.nix { inherit pkgs; }; programs.firefox = import ../../snippets/firefox.nix { inherit pkgs; };