foglar/nixos-config
foglar/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: foglar:5314c171f9731a9c0e30e02138402a5f8b60cf1f
Branches Tags
foglar:master
..
compare: foglar:7297ba1a5c96f86510f785ce5b2374858bc237ab
Branches Tags
foglar:master

No commits in common. "5314c171f9731a9c0e30e02138402a5f8b60cf1f" and "7297ba1a5c96f86510f785ce5b2374858bc237ab" have entirely different histories.
5314c171f9 ... 7297ba1a5c

8 changed files with 34 additions and 142 deletions
Show Stats Expand all files Collapse all files

60
flake.lock
View File

@ -40,11 +40,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1740813555, "lastModified": 1739098586,
"narHash": "sha256-GvkG6zoBsWgI7pbt92NZjGcOZMYC1C6pW8Lc4W1xMBU=", "narHash": "sha256-08FW+tVGWQKdiPZqXk6FO1JNB/Zybi7IYSWSGpp8V0Y=",
"owner": "AdnanHodzic", "owner": "AdnanHodzic",
"repo": "auto-cpufreq", "repo": "auto-cpufreq",
"rev": "6be154724337fa74236ee811150872304db21d8b", "rev": "e6bbd2c8335a33f25a3fcb3bd2376e790f460ba2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -129,11 +129,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1741147406, "lastModified": 1740212040,
"narHash": "sha256-sXP9Iz+DSfnS45XzlVIxnsGw3SOwlGWGogJB0MxALEw=", "narHash": "sha256-Gpvn9Z+ZgKPyb6qaAbahLbo6ZVj7VuLzSCmHZRvsACA=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "b8236b71159b0090b722eb686ec38612de854ddb", "rev": "9a8a0914000e4453c99a4c12e9862a0a40075851",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -408,11 +408,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741174782, "lastModified": 1740699498,
"narHash": "sha256-dYRebJk58/d5Ej1G6xTOadTfG6tU5zFgXYrLsRJlrgw=", "narHash": "sha256-r9hkKzX99CGiP1ZqH0e+SWKK4CMsRNRLyotuwrUjhTI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "def0dbbcea715d4514ca343ab4d6d7f3a1742da0", "rev": "b71edac7a3167026aabea82a54d08b1794088c21",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -539,11 +539,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1741203213, "lastModified": 1740707551,
"narHash": "sha256-q8RZy0nUhx3cocQBs7Tvg/+xNA6H8oXIV+M7iwuzH04=", "narHash": "sha256-khQu5pduq+KTid2lHYQpVkFPR3WigOdtE5/95PijxU4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "b51ab182ae3e8d88426af856b59dd28c6a9722ef", "rev": "445337d03dce7c9aef10ff4d57fc516ac8c1b24d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -817,11 +817,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1740995332, "lastModified": 1740390822,
"narHash": "sha256-SELnZZg9LOhw+kz60yEAr3l1plu70rBLInMRszLHtuc=", "narHash": "sha256-UnMANgi2Zf4gf4p49cXM4fDRrPEpN6oJJMXT4Z2BW/U=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-ld", "repo": "nix-ld",
"rev": "090c2003e3faa739e5a94e0a3cd782a1ccc40964", "rev": "4c86e9f94553bceba004c48be6f2691971d2a6f7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -959,11 +959,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1741048562, "lastModified": 1740603184,
"narHash": "sha256-W4YZ3fvWZiFYYyd900kh8P8wU6DHSiwaH0j4+fai1Sk=", "narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6af28b834daca767a7ef99f8a7defa957d0ade6f", "rev": "f44bd8ca21e026135061a0a57dcf3d0775b67a49",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -975,11 +975,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1741010256, "lastModified": 1740560979,
"narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", "rev": "5135c59491985879812717f4c9fea69604e7f26f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1257,11 +1257,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741043164, "lastModified": 1739262228,
"narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=", "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "3f2412536eeece783f0d0ad3861417f347219f4d", "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1278,11 +1278,11 @@
"systems": "systems_5" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1740889006, "lastModified": 1740284169,
"narHash": "sha256-A1iyKVvZrLdLwqWPC9OvPjC85ADQn2R1EGfCzJBl+wI=", "narHash": "sha256-Ne+3kEyOFD2sNfw3cnKk+Zi/tTk+WkmnsfE7PDLNEXU=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "f8d3757d4ae3af2175a631fb9598a42d30ee75fc", "rev": "fd31f20e2bd2bf3894d729590bf578c02c252239",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1315,11 +1315,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1741112087, "lastModified": 1740769934,
"narHash": "sha256-dBGwN4aHmX2QUXolZDhV+p06+WM5ZykL4wd9BD6bT7k=", "narHash": "sha256-iyxUwII/NQNClT77VqQiDpaXJz1r0Z8tNVxgY64mLak=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "11780517948f214b9f93d1bf5a2d29bc181d3a33", "rev": "de4ee5899042801b62f988687acd454d4d411075",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
ginoza/configuration.nix
View File

@ -41,7 +41,6 @@
bluetooth = { bluetooth = {
enable = true; enable = true;
blueman.enable = false; blueman.enable = false;
media-player-control.enable = false;
}; };
autoUpdate.enable = false; autoUpdate.enable = false;
autoCleanup.enable = true; autoCleanup.enable = true;

1
kogami/configuration.nix
View File

@ -42,7 +42,6 @@
bluetooth = { bluetooth = {
enable = true; enable = true;
blueman.enable = true; blueman.enable = true;
media-player-control.enable = true;
}; };
autoUpdate.enable = true; autoUpdate.enable = true;

2
nixos/home/apps/games.nix
View File

@ -15,7 +15,7 @@
vitetris vitetris
steam steam
superTuxKart superTuxKart
wineWowPackages.stable wine
(writeShellScriptBin "gs" '' (writeShellScriptBin "gs" ''
set -xeuo pipefail set -xeuo pipefail

72
nixos/home/desktop/hyprland/eww.nix
View File

@ -246,18 +246,6 @@ in {
margin: 10px 0px 0px 0px; margin: 10px 0px 0px 0px;
} }
.bt_bluetooth {
color: #${config.lib.stylix.colors.base02};
font-size: 22px;
font-weight: normal;
}
.bt_toggle {
font-size: 52px;
font-weight: normal;
color: #${config.lib.stylix.colors.base16};
}
/** Weather ***************************************/ /** Weather ***************************************/
.iconweather { .iconweather {
font-family: Iosevka Nerd Font; font-family: Iosevka Nerd Font;
@ -484,61 +472,6 @@ in {
home.packages = with pkgs; [ home.packages = with pkgs; [
brightnessctl brightnessctl
(writeShellScriptBin "bluetooth-toggle" ''
# Check if MAC address is provided
if [ -z "$1" ]; then
echo "Usage: $0 <MAC_ADDRESS>"
exit 1
fi
MAC_ADDRESS="$1"
# Get connection status
CONNECTED=$(bluetoothctl info "$MAC_ADDRESS" | grep "Connected" | awk '{print $2}')
if [ "$CONNECTED" = "yes" ]; then
echo "Device $MAC_ADDRESS is connected. Disconnecting..."
bluetoothctl disconnect "$MAC_ADDRESS"
else
echo "Device $MAC_ADDRESS is not connected. Connecting..."
bluetoothctl connect "$MAC_ADDRESS"
fi
'')
(writeShellScriptBin "bluetooth-status" ''
# Check if MAC address is provided as an argument
if [ -z "$1" ]; then
echo "Usage: $0 <MAC_ADDRESS>"
exit 1
fi
# Run bluetoothctl command and check if the device is connected
status=$(bluetoothctl info "$1" | grep "Connected" | awk '{print $2}')
if [ "$status" == "yes" ]; then
echo "Connected"
else
echo "Offline"
fi
'')
(writeShellScriptBin "bluetooth-battery" ''
# Check if MAC address is provided as an argument
if [ -z "$1" ]; then
echo "Usage: $0 <MAC_ADDRESS>"
exit 1
fi
# Run bluetoothctl command and check if the device is connected
status=$(bluetoothctl info "$1" | grep "Connected" | awk '{print $2}')
if [ "$status" == "yes" ]; then
battery=$(bluetoothctl info "$1" | grep "Battery Percentage" | awk '{print $4}')
echo " ''${battery:1:-1}%"
else
echo ""
fi'')
(writeShellScriptBin "eww-dashboard-toggle" '' (writeShellScriptBin "eww-dashboard-toggle" ''
FILE="$HOME/${EWW_CACHE}" FILE="$HOME/${EWW_CACHE}"
CFG="$HOME/${EWW_PATH}" CFG="$HOME/${EWW_PATH}"
@ -557,8 +490,7 @@ in {
system \ system \
clock \ clock \
uptime \ uptime \
music \ music
bluetooth
} }
## Launch or close widgets accordingly ## Launch or close widgets accordingly
@ -567,7 +499,7 @@ in {
run_eww run_eww
else else
${EWW} --config "$CFG" close \ ${EWW} --config "$CFG" close \
background profile system clock uptime music apps logout sleep reboot poweroff folders bluetooth background profile system clock uptime music apps logout sleep reboot poweroff folders
rm "$FILE" rm "$FILE"
fi fi
'') '')

27
nixos/home/desktop/hyprland/eww/dashboard/eww.yuck
View File

@ -38,13 +38,6 @@
;; Files vars ;; Files vars
(defpoll FREE :interval "5s" `df -h / | awk '{print $4}' | tail -n 1 | sed 's/G/GB/'`) (defpoll FREE :interval "5s" `df -h / | awk '{print $4}' | tail -n 1 | sed 's/G/GB/'`)
;; Bluetooth vars
;; Headphones
(defpoll BLUETOOTH_HEADPHONES_STATUS :interval "5s" `bluetooth-status EF:DD:5D:31:76:F0`)
(defpoll BLUETOOTH_HEADPHONES_BATTERY :interval "5s" `bluetooth-battery EF:DD:5D:31:76:F0`)
(defpoll BLUETOOTH_MOUSE_STATUS :interval "5s" `bluetooth-status D9:2E:B4:70:BF:D6`)
(defpoll BLUETOOTH_MOUSE_BATTERY :interval "5s" `bluetooth-battery D9:2E:B4:70:BF:D6`)
;; ** Widgets ************************************************************************* ;; ** Widgets *************************************************************************
@ -89,7 +82,7 @@
;; uptime ;; uptime
(defwidget uptime [] (defwidget uptime []
(box :class "genwin" (box :class "genwin"
(box :orientation "h" :halign "center" :spacing 5 :space-evenly "false" :vexpand "false" :hexpand "false" (box :orientation "h" :halign "center" :spacing 40 :space-evenly "false" :vexpand "false" :hexpand "false"
(label :class "icontimer" :valign "center" :text "󱎫 ") (label :class "icontimer" :valign "center" :text "󱎫 ")
(box :orientation "v" :valign "center" :spacing 0 :space-evenly "false" :vexpand "false" :hexpand "false" (box :orientation "v" :valign "center" :spacing 0 :space-evenly "false" :vexpand "false" :hexpand "false"
(label :class "uphour" :halign "start" :wrap "true" :limit-width 25 :text UPHOUR) (label :class "uphour" :halign "start" :wrap "true" :limit-width 25 :text UPHOUR)
@ -109,19 +102,6 @@
(box :class "music_bar" :halign "center" :vexpand "false" :hexpand "false" (box :class "music_bar" :halign "center" :vexpand "false" :hexpand "false"
(scale :onscroll "playerctl position 1+" :min 0 :active "true" :max 100 :value CURRENT))))) (scale :onscroll "playerctl position 1+" :min 0 :active "true" :max 100 :value CURRENT)))))
;; Bluetooth
(defwidget bluetooth []
(box :class "genwin" :orientation "v" :spacing 10
(box :orientation "h" :spacing 5 :halign "center" :space-evenly "false" :vexpand "false" :hexpand "true"
(button :class "bt_toggle" :onclick "bluetooth-toggle EF:DD:5D:31:76:F0" "󰋋"))
(box :orientation "v" :spacing 10 :halign "center" :space-evenly "false" :vexpand "false" :hexpand "true"
(label :class "bt_bluetooth" :text BLUETOOTH_HEADPHONES_STATUS)
(label :class "bt_bluetooth" :text BLUETOOTH_HEADPHONES_BATTERY))
(box :orientation "h" :spacing 5 :halign "center" :space-evenly "false" :vexpand "false" :hexpand "true"
(button :class "bt_toggle" :onclick "bluetooth-toggle D9:2E:B4:70:BF:D6" "󰍽"))
(box :orientation "v" :spacing 10 :halign "center" :space-evenly "false" :vexpand "false" :hexpand "true"
(label :class "bt_bluetooth" :text BLUETOOTH_MOUSE_STATUS)
(label :class "bt_bluetooth" :text BLUETOOTH_MOUSE_BATTERY))))
;; folders ;; folders
(defwidget folders [] (defwidget folders []
(box :class "genwin" :orientation "v" :space-evenly "false" :vexpand "false" :hexpand "false" (box :class "genwin" :orientation "v" :space-evenly "false" :vexpand "false" :hexpand "false"
@ -184,11 +164,6 @@
:geometry (geometry :x 515 :y 490 :width 610 :height 280) :geometry (geometry :x 515 :y 490 :width 610 :height 280)
(music)) (music))
;; bluetooth
(defwindow bluetooth :stacking "fg" :focusable "false" :monitor 0
:geometry (geometry :x 880 :y 150 :width 220 :height 325)
(bluetooth))
;; folders ;; folders
(defwindow folders :stacking "fg" :focusable "false" :monitor 0 (defwindow folders :stacking "fg" :focusable "false" :monitor 0
:geometry (geometry :x 1445 :y 490 :width 325 :height 440) :geometry (geometry :x 1445 :y 490 :width 325 :height 440)

12
nixos/system/settings/network.nix
View File

@ -2,14 +2,12 @@
lib, lib,
config, config,
userSettings, userSettings,
pkgs,
... ...
}: { }: {
options = { options = {
sys.network.enable = lib.mkEnableOption "Enable networking"; sys.network.enable = lib.mkEnableOption "Enable networking";
sys.bluetooth.enable = lib.mkEnableOption "Enable Bluetooth support"; sys.bluetooth.enable = lib.mkEnableOption "Enable Bluetooth support";
sys.bluetooth.blueman.enable = lib.mkEnableOption "Enable Blueman App"; sys.bluetooth.blueman.enable = lib.mkEnableOption "Enable Blueman App";
sys.bluetooth.media-player-control.enable = lib.mkEnableOption "Enable Media Player Control";
}; };
config = lib.mkMerge [ config = lib.mkMerge [
@ -37,15 +35,5 @@
services.blueman.enable = true; services.blueman.enable = true;
} }
) )
(
lib.mkIf config.sys.bluetooth.media-player-control.enable {
systemd.user.services.mpris-proxy = {
description = "Mpris proxy";
after = ["network.target" "sound.target"];
wantedBy = ["default.target"];
serviceConfig.ExecStart = "${pkgs.bluez}/bin/mpris-proxy";
};
}
)
]; ];
} }

1
nixos/system/system.nix
View File

@ -46,7 +46,6 @@
bluetooth = { bluetooth = {
enable = lib.mkDefault true; enable = lib.mkDefault true;
blueman.enable = lib.mkDefault true; blueman.enable = lib.mkDefault true;
media-player-control.enable = lib.mkDefault false;
}; };
autoUpdate.enable = lib.mkDefault true; autoUpdate.enable = lib.mkDefault true;