mrflos/nixos-config
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: mrflos:5d45159363451af706b21eb5418912a5830f926d
Branches Tags
mrflos:main
mrflos:macos
..
compare: mrflos:c1c0dcf50d595a0837608a841a488751082c4dc4
Branches Tags
mrflos:main
mrflos:macos

No commits in common. "5d45159363451af706b21eb5418912a5830f926d" and "c1c0dcf50d595a0837608a841a488751082c4dc4" have entirely different histories.
5d45159363 ... c1c0dcf50d

4 changed files with 23 additions and 20 deletions
Show stats Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1,5 +1,5 @@
.DS_Store .DS_Store
/configuration.nix ./configuration.nix
darwin-configuration.nix darwin-configuration.nix
deploy/result deploy/result

6
dotfiles/kitty/kitty.conf
View file

@ -84,10 +84,10 @@ confirm_os_window_close 0
enable_audio_bell no enable_audio_bell no
window_padding_width 10 window_padding_width 10
font_size 14.0 font_size 14.0
#background_opacity 1 background_opacity 1
background_opacity 0.98 #background_opacity 0.98
#background_image ~/Nextcloud/Images/Wallpapers/kitty-bg.png #background_image ~/Nextcloud/Images/Wallpapers/kitty-bg.png
#background_image_layout cscaled #background_image_layout cscaled
#background_tint 0.99 #background_tint 0.99
#modify_font cell_height 130% #modify_font cell_height 130%
#startup_session ~/.config/kitty/session.conf startup_session ~/.config/kitty/session.conf

15
modules/desktop.nix
View file

@ -26,12 +26,16 @@
openFirewall = true; openFirewall = true;
}; };
desktopManager.plasma6.enable = true; xserver.desktopManager.plasma5.enable = true;
displayManager.defaultSession = "plasma"; displayManager.defaultSession = "plasmawayland";
displayManager.sddm.wayland.enable = true; displayManager.sddm.wayland.enable = true;
displayManager.sddm.enable = true; displayManager.sddm.enable = true;
displayManager.sddm.enableHidpi = true; displayManager.sddm.enableHidpi = true;
displayManager.sddm.theme = "rose-pine"; displayManager.sddm.theme = "rose-pine";
#xserver = {
# enable = true;
# desktopManager.plasma5.enable = true;
#};
dbus.enable = true; dbus.enable = true;
}; };
@ -59,7 +63,7 @@
droidcam.enable = true; droidcam.enable = true;
firefox.enable = true; firefox.enable = true;
firefox.languagePacks = [ "fr" ]; firefox.languagePacks = [ "fr" ];
hyprland.enable = true; #hyprland.enable = true;
ssh.askPassword = pkgs.lib.mkForce "${pkgs.ksshaskpass.out}/bin/ksshaskpass"; # conflict between kde and gnome cf. https://github.com/NixOS/nixpkgs/issues/75867 ssh.askPassword = pkgs.lib.mkForce "${pkgs.ksshaskpass.out}/bin/ksshaskpass"; # conflict between kde and gnome cf. https://github.com/NixOS/nixpkgs/issues/75867
ssh.startAgent = true; ssh.startAgent = true;
@ -78,7 +82,7 @@
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
# no kde bloat # no kde bloat
environment.plasma6.excludePackages = with pkgs.kdePackages; [ environment.plasma5.excludePackages = with pkgs.libsForQt5; [
baloo baloo
elisa elisa
khelpcenter khelpcenter
@ -133,7 +137,7 @@
kitty kitty
latte-dock latte-dock
libreoffice-qt libreoffice-qt
kdePackages.ark libsForQt5.ark
mixxx mixxx
mumble mumble
nextcloud-client nextcloud-client
@ -150,7 +154,6 @@
waybar waybar
fuzzel fuzzel
alacritty alacritty
networkmanagerapplet
]; ];

20
modules/home-config.nix
View file

@ -6,12 +6,12 @@
... ...
}: }:
let let
# plasma-manager = pkgs.fetchFromGitHub { plasma-manager = pkgs.fetchFromGitHub {
# owner = "pjones"; owner = "pjones";
# repo = "plasma-manager"; repo = "plasma-manager";
# rev = "4e56cfeb95081a43cb49487d0996dc936d6201e5"; rev = "4e56cfeb95081a43cb49487d0996dc936d6201e5";
# sha256 = "sha256-LJ/lFEupLSi7xtUps234hhMk7ZdVLRoYeU7KiCFaoGw="; sha256 = "sha256-LJ/lFEupLSi7xtUps234hhMk7ZdVLRoYeU7KiCFaoGw=";
# }; };
startupScript = pkgs.pkgs.writeShellScriptBin "hyprland-start" '' startupScript = pkgs.pkgs.writeShellScriptBin "hyprland-start" ''
${pkgs.waybar}/bin/waybar & ${pkgs.waybar}/bin/waybar &
${pkgs.swww}/bin/swww init & ${pkgs.swww}/bin/swww init &
@ -67,10 +67,10 @@ in
yarn yarn
]; ];
# imports = [ imports = [
# (plasma-manager + "/modules") (plasma-manager + "/modules")
# ./home-plasma.nix ./home-plasma.nix
# ]; ];
home.file = { home.file = {
"./.config/kitty/" = { "./.config/kitty/" = {
source = ../dotfiles/kitty; source = ../dotfiles/kitty;