szymon/amazing-dotfiles
1
0
Fork 0
mirror of https://github.com/szymon-jozef/amazing-dotfiles.git synced 2026-09-07 12:10:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

test

Browse Source
This commit is contained in:
Szymon P
2026-02-25 00:24:43 +01:00
parent cd8ef7e5db
commit a1952fa7a9
5 changed files with 48 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
flake.lock generated
View File

@@ -20,11 +20,11 @@
]
},
"locked": {
"lastModified": 1770895474,
"narHash": "sha256-JBcrq1Y0uw87VZdYsByVbv+GBuT6ECaCNb9txLX9UuU=",
"lastModified": 1771610171,
"narHash": "sha256-+DeInuhbm6a6PpHDNUS7pozDouq2+8xSDefoNaZLW0E=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "a494d50d32b5567956b558437ceaa58a380712f7",
"rev": "7f9eb087703ec4acc6b288d02fa9ea3db803cd3d",
"type": "github"
},
"original": {
@@ -205,11 +205,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1771763411,
"narHash": "sha256-tBcqD2V1lfAjbKEDUQpEODqeRJTiBn/+E5o5QiVjNvg=",
"lastModified": 1771959711,
"narHash": "sha256-fVxN49l5Tu/iCSGuQuyR7HLBl9qJyg/4kt8WHTFn3MY=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "b4ee4674f9a74e3d602c7fb17bc09f79d221583c",
"rev": "c60b3cb2ed0404d9573b2801b51ba7be1da999d9",
"type": "github"
},
"original": {
@@ -305,11 +305,11 @@
]
},
"locked": {
"lastModified": 1767983607,
"narHash": "sha256-8C2co8NYfR4oMOUEsPROOJ9JHrv9/ktbJJ6X1WsTbXc=",
"lastModified": 1771866172,
"narHash": "sha256-fYFoXhQLrm1rD8vSFKQBOEX4OGCuJdLt1amKfHd5GAw=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "d4037379e6057246b408bbcf796cf3e9838af5b2",
"rev": "0b219224910e7642eb0ed49f0db5ec3d008e3e41",
"type": "github"
},
"original": {
@@ -382,11 +382,11 @@
]
},
"locked": {
"lastModified": 1770139857,
"narHash": "sha256-bCqxcXjavgz5KBJ/1CBLqnagMMf9JvU1m9HmYVASKoc=",
"lastModified": 1771271487,
"narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "9038eec033843c289b06b83557a381a2648d8fa5",
"rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d",
"type": "github"
},
"original": {
@@ -436,11 +436,11 @@
]
},
"locked": {
"lastModified": 1770203293,
"narHash": "sha256-PR/KER+yiHabFC/h1Wjb+9fR2Uy0lWM3Qld7jPVaWkk=",
"lastModified": 1771606233,
"narHash": "sha256-F3PLUqQ/TwgR70U+UeOqJnihJZ2EuunzojYC4g5xHr0=",
"owner": "hyprwm",
"repo": "hyprwire",
"rev": "37bc90eed02b0c8b5a77a0b00867baf3005cfb98",
"rev": "06c7f1f8c4194786c8400653c4efc49dc14c0f3a",
"type": "github"
},
"original": {
@@ -467,11 +467,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1770841267,
"narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=",
"lastModified": 1771848320,
"narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae",
"rev": "2fc6539b481e1d2569f25f8799236694180c0993",
"type": "github"
},
"original": {
@@ -483,11 +483,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1771369470,
"narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
"lastModified": 1771848320,
"narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0182a361324364ae3f436a63005877674cf45efb",
"rev": "2fc6539b481e1d2569f25f8799236694180c0993",
"type": "github"
},
"original": {
@@ -529,11 +529,11 @@
]
},
"locked": {
"lastModified": 1770726378,
"narHash": "sha256-kck+vIbGOaM/dHea7aTBxdFYpeUl/jHOy5W3eyRvVx8=",
"lastModified": 1771858127,
"narHash": "sha256-Gtre9YoYl3n25tJH2AoSdjuwcqij5CPxL3U3xysYD08=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "5eaaedde414f6eb1aea8b8525c466dc37bba95ae",
"rev": "49bbbfc218bf3856dfa631cead3b052d78248b83",
"type": "github"
},
"original": {
@@ -546,15 +546,10 @@
"inputs": {
"catppuccin": "catppuccin",
"home-manager": "home-manager",
<<<<<<< HEAD
"hyprland": "hyprland",
"nixpkgs": "nixpkgs_3",
"nixvim": "nixvim"
=======
"nixpkgs": "nixpkgs_2",
"nixvim": "nixvim",
"wallpapers": "wallpapers"
>>>>>>> c77553344515b404d765c04e1e472dac1cf4bb94
}
},
"systems": {
@@ -587,7 +582,22 @@
"type": "github"
}
},
<<<<<<< HEAD
"wallpapers": {
"flake": false,
"locked": {
"lastModified": 1762937381,
"narHash": "sha256-N+MZHSRcwOldS5Ai8B3YfKquKs9oeUW/GkV1iKM5+i8=",
"owner": "orangci",
"repo": "walls-catppuccin-mocha",
"rev": "7bfdf10d16ad3a689f9f0cf3a0930da3d1a245a8",
"type": "github"
},
"original": {
"owner": "orangci",
"repo": "walls-catppuccin-mocha",
"type": "github"
}
},
"xdph": {
"inputs": {
"hyprland-protocols": [
@@ -626,21 +636,6 @@
"original": {
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
=======
"wallpapers": {
"flake": false,
"locked": {
"lastModified": 1762937381,
"narHash": "sha256-N+MZHSRcwOldS5Ai8B3YfKquKs9oeUW/GkV1iKM5+i8=",
"owner": "orangci",
"repo": "walls-catppuccin-mocha",
"rev": "7bfdf10d16ad3a689f9f0cf3a0930da3d1a245a8",
"type": "github"
},
"original": {
"owner": "orangci",
"repo": "walls-catppuccin-mocha",
>>>>>>> c77553344515b404d765c04e1e472dac1cf4bb94
"type": "github"
}
}

16
flake.nix
View File

@@ -38,7 +38,7 @@
email = "szymon_jozef@proton.me";
fullName = "Szymon P";
# your public ssh key
signingKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKxyiqawA95AlLjXGd99sQCVR2rDq2/D7PG/vz7sZv5G";
signingKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILaITOo0cG6j0iQKpn7ldhfq9P0FVhGpwUqw2hf+Uhaq";
mainMonitor = "DP-1"; # only for some applications: you still need to set hyprland monitors yourself!
statusBar = "ashell"; # available: ashell|waybar
@@ -55,15 +55,8 @@
pkgs = import nixpkgs { system = "x86_64-linux"; };
extraSpecialArgs = {
inherit
<<<<<<< HEAD
username
email
full_name
inputs
=======
inputs
userConfig
>>>>>>> c77553344515b404d765c04e1e472dac1cf4bb94
;
isNixOS = false;
};
@@ -78,15 +71,8 @@
pkgs = import nixpkgs { system = "x86_64-linux"; };
extraSpecialArgs = {
inherit
<<<<<<< HEAD
username
email
full_name
inputs
=======
inputs
userConfig
>>>>>>> c77553344515b404d765c04e1e472dac1cf4bb94
;
isNixOS = true;
};

5
modules/cli/git.nix
View File

@@ -29,14 +29,9 @@
};
signing = {
<<<<<<< HEAD
key = email;
signByDefault = false;
=======
key = userConfig.signingKey;
signByDefault = true;
format = "ssh";
>>>>>>> c77553344515b404d765c04e1e472dac1cf4bb94
};
ignores = [

9
modules/hypr/hyprland.nix
View File

@@ -1,14 +1,9 @@
{
<<<<<<< HEAD
inputs,
pkgs,
isNixOS,
lib,
=======
isNixOS,
lib,
userConfig,
>>>>>>> c77553344515b404d765c04e1e472dac1cf4bb94
inputs,
pkgs,
...
}:

6
modules/xdg.nix
View File

@@ -15,7 +15,11 @@
defaultApplications = {
"application/pdf" = [ "org.pwmt.zathura.desktop" ];
"text/html" = [ "zen.desktop" ];
"text/html" = [
"zen-beta.desktop"
"zen.desktop"
"chromium.desktop"
];
"application/xhtml+xml" = [ "zen.desktop" ];
"x-scheme-handler/http" = [ "zen.desktop" ];
"x-scheme-handler/https" = [ "zen.desktop" ];