november dump

machines/MacBookPro12.1-configuration.nix

@@ -58,10 +58,10 @@
     LC_TELEPHONE = "fr_FR.UTF-8";
     LC_TIME = "fr_FR.UTF-8";
   };
-  
+
   # Configure keymap in X11
   services.xserver = {
-    layout = "us";
+    layout = "us,ru";
     xkbVariant = "mac";
   };
 
@@ -84,4 +84,3 @@
   system.stateVersion = "23.05"; # Did you read the comment?
 
 }
-

machines/MacBookPro12.1-hardware-configuration.nix

@@ -29,10 +29,11 @@
 
   fileSystems."/mnt/nas/music" =
     {
-      device = "192.168.1.2:/volume1/music";
+      device = "192.168.1.9:/volume1/music";
       options = [ "nfsvers=4.2" "x-systemd.automount" "noauto" "rw" "relatime" "user" "acl" "defaults"];
       fsType = "nfs";
     };
+
   services.rpcbind.enable = true; # needed for NFS
   systemd.mounts = [{
     type = "nfs";
@@ -81,4 +82,9 @@
   services.udev.extraRules = lib.mkDefault ''
     SUBSYSTEM=="pci", KERNEL=="0000:00:14.0", ATTR{power/wakeup}="disabled"
   '';
+
+   services.logind.extraConfig = ''
+    RuntimeDirectorySize=8G
+    HandleLidSwitchDocked=ignore
+  '';
 }

modules/console.nix

@@ -18,7 +18,8 @@
       enable = true;
       autosuggestions.enable = true;
       shellAliases = {
-        ls = "ls --hyperlink=auto";
+        ls = "lsd --hyperlink=auto";
+        icat = "kitty +kitten icat";
         nixedit = "codium /etc/nixos";
         nixupdate = "sudo nix-channel --update && sudo nixos-rebuild switch";
         nixclean = "sudo nix-env --delete-generations old --profile /nix/var/nix/profiles/system && sudo /nix/var/nix/profiles/system/bin/switch-to-configuration switch && sudo nix-store --gc";
@@ -51,6 +52,7 @@
     git
     glances
     htop
+    lsd
     mc
     micro
     mosh

modules/desktop.nix

@@ -1,9 +1,9 @@
 # Window Manager and desktop programs
 { config, lib, pkgs, ... }:
 let
-  unstableTarball =
+  # unstableTarball =
-    fetchTarball
+  #   fetchTarball
-      https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz;
+  #     https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz;
 in
 {
   sound.enable = true;
@@ -14,8 +14,8 @@ in
     #blueman.enable = true;
     #openvpn.restartAfterSleep = false;
     openvpn.servers = {
-      arn  = { 
+      arn  = {
-        config = '' config /home/mrflos/Nextcloud/vpn\ ARN/2023/vpn510.conf ''; 
+        config = '' config /home/mrflos/Nextcloud/vpn\ ARN/2023/vpn510.conf '';
         autoStart = false;
       };
     };
@@ -32,15 +32,24 @@ in
       #media-session.enable = true;
     };
     printing.enable = true; # Enable CUPS to print documents.
+    printing.drivers = [ pkgs.brlaser ];
+
     xserver = {
       enable = true;
-      layout = "us";
+      #desktopManager.gnome.enable = true;
-      # desktopManager.gnome.enable = true;
+      displayManager.defaultSession = "plasmawayland";
       desktopManager.plasma5.enable = true;
       displayManager.sddm.enable = true;
-      # libinput.enable = true; # Enable touchpad support (enabled default in most desktopManager).
+      displayManager.sddm.enableHidpi = true;
     };
+    dbus.enable = true;
   };
+  # xdg.portal = {
+  #   enable = true;
+  #   wlr.enable = true;
+  #   # gtk portal needed to make gtk apps happy
+  #   extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+  # };
 
   programs = {
     chromium = {
@@ -63,13 +72,38 @@ in
         ];
       };
     };
-    dconf.enable = true;
+    # dconf.enable = true;
     droidcam.enable = true;
     firefox.enable = true;
-    kdeconnect.enable = true;
+    firefox.languagePacks = ["fr"];
+    hyprland.enable = true;
+
+    #kdeconnect.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.startAgent = true;
     steam.enable = true;
+    sway = {
+      enable = true;
+      wrapperFeatures.gtk = true; # so that gtk works properly
+      extraPackages = with pkgs; [
+        swaylock
+        swayidle
+        wl-clipboard
+        wf-recorder
+        mako # notification daemon
+        grim
+        slurp
+        alacritty # Alacritty is the default terminal in the config
+        dmenu # Dmenu is the default in the config but i recommend wofi since its wayland native
+      ];
+      extraSessionCommands = ''
+        export SDL_VIDEODRIVER=wayland
+        export QT_QPA_PLATFORM=wayland
+        export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
+        export _JAVA_AWT_WM_NONREPARENTING=1
+        export MOZ_ENABLE_WAYLAND=1
+      '';
+  };
   };
 
   # Allow unfree packages
@@ -98,17 +132,21 @@ in
       vscodeExtensions = with vscode-extensions; [
         bmewburn.vscode-intelephense-client
         dracula-theme.theme-dracula
+        editorconfig.editorconfig
+        esbenp.prettier-vscode
+        github.github-vscode-theme
         gruntfuggly.todo-tree
         jnoortheen.nix-ide
-        #junstyle.php-cs-fixer
         mhutchie.git-graph
         ms-ceintl.vscode-language-pack-fr
+        #junstyle.php-cs-fixer
+        #ms-vscode-remote.remote-ssh
       ]
       ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
       {
-        name = "twig-language-2";
+        name = "vscode-twig-language-2";
         publisher = "mblode";
-        version = "2.1.14";
+        version = "0.9.2";
         sha256 = "113w2iis4zi4z3sqc3vd2apyrh52hbh2gvmxjr5yvjpmrsksclbd";
       }
       ]
@@ -117,57 +155,46 @@ in
     (chromium.override {
       enableWideVine = true; # DRM support
     })
+    audacious
     bitwarden
     calibre
     digikam
     dracula-theme
-    #palenight-theme
     numix-cursor-theme
     papirus-icon-theme
     element-desktop
     filezilla
     gimp-with-plugins
-    #hyprland
+    hunspell
+    hunspellDicts.fr-moderne
+    hyprpaper
     inkscape-with-extensions
     joplin-desktop
-    #keychain
     kitty
     kitty-themes
     latte-dock
-    libreoffice
+    libreoffice-qt
     libsForQt5.ark
     libsForQt5.bismuth
-    mattermost-desktop
+    #mattermost-desktop
     mixxx
+    mpd
     nextcloud-client
     obsidian
     signal-desktop
-    tdesktop #telegram
+    tdesktop # strange name for telegram client
     thunderbird
+    tor-browser-bundle-bin
     transmission-qt
     vlc
+    waybar
+    wl-clipboard
+    wofi
+    mako # notification system developed by swaywm maintainer
+    wdisplays # tool to configure displays
     yt-dlp
   ];
 
-  # environment.gnome.excludePackages = (with pkgs; [
-  #   gnome-photos
-  #   gnome-tour
-  # ]) ++ (with pkgs.gnome; [
-  #   cheese # webcam tool
-  #   gnome-music
-  #   gedit # text editor
-  #   epiphany # web browser
-  #   geary # email reader
-  #   gnome-characters
-  #   tali # poker game
-  #   iagno # go game
-  #   hitori # sudoku game
-  #   atomix # puzzle game
-  #   yelp # Help view
-  #   gnome-contacts
-  #   gnome-initial-setup
-  # ]);
-  
   # Do not restart the display manager automatically
   systemd.services.display-manager.restartIfChanged = lib.mkForce false;
 

modules/home-config.nix

@@ -13,7 +13,7 @@
   #programs.home-manager.enable = true;
 
   home-manager.users.mrflos = { pkgs, ... }: {
-    home.stateVersion = "23.05";    
+    home.stateVersion = "23.05";
 
     accounts.email.accounts = {
       "mrflos@chmok.net" = {
@@ -69,7 +69,7 @@
         init.defaultBranch = "main";
       };
     };
-    
+
     programs.thunderbird = {
       enable = true;
       profiles.default = {

modules/local-dev.nix

@@ -9,25 +9,28 @@
     };
     libvirtd.enable = true;
     lxd.enable = true;
+    waydroid.enable = true;
   };
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
     (import (fetchTarball https://install.devenv.sh/latest)).default
+    clang
     direnv
     docker-compose
+    gcc
+    gitkraken
     nodejs
     php
-    gcc
-    clang
-    zig
     php82Packages.composer
     php82Packages.php-cs-fixer
+    python311Packages.virtualenv
     rpi-imager
     symfony-cli
     virt-manager
     yarn
+    zig
     zola
   ];
 }

modules/nixos.nix

@@ -3,7 +3,7 @@
   system.autoUpgrade = {
         enable = true;
   };
-  
+
   # Automatic Garbage Collection
   nix.gc = {
     automatic = true;
@@ -11,8 +11,8 @@
     options = "--delete-older-than 7d";
   };
 
-  # TODO : find what is installing this
+  # TODO : find what is installing this, probably obsidian?
-  # nixpkgs.config.permittedInsecurePackages = [
+  nixpkgs.config.permittedInsecurePackages = [
-  #   "electron-21.4.0"
+    "electron-24.8.6"
-  # ];
+  ];
 }