diff --git a/eggs/thunar/xfce/xfconf/xfce-perchannel-xml/thunar.xml b/eggs/thunar/xfce/xfconf/xfce-perchannel-xml/thunar.xml
index 4d42c420..4a35d116 100644
--- a/eggs/thunar/xfce/xfconf/xfce-perchannel-xml/thunar.xml
+++ b/eggs/thunar/xfce/xfconf/xfce-perchannel-xml/thunar.xml
@@ -6,7 +6,7 @@
-
+
@@ -32,7 +32,7 @@
-
+
diff --git a/root-conf/nixos/flake.lock b/root-conf/nixos/flake.lock
index 1c758623..5c779211 100644
--- a/root-conf/nixos/flake.lock
+++ b/root-conf/nixos/flake.lock
@@ -20,11 +20,11 @@
]
},
"locked": {
- "lastModified": 1772292445,
- "narHash": "sha256-4F1Q7U313TKUDDovCC96m/Za4wZcJ3yqtu4eSrj8lk8=",
+ "lastModified": 1778620495,
+ "narHash": "sha256-Gu7UhWjwKCgSiVC3Qz/Rc7cYi9DNuDTBxYzg3kfLvfM=",
"owner": "hyprwm",
"repo": "aquamarine",
- "rev": "1dbbba659c1cef0b0202ce92cadfe13bae550e8f",
+ "rev": "be35f75ac305f430f5f9d89b5f5a4af59ca7567e",
"type": "github"
},
"original": {
@@ -78,11 +78,11 @@
]
},
"locked": {
- "lastModified": 1772985280,
- "narHash": "sha256-FdrNykOoY9VStevU4zjSUdvsL9SzJTcXt4omdEDZDLk=",
+ "lastModified": 1778905220,
+ "narHash": "sha256-ox/5IHc8uwy6UTw6N7Shp6uCHIgu/S2PsWeuXsOHSo8=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "8f736f007139d7f70752657dff6a401a585d6cbc",
+ "rev": "d1686dc7d36cbd1234cb226ad6ef97e882716acb",
"type": "github"
},
"original": {
@@ -108,11 +108,11 @@
]
},
"locked": {
- "lastModified": 1753964049,
- "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
+ "lastModified": 1776511930,
+ "narHash": "sha256-fCpwFiTW0rT7oKJqr3cqHMnkwypSwQKpbtUEtxdkgrM=",
"owner": "hyprwm",
"repo": "hyprcursor",
- "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
+ "rev": "39435900785d0c560c6ae8777d29f28617d031ef",
"type": "github"
},
"original": {
@@ -137,11 +137,11 @@
]
},
"locked": {
- "lastModified": 1770511807,
- "narHash": "sha256-suKmSbSk34uPOJDTg/GbPrKEJutzK08vj0VoTvAFBCA=",
+ "lastModified": 1776426399,
+ "narHash": "sha256-RUESLKNikIeEq9ymGJ6nmcDXiSFQpUW1IhJ245nL3xM=",
"owner": "hyprwm",
"repo": "hyprgraphics",
- "rev": "7c75487edd43a71b61adb01cae8326d277aab683",
+ "rev": "68d064434787cf1ed4a2fe257c03c5f52f33cf84",
"type": "github"
},
"original": {
@@ -167,11 +167,11 @@
"xdph": "xdph"
},
"locked": {
- "lastModified": 1773171407,
- "narHash": "sha256-mtSDWOrekyWpJnuPu4uFxqOfSvsow74mmCm3PffqRTE=",
+ "lastModified": 1779179261,
+ "narHash": "sha256-ZFLN+o6SoQp+OF9TU48VpeYdBe71epRuUKBUGsu2KDk=",
"owner": "hyprwm",
"repo": "Hyprland",
- "rev": "0e083e886f02034c56b851649a6c27f55fe85e32",
+ "rev": "ba473375922dc19e311342921ce6c84095ff8b03",
"type": "github"
},
"original": {
@@ -213,11 +213,11 @@
]
},
"locked": {
- "lastModified": 1767023960,
- "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=",
+ "lastModified": 1776426575,
+ "narHash": "sha256-KI6nIfVihn/DPaeB5Et46Xg3dkNHrrEtUd5LBBVomB0=",
"owner": "hyprwm",
"repo": "hyprland-guiutils",
- "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660",
+ "rev": "a968d211048e3ed538e47b84cb3649299578f19d",
"type": "github"
},
"original": {
@@ -243,11 +243,11 @@
]
},
"locked": {
- "lastModified": 1771865848,
- "narHash": "sha256-xwNa+1D8WPsDnJtUofDrtyDCZKZotbUymzV/R5s+M0I=",
+ "lastModified": 1779056516,
+ "narHash": "sha256-RPAGnMedFb4In5bX9CtN/VMLWgqiee8h8g7sILe+2u8=",
"owner": "hyprwm",
"repo": "hyprland-plugins",
- "rev": "b85a56b9531013c79f2f3846fd6ee2ff014b8960",
+ "rev": "b3247839c94ceb76506730841f0b3735feccf37c",
"type": "github"
},
"original": {
@@ -268,11 +268,11 @@
]
},
"locked": {
- "lastModified": 1765214753,
- "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=",
+ "lastModified": 1772460177,
+ "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
- "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab",
+ "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917",
"type": "github"
},
"original": {
@@ -297,11 +297,11 @@
]
},
"locked": {
- "lastModified": 1771866172,
- "narHash": "sha256-fYFoXhQLrm1rD8vSFKQBOEX4OGCuJdLt1amKfHd5GAw=",
+ "lastModified": 1777320127,
+ "narHash": "sha256-Qu+Wf2Bp5qUjyn2YpZNq8a7JyzTGowhT1knrwE38a9U=",
"owner": "hyprwm",
"repo": "hyprlang",
- "rev": "0b219224910e7642eb0ed49f0db5ec3d008e3e41",
+ "rev": "090117506ddc3d7f26e650ff344d378c2ec329cc",
"type": "github"
},
"original": {
@@ -349,11 +349,11 @@
]
},
"locked": {
- "lastModified": 1764592794,
- "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=",
+ "lastModified": 1772462885,
+ "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=",
"owner": "hyprwm",
"repo": "hyprtoolkit",
- "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e",
+ "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998",
"type": "github"
},
"original": {
@@ -374,11 +374,11 @@
]
},
"locked": {
- "lastModified": 1771271487,
- "narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=",
+ "lastModified": 1778234770,
+ "narHash": "sha256-jAcsogZwWMfXT9MfXxZzkwliAqIuZUV0p71h6Ba9ReE=",
"owner": "hyprwm",
"repo": "hyprutils",
- "rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d",
+ "rev": "a2dbd8a4cc51f7cbe4224732668392bb1aa79df2",
"type": "github"
},
"original": {
@@ -399,11 +399,11 @@
]
},
"locked": {
- "lastModified": 1770501770,
- "narHash": "sha256-NWRM6+YxTRv+bT9yvlhhJ2iLae1B1pNH3mAL5wi2rlQ=",
+ "lastModified": 1777159683,
+ "narHash": "sha256-Jxixw6wZphUp+nHYxOKUYSckL17QMBx2d5Zp0rJHr1g=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
- "rev": "0bd8b6cde9ec27d48aad9e5b4deefb3746909d40",
+ "rev": "b8632713a6beaf28b56f2a7b0ab2fb7088dbb404",
"type": "github"
},
"original": {
@@ -428,11 +428,11 @@
]
},
"locked": {
- "lastModified": 1771606233,
- "narHash": "sha256-F3PLUqQ/TwgR70U+UeOqJnihJZ2EuunzojYC4g5xHr0=",
+ "lastModified": 1778410714,
+ "narHash": "sha256-o6RzFj4nJXaPRY7EM01siuCQeT41RfwwmcmFQqwFJJg=",
"owner": "hyprwm",
"repo": "hyprwire",
- "rev": "06c7f1f8c4194786c8400653c4efc49dc14c0f3a",
+ "rev": "85148a8e612808cf5ddb25d0b3c5840f3498a7dc",
"type": "github"
},
"original": {
@@ -443,11 +443,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1772198003,
- "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=",
+ "lastModified": 1778443072,
+ "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61",
+ "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
"type": "github"
},
"original": {
@@ -459,27 +459,27 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1773068389,
- "narHash": "sha256-vMrm7Pk2hjBRPnCSjhq1pH0bg350Z+pXhqZ9ICiqqCs=",
+ "lastModified": 1779065790,
+ "narHash": "sha256-hDWBoHGOT+Ll3GSJ3nb2CmixAyZ7X2HL8DUPQ1URdYg=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "44bae273f9f82d480273bab26f5c50de3724f52f",
+ "rev": "f1846e514659245e08fd06cfbf16ef9b2ee47fa7",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-25.11",
+ "ref": "staging-26.05",
"repo": "nixpkgs",
"type": "github"
}
},
"pkgs-unstable": {
"locked": {
- "lastModified": 1777578337,
- "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=",
+ "lastModified": 1778869304,
+ "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab",
+ "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
"type": "github"
},
"original": {
@@ -499,11 +499,11 @@
]
},
"locked": {
- "lastModified": 1772024342,
- "narHash": "sha256-+eXlIc4/7dE6EcPs9a2DaSY3fTA9AE526hGqkNID3Wg=",
+ "lastModified": 1778507602,
+ "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=",
"owner": "cachix",
"repo": "git-hooks.nix",
- "rev": "6e34e97ed9788b17796ee43ccdbaf871a5c2b476",
+ "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a",
"type": "github"
},
"original": {
@@ -564,11 +564,11 @@
]
},
"locked": {
- "lastModified": 1761431178,
- "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
+ "lastModified": 1778265244,
+ "narHash": "sha256-8jlPtGSsv/CQY6tVVyLF4Jjd0gnS+Zbn9yk/V13A9nM=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
- "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
+ "rev": "813ea5ca9a1702a9a2d1f5836bc00172ef698968",
"type": "github"
},
"original": {
diff --git a/root-conf/nixos/flake.nix b/root-conf/nixos/flake.nix
index d18ecbd8..ed68d4a2 100644
--- a/root-conf/nixos/flake.nix
+++ b/root-conf/nixos/flake.nix
@@ -2,10 +2,10 @@
description = "System building flake";
inputs = {
- nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
+ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
pkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
home-manager = {
- url = "github:nix-community/home-manager/release-25.11";
+ url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland.url = "github:hyprwm/Hyprland";
@@ -15,7 +15,7 @@
};
};
- outputs = { self, nixpkgs, pkgs-unstable, home-manager, ... }@inputs:
+ outputs = { self, nixpkgs, pkgs-unstable, home-manager, ... }@inputs:
let
system = "x86_64-linux";
in {
@@ -25,7 +25,7 @@
pkgs-unstable = import pkgs-unstable { inherit system; };
inputs = inputs;
};
- modules = [
+ modules = [
./nixMain/configuration.nix
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
@@ -34,7 +34,7 @@
home-manager.users.someone = import ./nixMain/homemanager/someone.nix;
home-manager.extraSpecialArgs = {inherit inputs;};
- }
+ }
];
};
nixosConfigurations.nixLap = nixpkgs.lib.nixosSystem {
@@ -43,7 +43,7 @@
pkgs-unstable = import pkgs-unstable { inherit system; };
inputs = inputs;
};
- modules = [
+ modules = [
./nixLap/configuration.nix
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
@@ -52,11 +52,8 @@
home-manager.users.someone = import ./nixLap/homemanager/someone.nix;
home-manager.extraSpecialArgs = {inherit inputs;};
- }
+ }
];
};
};
}
-
-
-
diff --git a/root-conf/nixos/homemanager/shared-conf.nix b/root-conf/nixos/homemanager/shared-conf.nix
index a96b9011..f62ecfd6 100644
--- a/root-conf/nixos/homemanager/shared-conf.nix
+++ b/root-conf/nixos/homemanager/shared-conf.nix
@@ -4,15 +4,15 @@
xdg = {
desktopEntries = {
packettracer8_workaround = {
- name = "Cisco Packet Tracer 8; Opening Exams Workaround";
- exec = "${pkgs.ciscoPacketTracer8}/bin/packettracer8 %u";
+ name = "Cisco Packet Tracer 9; Opening Exams Workaround";
+ exec = "${pkgs.ciscoPacketTracer9}/bin/packettracer9 %u";
type = "Application";
mimeType = [ "x-scheme-handler/pttp" ];
noDisplay = true;
};
};
mimeApps.defaultApplications = {
- "x-scheme-handler/pttp" = [ "packettracer8_workaround.desktop" ];
+ "x-scheme-handler/pttp" = [ "packettracer9_workaround.desktop" ];
};
};
}
diff --git a/root-conf/nixos/local-pkgs/CiscoPacketTracer822_amd64_signed.deb b/root-conf/nixos/local-pkgs/CiscoPacketTracer_900_Ubuntu_64bit.deb
similarity index 71%
rename from root-conf/nixos/local-pkgs/CiscoPacketTracer822_amd64_signed.deb
rename to root-conf/nixos/local-pkgs/CiscoPacketTracer_900_Ubuntu_64bit.deb
index bc382ca2..1a452970 100644
Binary files a/root-conf/nixos/local-pkgs/CiscoPacketTracer822_amd64_signed.deb and b/root-conf/nixos/local-pkgs/CiscoPacketTracer_900_Ubuntu_64bit.deb differ
diff --git a/root-conf/nixos/nixMain/configuration.nix b/root-conf/nixos/nixMain/configuration.nix
index 69708660..dad52e76 100644
--- a/root-conf/nixos/nixMain/configuration.nix
+++ b/root-conf/nixos/nixMain/configuration.nix
@@ -1,11 +1,11 @@
-# Edit this configuration file to define what should be installed on your system. Help is available in the configuration.nix(5) man page and in the NixOS manual
+# Edit this configuration file to define what should be installed on your system. Help is available in the configuration.nix(5) man page and in the NixOS manual
# (accessible by running ‘nixos-help’).
{ config, pkgs, pkgs-unstable, ... }:
let
optionalPkgs = import ../optional-packages.nix { inherit pkgs; };
-in
+in
{
imports =
[
@@ -31,7 +31,7 @@ in
boot.extraModprobeConfig = ''
options gpio-mockup gpio_mockup_ranges=-1,21
'';
-
+
# Enable emulation if Architecture:
boot.binfmt.emulatedSystems = [
"aarch64-linux"
@@ -43,25 +43,19 @@ in
KERNEL=="ttyACM0", GROUP="gpio", MODE="0660"
SUBSYSTEM=="gpio", KERNEL=="gpiochip*", GROUP="gpio", MODE="0660"
'';
-
+
services.logind.settings.Login.powerKey = "ignore";
services.logind.settings.Login.powerKeyLongPress = "ignore";
services.logind.settings.Login.rebootKey = "ignore";
- systemd.sleep.extraConfig = ''
- SuspendState=freeze
- '';
+ systemd.sleep.settings.Sleep = {
+ SuspendState = "freeze";
+ };
# Enable openrgb
services.hardware.openrgb.enable = true;
- # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
- # Configure network proxy if necessary
- # networking.proxy.default = "http://user:password@proxy:port/";
- # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"
-
-
networking.firewall = {
enable = true;
@@ -82,7 +76,7 @@ in
48010
];
allowedTCPPortRanges = [
- # KDE Connect
+ # KDE Connect
{ from = 1714; to = 1764; }
];
allowedUDPPortRanges = [
@@ -120,19 +114,20 @@ in
packages = with pkgs; [];
shell = pkgs.bash;
};
+
# Use lemurs as display manager
services.displayManager.ly = {
- enable = true;
+ enable = true;
settings = {
tty = 1;
};
};
-
+
# Docker
virtualisation.docker.enable = true;
virtualisation.docker.storageDriver = "btrfs";
# Added docker group to user
-
+
# Desktop enviorment
programs.hyprland = {
@@ -148,28 +143,17 @@ in
dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
#localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
};
-
- # https://discourse.nixos.org/t/unable-to-add-new-library-folder-to-steam/38923/9
- # xdg.portal = {
- # enable = true;
- # extraPortals = with pkgs; [xdg-desktop-portal-gtk];
- # config = {
- # common.default = ["gtk"];
- # };
- # };
-
# Thunar file manager
programs.thunar.enable = true;
programs.xfconf.enable = true; # Neded to save preferances
- programs.thunar.plugins = with pkgs.xfce; [
+ programs.thunar.plugins = with pkgs; [
thunar-archive-plugin
];
services.gvfs.enable = true; # Mount, trash, and other functionalities
services.tumbler.enable = true; # Thumbnail support for images
- programs.adb.enable = true;
environment.systemPackages = with pkgs; [
polkit
libsecret # needet by gnnnome keyring
@@ -196,11 +180,12 @@ in
tree
unzip
adwaita-icon-theme
- hyprpicker
+ hyprpicker
hypridle
playerctl
pwvucontrol
hyprlandPlugins.hyprspace
+ android-tools
kdePackages.kdeconnect-kde
@@ -228,7 +213,7 @@ in
yazi
pkgs-unstable.orca-slicer
pkgs-unstable.video-downloader
-
+
bind # nsutils
grim # screenshot
slurp # area selectionn
@@ -239,7 +224,7 @@ in
# Theme
catppuccin-cursors.frappeMauve
libsForQt5.qt5ct
- qt6Packages.qt6ct
+ qt6Packages.qt6ct
hyprpaper
lxappearance
@@ -247,46 +232,27 @@ in
heroic
prismlauncher
] ++ optionalPkgs;
-
+
# nerdfonts wher seperated into different packages, so nerdfonts dosnt work
fonts.packages = with pkgs; [] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
-
- #Enviormant
+
+ #Enviormant
# needet for electron apps under wayland
- environment.sessionVariables.NIXOS_OZONE_WL = "1";
-
- # Enable auth polkit
+ environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
+ # Enable auth polkit
security.polkit.enable = true;
# Walet, needet for nextcloud login
services.gnome.gnome-keyring.enable = true;
-
+
security.pam.services.ly.enableGnomeKeyring = true;
# Required for non native linked programms
# https://nix.dev/guides/faq#how-to-run-non-nix-executables
programs.nix-ld.enable = true;
-
- # Some programs need SUID wrappers, can be configured further or are
- # started in user sessions.
- # programs.mtr.enable = true;
- # programs.gnupg.agent = {
- # enable = true;
- # enableSSHSupport = true;
- # };
-
- # List services that you want to enable:
-
- # Enable the OpenSSH daemon.
- # services.openssh.enable = true;
-
- # Open ports in the firewall.
- # networking.firewall.allowedTCPPorts = [ ... ];
- # networking.firewall.allowedUDPPorts = [ ... ];
- # Or disable the firewall altogether.
- # networking.firewall.enable = false;
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
diff --git a/root-conf/nixos/shared-conf.nix b/root-conf/nixos/shared-conf.nix
index 48cdd7e9..29cfd0d1 100644
--- a/root-conf/nixos/shared-conf.nix
+++ b/root-conf/nixos/shared-conf.nix
@@ -1,15 +1,9 @@
{ config, pkgs, pkgs-unstable, ... }:
-let
- # Create a customized version of logseq
- logseq-patch = pkgs.logseq.overrideAttrs (oldAttrs: {
- electron_27 = pkgs.electron_38;
- });
-in
{
system.activationScripts.ciscoPreHook = {
text = ''
echo "Prefetching Cisco Packet Tracer dependencies..."
- ${pkgs.nix}/bin/nix-prefetch-url --type sha256 file:///etc/nixos/local-pkgs/CiscoPacketTracer822_amd64_signed.deb
+ ${pkgs.nix}/bin/nix-prefetch-url --type sha256 file:///etc/nixos/local-pkgs/CiscoPacketTracer_900_Ubuntu_64bit.deb
'';
deps = [];
};
@@ -102,10 +96,6 @@ in
nixpkgs.config.allowUnfree = true;
- nixpkgs.config.permittedInsecurePackages = [
- "ciscoPacketTracer8-8.2.2"
- ];
-
environment.systemPackages = with pkgs; [
starship
virtiofsd
@@ -120,9 +110,9 @@ in
rnote
vscode
nextcloud-client
- ciscoPacketTracer8
+ ciscoPacketTracer9
gimp3
- logseq-patch
+ logseq
pdfarranger
thunderbird
textpieces