materus/nixos-config
1
0
Fork 0
mirror of https://github.com/materusPL/nixos-config synced 2025-06-18 14:36:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

25.05 updates

Browse Source
This commit is contained in:
Mateusz Słodkowicz 2025-06-08 19:24:01 +02:00
parent 18012450c0
commit cf1895a14e
Signed by: materus
GPG Key ID: 28D140BCA60B4FD1
7 changed files with 91 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configurations/host/materusPC/other/desktop/kde.nix
View File

@ -8,7 +8,7 @@
services.desktopManager.plasma6.enable = true;
services.desktopManager.plasma6.enableQt5Integration = true;
#programs.gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-gnome3;
#programs.gnupg.agent.pinentryPackage = lib.mkForce (pkgs.kwalletcli.overrideAttrs {meta.mainProgram = "pinentry-kwallet";});
#environment.plasma6.excludePackages = with pkgs.kdePackages; [ kwallet kwalletmanager kwallet-pam ];
environment.variables = {
# Old fix for black cursor on amdgpu, seems to work fine now
@ -29,4 +29,12 @@
];
programs.kdeconnect.enable = true;
materus.profile.steam.extraPkgs = [ pkgs.kdePackages.breeze pkgs.kdePackages.breeze-gtk pkgs.kdePackages.dolphin pkgs.vlc pkgs.vkbasalt-cli ];
programs.firefox = {
enable = true;
autoConfig = builtins.readFile(builtins.fetchurl {
url = "https://raw.githubusercontent.com/MrOtherGuy/fx-autoconfig/master/program/config.js";
sha256 = "1mx679fbc4d9x4bnqajqx5a95y1lfasvf90pbqkh9sm3ch945p40";
});
};
}

2
configurations/host/waffentrager/configuration.nix
View File

@ -28,7 +28,7 @@
gzip
];
sound.enable = false;
boot.tmp.useTmpfs = true;
services.xserver.enable = false;
networking.hostName = "waffentrager";

4
configurations/host/waffentrager/services/storage/nextcloud.nix
View File

@ -22,7 +22,7 @@
services.nextcloud = {
enable = true;
notify_push.enable = true;
package = pkgs.nextcloud29;
package = pkgs.nextcloud31;
hostName = "waffentrager.materus.pl";
home = config.waffentragerService.elements.nextcloudDir;
config.adminuser = "nextcloud-master";
@ -37,7 +37,7 @@
appstoreEnable = true;
database.createLocally = true;
nginx.recommendedHttpHeaders = true;
extraApps = with pkgs.nextcloud29Packages.apps; {
extraApps = with pkgs.nextcloud31Packages.apps; {
inherit notify_push previewgenerator;
};
settings = {

37
configurations/host/waffentrager/services/storage/samba.nix
View File

@ -24,25 +24,26 @@
package = pkgs.sambaFull;
securityType = "user";
openFirewall = true;
extraConfig = ''
workgroup = WORKGROUP
server string = smbwaffentrager
netbios name = smbwaffentrager
security = user
hosts allow = ${materusArg.wireguard.sambaIp} 192.168.100. 127.0.0.1 localhost
hosts deny = 0.0.0.0/0
guest account = nobody
map to guest = bad user
mangled names = no
dos charset = CP850
unix charset = UTF-8
display charset = UTF-8
catia:mappings = 0x22:0xa8,0x2a:0xa4,0x2f:0xf8,0x3a:0xf7,0x3c:0xab,0x3e:0xbb,0x3f:0xbf,0x5c:0xff,0x7c:0xa6
'';
shares = {
settings =
{
global = {
"workgroup" = "WORKGROUP";
"server string" = "smbwaffentrager";
"netbios name" = "smbwaffentrager";
"security" = "user";
"hosts allow" = "${materusArg.wireguard.sambaIp} 192.168.100. 127.0.0.1 localhost";
"hosts deny" = "0.0.0.0/0";
"guest account" = "nobody";
"map to guest" = "bad user";
"mangled names" = "no";
"dos charset" = "CP850";
"unix charset" = "UTF-8";
"display charset" = "UTF-8";
"catia:mappings" = "0x22:0xa8,0x2a:0xa4,0x2f:0xf8,0x3a:0xf7,0x3c:0xab,0x3e:0xbb,0x3f:0xbf,0x5c:0xff,0x7c:0xa6";
};
materus = {
path = "${config.waffentragerService.elements.path}/storage/materus";
browseable = "yes";
"path" = "${config.waffentragerService.elements.path}/storage/materus";
"browseable" = "yes";
"read only" = "no";
"guest ok" = "no";
"create mask" = "0770";

24
extraFiles/config/emacs/EMACS-CONFIG.org
View File

@ -11,6 +11,7 @@
- [[#init-core][Init Core]]
- [[#prepare][Prepare]]
- [[#elpaca][Elpaca]]
- [[#variables][Variables]]
- [[#functions][Functions]]
- [[#custom-file][Custom File]]
- [[#font--text][Font & Text]]
@ -179,7 +180,6 @@
(print "WARN: emacs-build-time not set up, using current time")
(setq emacs-build-time (decode-time (current-time))))
(add-to-list 'load-path (concat user-emacs-directory "etc/pkgs/")) ; Extra load path for packages
(defvar materus/nixos-config (getenv "MATERUS_CONFIG_DIR"))
(setq read-process-output-max (* 1024 1024 3))
#+END_src
@ -230,6 +230,16 @@
(setq elpaca-use-package-by-default t))
#+END_src
** Variables
#+begin_src emacs-lisp :noweb-ref init-variables
(defvar materus/nixos-config (getenv "MATERUS_CONFIG_DIR"))
(defvar materus/server-env nil)
(defvar materus/pkgs/vterm-enable nil)
(let ((vars-file (expand-file-name "etc/variables.el" user-emacs-directory)))
(unless (file-exists-p vars-file) (make-empty-file vars-file))
(load vars-file))
#+end_src
** Functions
#+begin_src emacs-lisp :noweb-ref init-functions
;; Use package preffering built-in / nix packages
@ -459,7 +469,8 @@ Setting up mouse
#+end_src
*** Vterm
#+begin_src emacs-lisp
(materus/use-package vterm)
(when (or materus/pkgs/vterm-enable (locate-library (symbol-name 'vterm)))
(materus/use-package vterm))
#+end_src
** Navigation and Completion
*** minibuffer (orderless, vertico, marginalia, consult)
@ -797,7 +808,7 @@ Setting up mouse
#+end_src
**** Common Lisp
#+begin_src emacs-lisp
(use-package slime
(use-package sly
:if (executable-find "sbcl")
:config
(setq inferior-lisp-program "sbcl"))
@ -941,14 +952,16 @@ Setting up mouse
#+end_src
*** Elcord
#+begin_src emacs-lisp
(use-package elcord
:if (not materus/server-env)
:config
(defun materus/elcord-toggle (&optional _frame)
"Toggle elcord based on visible frames"
(if (> (length (frame-list)) 1)
(elcord-mode 1)
(elcord-mode -1))
)
(use-package elcord
:config
(unless (daemonp) (elcord-mode 1))
(add-hook 'after-delete-frame-functions 'materus/elcord-toggle)
(add-hook 'server-after-make-frame-hook 'materus/elcord-toggle))
@ -1056,6 +1069,7 @@ Setting up mouse
;;; -*- lexical-binding: t; -*-
<<init>>
<<init-elpaca>>
<<init-variables>>
<<init-functions>>
<<package-no-littering>>
<<init-extra>>

19
extraFiles/config/emacs/init.el
View File

@ -6,7 +6,6 @@
(print "WARN: emacs-build-time not set up, using current time")
(setq emacs-build-time (decode-time (current-time))))
(add-to-list 'load-path (concat user-emacs-directory "etc/pkgs/")) ; Extra load path for packages
(defvar materus/nixos-config (getenv "MATERUS_CONFIG_DIR"))
(setq read-process-output-max (* 1024 1024 3))
;; Elpaca Init
@ -53,6 +52,13 @@
(elpaca-use-package-mode)
(setq elpaca-use-package-by-default t))
(defvar materus/nixos-config (getenv "MATERUS_CONFIG_DIR"))
(defvar materus/server-env nil)
(defvar materus/pkgs/vterm-enable nil)
(let ((vars-file (expand-file-name "etc/variables.el" user-emacs-directory)))
(unless (file-exists-p vars-file) (make-empty-file vars-file))
(load vars-file))
;; Use package preffering built-in / nix packages
(defmacro materus/use-package (package &rest body)
(if (locate-library (symbol-name `,package))
@ -224,7 +230,8 @@
("C-r" . visual-replace-from-isearch)))
(use-package eat)
(materus/use-package vterm)
(when (or materus/pkgs/vterm-enable (locate-library (symbol-name 'vterm)))
(materus/use-package vterm))
(use-package orderless
:init
;; Tune the global completion style settings to your liking!
@ -487,7 +494,7 @@
(when (treesit-language-available-p 'nix) (push '(nix-mode . nix-ts-mode) major-mode-remap-alist)))
(use-package paredit)
(use-package slime
(use-package sly
:if (executable-find "sbcl")
:config
(setq inferior-lisp-program "sbcl"))
@ -575,14 +582,16 @@
(setq persp-modestring-short t)
(persp-mode 1)
)
(use-package elcord
:if (not materus/server-env)
:config
(defun materus/elcord-toggle (&optional _frame)
"Toggle elcord based on visible frames"
(if (> (length (frame-list)) 1)
(elcord-mode 1)
(elcord-mode -1))
)
(use-package elcord
:config
(unless (daemonp) (elcord-mode 1))
(add-hook 'after-delete-frame-functions 'materus/elcord-toggle)
(add-hook 'server-after-make-frame-hook 'materus/elcord-toggle))