Compare commits
27 Commits
91f6c637de
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 2d09cfeea1 | |||
| 892ae40180 | |||
| 4a1cd4804d | |||
| 31fa6033b0 | |||
| b88445e529 | |||
| e3597c147a | |||
| e1e1b316cf | |||
| 184e939bb6 | |||
| 103c8e803a | |||
| 160ae56e03 | |||
| d178e340b4 | |||
| e2ec5cae11 | |||
| d9261385de | |||
| b0c84b9b27 | |||
| d036eb2512 | |||
| 83f48b3403 | |||
| 9d56a9bd10 | |||
| 86272d668d | |||
| 7f224bd6fc | |||
| 3d0bd560fb | |||
| 214c833821 | |||
| 8e519e9ad1 | |||
| a706f7c5cb | |||
| f49edaf975 | |||
| 8545cccd46 | |||
| 6e28e26d5a | |||
| 538b6051e2 |
18
flake.lock
generated
18
flake.lock
generated
@@ -655,11 +655,11 @@
|
||||
},
|
||||
"nixpkgs-us": {
|
||||
"locked": {
|
||||
"lastModified": 1757068644,
|
||||
"narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=",
|
||||
"lastModified": 1762363567,
|
||||
"narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9",
|
||||
"rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -740,17 +740,17 @@
|
||||
"nixvim": "nixvim_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1756234794,
|
||||
"narHash": "sha256-objBSkdkrn6BpQ1mH1tkvXmipfJ+mONHuydefPhdNSs=",
|
||||
"lastModified": 1760575893,
|
||||
"narHash": "sha256-u6eyhxtlxgG29uI2VCSt5Ir6/BW9hkhglCTfbJ14Hgg=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "50ffcb48e2bc7e18fd7123c876158b913300b177",
|
||||
"revCount": 35,
|
||||
"rev": "bcc5185ef433a77b18f5aa585ee79d97f9a8e69c",
|
||||
"revCount": 36,
|
||||
"type": "git",
|
||||
"url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Moirai"
|
||||
"url": "ssh://gitea@gitea.esotericbytes.com/Blunkall-Technologies/Moirai"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Moirai"
|
||||
"url": "ssh://gitea@gitea.esotericbytes.com/Blunkall-Technologies/Moirai"
|
||||
}
|
||||
},
|
||||
"nixvim_2": {
|
||||
|
||||
@@ -39,8 +39,8 @@
|
||||
|
||||
hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
|
||||
|
||||
#nixvim.url = "git+https://gitea.blunkall.us/Blunkall-Technologies/Moirai";
|
||||
nixvim.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Moirai";
|
||||
#nixvim.url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai";
|
||||
nixvim.url = "git+ssh://gitea@gitea.esotericbytes.com/Blunkall-Technologies/Moirai";
|
||||
|
||||
};
|
||||
|
||||
|
||||
0
home-manager/users/nathan/dotfiles/Wallpaper/galaxy.jpg
Executable file → Normal file
0
home-manager/users/nathan/dotfiles/Wallpaper/galaxy.jpg
Executable file → Normal file
|
Before Width: | Height: | Size: 1007 KiB After Width: | Height: | Size: 1007 KiB |
BIN
home-manager/users/nathan/dotfiles/Wallpaper/pink_fc.mp4
Normal file
BIN
home-manager/users/nathan/dotfiles/Wallpaper/pink_fc.mp4
Normal file
Binary file not shown.
@@ -112,7 +112,7 @@ ecosystem {
|
||||
# Binds
|
||||
$mainMod = ALT
|
||||
|
||||
bind = $mainMod SHIFT, H, exec, colorPrefix kitty -e "hyprctl binds | less"
|
||||
bind = CTRL SHIFT, H, exec, colorPrefix kitty -e 'bash -c "hyprctl binds | less"'
|
||||
|
||||
bind = $mainMod SHIFT, E, exec, colorPrefix kitty
|
||||
|
||||
@@ -174,6 +174,8 @@ bind = $mainMod, Return, exec, discord --enable-features=UseOzonePlatform --ozon
|
||||
|
||||
bind = $mainMod CTRL, Return, exec, firefox https://discord.com/app
|
||||
|
||||
bind = , Home, exec, setWallpaper
|
||||
|
||||
# Move focus with mainMod + arrow keys
|
||||
bind = $mainMod, W, movefocus, u
|
||||
bind = $mainMod, A, movefocus, l
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
import QtQuick // for Text
|
||||
import QtQuick.Controls
|
||||
import QtQuick.Layouts
|
||||
import Quickshell.Widgets
|
||||
import Quickshell.Hyprland
|
||||
import Quickshell
|
||||
|
||||
Item {
|
||||
implicitWidth: t.contentWidth + 10
|
||||
implicitHeight: 30
|
||||
|
||||
ClippingWrapperRectangle {
|
||||
radius: 5
|
||||
anchors.fill: parent
|
||||
Text {
|
||||
id: t
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
text: {
|
||||
if(hws.toplevels.values.length > 0) {
|
||||
return Hyprland.activeToplevel.title
|
||||
} else {
|
||||
return " Desktop"
|
||||
}
|
||||
}
|
||||
|
||||
property HyprlandWorkspace hws: Hyprland.focusedWorkspace
|
||||
|
||||
onHwsChanged: {
|
||||
Hyprland.refreshToplevels()
|
||||
Hyprland.refreshWorkspaces()
|
||||
}
|
||||
|
||||
font.pointSize: 11
|
||||
}
|
||||
}
|
||||
}
|
||||
170
home-manager/users/nathan/dotfiles/quickshell/modules/Bar.qml
Normal file
170
home-manager/users/nathan/dotfiles/quickshell/modules/Bar.qml
Normal file
@@ -0,0 +1,170 @@
|
||||
import Quickshell // for PanelWindow
|
||||
import QtQuick // for Text
|
||||
import QtQuick.Controls
|
||||
import QtQuick.Layouts
|
||||
import Quickshell.Io
|
||||
import Quickshell.Widgets
|
||||
import Quickshell.Wayland
|
||||
|
||||
PanelWindow {
|
||||
anchors {
|
||||
top: true
|
||||
//left: true
|
||||
//right: true
|
||||
//bottom: true
|
||||
|
||||
}
|
||||
|
||||
id: bar
|
||||
|
||||
exclusionMode: ExclusionMode.Ignore
|
||||
WlrLayershell.layer: WlrLayer.Background
|
||||
|
||||
color: "#a0706050"
|
||||
|
||||
|
||||
implicitHeight: 40
|
||||
implicitWidth: 1900
|
||||
|
||||
/*RowLayout {
|
||||
width: bar.width
|
||||
}*/
|
||||
RowLayout {
|
||||
//Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
|
||||
id: left
|
||||
x: 0
|
||||
y: parent.y + (parent.height - height) / 2
|
||||
//width: center.x
|
||||
spacing: 0
|
||||
|
||||
Launcher {
|
||||
id: l
|
||||
Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
|
||||
Layout.preferredWidth: width
|
||||
Layout.margins: 5
|
||||
}
|
||||
|
||||
Workspaces {
|
||||
id: ws
|
||||
Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
|
||||
Layout.margins: 5
|
||||
}
|
||||
|
||||
/*ActiveWindow {
|
||||
id: aw
|
||||
Layout.margins: 5
|
||||
|
||||
Layout.maximumWidth: Math.min(implicitWidth, center.x - (parent.x + x + Layout.margins))
|
||||
}*/
|
||||
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
//Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
|
||||
id: center
|
||||
x: (parent.width - cl.width) / 2 + parent.x - centerLeft.width
|
||||
//y: parent.y + (parent.height - height) / 2
|
||||
y: parent.y + (parent.height - height) / 2
|
||||
spacing: 0
|
||||
|
||||
RowLayout {
|
||||
id: centerLeft
|
||||
spacing: 0
|
||||
|
||||
Volume {
|
||||
id: v
|
||||
window: bar
|
||||
popupOffset: center.x
|
||||
Layout.margins: 5
|
||||
}
|
||||
|
||||
Battery {
|
||||
id: bat
|
||||
window: bar
|
||||
popupOffset: center.x
|
||||
Layout.margins: 5
|
||||
}
|
||||
|
||||
Hyprsunset {
|
||||
id: hs
|
||||
Layout.margins: 5
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Clock {
|
||||
id: cl
|
||||
Layout.margins: 5
|
||||
}
|
||||
|
||||
IdleInhibitor {
|
||||
id: ii
|
||||
Layout.margins: 5
|
||||
}
|
||||
|
||||
Wifi {
|
||||
id: wifi
|
||||
window: bar
|
||||
Layout.margins: 5
|
||||
}
|
||||
|
||||
Bluetooth {
|
||||
id: bt
|
||||
window: bar
|
||||
popupOffset: center.x + center.width
|
||||
Layout.margins: 5
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
RowLayout {
|
||||
//Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
|
||||
id: right
|
||||
//implicitWidth: bar.width - (spacer.x + spacer.width)
|
||||
x: bar.width - implicitWidth
|
||||
y: parent.y + (parent.height - height) / 2
|
||||
//Layout.maximumWidth: bar.width - (center.x + center.width)
|
||||
//Layout.preferredWidth: 10
|
||||
spacing: 0
|
||||
|
||||
Media {
|
||||
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
|
||||
id: media
|
||||
|
||||
implicitWidth: Math.min(textWidth, bar.width - (righter.width) - (center.x + center.width) - 10)
|
||||
|
||||
Layout.margins: 5
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
id: righter
|
||||
spacing: 0
|
||||
Tray {
|
||||
id: tray
|
||||
window: bar
|
||||
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
|
||||
Layout.margins: 5
|
||||
popupOffset: right.x + righter.x + x
|
||||
}
|
||||
|
||||
Notifications {
|
||||
id: notif
|
||||
window: bar
|
||||
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
|
||||
Layout.margins: 5
|
||||
}
|
||||
|
||||
Power {
|
||||
id: power
|
||||
window: bar
|
||||
popupOffset: bar.width
|
||||
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
|
||||
Layout.margins: 5
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
import Quickshell // for PanelWindow
|
||||
import QtQuick // for Text
|
||||
import QtQuick.Controls
|
||||
import QtQuick.Layouts
|
||||
import Quickshell.Io
|
||||
import Quickshell.Widgets
|
||||
import Quickshell.Hyprland
|
||||
import Quickshell.Services.UPower
|
||||
|
||||
ClippingWrapperRectangle {
|
||||
radius: 5
|
||||
width: 100; height: 30
|
||||
color: "red"
|
||||
Button {
|
||||
id: button
|
||||
text: " " + Math.floor(UPower.displayDevice.percentage * 100) + "%"
|
||||
font.pointSize: 12
|
||||
implicitHeight: parent.height
|
||||
//icon.color: "red"
|
||||
//icon.source: "/nix/store/c4dcn4vl0v5njv4d587sazrad1xgyd9h-rose-pine-icon-theme-unstable-2022-09-01/share/icons/rose-pine/symbolic/devices/battery-symbolic.svg"
|
||||
onClicked: {
|
||||
menu.visible = true
|
||||
grab.active = true
|
||||
}
|
||||
}
|
||||
|
||||
required property var window
|
||||
required property real popupOffset
|
||||
id: root
|
||||
|
||||
PopupWindow {
|
||||
|
||||
id: menu
|
||||
|
||||
anchor.window: window
|
||||
anchor.rect.x: popupOffset
|
||||
anchor.rect.y: 50
|
||||
implicitWidth: 250
|
||||
implicitHeight: 150
|
||||
visible: false
|
||||
|
||||
color: "transparent"
|
||||
|
||||
ClippingWrapperRectangle {
|
||||
radius: 5
|
||||
|
||||
implicitHeight: parent.height - 20
|
||||
implicitWidth: parent.width
|
||||
|
||||
ColumnLayout {
|
||||
|
||||
spacing: 0
|
||||
|
||||
Button {
|
||||
Layout.topMargin: 5
|
||||
x: (parent.width - width) / 2
|
||||
implicitWidth: parent.width - 10
|
||||
implicitHeight: parent.height / 5 - parent.spacing
|
||||
|
||||
text: 'shutdown'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
HyprlandFocusGrab {
|
||||
id: grab
|
||||
windows: [ menu ]
|
||||
onCleared: menu.visible = false
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,141 @@
|
||||
import Quickshell // for PanelWindow
|
||||
import QtQuick // for Text
|
||||
import QtQuick.Controls
|
||||
import QtQuick.Layouts
|
||||
import Quickshell.Io
|
||||
import Quickshell.Widgets
|
||||
import Quickshell.Hyprland
|
||||
import Quickshell.Bluetooth
|
||||
|
||||
ClippingWrapperRectangle {
|
||||
|
||||
|
||||
radius: 5
|
||||
implicitWidth: 30; implicitHeight: 30
|
||||
Button {
|
||||
id: button
|
||||
text: ""
|
||||
font.pointSize: 16
|
||||
|
||||
onClicked: {
|
||||
menu.visible = true
|
||||
grab.active = true
|
||||
}
|
||||
implicitHeight: parent.height
|
||||
}
|
||||
|
||||
required property PanelWindow window
|
||||
required property real popupOffset
|
||||
id: root
|
||||
|
||||
PopupWindow {
|
||||
|
||||
id: menu
|
||||
|
||||
anchor.window: window
|
||||
anchor.rect.x: popupOffset - width
|
||||
anchor.rect.y: 50
|
||||
implicitWidth: 250
|
||||
implicitHeight: 150
|
||||
visible: false
|
||||
|
||||
color: "transparent"
|
||||
|
||||
ClippingWrapperRectangle {
|
||||
radius: 5
|
||||
|
||||
implicitHeight: parent.height - 20
|
||||
implicitWidth: parent.width
|
||||
|
||||
ColumnLayout {
|
||||
|
||||
spacing: 0
|
||||
|
||||
ClippingWrapperRectangle {
|
||||
radius: 5
|
||||
implicitWidth: parent.width - 2 * Layout.margins
|
||||
implicitHeight: 30
|
||||
Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
|
||||
Layout.margins: 5
|
||||
color: "#ff3333aa"
|
||||
|
||||
RowLayout {
|
||||
Text {
|
||||
text: 'Bluetooth'
|
||||
Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
|
||||
Layout.margins: 5
|
||||
}
|
||||
|
||||
Switch {
|
||||
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
|
||||
//Layout.margins: 5
|
||||
checked: Bluetooth.defaultAdapter.enabled
|
||||
onClicked: Bluetooth.defaultAdapter.enabled = checked
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
ScrollView {
|
||||
Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
|
||||
Layout.margins: 5
|
||||
|
||||
implicitWidth: parent.width - 4 * Layout.margins
|
||||
implicitHeight: menu.height / 2
|
||||
|
||||
id: scroll
|
||||
|
||||
ColumnLayout {
|
||||
spacing: 0
|
||||
|
||||
Repeater {
|
||||
|
||||
id: rep
|
||||
|
||||
model: Bluetooth.devices.values
|
||||
|
||||
ClippingWrapperRectangle {
|
||||
radius: 5
|
||||
color: "#ff3333aa"
|
||||
|
||||
implicitWidth: menu.width - 3 * scroll.x
|
||||
implicitHeight: 40
|
||||
|
||||
Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
|
||||
Layout.margins: 5
|
||||
|
||||
RowLayout {
|
||||
Text {
|
||||
Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
|
||||
Layout.margins: 5
|
||||
|
||||
text: rep.model[index].name
|
||||
}
|
||||
|
||||
Button {
|
||||
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
|
||||
Layout.rightMargin: 5
|
||||
text: 'Connect'
|
||||
|
||||
onClicked: rep.model[index].connected = !rep.model[index].connected
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
HyprlandFocusGrab {
|
||||
id: grab
|
||||
windows: [ menu ]
|
||||
onCleared: menu.visible = false
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
import QtQuick // for Text
|
||||
import QtQuick.Controls
|
||||
import QtQuick.Layouts
|
||||
import Quickshell.Widgets
|
||||
import Quickshell
|
||||
|
||||
Item {
|
||||
implicitWidth: t.contentWidth + 10
|
||||
implicitHeight: 30
|
||||
|
||||
ClippingWrapperRectangle {
|
||||
radius: 5
|
||||
anchors.fill: parent
|
||||
Text {
|
||||
id: t
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
text: Qt.formatDateTime(clock.date, "dddd HH:mm:ss MM/dd/yyyy")
|
||||
font.pointSize: 11
|
||||
|
||||
SystemClock {
|
||||
id: clock
|
||||
precision: SystemClock.Seconds
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
import Quickshell // for PanelWindow
|
||||
import QtQuick // for Text
|
||||
import QtQuick.Controls
|
||||
import Quickshell.Io
|
||||
import Quickshell.Widgets
|
||||
|
||||
ClippingWrapperRectangle {
|
||||
radius: 5
|
||||
implicitWidth: 30; height: 30
|
||||
Button {
|
||||
id: button
|
||||
text: " "
|
||||
font.pointSize: 16
|
||||
Process {
|
||||
id: idlent
|
||||
running: false
|
||||
command: ["hyprsunset", "-t", "4000"]
|
||||
|
||||
onExited: {
|
||||
running = button.text == " " ? false : true
|
||||
}
|
||||
}
|
||||
|
||||
onClicked: {
|
||||
idlent.running = button.text == " " ? true : false
|
||||
button.text = button.text == " " ? " " : " "
|
||||
}
|
||||
implicitHeight: parent.height
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
import Quickshell // for PanelWindow
|
||||
import QtQuick // for Text
|
||||
import QtQuick.Controls
|
||||
import Quickshell.Io
|
||||
import Quickshell.Widgets
|
||||
|
||||
ClippingWrapperRectangle {
|
||||
|
||||
property real interval: 100
|
||||
id: root
|
||||
|
||||
radius: 5
|
||||
implicitWidth: 30; height: 30
|
||||
Button {
|
||||
id: button
|
||||
text: " "
|
||||
font.pointSize: 16
|
||||
Process {
|
||||
id: idlent
|
||||
running: false
|
||||
command: ["systemd-inhibit", "--what=idle", "sleep", root.interval.toString()]
|
||||
|
||||
onExited: {
|
||||
running = button.text == " " ? false : true
|
||||
}
|
||||
}
|
||||
|
||||
onClicked: {
|
||||
idlent.running = button.text == " " ? true : false
|
||||
button.text = button.text == " " ? " " : " "
|
||||
}
|
||||
implicitHeight: parent.height
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
import Quickshell // for PanelWindow
|
||||
import QtQuick // for Text
|
||||
import QtQuick.Controls
|
||||
import Quickshell.Io
|
||||
import Quickshell.Widgets
|
||||
|
||||
ClippingWrapperRectangle {
|
||||
radius: 5
|
||||
width: 30; height: 30
|
||||
Button {
|
||||
id: button
|
||||
text: " "
|
||||
font.pointSize: 16
|
||||
Process {
|
||||
id: launcher
|
||||
running: false
|
||||
command: ["rofi", "-show", "drun"]
|
||||
}
|
||||
onClicked: launcher.running = true
|
||||
implicitHeight: parent.height
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
import QtQuick // for Text
|
||||
import QtQuick.Controls
|
||||
import QtQuick.Layouts
|
||||
import Quickshell.Services.Mpris
|
||||
import Quickshell.Widgets
|
||||
|
||||
Item {
|
||||
id: media
|
||||
height: 30
|
||||
|
||||
readonly property real textWidth: info.contentWidth + 10
|
||||
|
||||
ClippingWrapperRectangle {
|
||||
radius: 5
|
||||
anchors.fill: parent
|
||||
Text {
|
||||
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
|
||||
id: info
|
||||
|
||||
text: {
|
||||
let s = ''
|
||||
let players = []
|
||||
|
||||
Mpris.players.values.forEach((p) => {
|
||||
if(p.isPlaying) players.push(p)
|
||||
})
|
||||
|
||||
if(players[0]?.trackTitle) {
|
||||
s += players[0].trackTitle
|
||||
}
|
||||
if(players[0]?.trackAlbum) {
|
||||
s += ' - ' + players[0].trackAlbum
|
||||
}
|
||||
if(players[0]?.trackArtist) {
|
||||
s += ' - ' + players[0].trackArtist
|
||||
}
|
||||
|
||||
media.visible = players.length > 0
|
||||
|
||||
return s
|
||||
}
|
||||
font.pointSize: 11
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,183 @@
|
||||
import Quickshell
|
||||
import QtQuick // for Text
|
||||
import QtQuick.Controls
|
||||
import QtQuick.Layouts
|
||||
import Quickshell.Services.Notifications
|
||||
import Quickshell.Io
|
||||
import Quickshell.Widgets
|
||||
import Quickshell.Hyprland
|
||||
|
||||
Item {
|
||||
width: 50
|
||||
height: 30
|
||||
|
||||
ClippingWrapperRectangle {
|
||||
id: barbutton
|
||||
radius: 5
|
||||
anchors.fill: parent
|
||||
Button {
|
||||
id: button
|
||||
text: ""
|
||||
//text: server.trackedNotifications.values.length == 0 ? "" : ' ' + server.trackedNotifications.values.length
|
||||
//icon.source: ''
|
||||
font.pointSize: 16
|
||||
|
||||
onClicked: {
|
||||
|
||||
|
||||
menu.visible = true
|
||||
grab.active = true
|
||||
}
|
||||
implicitHeight: parent.height
|
||||
}
|
||||
}
|
||||
|
||||
NotificationServer {
|
||||
id: server
|
||||
persistenceSupported: true
|
||||
imageSupported: true
|
||||
actionsSupported: true
|
||||
bodyImagesSupported: true
|
||||
bodySupported: true
|
||||
bodyHyperlinksSupported: true
|
||||
inlineReplySupported: true
|
||||
actionIconsSupported: true
|
||||
|
||||
onNotification: (n) => {
|
||||
n.tracked = true
|
||||
console.log(n?.body)
|
||||
button.text = ' ' + (server.trackedNotifications.values.length + 1)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
required property PanelWindow window
|
||||
id: root
|
||||
|
||||
PopupWindow {
|
||||
|
||||
id: menu
|
||||
|
||||
anchor.window: window
|
||||
anchor.rect.x: window.width - width
|
||||
anchor.rect.y: 50
|
||||
implicitWidth: 400
|
||||
implicitHeight: 1080 - anchor.rect.y
|
||||
visible: false
|
||||
|
||||
color: "transparent"
|
||||
|
||||
ClippingWrapperRectangle {
|
||||
radius: 5
|
||||
|
||||
color: "#ff706050"
|
||||
|
||||
implicitHeight: parent.height - 20
|
||||
implicitWidth: parent.width
|
||||
|
||||
ColumnLayout {
|
||||
id: lay
|
||||
|
||||
spacing: 10
|
||||
|
||||
ClippingWrapperRectangle {
|
||||
radius: 5
|
||||
Layout.margins: 5
|
||||
Layout.alignment: Qt.AlignVCenter | Qt.AlignTop
|
||||
implicitWidth: menu.width - 2 * Layout.margins
|
||||
|
||||
RowLayout {
|
||||
width: parent.width
|
||||
Text {
|
||||
Layout.margins: 5
|
||||
Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
|
||||
text: 'Notifications'
|
||||
}
|
||||
Button {
|
||||
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
|
||||
Layout.margins: 5
|
||||
implicitWidth: 20
|
||||
implicitHeight: 20
|
||||
|
||||
text: 'x'
|
||||
|
||||
onClicked: {
|
||||
while(server.trackedNotifications.values.length > 0) {
|
||||
server.trackedNotifications.values[0].dismiss()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Repeater {
|
||||
id: rep
|
||||
|
||||
model: server.trackedNotifications.values
|
||||
ClippingWrapperRectangle {
|
||||
Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
|
||||
Layout.margins: 5
|
||||
radius: 10
|
||||
implicitWidth: parent.width - 2 * Layout.margins
|
||||
implicitHeight: 100
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
|
||||
RowLayout {
|
||||
Image {
|
||||
//anchors.fill: parent
|
||||
source: {
|
||||
let icon = rep.model[index].image
|
||||
if (icon.includes("?path=")) {
|
||||
const [name, path] = icon.split("?path=");
|
||||
icon = Qt.resolvedUrl(`${path}/${name.slice(name.lastIndexOf("/") + 1)}`);
|
||||
}
|
||||
return icon
|
||||
}
|
||||
|
||||
Layout.maximumWidth: 100
|
||||
Layout.maximumHeight: 100
|
||||
}
|
||||
|
||||
ColumnLayout {
|
||||
Layout.topMargin: 10
|
||||
Layout.alignment: Qt.AlignLeft | Qt.AlignTop
|
||||
Text {
|
||||
Layout.alignment: Qt.AlignLeft | Qt.AlignTop
|
||||
text: rep.model[index].summary
|
||||
Layout.leftMargin: 10
|
||||
font.pointSize: 14
|
||||
}
|
||||
Text {
|
||||
Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
|
||||
text: rep.model[index].body
|
||||
Layout.leftMargin: 10
|
||||
font.pointSize: 12
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
acceptedButtons: Qt.LeftButton | Qt.RightButton
|
||||
|
||||
onClicked: mouse => {
|
||||
if(mouse.button == Qt.LeftButton) {
|
||||
button.text = rep.count - 1 <= 0 ? "" : ' ' + (rep.count - 1)
|
||||
rep.model[index].dismiss()
|
||||
//button.text = server.trackedNotifications.values.length == 0 ? "" : ' ' + server.trackedNotifications.values.length
|
||||
} else if(mouse.button == Qt.RightButton) {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
HyprlandFocusGrab {
|
||||
id: grab
|
||||
windows: [ menu ]
|
||||
onCleared: menu.visible = false
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,96 @@
|
||||
import Quickshell
|
||||
import QtQuick // for Text
|
||||
import QtQuick.Controls
|
||||
import QtQuick.Layouts
|
||||
import Quickshell.Hyprland
|
||||
import Quickshell.Io
|
||||
import Quickshell.Widgets
|
||||
|
||||
Item {
|
||||
width: 30
|
||||
height: 30
|
||||
|
||||
id: root
|
||||
|
||||
required property PanelWindow window
|
||||
required property real popupOffset
|
||||
|
||||
ClippingWrapperRectangle {
|
||||
radius: 5
|
||||
width: 30; height: 30
|
||||
Button {
|
||||
id: button
|
||||
text: " "
|
||||
font.pointSize: 16
|
||||
|
||||
onClicked: {
|
||||
menu.visible = true
|
||||
grab.active = true
|
||||
}
|
||||
implicitHeight: parent.height
|
||||
}
|
||||
}
|
||||
|
||||
PopupWindow {
|
||||
|
||||
id: menu
|
||||
|
||||
anchor.window: window
|
||||
anchor.rect.x: popupOffset
|
||||
anchor.rect.y: 50
|
||||
implicitWidth: 150
|
||||
implicitHeight: 250
|
||||
visible: false
|
||||
|
||||
color: "transparent"
|
||||
|
||||
ClippingWrapperRectangle {
|
||||
radius: 5
|
||||
|
||||
implicitHeight: parent.height - 20
|
||||
implicitWidth: parent.width
|
||||
|
||||
ColumnLayout {
|
||||
|
||||
spacing: 0
|
||||
|
||||
Button {
|
||||
Layout.topMargin: 5
|
||||
x: (parent.width - width) / 2
|
||||
implicitWidth: parent.width - 10
|
||||
implicitHeight: parent.height / 5 - parent.spacing
|
||||
|
||||
text: 'shutdown'
|
||||
}
|
||||
|
||||
Button {
|
||||
x: (parent.width - width) / 2
|
||||
implicitWidth: parent.width - 10
|
||||
implicitHeight: parent.height / 5 - parent.spacing
|
||||
text: 'reboot'
|
||||
}
|
||||
|
||||
Button {
|
||||
x: (parent.width - width) / 2
|
||||
implicitWidth: parent.width - 10
|
||||
implicitHeight: parent.height / 5 - parent.spacing
|
||||
text: 'logout'
|
||||
}
|
||||
|
||||
Button {
|
||||
Layout.bottomMargin: 10
|
||||
x: (parent.width - width) / 2
|
||||
implicitWidth: parent.width - 10
|
||||
implicitHeight: parent.height / 5 - parent.spacing
|
||||
text: 'sleep'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
HyprlandFocusGrab {
|
||||
id: grab
|
||||
windows: [ menu ]
|
||||
onCleared: menu.visible = false
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
import QtQuick // for Text
|
||||
import QtQuick.Controls
|
||||
import QtQuick.Layouts
|
||||
import Quickshell.Services.SystemTray
|
||||
import Quickshell.Widgets
|
||||
|
||||
Item {
|
||||
implicitWidth: 10 + rep.count * (2 * lay.spacing + 20)
|
||||
height: 30
|
||||
visible: SystemTray.items.values.length != 0
|
||||
|
||||
id: root
|
||||
required property var window
|
||||
required property real popupOffset
|
||||
|
||||
ClippingWrapperRectangle {
|
||||
radius: 5
|
||||
anchors.fill: parent
|
||||
RowLayout {
|
||||
id: lay
|
||||
spacing: 4
|
||||
Repeater {
|
||||
id: rep
|
||||
|
||||
model: SystemTray.items
|
||||
ClippingWrapperRectangle {
|
||||
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
|
||||
radius: 10
|
||||
implicitWidth: 20
|
||||
implicitHeight: 20
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
|
||||
Image {
|
||||
anchors.fill: parent
|
||||
source: {
|
||||
let icon = SystemTray.items.values[index].icon
|
||||
if (icon.includes("?path=")) {
|
||||
const [name, path] = icon.split("?path=");
|
||||
icon = Qt.resolvedUrl(`${path}/${name.slice(name.lastIndexOf("/") + 1)}`);
|
||||
}
|
||||
return icon
|
||||
}
|
||||
}
|
||||
|
||||
acceptedButtons: Qt.LeftButton | Qt.RightButton
|
||||
|
||||
onClicked: (mouse) => {
|
||||
if(mouse.button == Qt.LeftButton) {
|
||||
SystemTray.items.values[index].activate()
|
||||
} else if(mouse.button == Qt.RightButton) {
|
||||
SystemTray.items.values[index].display(root.window, popupOffset, 40)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,97 @@
|
||||
import Quickshell // for PanelWindow
|
||||
import QtQuick // for Text
|
||||
import QtQuick.Controls
|
||||
import QtQuick.Layouts
|
||||
import Quickshell.Io
|
||||
import Quickshell.Widgets
|
||||
import Quickshell.Hyprland
|
||||
import Quickshell.Services.Pipewire
|
||||
|
||||
ClippingWrapperRectangle {
|
||||
radius: 5
|
||||
width: 100; height: 30
|
||||
Button {
|
||||
id: button
|
||||
text: " " + Math.floor(Pipewire.defaultAudioSink?.audio?.volume * 100) + "%"
|
||||
font.pointSize: 12
|
||||
implicitHeight: parent.height
|
||||
|
||||
PwObjectTracker {
|
||||
objects: [ Pipewire.defaultAudioSink ]
|
||||
}
|
||||
|
||||
onClicked: {
|
||||
menu.visible = true
|
||||
grab.active = true
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
required property var window
|
||||
required property real popupOffset
|
||||
id: root
|
||||
|
||||
PopupWindow {
|
||||
|
||||
id: menu
|
||||
|
||||
anchor.window: window
|
||||
anchor.rect.x: popupOffset
|
||||
anchor.rect.y: 50
|
||||
implicitWidth: 250
|
||||
implicitHeight: 150
|
||||
visible: false
|
||||
|
||||
color: "transparent"
|
||||
|
||||
ClippingWrapperRectangle {
|
||||
radius: 5
|
||||
|
||||
implicitHeight: parent.height - 20
|
||||
implicitWidth: parent.width
|
||||
|
||||
ScrollView {
|
||||
ColumnLayout {
|
||||
|
||||
spacing: 0
|
||||
|
||||
Text {
|
||||
text: 'Output Devices'
|
||||
}
|
||||
|
||||
ColumnLayout {
|
||||
|
||||
}
|
||||
|
||||
Text {
|
||||
text: 'Input Devices'
|
||||
}
|
||||
|
||||
ColumnLayout {
|
||||
/*Repeater {
|
||||
id: in
|
||||
|
||||
model: {
|
||||
set = []
|
||||
Pipewire.nodes.values.forEach(n => { !n.isSink && !n.isStream ? set.push(n) : return })
|
||||
return set
|
||||
}
|
||||
|
||||
Text {
|
||||
text: in.model[index].nickname
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
HyprlandFocusGrab {
|
||||
id: grab
|
||||
windows: [ menu ]
|
||||
onCleared: menu.visible = false
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,72 @@
|
||||
import Quickshell
|
||||
import QtQuick // for Text
|
||||
import QtQuick.Controls
|
||||
import QtQuick.Layouts
|
||||
import Quickshell.Hyprland
|
||||
import Quickshell.Io
|
||||
import Quickshell.Widgets
|
||||
|
||||
Item {
|
||||
implicitWidth: 30
|
||||
implicitHeight: 30
|
||||
|
||||
ClippingWrapperRectangle {
|
||||
radius: 5
|
||||
anchors.fill: parent
|
||||
Button {
|
||||
id: button
|
||||
text: " "
|
||||
font.pointSize: 16
|
||||
|
||||
onClicked: {
|
||||
menu.visible = true
|
||||
grab.active = true
|
||||
}
|
||||
implicitHeight: parent.height
|
||||
}
|
||||
}
|
||||
|
||||
property var window: null
|
||||
id: root
|
||||
|
||||
PopupWindow {
|
||||
|
||||
id: menu
|
||||
|
||||
anchor.window: window
|
||||
anchor.rect.x: root.parent.x + root.parent.width - width
|
||||
anchor.rect.y: 50
|
||||
implicitWidth: 250
|
||||
implicitHeight: 150
|
||||
visible: false
|
||||
|
||||
color: "transparent"
|
||||
|
||||
ClippingWrapperRectangle {
|
||||
radius: 5
|
||||
|
||||
implicitHeight: parent.height - 20
|
||||
implicitWidth: parent.width
|
||||
|
||||
ColumnLayout {
|
||||
|
||||
spacing: 0
|
||||
|
||||
Button {
|
||||
Layout.topMargin: 5
|
||||
x: (parent.width - width) / 2
|
||||
implicitWidth: parent.width - 10
|
||||
implicitHeight: parent.height / 5 - parent.spacing
|
||||
|
||||
text: 'shutdown'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
HyprlandFocusGrab {
|
||||
id: grab
|
||||
windows: [ menu ]
|
||||
onCleared: menu.visible = false
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
import QtQuick // for Text
|
||||
import QtQuick.Controls
|
||||
import QtQuick.Layouts
|
||||
import Quickshell.Hyprland
|
||||
import Quickshell.Widgets
|
||||
|
||||
Item {
|
||||
implicitWidth: 10 + rep.count * (2 * lay.spacing + 25)
|
||||
implicitHeight: 30
|
||||
|
||||
Component.onCompleted: Hyprland.refreshWorkspaces()
|
||||
|
||||
ClippingWrapperRectangle {
|
||||
radius: 5
|
||||
anchors.fill: parent
|
||||
RowLayout {
|
||||
id: lay
|
||||
Repeater {
|
||||
id: rep
|
||||
|
||||
property var ws: {
|
||||
let arr = [];
|
||||
Hyprland.workspaces.values.forEach((w) => { if(w.id > 0) arr.push(w) })
|
||||
return arr;
|
||||
}
|
||||
|
||||
model: ws
|
||||
ClippingWrapperRectangle {
|
||||
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
|
||||
radius: 10
|
||||
implicitWidth: 25
|
||||
Button {
|
||||
background: Rectangle {
|
||||
color: Hyprland.focusedWorkspace.id == rep.model[index].id ? "#ffff00ff" : "#ff7744dd"
|
||||
anchors.fill: parent
|
||||
}
|
||||
text: rep.model[index].id
|
||||
onClicked: rep.model[index].activate()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
14
home-manager/users/nathan/dotfiles/quickshell/shell.qml
Normal file
14
home-manager/users/nathan/dotfiles/quickshell/shell.qml
Normal file
@@ -0,0 +1,14 @@
|
||||
//@ pragma Env QS_NO_RELOAD_POPUP=1
|
||||
//@ pragma Env QSG_RENDER_LOOP=threaded
|
||||
//@ pragma Env QT_QUICK_FLICKABLE_WHEEL_DECELERATION=10000
|
||||
|
||||
//@ pragma UseQApplication
|
||||
|
||||
import Quickshell // for ShellRoot
|
||||
import qs.modules
|
||||
|
||||
ShellRoot {
|
||||
Bar {
|
||||
id: bar
|
||||
}
|
||||
}
|
||||
@@ -54,7 +54,7 @@
|
||||
xfce.thunar
|
||||
wl-clipboard
|
||||
blueberry
|
||||
lxqt.lxqt-policykit
|
||||
pkgs-us.quickshell
|
||||
] else []) ++ (if !config.homeconfig.minimal then [
|
||||
cava
|
||||
android-tools
|
||||
|
||||
@@ -29,38 +29,44 @@
|
||||
mkdir /tmp/nathan
|
||||
fi
|
||||
|
||||
img=''$(realpath ''$1)
|
||||
ext="''${''$(basename ''$img)''\#''\#*.}"
|
||||
img=''$(realpath "''${1:-$(find ~/Pictures/Wallpaper/* | rofi -dmenu)}")
|
||||
n=''$(basename "''$img")
|
||||
ext="''${n''\#''\#*.}"
|
||||
|
||||
if [[ ''$ext == "gif" || ''$ext == "mp4" ]]; then
|
||||
${pkgs.ffmpeg}/bin/ffmpeg -i ''$img -vframes 1 /tmp/nathan/tmp.jpg
|
||||
yes | ${pkgs.ffmpeg}/bin/ffmpeg -i "''$img" -vframes 1 /tmp/nathan/tmp.jpg
|
||||
cp /tmp/nathan/tmp.jpg /tmp/nathan/tmp2.jpg
|
||||
pidof mpvpaper && pkill mpvpaper
|
||||
${pkgs.swww}/bin/swww img /tmp/nathan/tmp.jpg -t wipe
|
||||
${pkgs.hyprpanel}/bin/hyprpanel sw /tmp/nathan/tmp2.jpg
|
||||
sleep 0.3
|
||||
hyprctl dispatch exec "${pkgs.mpvpaper}/bin/mpvpaper ALL ''$img -o loop"
|
||||
${pkgs.hyprpanel}/bin/hyprpanel sw /tmp/nathan/tmp.jpg
|
||||
rm /tmp/nathan/tmp2.jpg
|
||||
else
|
||||
|
||||
pidof mpvpaper && pkill mpvpaper
|
||||
hyprctl dispatch exec "${pkgs.swww}/bin/swww img ''$img -t wipe"
|
||||
${pkgs.hyprpanel}/bin/hyprpanel sw "''$img"
|
||||
fi
|
||||
|
||||
${pkgs.hyprpanel}/bin/hyprpanel sw ''$img
|
||||
changeColors ''$img ''$2
|
||||
changeColors "''$img" "''$2"
|
||||
'')
|
||||
|
||||
(pkgs.writeShellScriptBin "changeColors" ''
|
||||
|
||||
img=''$(realpath ''$1)
|
||||
img=''$(realpath "''$1")
|
||||
alpha=''${2:-70}
|
||||
|
||||
if [[ ''$alpha -lt 0 ]]; then
|
||||
''$alpha=0
|
||||
alpha=0
|
||||
elif [[ ''$alpha -gt 100 ]]; then
|
||||
''$alpha=100
|
||||
alpha=100
|
||||
fi
|
||||
|
||||
if [[ -f "~/.config/wal/colorschemes/dark/''${''$(basename ''$img)}-''$alpha.json" ]]; then
|
||||
${pkgs.pywal16}/bin/wal -n -f "''${''$(basename ''$img)}-''$alpha"
|
||||
if [[ -f ~/.config/wal/colorschemes/dark/''$(basename "''$img")-''$alpha.json ]]; then
|
||||
${pkgs.pywal16}/bin/wal -n -f "''$(basename "''$img")-''$alpha"
|
||||
else
|
||||
${pkgs.pywal16}/bin/wal -n -i ''$img -a ''$alpha --cols16 -p "''${''$(basename ''$img)}-''$alpha"
|
||||
${pkgs.pywal16}/bin/wal -n -i "''$img" -a "''$alpha" --cols16 -p "''$(basename "''$img")-''$alpha"
|
||||
fi
|
||||
|
||||
colorPrefix
|
||||
|
||||
@@ -27,8 +27,6 @@
|
||||
|
||||
hardware = {
|
||||
|
||||
graphics.enable = true;
|
||||
|
||||
nvidia = {
|
||||
modesetting.enable = true;
|
||||
open = false;
|
||||
@@ -42,11 +40,11 @@
|
||||
|
||||
services = {
|
||||
xserver = {
|
||||
#enable = true;
|
||||
enable = false;
|
||||
videoDrivers = ["nvidia"];
|
||||
};
|
||||
displayManager = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
defaultSession = "hyprland";
|
||||
autoLogin = {
|
||||
enable = true;
|
||||
@@ -54,6 +52,11 @@
|
||||
};
|
||||
};
|
||||
pulseaudio.enable = false;
|
||||
|
||||
hardware.openrgb = {
|
||||
enable = true;
|
||||
motherboard = "amd";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.extraConfig = "DefaultLimitNOFILE=2048";
|
||||
@@ -118,7 +121,7 @@
|
||||
sysconfig = {
|
||||
remoteBuildHost = true;
|
||||
host = "homebox";
|
||||
graphical = true;
|
||||
graphical = false;
|
||||
users = {
|
||||
nathan = {
|
||||
extraGroups = [ "wheel" "networkmanager" ];
|
||||
@@ -133,22 +136,23 @@
|
||||
{
|
||||
homeconfig = {
|
||||
minimal = false;
|
||||
hyprland.enable = true;
|
||||
hyprlock.enable = true;
|
||||
hyprland.enable = false;
|
||||
hyprlock.enable = false;
|
||||
wal.enable = true;
|
||||
mpd.enable = true;
|
||||
hyprpanel.enable = true;
|
||||
hyprpanel.enable = false;
|
||||
calcurse.enable = true;
|
||||
rofi.enable = true;
|
||||
firefox.enable = true;
|
||||
rofi.enable = false;
|
||||
firefox.enable = false;
|
||||
git.enable = true;
|
||||
nh.enable = true;
|
||||
};
|
||||
|
||||
services.hypridle.enable = lib.mkForce false;
|
||||
|
||||
home.packages = [
|
||||
pkgs.wayvnc
|
||||
home.packages = with pkgs; [
|
||||
wayvnc
|
||||
openrgb
|
||||
];
|
||||
}
|
||||
];
|
||||
@@ -165,15 +169,15 @@
|
||||
};
|
||||
|
||||
programs = {
|
||||
hyprland.enable = true;
|
||||
hyprpanel.enable = true;
|
||||
hyprland.enable = false;
|
||||
hyprpanel.enable = false;
|
||||
steam.enable = false;
|
||||
};
|
||||
|
||||
virtualization = {
|
||||
traefik.enable = true;
|
||||
jellyfin.enable = true;
|
||||
"blunkall.us".enable = true;
|
||||
"esotericbytes.com".enable = true;
|
||||
nextcloud.enable = true;
|
||||
ntfy.enable = false;
|
||||
gitea.enable = true;
|
||||
@@ -192,7 +196,7 @@
|
||||
rustdesk.enable = false; #broken
|
||||
#pihole.enable = false; #broken
|
||||
code-server.enable = false;
|
||||
novnc.enable = true;
|
||||
novnc.enable = false;
|
||||
minecraft.enable = true;
|
||||
|
||||
sandbox.enable = false;
|
||||
|
||||
@@ -31,8 +31,6 @@
|
||||
|
||||
specialisation = {
|
||||
docked.configuration = {
|
||||
hardware.nvidia.prime.sync.enable = true;
|
||||
|
||||
home-manager.users.nathan.wayland.windowManager.hyprland.extraConfig = ''
|
||||
monitor=eDP-1,1920x1080@300,0x0,1
|
||||
'';
|
||||
@@ -41,6 +39,7 @@
|
||||
|
||||
home-manager.users.nathan.wayland.windowManager.hyprland.extraConfig = lib.mkIf (config.specialisation != {}) ''
|
||||
monitor=eDP-1,1920x1080@60,0x0,1
|
||||
monitor=eDP-1, addreserved, 40,0,0,0
|
||||
'';
|
||||
|
||||
hardware = {
|
||||
@@ -53,7 +52,7 @@
|
||||
nvidia = {
|
||||
modesetting.enable = true;
|
||||
powerManagement.enable = true;
|
||||
powerManagement.finegrained = (config.specialisation != {});
|
||||
powerManagement.finegrained = true;
|
||||
open = false;
|
||||
nvidiaSettings = true;
|
||||
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||
@@ -65,7 +64,7 @@
|
||||
# WARNING: sync and offload are mutually exclusive.
|
||||
# You can only pick one!!
|
||||
#sync.enable = true;
|
||||
offload = lib.mkIf (config.specialisation != {}) {
|
||||
offload = {
|
||||
enable = true;
|
||||
enableOffloadCmd = true;
|
||||
};
|
||||
|
||||
75
system-config/services/containers/authentik/default.nix
Normal file
75
system-config/services/containers/authentik/default.nix
Normal file
@@ -0,0 +1,75 @@
|
||||
{ config, lib, inputs, ... }: {
|
||||
|
||||
options.sysconfig.virtualization.authentik.enable = lib.options.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
};
|
||||
|
||||
imports = [
|
||||
inputs.sops-nix.nixosModules.sops
|
||||
];
|
||||
|
||||
config = lib.mkIf config.sysconfig.virtualization.authentik.enable {
|
||||
|
||||
sops.secrets."authentik/dbpass" = {};
|
||||
|
||||
networking = {
|
||||
|
||||
nat.internalInterfaces = [ "ve-authentik" ];
|
||||
};
|
||||
|
||||
containers.authentik = {
|
||||
|
||||
autoStart = true;
|
||||
privateNetwork = true;
|
||||
hostAddress = "192.168.100.10";
|
||||
localAddress = "192.168.100.35";
|
||||
|
||||
extraFlags = [
|
||||
"--load-credential=dbpass:${config.sops.secrets."authentik/dbpass".path}"
|
||||
];
|
||||
|
||||
bindMounts = {
|
||||
"/etc/authentik" = {
|
||||
hostPath = "/ssd1/Authentik";
|
||||
isReadOnly = false;
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
|
||||
networking.firewall.allowedTCPPorts = [ 9001 ];
|
||||
|
||||
systemd.services.secrets_setup = {
|
||||
wantedBy = [ "authentik.service" ];
|
||||
|
||||
serviceConfig = {
|
||||
LoadCredential = [
|
||||
"dbpass"
|
||||
];
|
||||
};
|
||||
|
||||
script = ''
|
||||
cat ''${CREDENTIALS_DIRECTORY}/dbpass > /etc/authentik/dbpass
|
||||
chown postgres:postgres /etc/authentik/dbpass
|
||||
'';
|
||||
};
|
||||
|
||||
services.authentik = {
|
||||
enable = true;
|
||||
|
||||
environmentFile = "/etc/authentik/authentik.env";
|
||||
|
||||
settings = {
|
||||
disable_startup_analytics = true;
|
||||
avatars = "initials";
|
||||
};
|
||||
|
||||
worker.listenHTTP = "0.0.0.0:9001";
|
||||
};
|
||||
|
||||
system.stateVersion = "25.05";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -8,7 +8,7 @@
|
||||
config = lib.mkIf config.sysconfig.virtualization.gitea.enable {
|
||||
|
||||
networking = {
|
||||
hosts."192.168.100.20" = [ "gitea.blunkall.us" ];
|
||||
hosts."192.168.100.20" = [ "gitea.esotericbytes.com" ];
|
||||
|
||||
nat.internalInterfaces = [ "ve-gitea" ];
|
||||
};
|
||||
@@ -77,9 +77,9 @@
|
||||
|
||||
settings = {
|
||||
server = {
|
||||
DOMAIN = "gitea.blunkall.us";
|
||||
DOMAIN = "gitea.esotericbytes.com";
|
||||
HTTP_PORT = 3000;
|
||||
ROOT_URL = "https://gitea.blunkall.us/";
|
||||
ROOT_URL = "https://gitea.esotericbytes.com/";
|
||||
};
|
||||
service = {
|
||||
DISABLE_REGISTRATION = false;
|
||||
|
||||
@@ -62,7 +62,7 @@
|
||||
database.passwordFile = "/etc/keycloak/dbpass";
|
||||
|
||||
settings = {
|
||||
hostname = "auth.blunkall.us";
|
||||
hostname = "auth.esotericbytes.com";
|
||||
|
||||
http-enabled = true;
|
||||
|
||||
|
||||
@@ -28,14 +28,21 @@
|
||||
enable = true;
|
||||
|
||||
openFirewall = true;
|
||||
environment = {
|
||||
N8N_DIAGNOSTICS_ENABLED = "false";
|
||||
N8N_VERSION_NOTIFICATIONS_ENABLED = "false";
|
||||
N8N_TEMPLATES_ENABLED = "false";
|
||||
|
||||
settings = {
|
||||
|
||||
EXTERNAL_FRONTEND_HOOKS_URLS = "";
|
||||
N8N_DIAGNOSTICS_CONFIG_FRONTEND = "";
|
||||
N8N_DIAGNOSTICS_CONFIG_BACKEND = "";
|
||||
|
||||
N8N_SECURE_COOKIE = "false";
|
||||
};
|
||||
|
||||
#webhookUrl = "https://n8n.blunkall.us/";
|
||||
};
|
||||
|
||||
/*
|
||||
systemd.services.n8n = {
|
||||
environment = {
|
||||
N8N_DIAGNOSTICS_ENABLED = "false";
|
||||
@@ -49,7 +56,7 @@
|
||||
N8N_SECURE_COOKIE = "false";
|
||||
};
|
||||
};
|
||||
|
||||
*/
|
||||
system.stateVersion = "25.05";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
};
|
||||
|
||||
config = let
|
||||
pkgs-us = import inputs.nixpkgs-us {
|
||||
pkgs-com = import inputs.nixpkgs-us {
|
||||
system = "x86_64-linux";
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
@@ -26,9 +26,9 @@
|
||||
enable = config.sysconfig.services.netbird.enable;
|
||||
ui = {
|
||||
enable = true;
|
||||
#package = pkgs-us.netbird-ui;
|
||||
#package = pkgs-com.netbird-ui;
|
||||
};
|
||||
#package = pkgs-us.netbird;
|
||||
#package = pkgs-com.netbird;
|
||||
};
|
||||
|
||||
networking = {
|
||||
@@ -67,7 +67,7 @@
|
||||
|
||||
config = {
|
||||
|
||||
services.nginx.virtualHosts."vpn.blunkall.us" = {
|
||||
services.nginx.virtualHosts."vpn.esotericbytes.com" = {
|
||||
listen = [
|
||||
{
|
||||
addr = "0.0.0.0";
|
||||
@@ -82,13 +82,13 @@
|
||||
server = {
|
||||
enable = true;
|
||||
enableNginx = true;
|
||||
domain = "vpn.blunkall.us";
|
||||
domain = "vpn.esotericbytes.com";
|
||||
|
||||
dashboard = {
|
||||
enable = true;
|
||||
enableNginx = true;
|
||||
settings = {
|
||||
AUTH_AUTHORITY = "https://auth.blunkall.us/realms/General";
|
||||
AUTH_AUTHORITY = "https://auth.esotericbytes.com/realms/General";
|
||||
AUTH_CLIENT_ID = "netbird";
|
||||
AUTH_SUPPORTED_SCOPES = "openid profile email offline_access api";
|
||||
AUTH_AUDIENCE = "netbird";
|
||||
@@ -96,7 +96,7 @@
|
||||
NETBIRD_TOKEN_SOURCE = "accessToken";
|
||||
};
|
||||
|
||||
package = pkgs-us.netbird-dashboard;
|
||||
package = pkgs-com.netbird-dashboard;
|
||||
};
|
||||
management = {
|
||||
enable = true;
|
||||
@@ -107,19 +107,19 @@
|
||||
|
||||
dnsDomain = "vpn";
|
||||
|
||||
turnDomain = "vpn.blunkall.us";
|
||||
turnDomain = "vpn.esotericbytes.com";
|
||||
turnPort = 3478;
|
||||
|
||||
logLevel = "DEBUG";
|
||||
|
||||
oidcConfigEndpoint = "https://auth.blunkall.us/realms/General/.well-known/openid-configuration";
|
||||
oidcConfigEndpoint = "https://auth.esotericbytes.com/realms/General/.well-known/openid-configuration";
|
||||
|
||||
settings = {
|
||||
"TURNConfig" = {
|
||||
"Turns" = [
|
||||
{
|
||||
"Proto" = "udp";
|
||||
"URI" = "turn:vpn.blunkall.us:3478";
|
||||
"URI" = "turn:vpn.esotericbytes.com:3478";
|
||||
"Username" = "netbird";
|
||||
"Password"._secret = "/etc/netbird/coturnPass";
|
||||
}
|
||||
@@ -132,14 +132,14 @@
|
||||
|
||||
"HttpConfig" = {
|
||||
"Address" = "0.0.0.0:443";
|
||||
"AuthIssuer" = "https://auth.blunkall.us/realms/General";
|
||||
"AuthIssuer" = "https://auth.esotericbytes.com/realms/General";
|
||||
"AuthAudience" = "netbird";
|
||||
"AuthKeysLocation" = "https://auth.blunkall.us/realms/General/protocol/openid-connect/certs";
|
||||
"AuthKeysLocation" = "https://auth.esotericbytes.com/realms/General/protocol/openid-connect/certs";
|
||||
"AuthUserIDClaim" = "";
|
||||
"CertFile" = "";
|
||||
"CertKey" = "";
|
||||
"IdpSignKeyRefreshEnabled" = false;
|
||||
"OIDCConfigEndpoint" = "https://auth.blunkall.us/realms/General/.well-known/openid-configuration";
|
||||
"OIDCConfigEndpoint" = "https://auth.esotericbytes.com/realms/General/.well-known/openid-configuration";
|
||||
};
|
||||
|
||||
"DeviceAuthorizationFlow" = {
|
||||
@@ -150,8 +150,8 @@
|
||||
"Domain" = "";
|
||||
"ClientID" = "";
|
||||
"ClientSecret" = "";
|
||||
"TokenEndpoint" = "https://auth.blunkall.us/realms/General/protocol/openid-connect/token";
|
||||
"DeviceAuthEndpoint" = "https://auth.blunkall.us/realms/General/protocol/openid-connect/auth/device";
|
||||
"TokenEndpoint" = "https://auth.esotericbytes.com/realms/General/protocol/openid-connect/token";
|
||||
"DeviceAuthEndpoint" = "https://auth.esotericbytes.com/realms/General/protocol/openid-connect/auth/device";
|
||||
"Scope" = "openid";
|
||||
"UseIDToken" = false;
|
||||
"RedirectURLs" = null;
|
||||
@@ -161,15 +161,15 @@
|
||||
"IdpManagerConfig" = {
|
||||
"ManagerType" = "keycloak";
|
||||
"ClientConfig" = {
|
||||
"Issuer" = "https://auth.blunkall.us/realms/General";
|
||||
"TokenEndpoint" = "https://auth.blunkall.us/realms/General/protocol/openid-connect/token";
|
||||
"Issuer" = "https://auth.esotericbytes.com/realms/General";
|
||||
"TokenEndpoint" = "https://auth.esotericbytes.com/realms/General/protocol/openid-connect/token";
|
||||
"ClientID" = "netbird-backend";
|
||||
"ClientSecret" = "QuqjTOAHKE6N6jJqkB1F1RGo3kqUhEdg";
|
||||
"GrantType" = "client_credentials";
|
||||
};
|
||||
|
||||
"ExtraConfig" = {
|
||||
"AdminEndpoint" = "https://auth.blunkall.us/admin/realms/General";
|
||||
"AdminEndpoint" = "https://auth.esotericbytes.com/admin/realms/General";
|
||||
};
|
||||
"Auth0ClientCredentials" = null;
|
||||
"AzureClientCredentials" = null;
|
||||
@@ -183,8 +183,8 @@
|
||||
"ClientID" = "netbird";
|
||||
"ClientSecret" = "";
|
||||
"Domain" = "";
|
||||
"AuthorizationEndpoint" = "https://auth.blunkall.us/realms/General/protocol/openid-connect/auth";
|
||||
"TokenEndpoint" = "https://auth.blunkall.us/realms/General/protocol/openid-connect/token";
|
||||
"AuthorizationEndpoint" = "https://auth.esotericbytes.com/realms/General/protocol/openid-connect/auth";
|
||||
"TokenEndpoint" = "https://auth.esotericbytes.com/realms/General/protocol/openid-connect/token";
|
||||
"Scope" = "openid profile email offline_access api";
|
||||
"RedirectURLs" = [
|
||||
"http://localhost:53000"
|
||||
|
||||
@@ -67,7 +67,7 @@
|
||||
extraAppsEnable = true;
|
||||
settings = {
|
||||
overwriteprotocol = "https";
|
||||
trusted_domains = [ "nextcloud.blunkall.us" ];
|
||||
trusted_domains = [ "nextcloud.esotericbytes.com" ];
|
||||
trusted_proxies = [ "192.168.100.11" ];
|
||||
default_phone_region = "US";
|
||||
};
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{ config, lib, ... }: {
|
||||
|
||||
options.sysconfig.virtualization."blunkall.us".enable = lib.mkOption {
|
||||
options.sysconfig.virtualization."esotericbytes.com".enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
};
|
||||
|
||||
config = lib.mkIf config.sysconfig.virtualization."blunkall.us".enable {
|
||||
config = lib.mkIf config.sysconfig.virtualization."esotericbytes.com".enable {
|
||||
|
||||
containers.blunkall-us = {
|
||||
containers.esotericbytes-com = {
|
||||
|
||||
autoStart = true;
|
||||
privateNetwork = true;
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
bindMounts = {
|
||||
"/var/www/data" = {
|
||||
hostPath = "/ssd1/blunkall_us/data";
|
||||
hostPath = "/ssd1/esotericbytes-com/data";
|
||||
isReadOnly = false;
|
||||
};
|
||||
};
|
||||
@@ -26,12 +26,12 @@
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
virtualHosts = {
|
||||
"blunkall.us" = {
|
||||
"esotericbytes.com" = {
|
||||
enableACME = false;
|
||||
forceSSL = false;
|
||||
root = "/var/www/data";
|
||||
};
|
||||
"homebox.vpn/blunkall" = {
|
||||
"homebox.vpn/esotericbytes" = {
|
||||
enableACME = false;
|
||||
forceSSL = false;
|
||||
root = "/var/www/data";
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
config = lib.mkIf config.sysconfig.virtualization.traefik.enable {
|
||||
|
||||
networking = {
|
||||
hosts."192.168.100.11" = [ "blunkall.us" "*.blunkall.us" "traefik.local" ];
|
||||
hosts."192.168.100.11" = [ "esotericbytes.com" "*.esotericbytes.com" "traefik.local" ];
|
||||
firewall.allowedTCPPorts = [ 22 80 443];
|
||||
|
||||
nat.internalInterfaces = [ "ve-traefik" ];
|
||||
@@ -74,8 +74,8 @@
|
||||
http.tls = {
|
||||
certResolver = "cloudflare";
|
||||
domains = {
|
||||
main = "blunkall.us";
|
||||
sans = [ "*.blunkall.us" "blunkall.us" ];
|
||||
main = "esotericbytes.com";
|
||||
sans = [ "*.esotericbytes.com" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -105,88 +105,88 @@
|
||||
routers = {
|
||||
homepageSecure = {
|
||||
entryPoints = [ "websecure" ];
|
||||
rule = "Host(`blunkall.us`) || Host(`www.blunkall.us`) || (Host(`homebox.vpn`) && PathPrefix(`/blunkall`))";
|
||||
rule = "Host(`esotericbytes.com`) || Host(`www.esotericbytes.com`)";
|
||||
service = "homepage";
|
||||
tls.certResolver = "cloudflare";
|
||||
};
|
||||
/*remote = {
|
||||
entryPoints = [ "websecure" ];
|
||||
rule = "Host(`remote.blunkall.us`)";
|
||||
rule = "Host(`remote.esotericbytes.com`)";
|
||||
service = "novnc";
|
||||
tls.certResolver = "cloudflare";
|
||||
#middlewares = [ "authentik" ];
|
||||
};*/
|
||||
/*homeassistant = {
|
||||
entryPoints = [ "websecure" ];
|
||||
rule = "Host(`hass.blunkall.us`)";
|
||||
rule = "Host(`hass.esotericbytes.com`)";
|
||||
service = "homeassistant";
|
||||
tls.certResolver = "cloudflare";
|
||||
};*/
|
||||
jellyfin = {
|
||||
entryPoints = [ "websecure" ];
|
||||
rule = "Host(`jellyfin.blunkall.us`)";
|
||||
rule = "Host(`jellyfin.esotericbytes.com`)";
|
||||
service = "jellyfin";
|
||||
tls.certResolver = "cloudflare";
|
||||
};
|
||||
|
||||
auth = {
|
||||
entryPoints = [ "websecure" ];
|
||||
rule = "Host(`auth.blunkall.us`)";
|
||||
rule = "Host(`auth.esotericbytes.com`)";
|
||||
service = "keycloak";
|
||||
tls.certResolver = "cloudflare";
|
||||
};
|
||||
/*gitlab = {
|
||||
entryPoints = [ "websecure" ];
|
||||
rule = "Host(`gitlab.blunkall.us`)";
|
||||
rule = "Host(`gitlab.esotericbytes.com`)";
|
||||
service = "gitlab";
|
||||
tls.certResolver = "cloudflare";
|
||||
};*/
|
||||
gitea = {
|
||||
entryPoints = [ "websecure" ];
|
||||
rule = "Host(`gitea.blunkall.us`)";
|
||||
rule = "Host(`gitea.esotericbytes.com`)";
|
||||
service = "gitea";
|
||||
tls.certResolver = "cloudflare";
|
||||
};
|
||||
nextcloud = {
|
||||
entryPoints = [ "websecure" ];
|
||||
rule = "Host(`nextcloud.blunkall.us`)";
|
||||
rule = "Host(`nextcloud.esotericbytes.com`)";
|
||||
service = "nextcloud";
|
||||
tls.certResolver = "cloudflare";
|
||||
middlewares = [
|
||||
"nextcloud_redirectregex"
|
||||
];
|
||||
};
|
||||
traefik = {
|
||||
/*traefik = {
|
||||
entryPoints = [ "websecure" ];
|
||||
rule = "Host(`192.168.100.11`) || Host(`homebox.vpn`)";
|
||||
service = "api@internal";
|
||||
tls.certResolver = "cloudflare";
|
||||
#middlewares = [ "authentik" ];
|
||||
};
|
||||
};*/
|
||||
/*ntfy = {
|
||||
entryPoints = [ "websecure" ];
|
||||
rule = "Host(`ntfy.blunkall.us`)";
|
||||
rule = "Host(`ntfy.esotericbytes.com`)";
|
||||
service = "ntfy";
|
||||
tls.certResolver = "cloudflare";
|
||||
};*/
|
||||
|
||||
/*pihole = {
|
||||
entryPoints = [ "localsecure" ];
|
||||
rule = "Host(`pihole.blunkall.us`)";
|
||||
rule = "Host(`pihole.esotericbytes.com`)";
|
||||
service = "pihole";
|
||||
tls.certResolver = "cloudflare";
|
||||
};*/
|
||||
|
||||
netbird = {
|
||||
entryPoints = [ "websecure" ];
|
||||
rule = "Host(`vpn.blunkall.us`)";
|
||||
rule = "Host(`vpn.esotericbytes.com`)";
|
||||
service = "netbird";
|
||||
tls.certResolver = "cloudflare";
|
||||
};
|
||||
|
||||
/*n8n = {
|
||||
entryPoints = [ "websecure" ];
|
||||
rule = "Host(`n8n.blunkall.us`)";
|
||||
rule = "Host(`n8n.esotericbytes.com`)";
|
||||
service = "n8n";
|
||||
tls.certResolver = "cloudflare";
|
||||
};*/
|
||||
@@ -197,8 +197,8 @@
|
||||
|
||||
nextcloud_redirectregex.redirectregex = {
|
||||
permanent = true;
|
||||
regex = "https://nextcloud.blunkall.us/.well-known/(?:card|cal)dav";
|
||||
replacement = "https://nextcloud.blunkall.us/remote.php/dav";
|
||||
regex = "https://nextcloud.esotericbytes.com/.well-known/(?:card|cal)dav";
|
||||
replacement = "https://nextcloud.esotericbytes.com/remote.php/dav";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -98,11 +98,7 @@
|
||||
openwakeword = lib.mkIf config.sysconfig.virtualization.wyoming.openwakeword {
|
||||
enable = true;
|
||||
uri = "tcp://0.0.0.0:11432";
|
||||
preloadModels = [
|
||||
"alexa"
|
||||
"hey_jarvis"
|
||||
"ok_nabu"
|
||||
];
|
||||
|
||||
threshold = 0.5;
|
||||
customModelsDirectories = [
|
||||
#./wake_words
|
||||
|
||||
17
system-config/services/wireguard/default.nix
Normal file
17
system-config/services/wireguard/default.nix
Normal file
@@ -0,0 +1,17 @@
|
||||
{ config, lib, ... }: {
|
||||
|
||||
options = {
|
||||
sysconfig.wireguard.enable = lib.options.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf config.sysconfig.wireguard.enable {
|
||||
networking.wireguard = {
|
||||
enable = true;
|
||||
interfaces.wg0 = {
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -94,7 +94,7 @@
|
||||
homeconfig = {
|
||||
host = config.sysconfig.host;
|
||||
name = x;
|
||||
graphical = config.sysconfig.graphical;
|
||||
graphical = lib.mkDefault config.sysconfig.graphical;
|
||||
};
|
||||
}
|
||||
] ++ (if inputs ? ${x} then [ (inputs.${x} /*{ config = config.home-manager.users.${x}; inherit lib pkgs inputs; }*/) ] else [])
|
||||
|
||||
Reference in New Issue
Block a user