lxsameer
/
Universe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for x11vnc to maryland

This commit is contained in:
Sameer Rahmani 2024-04-11 12:01:52 +01:00
parent 5f4fb55f6c
commit 7d31271f32
Signed by: lxsameer
GPG Key ID: 8741FACBF412FFA5
7 changed files with 118 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

236
flake.lock
View File

@ -10,11 +10,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1707830867,
"narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
"lastModified": 1712079060,
"narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=",
"owner": "ryantm",
"repo": "agenix",
"rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
"rev": "1381a759b205dff7a6818733118d02253340fd5e",
"type": "github"
},
"original": {
@ -197,11 +197,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1711462743,
"narHash": "sha256-3wKGpHy9Kyh98DrziqC/s//60Q0pE17NgbY93L0uWng=",
"lastModified": 1712765858,
"narHash": "sha256-gWRdIXmNsgOKFNiFOAzo4hleJsl03vu9nLPrkmwmTwY=",
"owner": "nix-community",
"repo": "disko",
"rev": "a6717b1afee7ae955c61eefdf0ce8f864ef78115",
"rev": "53c4cc48b71bbd98d65fb4c7bc0e2ea22d9a6672",
"type": "github"
},
"original": {
@ -233,7 +233,7 @@
},
"emacs-overlay_2": {
"inputs": {
"flake-utils": "flake-utils_3",
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_4",
"nixpkgs-stable": "nixpkgs-stable_2"
},
@ -255,21 +255,20 @@
"fg42": {
"inputs": {
"emacs-overlay": "emacs-overlay",
"flake-utils": "flake-utils_2",
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_3",
"noether": "noether"
},
"locked": {
"lastModified": 1712352760,
"narHash": "sha256-Lfm/Tn40rX4G6tIMkw7nZBZPPxoS0v0fzIA6wicgu8w=",
"ref": "v4",
"rev": "02794af163a7227d44f9878db3b3f3141a782d00",
"revCount": 1072,
"lastModified": 1712786536,
"narHash": "sha256-nQJRWtZk/TkusN8l2pjo5VcO2oEXjASCT0UH5f83APE=",
"ref": "refs/heads/master",
"rev": "dc949d26c47a65aff48ea43ab841005fb43a494e",
"revCount": 1089,
"type": "git",
"url": "https://devheroes.codes/FG42/FG42"
},
"original": {
"ref": "v4",
"type": "git",
"url": "https://devheroes.codes/FG42/FG42"
}
@ -290,6 +289,42 @@
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1712014858,
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
"lastModified": 1712014858,
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems_2"
@ -312,24 +347,6 @@
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
@ -344,42 +361,6 @@
"type": "github"
}
},
"flake-utils_4": {
"inputs": {
"systems": "systems_5"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake_utils": {
"inputs": {
"systems": "systems_6"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"fromYaml": {
"flake": false,
"locked": {
@ -478,11 +459,11 @@
},
"nixlib": {
"locked": {
"lastModified": 1711241261,
"narHash": "sha256-knrTvpl81yGFHIpm1SsLDApe0thFkw1cl3ISAMPmP/0=",
"lastModified": 1712450863,
"narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "b2a1eeef8c185f6bd27432b053ff09d773244cbc",
"rev": "3c62b6a12571c9a7f65ab037173ee153d539905f",
"type": "github"
},
"original": {
@ -499,11 +480,11 @@
]
},
"locked": {
"lastModified": 1711375484,
"narHash": "sha256-+d4HqehyQvuHUKR8Nv9HGGd/SP5wjg3MA/hEYJBWQq0=",
"lastModified": 1712537332,
"narHash": "sha256-yYlxv1sg/TNl6hghjAe0ct+/p5PwXiT1mpuaExjhR88=",
"owner": "nix-community",
"repo": "nixos-generators",
"rev": "2b3720c7af2271be8cee713cd2f69c5127b0a8e4",
"rev": "d942db8df8ee860556a38754f15b8d03bf7e6933",
"type": "github"
},
"original": {
@ -514,11 +495,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1711352745,
"narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=",
"lastModified": 1712760404,
"narHash": "sha256-4zhaEW1nB+nGbCNMjOggWeY5nXs/H0Y71q0+h+jdxoU=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0",
"rev": "e1c4bac14beb8c409d0534382cf967171706b9d9",
"type": "github"
},
"original": {
@ -529,11 +510,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1710889954,
"narHash": "sha256-Pr6F5Pmd7JnNEMHHmspZ0qVqIBVxyZ13ik1pJtm2QXk=",
"lastModified": 1711715736,
"narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7872526e9c5332274ea5932a0c3270d6e4724f3b",
"rev": "807c549feabce7eddbf259dbdcec9e0600a0660d",
"type": "github"
},
"original": {
@ -543,6 +524,42 @@
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"dir": "lib",
"lastModified": 1711703276,
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib_2": {
"locked": {
"dir": "lib",
"lastModified": 1711703276,
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1707650010,
@ -674,20 +691,19 @@
"noether": {
"inputs": {
"emacs-overlay": "emacs-overlay_2",
"flake-utils": "flake-utils_4",
"flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1712346647,
"narHash": "sha256-flVg6BjO8umCjYpjRhCmvXeJxF7OoQ+bdh1ZZt2gvUM=",
"ref": "refs/heads/main",
"rev": "17e766cb320eea770ae169745d2e47bfbe80fdfe",
"revCount": 45,
"lastModified": 1712776989,
"narHash": "sha256-DiZoTYM8FptB4DkyrzdFDMDIMECNCdYpnthjhi0NaRs=",
"rev": "5241f9f243cb6099a185db12552a32f70509ada6",
"revCount": 48,
"type": "git",
"url": "https://devheroes.codes/lxsameer/noether"
},
"original": {
"rev": "17e766cb320eea770ae169745d2e47bfbe80fdfe",
"rev": "5241f9f243cb6099a185db12552a32f70509ada6",
"type": "git",
"url": "https://devheroes.codes/lxsameer/noether"
}
@ -697,7 +713,6 @@
"agenix": "agenix",
"disko": "disko",
"fg42": "fg42",
"flake_utils": "flake_utils",
"home-manager": "home-manager_2",
"nixos-generators": "nixos-generators",
"nixos-hardware": "nixos-hardware",
@ -780,51 +795,6 @@
"repo": "default",
"type": "github"
}
},
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_6": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",

4
flake.nix
View File

@ -30,11 +30,9 @@
inputs.nixpkgs.follows = "nixpkgs";
};
fg42.url = "git+https://devheroes.codes/FG42/FG42?ref=v4";
fg42.url = "git+https://devheroes.codes/FG42/FG42";
#g42.url = "/home/lxsameer/src/fg42";
flake_utils.url = "github:numtide/flake-utils";
agenix.url = "github:ryantm/agenix";
agenix.inputs.nixpkgs.follows = "nixpkgs";

2
modules/default.nix
View File

@ -275,7 +275,7 @@ rec {
];
stylix.image = lib.mkDefault ./wallpaper.jpg;
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/stella.yaml";
stylix.base16Scheme = lib.mkDefault "${pkgs.base16-schemes}/share/themes/stella.yaml";
stylix.polarity = "dark";
stylix.fonts = {
serif = {

2
modules/udev/default.nix
View File

@ -24,6 +24,8 @@
ENV{ID_VENDOR_ID}=="1050",\
ENV{ID_VENDOR}=="Yubico",\
RUN+="${pkgs.systemd}/bin/loginctl lock-sessions"
ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6010", MODE="0660", GROUP="dialout", TAG+="uaccess"
'';
};
}

3
users/lxsameer/desktop.nix
View File

@ -253,6 +253,8 @@ in {
"......" = "../../../../..";
"yubi_switch" = ''gpg-connect-agent "scd serialno" "learn --force" /bye'';
maryland = ''ssh -t -L 5900:localhost:5900 mary 'x11vnc -localhost -display :0'';
};
initExtra = ''
@ -412,4 +414,5 @@ in {
nix-direnv.enable = true;
};
stylix.base16Scheme = lib.mkForce "${pkgs.base16-schemes}/share/themes/eighties.yaml";
}

83
users/lxsameer/fg42.el
View File

@ -4,7 +4,7 @@
;;
;; Author: Sameer Rahmani <lxsameer@gnu.org>
;; URL: https://gitlab.com/FG42/FG42
;; Version: 3.0.0
;; Version: 4.0.0
;;
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
@ -24,86 +24,13 @@
;; Uncomment this line for debugging
;; (setq debug-on-error t)
(eval-when-compile
(defvar fg42/font nil))
(defvar global-font-size 11)
(use-flags
(fg42/merge-with-default-flags
wm
dracula-theme
-badwolf-theme
python
golang
-vterm
-smart-mode-line
-mini-mode-line
disable-modeline
fg42/region-expansion-cube))
;;TODO: Move this block to a macro or something ===========
(setq fg42/font '("Fira Code" 10))
(when-wm
(setq global-font-size 8)
(custom-set-faces
'(mini-modeline-mode-line
((((background light))
:background "#aa0000" :height 0.1 :box nil)
(t
:background "#6272a4" :height 0.1 :box nil))))
(fg42/wm-cube :number-of-workspaces 9)
(setq fg42/font '("Fira Code" 8)))
;; Change the resolution and monitors to your need
(defvar monitors
'(:hdmi-only
("--output HDMI-A-0 --primary")))
(require 'seq)
(defun monitor-profiles ()
(mapcar
#'car
(seq-partition monitors 2)))
(defun monitor (mon)
(interactive
(list (completing-read
"Monitor Profole: "
(monitor-profiles))))
(let ((cmd (mapconcat (lambda (x) (format "xrandr %s" x))
(plist-get monitors (intern (format "%s" mon)))
" && ")))
(message "Setting monitor profile: %s" cmd)
(async-shell-command cmd "*xrandr*")))
(comment
;; how to run it via elisp
(monitor :hdmi-only))
(use-flags
(fg42/merge-with-default-flags
wm
-python
-golang
rcirc
vterm
-company
-projectile
-lsp
-flycheck
fg42/region-expansion-cube)))
(fg42/editor
:fg42/cursor-cube '(:type 'bar :color "#bd93f9")
:fg42/font-cube '(:font-name "Fira code" :font-size global-font-size)
:fg42/org-cube '(:global-tags '(("Math", ?m)
("Serene", ?s)
("FG42", ?f)
("Physics", ?p)
("Lab", ?l)
("Life", ?L))))
(when (file-exists-p "~/.fg42.user.el")
(load "~/.fg42.user.el"))
(provide '.fg42)
;;; .fg42.el ends here

4
users/mary/desktop.nix
View File

@ -123,6 +123,8 @@
krita
rawtherapee
pinentry-curses
x11vnc
];
# basic configuration of git, please change to your own
@ -350,7 +352,7 @@
enableSshSupport = lib.mkForce true;
};
gtk = {
enable = true;
iconTheme.package = pkgs.gnome.adwaita-icon-theme;