outfoxxed/nixnew
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: outfoxxed:b3e9b4e6be57ce1918b115c6e7d4fe26186e9089
Branches Tags
outfoxxed:master
..
compare: outfoxxed:fc0a0b958cda7cf9eefeb30ea1b8ca23990fe3bc
Branches Tags
outfoxxed:master

No commits in common. "b3e9b4e6be57ce1918b115c6e7d4fe26186e9089" and "fc0a0b958cda7cf9eefeb30ea1b8ca23990fe3bc" have entirely different histories.
b3e9b4e6be ... fc0a0b958c

7 changed files with 59 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

90
flake.lock generated
View file

@ -20,11 +20,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1774211390, "lastModified": 1772460678,
"narHash": "sha256-sTtAgCCaX8VNNZlQFACd3i1IQ+DB0Wf3COgiFS152ds=", "narHash": "sha256-NYaWs8fYJ38IgFld0hGSdT2LEVhrgO8SiRReBjIH7YY=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "f62a4dbfa4e5584f14ad4c62afedf6e4b433cf70", "rev": "5d2cb726b16ee349df443f84b64cff53221b6983",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -43,11 +43,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775381444, "lastModified": 1772938270,
"narHash": "sha256-06aT/yhP4aLA15e8ASbXBfe615jG6QE+sis+KhhVtSo=", "narHash": "sha256-EGGrJl8GkQianhniX6dvC8VJgtzJuZz7MBQCaU4fqd0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "c868f794043735f1e2cc8d93f6a6d947bfa9e0f0", "rev": "286f28782f03dcfbd6713fce333785e9f8c754e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -122,11 +122,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775427330, "lastModified": 1772845525,
"narHash": "sha256-pm1SDX9Tj4eHWwjtDEqSU+5QZO7nHHqU8GT0JtbI9rc=", "narHash": "sha256-Dp5Ir2u4jJDGCgeMRviHvEQDe+U37hMxp6RSNOoMMPc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7e7269ac064bea120d7b23daed432a096617872d", "rev": "27b93804fbef1544cb07718d3f0a451f4c4cd6c0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -218,16 +218,17 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1775416789, "lastModified": 1772885694,
"narHash": "sha256-0IELkB6YXCZGqZqLdmOcTw8mki6NNhDmG47y7Qynuj8=", "narHash": "sha256-XNPMJcc5+ghqTgK4bnAFhYdfv6xai3YKq7EGAHoPU/U=",
"owner": "hyprwm", "owner": "outfoxxed",
"repo": "Hyprland", "repo": "hyprland",
"rev": "aaa2fc342f002bf4acd965f1ad2ead3796347e35", "rev": "213e560d1b7dd3774c2ca0741b4512235bfa7fa0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "hyprwm", "owner": "outfoxxed",
"repo": "Hyprland", "ref": "itarget-visualbox-541",
"repo": "hyprland",
"type": "github" "type": "github"
} }
}, },
@ -284,15 +285,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775435678, "lastModified": 1773116363,
"narHash": "sha256-gh1o8cIWY+2Z8Qh9GDU3Z6oGnv+MqZqAlQCN9yEOa1g=", "narHash": "sha256-Xp8XiwRSvAgtdO57PeA7pH2cg9Ene9y2xhZ7kA3WUDg=",
"owner": "outfoxxed", "owner": "outfoxxed",
"repo": "hy3", "repo": "hy3",
"rev": "76010d97fe69498557ac6426a7ec6b989ac14343", "rev": "90fed4a9f093e7850de0277e34f0c1e488d1ca6d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "outfoxxed", "owner": "outfoxxed",
"ref": "0.54",
"repo": "hy3", "repo": "hy3",
"type": "github" "type": "github"
} }
@ -410,11 +412,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1774911391, "lastModified": 1772908136,
"narHash": "sha256-c4YVwO33Mmw+FIV8E0u3atJZagHvGTJ9Jai6RtiB8rE=", "narHash": "sha256-i2ZF719gjEB1D5pAOurpM5+SuN+SXPOP8h2OCHO0WYc=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "e6caa3d4d1427eedbdf556cf4ceb70f2d9c0b56d", "rev": "8eb974bdeaa64d7127ab2fff272166c705b7a933",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -464,11 +466,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773074819, "lastModified": 1772463520,
"narHash": "sha256-qRqYnXiKoJLRTcfaRukn7EifmST2IVBUMZOeZMAc5UA=", "narHash": "sha256-GIjASzYnV4fK19HnyJKmHyqyxHxIpjusK9foEA4Yo+4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwire", "repo": "hyprwire",
"rev": "f68afd0e73687598cc2774804fedad76693046f0", "rev": "4e1933ae5602b350c5b6633f5c932549c9b8aca2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -499,11 +501,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775365369, "lastModified": 1772945408,
"narHash": "sha256-DgH5mveLoau20CuTnaU5RXZWgFQWn56onQ4Du2CqYoI=", "narHash": "sha256-PMt48sEQ8cgCeljQ9I/32uoBq/8t8y+7W/nAZhf72TQ=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "cef5cf82671e749ac87d69aadecbb75967e6f6c3", "rev": "1c1d8ea87b047788fd7567adf531418c5da321ec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -534,11 +536,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1775036866, "lastModified": 1772773019,
"narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", "rev": "aca4d95fce4914b3892661bcb80b8087293536c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -555,11 +557,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775435376, "lastModified": 1772947144,
"narHash": "sha256-j38MtwM1VFWWU+bCEBGOsZbR1oaR7ByXSlP2+VRBMy4=", "narHash": "sha256-wthfdRyLnHUcVR1wQvCs5wu06BTbzDZJ7rv+mB/orzk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "c8fe168c59186cbcb65d5b4022cd5cf39d99a201", "rev": "06602287438c0066e4353751afee0a21757c61bd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -578,11 +580,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1774104215, "lastModified": 1772024342,
"narHash": "sha256-EAtviqz0sEAxdHS4crqu7JGR5oI3BwaqG0mw7CmXkO8=", "narHash": "sha256-+eXlIc4/7dE6EcPs9a2DaSY3fTA9AE526hGqkNID3Wg=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "f799ae951fde0627157f40aec28dec27b22076d0", "rev": "6e34e97ed9788b17796ee43ccdbaf871a5c2b476",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -618,11 +620,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775335892, "lastModified": 1772925576,
"narHash": "sha256-rWJ//l6k1hwe/A2fNdzuvEuHedBQkMIHLU9eNTu4N7I=", "narHash": "sha256-mMoiXABDtkSJxCYDrkhJ/TrrJf5M46oUfIlJvv2gkZ0=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "ad5fd9116e25bc502468f4dfa884ee027887c51c", "rev": "15a84097653593dd15fad59a56befc2b7bdc270d",
"revCount": 793, "revCount": 750,
"type": "git", "type": "git",
"url": "https://git.outfoxxed.me/quickshell/quickshell" "url": "https://git.outfoxxed.me/quickshell/quickshell"
}, },
@ -708,11 +710,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773601989, "lastModified": 1772476586,
"narHash": "sha256-2tJf/CQoHApoIudxHeJye+0Ii7scR0Yyi7pNiWk0Hn8=", "narHash": "sha256-N/ZwsRLULLpBP5ecvAUzNq8E/CgLRwPwSrHyY3xB5KM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "a9b862d1aa000a676d310cc62d249f7ad726233d", "rev": "eb6c02a2ead882f3474f3d7f2fbe966b64ed5110",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View file

@ -36,7 +36,8 @@
}; };
hyprland = { hyprland = {
url = "github:hyprwm/Hyprland"; #url = "github:hyprwm/Hyprland";
url = "github:outfoxxed/hyprland/itarget-visualbox-541";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.systems.follows = "systems"; inputs.systems.follows = "systems";
inputs.hyprutils.follows = "hyprutils"; inputs.hyprutils.follows = "hyprutils";
@ -44,7 +45,7 @@
}; };
hyprland-hy3 = { hyprland-hy3 = {
url = "github:outfoxxed/hy3"; url = "github:outfoxxed/hy3/0.54";
inputs.hyprland.follows = "hyprland"; inputs.hyprland.follows = "hyprland";
}; };
@ -72,7 +73,6 @@
}; };
outputs = inputs @ { self, nixpkgs, ... }: { outputs = inputs @ { self, nixpkgs, ... }: {
inherit self;
nixosConfigurations = { nixosConfigurations = {
msi = nixpkgs.lib.nixosSystem rec { msi = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux"; system = "x86_64-linux";

1
modules/system.nix
View file

@ -32,7 +32,6 @@
networkmanager = { networkmanager = {
enable = true; enable = true;
dns = lib.mkForce "systemd-resolved"; dns = lib.mkForce "systemd-resolved";
settings.connectivity.uri = "http://nmcheck.gnome.org/check_network_status.txt";
}; };
nameservers = [ "9.9.9.9" ]; nameservers = [ "9.9.9.9" ];

2
modules/user/default.nix
View file

@ -17,7 +17,7 @@ in {
users.users.${username} = { users.users.${username} = {
isNormalUser = true; isNormalUser = true;
uid = 1000; uid = 1000;
extraGroups = [ "wheel" "networkmanager" ]; extraGroups = [ "wheel" ];
initialPassword = "test"; initialPassword = "test";
}; };

1
modules/user/modules/quickshell/shell/bar/BarContainment.qml
View file

@ -29,7 +29,6 @@ PanelWindow {
color: "transparent" color: "transparent"
WlrLayershell.namespace: "shell:bar" WlrLayershell.namespace: "shell:bar"
focusable: tooltip.activeItem != null
readonly property Tooltip tooltip: tooltip; readonly property Tooltip tooltip: tooltip;
Tooltip { Tooltip {

3
modules/user/modules/quickshell/shell/bar/connections/Network.qml
View file

@ -11,7 +11,7 @@ import qs.bar
ClickableIcon { ClickableIcon {
id: root id: root
required property var bar; required property var bar;
readonly property WifiDevice adapter: Networking.devices.values[0] ?? null readonly property NetworkDevice adapter: Networking.devices.values[0]
readonly property bool connected: adapter.connected readonly property bool connected: adapter.connected
readonly property WifiNetwork activeNetwork: adapter.networks.values.find(network => network.connected) readonly property WifiNetwork activeNetwork: adapter.networks.values.find(network => network.connected)
@ -124,7 +124,6 @@ ClickableIcon {
device: root.adapter device: root.adapter
network: modelData network: modelData
width: parent.width width: parent.width
onConnectionAttempted: root.adapter.scannerEnabled = false
} }
} }
} }

59
modules/user/modules/quickshell/shell/bar/connections/NetworkDelegate.qml
View file

@ -12,45 +12,17 @@ WrapperMouseArea {
required property NetworkDevice device required property NetworkDevice device
required property WifiNetwork network required property WifiNetwork network
property bool menuOpen: false property bool menuOpen: false
property bool passwordRequired: false readonly property bool showBg: false
readonly property bool showBg: root.passwordRequired
hoverEnabled: true hoverEnabled: true
signal connectionAttempted();
function tryConnect() {
const connecting = root.network.connected || root.network.state == ConnectionState.Connecting;
if (connecting) root.device.disconnect();
else {
root.connectionAttempted();
if (pwField.text != "") root.network.connectWithPsk(pwField.text);
else root.network.connect();
}
}
onClicked: menuOpen = !menuOpen onClicked: menuOpen = !menuOpen
Connections {
target: root.network
function onConnectionFailed(reason) {
console.log(reason, reason == ConnectionFailReason.NoSecrets);
pwField.text = "";
root.passwordRequired = reason == ConnectionFailReason.NoSecrets;
}
function onStateChanged() {
if (root.network.state == ConnectionState.Connected) {
root.passwordRequired = false;
pwField.text = "";
}
}
}
WrapperRectangle { WrapperRectangle {
color: root.showBg ? ShellGlobals.colors.widget : "transparent" color: root.showBg ? ShellGlobals.colors.widget : "transparent"
border.width: 1 border.width: 1
border.color: root.showBg ? ShellGlobals.colors.widgetOutline : "transparent" border.color: root.showBg ? ShellGlobals.colors.widgetOutline : "transparent"
radius: 4 radius: 4
rightMargin: 2
ColumnLayout { ColumnLayout {
RowLayout { RowLayout {
@ -71,7 +43,11 @@ WrapperMouseArea {
implicitHeight: 24 implicitHeight: 24
implicitWidth: height implicitWidth: height
showAction: root.network.stateChanging showAction: root.network.stateChanging
onClicked: tryConnect() onClicked: {
if (showAction) return;
else if (root.network.connected) root.device.disconnect();
else root.network.connect();
}
} }
ClickableIcon { ClickableIcon {
@ -80,25 +56,6 @@ WrapperMouseArea {
implicitWidth: height implicitWidth: height
visible: root.network.known visible: root.network.known
onClicked: root.network.forget() onClicked: root.network.forget()
Layout.rightMargin: 2
}
}
TextField {
id: pwField
visible: root.passwordRequired
Layout.fillWidth: true
Layout.margins: 4
placeholderText: "Password"
echoMode: TextInput.Password
enabled: !(root.network.stateChanging || root.network.connected)
onAccepted: tryConnect()
background: Rectangle {
//color: "transparent" // ShellGlobals.colors.widget
color: pwField.enabled ? "transparent" : ShellGlobals.colors.widgetActive
border.color: ShellGlobals.colors.widgetOutline
radius: 4
} }
} }
} }